Skip to content

Commit dcc13a5

Browse files
CodePlayerCodePlayer
committed
build(deps): 升级依赖版本并替换注解库
- 将项目版本从 4.2.0 更新至 4.3.0 - 替换 findbugs:jsr305 为 jspecify:jspecify 1.0.0
1 parent a13c34a commit dcc13a5

File tree

19 files changed

+95
-84
lines changed

19 files changed

+95
-84
lines changed

‎pom.xml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>me.codeplayer</groupId>
66
<artifactId>ready-x</artifactId>
7-
<version>4.2.0</version>
7+
<version>4.3.0</version>
88
<packaging>jar</packaging>
99

1010
<name>ready-x</name>
@@ -32,9 +32,9 @@
3232
</dependency>
3333

3434
<dependency>
35-
<groupId>com.google.code.findbugs</groupId>
36-
<artifactId>jsr305</artifactId>
37-
<version>3.0.2</version>
35+
<groupId>org.jspecify</groupId>
36+
<artifactId>jspecify</artifactId>
37+
<version>1.0.0</version>
3838
</dependency>
3939

4040
<dependency>
@@ -52,14 +52,14 @@
5252
<dependency>
5353
<groupId>org.junit.jupiter</groupId>
5454
<artifactId>junit-jupiter-engine</artifactId>
55-
<version>5.13.4</version>
55+
<version>5.14.1</version>
5656
<scope>test</scope>
5757
</dependency>
5858

5959
<dependency>
6060
<groupId>org.junit.jupiter</groupId>
6161
<artifactId>junit-jupiter-params</artifactId>
62-
<version>5.13.4</version>
62+
<version>5.14.1</version>
6363
<scope>test</scope>
6464
</dependency>
6565

@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>org.assertj</groupId>
8383
<artifactId>assertj-core</artifactId>
84-
<version>3.27.4</version>
84+
<version>3.27.6</version>
8585
<scope>test</scope>
8686
</dependency>
8787

@@ -153,7 +153,7 @@
153153
<plugin>
154154
<groupId>org.apache.maven.plugins</groupId>
155155
<artifactId>maven-compiler-plugin</artifactId>
156-
<version>3.14.0</version>
156+
<version>3.14.1</version>
157157
<executions>
158158
<!-- compile for Java 9+ -->
159159
<execution>
@@ -210,7 +210,7 @@
210210
<plugin>
211211
<groupId>org.sonatype.central</groupId>
212212
<artifactId>central-publishing-maven-plugin</artifactId>
213-
<version>0.8.0</version>
213+
<version>0.9.0</version>
214214
<extensions>true</extensions>
215215
<configuration>
216216
<publishingServerId>central</publishingServerId>
@@ -247,14 +247,16 @@
247247
<jdk>[9,)</jdk>
248248
</activation>
249249
<properties>
250-
<surefire.argline>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED</surefire.argline>
250+
<surefire.argline>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens
251+
java.base/jdk.internal.misc=ALL-UNNAMED
252+
</surefire.argline>
251253
</properties>
252254
<build>
253255
<plugins>
254256
<plugin>
255257
<groupId>org.apache.maven.plugins</groupId>
256258
<artifactId>maven-compiler-plugin</artifactId>
257-
<version>3.14.0</version>
259+
<version>3.14.1</version>
258260
<executions>
259261
<!-- compile for Java 9+ -->
260262
<execution>
@@ -286,7 +288,7 @@
286288
<plugin>
287289
<groupId>org.apache.maven.plugins</groupId>
288290
<artifactId>maven-compiler-plugin</artifactId>
289-
<version>3.14.0</version>
291+
<version>3.14.1</version>
290292
<executions>
291293
<execution>
292294
<id>compile-java-8</id>
@@ -305,7 +307,7 @@
305307
<plugin>
306308
<groupId>org.apache.maven.plugins</groupId>
307309
<artifactId>maven-jar-plugin</artifactId>
308-
<version>3.4.2</version>
310+
<version>3.5.0</version>
309311
<configuration>
310312
<archive>
311313
<manifestEntries>
@@ -332,7 +334,7 @@
332334
<plugin>
333335
<groupId>org.jacoco</groupId>
334336
<artifactId>jacoco-maven-plugin</artifactId>
335-
<version>0.8.12</version>
337+
<version>0.8.14</version>
336338
<configuration>
337339
<excludes>
338340
<!-- 排除所有 Multi-Release JAR 版本目录 -->
@@ -359,7 +361,7 @@
359361
<plugin>
360362
<groupId>org.apache.maven.plugins</groupId>
361363
<artifactId>maven-source-plugin</artifactId>
362-
<version>3.3.1</version>
364+
<version>3.4.0</version>
363365
<executions>
364366
<execution>
365367
<id>attach-sources</id>
@@ -373,7 +375,7 @@
373375
<plugin>
374376
<groupId>org.apache.maven.plugins</groupId>
375377
<artifactId>maven-javadoc-plugin</artifactId>
376-
<version>3.11.3</version>
378+
<version>3.12.0</version>
377379
<configuration>
378380
<encoding>UTF-8</encoding>
379381
<doclint>none</doclint>

