Skip to content

Commit 34b9d45

Browse files
committed
mark nullable
Signed-off-by: neo <1100909+neowu@users.noreply.github.com>
1 parent 69e7deb commit 34b9d45

File tree

13 files changed

+35
-13
lines changed

13 files changed

+35
-13
lines changed

buildSrc/src/main/kotlin/db-migration.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
tasks.withType<AbstractFlywayTask> {
8-
notCompatibleWithConfigurationCache("https://github.com/flyway/flyway/issues/3550")
8+
notCompatibleWithConfigurationCache("https://github.com/flyway/flyway/issues/4107")
99

1010
val migrationDir = file("src/main/resources/db/migration")
1111
if (!migrationDir.exists()) throw Error("$migrationDir does not exist")

core-ng-search/src/main/java/core/framework/search/impl/DocumentClassValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void visitClass(Class<?> objectClass, @Nullable String path) {
2929
}
3030

3131
@Override
32-
public void visitField(Field field, String parentPath) {
32+
public void visitField(Field field, @Nullable String parentPath) {
3333
super.visitField(field, parentPath);
3434

3535
try {

core-ng/src/main/java/core/framework/internal/inject/BeanFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void bind(Type type, @Nullable String name, Object instance) {
3434
throw new Error(format("found duplicate bean, type={}, name={}, previous={}", type.getTypeName(), name, previous));
3535
}
3636

37-
public Object bean(Type type, String name) {
37+
public Object bean(Type type, @Nullable String name) {
3838
Object bean = beans.get(new Key(type, name));
3939
if (bean == null) throw new Error(format("can not find bean, type={}, name={}", type.getTypeName(), name));
4040
return bean;

core-ng/src/main/java/core/framework/internal/inject/InjectValidator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import core.framework.inject.Inject;
44
import core.framework.internal.reflect.Fields;
55
import core.framework.util.Strings;
6+
import org.jspecify.annotations.Nullable;
67

78
import java.lang.reflect.Field;
89
import java.lang.reflect.Modifier;
@@ -61,6 +62,7 @@ private boolean shouldInspect(Object value) {
6162
return !visitedObjects.contains(value);
6263
}
6364

65+
@Nullable
6466
private Object fieldValue(Field field, Object instance) {
6567
if (field.trySetAccessible()) {
6668
try {
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.inject;
3+
4+
import org.jspecify.annotations.NullMarked;

core-ng/src/main/java/core/framework/internal/json/JSONClassValidator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import core.framework.internal.validate.ClassVisitor;
88
import core.framework.util.Maps;
99
import core.framework.util.Sets;
10+
import org.jspecify.annotations.Nullable;
1011

1112
import java.lang.reflect.Field;
1213
import java.math.BigDecimal;
@@ -55,7 +56,7 @@ public void validate() {
5556
}
5657

5758
@Override
58-
public void visitField(Field field, String parentPath) {
59+
public void visitField(Field field, @Nullable String parentPath) {
5960
Property property = field.getDeclaredAnnotation(Property.class);
6061
if (property == null)
6162
throw new Error("field must have @Property, field=" + Fields.path(field));

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package core.framework.internal.log;
22

3+
import org.jspecify.annotations.Nullable;
34
import org.slf4j.Logger;
45
import org.slf4j.Marker;
56

@@ -13,23 +14,23 @@ abstract class AbstractLogger implements Logger {
1314
this.name = name;
1415
}
1516

16-
abstract void log(Marker marker, LogLevel level, String message, Object[] arguments, Throwable exception);
17+
abstract void log(@Nullable Marker marker, LogLevel level, String message, @Nullable Object[] arguments, @Nullable Throwable exception);
1718

18-
private void logWithOneArgument(Marker marker, LogLevel level, String format, Object arg) {
19+
private void logWithOneArgument(@Nullable Marker marker, LogLevel level, String format, Object arg) {
1920
if (arg instanceof Throwable exception)
2021
log(marker, level, format, null, exception);
2122
else
2223
log(marker, level, format, new Object[]{arg}, null);
2324
}
2425

25-
private void logWithTwoArguments(Marker marker, LogLevel level, String format, Object arg1, Object arg2) {
26+
private void logWithTwoArguments(@Nullable Marker marker, LogLevel level, String format, Object arg1, Object arg2) {
2627
if (arg2 instanceof Throwable exception)
2728
log(marker, level, format, new Object[]{arg1}, exception);
2829
else
2930
log(marker, level, format, new Object[]{arg1, arg2}, null);
3031
}
3132

32-
private void logWithArguments(Marker marker, LogLevel level, String format, Object... arguments) {
33+
private void logWithArguments(@Nullable Marker marker, LogLevel level, String format, Object... arguments) {
3334
if (arguments.length > 0 && arguments[arguments.length - 1] instanceof Throwable exception) {
3435
Object[] messageArguments = new Object[arguments.length - 1];
3536
System.arraycopy(arguments, 0, messageArguments, 0, arguments.length - 1);

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,19 @@ public final class ActionLog {
3737
public LogLevel result = LogLevel.INFO;
3838
public Trace trace = Trace.NONE; // whether flush trace log for all subsequent actions
3939
public String action = "unassigned";
40+
@Nullable
4041
public List<String> correlationIds; // with bulk message handler, there will be multiple correlationIds handled by one batch
42+
@Nullable
4143
public List<String> clients;
44+
@Nullable
4245
public List<String> refIds;
43-
public String errorMessage;
4446
long elapsed;
47+
@Nullable
48+
public String errorMessage;
49+
@Nullable
4550
private String errorCode;
4651

47-
public ActionLog(String message, String id) {
52+
public ActionLog(String message, @Nullable String id) {
4853
startTime = System.nanoTime();
4954
date = Instant.now();
5055
if (id == null) {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ final class LogEvent {
1717

1818
private final long time = System.nanoTime();
1919
private final String logger;
20+
@Nullable
2021
private final Marker marker;
2122
private final String message;
22-
private final Object[] arguments;
23+
private final Object @Nullable [] arguments;
24+
@Nullable
2325
private final Throwable exception;
2426

25-
LogEvent(String logger, Marker marker, LogLevel level, String message, Object[] arguments, Throwable exception) {
27+
LogEvent(String logger, @Nullable Marker marker, LogLevel level, String message, Object @Nullable [] arguments, @Nullable Throwable exception) {
2628
this.logger = logger;
2729
this.marker = marker;
2830
this.level = level;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public static ActionLog currentActionLog() {
5353
}
5454

5555
private final ActionLogMessageFactory actionLogMessageFactory = new ActionLogMessageFactory();
56+
@Nullable
5657
public LogAppender appender;
5758

5859
// this is internal api, to simplify the design, task must not throw exceptions, all callers catch throwable and log error

0 commit comments

Comments
 (0)