Skip to content

Commit 5283fdb

Browse files
committed
Fix global arguments error
1 parent 1755be3 commit 5283fdb

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/main/java/net/cofcool/sourcebox/internal/simplenote/NoteService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import lombok.CustomLog;
77
import net.cofcool.sourcebox.internal.simplenote.entity.Note;
88
import net.cofcool.sourcebox.util.SqlRepository;
9+
import org.apache.commons.lang3.StringUtils;
910

1011
@CustomLog
1112
public class NoteService {
@@ -18,7 +19,7 @@ public NoteService(Vertx vertx) {
1819

1920
public Future<Note> save(Note note) {
2021
var n = note;
21-
if (n.id() == null) {
22+
if (StringUtils.isBlank(n.id())) {
2223
n = Note.init(n.content());
2324
}
2425
return noteRepository.save(n);

src/main/java/net/cofcool/sourcebox/runner/WebVerticle.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,13 @@ private Router build(Credentials credentials) {
167167
r.body().asJsonObject()
168168
.forEach(e -> args.arg(e.getKey(), (String) e.getValue()));
169169
var webToolContext = contextSupplier.apply(tool);
170-
args.copyConfigFrom(tool.config())
171-
.copyConfigFrom(globalConfig.removePrefix(toolName))
170+
args.copyConfigFrom(globalConfig.removePrefix(toolName))
171+
.copyConfigFrom(tool.config())
172172
.context(webToolContext);
173173

174174
vertx.executeBlocking(() -> {
175175
tool.run(args);
176-
return Future.succeededFuture(webToolContext.toObject());
176+
return Future.succeededFuture("success");
177177
})
178178
.onSuccess(a ->
179179
EVENT_QUEUE.offer(new ActionEvent(a.result(), toolName, "finished")))

0 commit comments

Comments
 (0)