‎src/main/java/me/codeplayer/util/Arith.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package me.codeplayer.util;
22

33
import java.math.*;
4-
import javax.annotation.Nullable;
4+
5+
import org.jspecify.annotations.Nullable;
56

67
/**
78
* 用于商业运算的常用计算工具类

‎src/main/java/me/codeplayer/util/ArrayX.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.lang.reflect.Array;
44
import java.util.*;
55
import java.util.function.*;
6-
import javax.annotation.Nullable;
76

87
import org.apache.commons.lang3.ArrayUtils;
8+
import org.jspecify.annotations.Nullable;
99

1010
/**
1111
* 用于对数组类型的数据(字节数组参见NumberUtil类)进行相应处理的工具类

‎src/main/java/me/codeplayer/util/Assert.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package me.codeplayer.util;
22

33
import java.util.function.Supplier;
4-
import javax.annotation.Nonnull;
5-
import javax.annotation.Nullable;
4+
5+
import org.jspecify.annotations.NonNull;
6+
import org.jspecify.annotations.Nullable;
67

78
import static me.codeplayer.util.StringX.nullSafeGet;
89

@@ -180,7 +181,7 @@ public static void isNull(@Nullable Object object, @Nullable Supplier<? extends
180181
* @param object 指定对象
181182
* @throws NullPointerException 如果对象为 null
182183
*/
183-
@Nonnull
184+
@NonNull
184185
public static <T> T notNull(@Nullable T object) throws NullPointerException {
185186
if (object == null) {
186187
throw new NullPointerException();
@@ -196,7 +197,7 @@ public static <T> T notNull(@Nullable T object) throws NullPointerException {
196197
* @param errorMsg 异常消息内容
197198
* @throws NullPointerException 如果对象为 null
198199
*/
199-
@Nonnull
200+
@NonNull
200201
public static <T> T notNull(final @Nullable T obj, final @Nullable CharSequence errorMsg) throws NullPointerException {
201202
if (obj == null) {
202203
throw new NullPointerException(nullSafeGet(errorMsg));
@@ -212,7 +213,7 @@ public static <T> T notNull(final @Nullable T obj, final @Nullable CharSequence
212213
* @param msger 异常消息内容
213214
* @throws NullPointerException 如果对象为 null
214215
*/
215-
@Nonnull
216+
@NonNull
216217
public static <T> T notNull(final @Nullable T obj, final @Nullable Supplier<? extends CharSequence> msger) throws NullPointerException {
217218
if (obj == null) {
218219
throw new NullPointerException(nullSafeGet(msger));
@@ -263,7 +264,7 @@ public static void isEmpty(final @Nullable CharSequence str, final @Nullable Sup
263264
* @throws AssertException 如果断言失败
264265
* @see StringX#notEmpty(CharSequence)
265266
*/
266-
@Nonnull
267+
@NonNull
267268
public static <T extends CharSequence> T notEmpty(@Nullable T str) {
268269
isTrue(StringX.notEmpty(str));
269270
return str;
@@ -307,7 +308,7 @@ public static <T extends CharSequence> T notEmpty(@Nullable T str, final @Nullab
307308
* @throws AssertException 如果断言失败
308309
* @see StringX#notBlank(CharSequence)
309310
*/
310-
@Nonnull
311+
@NonNull
311312
public static <T extends CharSequence> T notBlank(@Nullable T obj) {
312313
isTrue(StringX.notBlank(obj));
313314
return obj;
@@ -324,7 +325,7 @@ public static <T extends CharSequence> T notBlank(@Nullable T obj) {
324325
* @throws AssertException 如果断言失败
325326
* @see StringX#notBlank(CharSequence)
326327
*/
327-
@Nonnull
328+
@NonNull
328329
public static <T extends CharSequence> T notBlank(@Nullable T cs, @Nullable CharSequence errorMsg) {
329330
isTrue(StringX.notBlank(cs), errorMsg);
330331
return cs;
@@ -341,7 +342,7 @@ public static <T extends CharSequence> T notBlank(@Nullable T cs, @Nullable Char
341342
* @throws AssertException 如果断言失败
342343
* @see StringX#notBlank(CharSequence)
343344
*/
344-
@Nonnull
345+
@NonNull
345346
public static <T extends CharSequence> T notBlank(@Nullable T cs, final @Nullable Supplier<? extends CharSequence> errorMsger) {
346347
isTrue(StringX.notBlank(cs), errorMsger);
347348
return cs;

‎src/main/java/me/codeplayer/util/Cmp.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
import java.math.BigDecimal;
44
import java.math.BigInteger;
5-
import javax.annotation.Nonnull;
6-
import javax.annotation.Nullable;
5+
6+
import org.jspecify.annotations.NonNull;
7+
import org.jspecify.annotations.Nullable;
78

89
/**
910
* 用于进行数值比较的工具类
@@ -114,23 +115,23 @@ public static BigDecimal zeroToNull(@Nullable BigDecimal val) {
114115
/**
115116
* 返回指定的 val，如果该参数为 null 时，则返回 0
116117
*/
117-
@Nonnull
118+
@NonNull
118119
public static Integer nullToZero(@Nullable Integer val) {
119120
return val == null ? 0 : val;
120121
}
121122

122123
/**
123124
* 返回指定的 val，如果该参数为 null 时，则返回 0
124125
*/
125-
@Nonnull
126+
@NonNull
126127
public static Long nullToZero(@Nullable Long val) {
127128
return val == null ? 0L : val;
128129
}
129130

130131
/**
131132
* 返回指定的 val，如果该参数为 null 时，则返回 0
132133
*/
133-
@Nonnull
134+
@NonNull
134135
public static Double nullToZero(@Nullable Double val) {
135136
// 此处 Double.valueOf(0) 不能简写成 0 或 0D，否则会产生额外的拆箱/装箱开销 */
136137
return val == null ? Double.valueOf(0) : val;
@@ -139,7 +140,7 @@ public static Double nullToZero(@Nullable Double val) {
139140
/**
140141
* 返回指定的 val，如果该参数为 null 时，则返回 0
141142
*/
142-
@Nonnull
143+
@NonNull
143144
public static Float nullToZero(@Nullable Float val) {
144145
// 此处 Float.valueOf(0) 不能简写成 0 或 0F，否则会产生额外的拆箱/装箱开销 */
145146
return val == null ? Float.valueOf(0) : val;
@@ -148,15 +149,15 @@ public static Float nullToZero(@Nullable Float val) {
148149
/**
149150
* 返回指定的 val，如果该参数为 null 时，则返回 0
150151
*/
151-
@Nonnull
152+
@NonNull
152153
public static BigDecimal nullToZero(@Nullable BigDecimal val) {
153154
return val == null ? BigDecimal.ZERO : val;
154155
}
155156

156157
/**
157158
* 返回指定的 val，如果该参数为 null 时，则返回 0
158159
*/
159-
@Nonnull
160+
@NonNull
160161
public static BigInteger nullToZero(@Nullable BigInteger val) {
161162
return val == null ? BigInteger.ZERO : val;
162163
}

‎src/main/java/me/codeplayer/util/CollectionX.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import java.net.URLEncoder;
66
import java.util.*;
77
import java.util.function.*;
8-
import javax.annotation.Nonnull;
9-
import javax.annotation.Nullable;
8+
9+
import org.jspecify.annotations.NonNull;
10+
import org.jspecify.annotations.Nullable;
1011

1112
/**
1213
* List、Set、Map等常见集合数据操作的工具类
@@ -938,7 +939,7 @@ public static <E, R> ArrayList<R> toList(@Nullable Collection<E> c, Function<? s
938939
* </code></pre>
939940
* 但性能更优
940941
*/
941-
@Nonnull
942+
@NonNull
942943
public static <K, V> Map<K, List<V>> groupBy(@Nullable final Collection<V> c, final Function<? super V, ? extends K> keyMapper) {
943944
return groupBy(c, keyMapper, Function.identity());
944945
}
@@ -950,7 +951,7 @@ public static <K, V> Map<K, List<V>> groupBy(@Nullable final Collection<V> c, fi
950951
* </code></pre>
951952
* 但性能更优
952953
*/
953-
@Nonnull
954+
@NonNull
954955
public static <E, K, V> Map<K, List<V>> groupBy(@Nullable final Collection<E> c, final Function<? super E, ? extends K> keyMapper, final Function<? super E, ? extends V> valueMapper) {
955956
final int size = c == null ? 0 : c.size();
956957
if (size == 0) {
@@ -971,7 +972,7 @@ public static <E, K, V> Map<K, List<V>> groupBy(@Nullable final Collection<E> c,
971972
* </code></pre>
972973
* 但性能更优
973974
*/
974-
@Nonnull
975+
@NonNull
975976
public static <T, R> List<R> filterAndMap(@Nullable Collection<T> c, final Predicate<? super T> filter, final Function<? super T, R> mapper) {
976977
final int size = c == null ? 0 : c.size();
977978
final List<R> result = new ArrayList<>();
@@ -1200,7 +1201,7 @@ public static StringBuilder mapToParams(@Nullable StringBuilder sb, @Nullable Bo
12001201
*
12011202
* @return 如果传入的 {@code params} 为空，则返回 ""
12021203
*/
1203-
@Nonnull
1204+
@NonNull
12041205
public static String mapToParams(final @Nullable Map<String, ?> params, final boolean urlSafeRequired) {
12051206
StringBuilder sb = mapToParams(null, Boolean.FALSE, params, urlSafeRequired, null);
12061207
return sb == null ? "" : sb.toString();
@@ -1212,7 +1213,7 @@ public static String mapToParams(final @Nullable Map<String, ?> params, final bo
12121213
*
12131214
* @return 如果传入的 {@code params} 为空，则返回 ""
12141215
*/
1215-
@Nonnull
1216+
@NonNull
12161217
public static String mapToParams(final @Nullable Map<String, ?> params) {
12171218
return mapToParams(params, true);
12181219
}

‎src/main/java/me/codeplayer/util/EasyDate.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import java.text.*;
88
import java.time.*;
99
import java.util.*;
10-
import javax.annotation.Nonnull;
11-
import javax.annotation.Nullable;
1210

1311
import org.apache.commons.lang3.time.FastDateFormat;
12+
import org.jspecify.annotations.NonNull;
13+
import org.jspecify.annotations.Nullable;
1414

1515
import static java.util.Calendar.*;
1616
import static me.codeplayer.util.NumberX.pickValidChars;
@@ -180,7 +180,7 @@ public static long getTimeOfDate(@Nullable Object date, boolean nullAsNow) {
180180
* 返回自 1970 年 1 月 1 日 00:00:00 GMT 以来指定日期对象表示的毫秒数。<br>
181181
* 如果为null，则默认为当前时间
182182
*/
183-
public static long getTimeOfDate(@Nonnull Object date) {
183+
public static long getTimeOfDate(@NonNull Object date) {
184184
return getTimeOfDate(date, false);
185185
}
186186

‎src/main/java/me/codeplayer/util/EnumX.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import java.lang.reflect.Array;
44
import java.util.function.*;
5-
import javax.annotation.Nullable;
5+
6+
import org.jspecify.annotations.Nullable;
67

78
/**
89
* 枚举工具类

‎src/main/java/me/codeplayer/util/FileX.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import java.nio.channels.FileChannel;
77
import java.nio.file.*;
88
import java.util.*;
9-
import javax.annotation.Nullable;
109

1110
import org.apache.commons.lang3.time.FastDateFormat;
11+
import org.jspecify.annotations.Nullable;
1212

1313
/**
1414
* 用于文件操作的公共工具类

0 commit comments

Comments
 (0)