Skip to content

Commit 0bc5969

Browse files
committed
引入 jspecify 的 @Nullable,@NonNull 注解
1 parent 42b1962 commit 0bc5969

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

UPDATE_LOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
### v3.7.2
3131

32+
* 引入 jspecify 的 `@Nullable`,`@NonNull` 注解
3233
* 新增 resilience4j-solon-cloud-plugin 插件
3334
* 新增 solon-cloud-gateway websocket 协议代理支持
3435
* 新增 solon 启动扫描类索引机制(由 solon aot 构建时自动生成)

solon-parent/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<hutool.version>5.8.36</hutool.version>
6666

6767
<asm.version>9.8</asm.version>
68+
<jspecify.version>1.0.0</jspecify.version>
6869

6970
<r2dbc.version>1.0.0.RELEASE</r2dbc.version>
7071

solon/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
<version>${slf4j.version}</version>
2323
</dependency>
2424

25+
<dependency>
26+
<groupId>org.jspecify</groupId>
27+
<artifactId>jspecify</artifactId>
28+
<version>${jspecify.version}</version>
29+
</dependency>
30+
2531
<dependency>
2632
<groupId>org.noear</groupId>
2733
<artifactId>eggg</artifactId>

solon/src/main/java/org/noear/solon/lang/NonNull.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
* @author noear
2424
* @since 1.10
2525
*/
26-
@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD, ElementType.LOCAL_VARIABLE})
27-
@Retention(RetentionPolicy.CLASS)
26+
@org.jspecify.annotations.NonNull
27+
@Target({ElementType.TYPE_USE})
28+
@Retention(RetentionPolicy.RUNTIME)
2829
@Documented
2930
public @interface NonNull {
3031
}

solon/src/main/java/org/noear/solon/lang/Nullable.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
* @author noear
2424
* @since 1.10
2525
*/
26-
@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD, ElementType.LOCAL_VARIABLE})
27-
@Retention(RetentionPolicy.CLASS)
26+
@org.jspecify.annotations.Nullable
27+
@Target({ElementType.TYPE_USE})
28+
@Retention(RetentionPolicy.RUNTIME)
2829
@Documented
2930
public @interface Nullable {
3031
}

0 commit comments

Comments
 (0)