Skip to content

Commit 3f8c4a4

Browse files
committed
update undertow and misc reviews
Signed-off-by: neo <1100909+neowu@users.noreply.github.com>
1 parent fa6464a commit 3f8c4a4

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ project("core-ng") {
3939
implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
4040
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
4141
implementation("com.squareup.okhttp3:okhttp:5.1.0")
42-
implementation("io.undertow:undertow-core:2.3.18.Final")
42+
implementation("io.undertow:undertow-core:2.3.19.Final")
4343
implementation("org.apache.kafka:kafka-clients:4.1.0") {
4444
exclude("org.xerial.snappy")
4545
exclude("org.lz4")

core-ng/src/main/java/core/framework/internal/log/LogManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public static ActionLog currentActionLog() {
5555
private final ActionLogMessageFactory actionLogMessageFactory = new ActionLogMessageFactory();
5656
public LogAppender appender;
5757

58+
// this is internal api, to simplify the design, task must not throw exceptions, all callers catch throwable and log error
59+
// if task throws exception, current action log may not be marked as error
5860
public <T> T run(String action, String id, ActionLogCallable<T> task) {
5961
var log = new ActionLog("=== " + action + " begin ===", id);
6062
return where(CURRENT_ACTION_LOG, log).call(() -> {

core-ng/src/test/java/core/framework/internal/web/sse/TestChannelListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import core.framework.web.Request;
44
import core.framework.web.sse.Channel;
55
import core.framework.web.sse.ChannelListener;
6+
import org.jspecify.annotations.Nullable;
67

78
public class TestChannelListener implements ChannelListener<TestEvent> {
89
@Override
9-
public void onConnect(Request request, Channel<TestEvent> channel, String lastEventId) {
10+
public void onConnect(Request request, Channel<TestEvent> channel, @Nullable String lastEventId) {
1011

1112
}
1213
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@NullMarked
2+
package core.framework.internal.web.sse;
3+
4+
import org.jspecify.annotations.NullMarked;

0 commit comments

Comments
 (0)