migrate to jdk25

neowu · neowu · commit a40caff1e175 · 2025-09-25T12:23:56.000+08:00
Signed-off-by: neo &lt;1100909+neowu@users.noreply.github.com&gt;
diff --git a/buildSrc/src/main/check/pmd.xml b/buildSrc/src/main/check/pmd.xml
@@ -26,6 +26,7 @@
     <rule ref="category/java/bestpractices.xml/OneDeclarationPerLine"/>
     <rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
     <rule ref="category/java/bestpractices.xml/PrimitiveWrapperInstantiation"/>
+    <rule ref="category/java/bestpractices.xml/RelianceOnDefaultCharset"/>
     <rule ref="category/java/bestpractices.xml/SimplifiableTestAssertion"/>
     <rule ref="category/java/bestpractices.xml/SystemPrintln"/>
     <rule ref="category/java/bestpractices.xml/UnnecessaryVarargsArrayCreation"/>
@@ -52,20 +53,21 @@
             <property name="ignoredAnnotations" value="org.junit.jupiter.api.Test"/>
         </properties>
     </rule>
+    <rule ref="category/java/codestyle.xml/ModifierOrder"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryAnnotationValueElement"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryBoxing"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryCast"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryConstructor"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryImport"/>
-    <rule ref="category/java/codestyle.xml/UnnecessaryLocalBeforeReturn"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryModifier"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
     <rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>
     <rule ref="category/java/codestyle.xml/UseDiamondOperator"/>
     <rule ref="category/java/codestyle.xml/UselessParentheses"/>
     <rule ref="category/java/codestyle.xml/UselessQualifiedThis"/>
     <rule ref="category/java/codestyle.xml/UseShortArrayInitializer"/>
+    <rule ref="category/java/codestyle.xml/VariableCanBeInlined"/>
 
     <rule ref="category/java/design.xml/AbstractClassWithoutAnyMethod"/>
     <rule ref="category/java/design.xml/AvoidThrowingNewInstanceOfSameException"/>
@@ -86,7 +88,7 @@
     <rule ref="category/java/design.xml/SwitchDensity"/>
     <rule ref="category/java/design.xml/UselessOverridingMethod"/>
 
-    <rule ref="category/java/errorprone.xml/AssignmentInOperand"/>
+    <!--    <rule ref="category/java/errorprone.xml/AssignmentInOperand"/>-->
     <rule ref="category/java/errorprone.xml/AssignmentToNonFinalStatic"/>
     <rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier"/>
     <rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop"/>
@@ -95,7 +97,6 @@
     <rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
     <rule ref="category/java/errorprone.xml/AvoidEnumAsIdentifier"/>
     <rule ref="category/java/errorprone.xml/AvoidInstanceofChecksInCatchClause"/>
-    <rule ref="category/java/errorprone.xml/AvoidLosingExceptionInformation"/>
     <rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
     <rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
     <rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
@@ -121,6 +122,7 @@
     <rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
     <rule ref="category/java/errorprone.xml/NonStaticInitializer"/>
     <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode"/>
+    <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashCodeOnComparable"/>
     <rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock"/>
     <rule ref="category/java/errorprone.xml/SingleMethodSingleton"/>
     <rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
@@ -135,7 +137,7 @@
     <rule ref="category/java/errorprone.xml/UnusedNullCheckInEquals"/>
     <rule ref="category/java/errorprone.xml/UseCorrectExceptionLogging"/>
     <rule ref="category/java/errorprone.xml/UseEqualsToCompareStrings"/>
-    <rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
+    <!--    <rule ref="category/java/errorprone.xml/UselessPureMethodCall" />-->
     <rule ref="category/java/errorprone.xml/UseLocaleWithCaseConversions"/>
     <rule ref="category/java/errorprone.xml/UseProperClassLoader"/>
 
diff --git a/buildSrc/src/main/check/spotbugs.xml b/buildSrc/src/main/check/spotbugs.xml
@@ -335,7 +335,6 @@
             DMI_INVOKING_TOSTRING_ON_ARRAY,
             DMI_INVOKING_TOSTRING_ON_ANONYMOUS_ARRAY,
             ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT,
-            DMI_HARDCODED_ABSOLUTE_FILENAME,
             DMI_BAD_MONTH,
             DMI_USELESS_SUBSTRING,
             DMI_CALLING_NEXT_FROM_HASNEXT,
diff --git a/buildSrc/src/main/kotlin/check.gradle.kts b/buildSrc/src/main/kotlin/check.gradle.kts
@@ -16,7 +16,7 @@ apply(plugin = "jacoco-report-aggregation")
 
 checkstyle {
     dependencies {
-        checkstyle("com.puppycrawl.tools:checkstyle:10.26.1")
+        checkstyle("com.puppycrawl.tools:checkstyle:11.0.1")
         checkstyle("com.github.sevntu-checkstyle:sevntu-checks:1.44.1")
     }
 
@@ -44,7 +44,7 @@ checkstyle {
 pmd {
     ruleSets = listOf()
     ruleSetFiles = rootProject.files("buildSrc/src/main/check/pmd.xml")
-    toolVersion = "7.16.0"
+    toolVersion = "7.17.0"
     isConsoleOutput = true
 
     tasks.withType<Pmd> {
@@ -57,7 +57,7 @@ spotbugs {
         spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.12")
     }
 
-    toolVersion = "4.9.3"
+    toolVersion = "4.9.6"
     reportLevel = Confidence.LOW
     extraArgs = listOf("-longBugCodes")
     includeFilter = rootProject.file("buildSrc/src/main/check/spotbugs.xml")
diff --git a/core-ng/src/main/java/core/framework/internal/web/controller/WebContextImpl.java b/core-ng/src/main/java/core/framework/internal/web/controller/WebContextImpl.java
@@ -16,7 +16,7 @@ public class WebContextImpl implements WebContext {
     private static final ThreadLocal<Context> CONTEXT = new ThreadLocal<>();
 
     @Override
-    public Object get(String key) {
+    public @Nullable Object get(String key) {
         Context context = CONTEXT.get();
         if (context.context == null) return null;
         return context.context.get(key);
@@ -38,7 +38,7 @@ public Request request() {
     public void responseCookie(CookieSpec spec, @Nullable String value) {
         Context context = CONTEXT.get();
         if (context.responseCookies == null) context.responseCookies = new HashMap<>();
-        context.responseCookies.put(spec, value);
+        context.responseCookies.put(spec, value);   // cookies map allows null, to remove cookie thru response cookie header, refer to core.framework.internal.web.response.ResponseHandler.cookie
     }
 
     public void initialize(Request request) {
@@ -60,7 +60,9 @@ public void cleanup() {
 
     static class Context {
         final Request request;
+        @Nullable
         Map<String, Object> context;
+        @Nullable
         Map<CookieSpec, String> responseCookies;
 
         Context(Request request) {
diff --git a/core-ng/src/main/java/core/framework/internal/web/controller/package-info.java b/core-ng/src/main/java/core/framework/internal/web/controller/package-info.java
@@ -0,0 +1,4 @@
+@NullMarked
+package core.framework.internal.web.controller;
+
+import org.jspecify.annotations.NullMarked;
diff --git a/core-ng/src/main/java/core/framework/internal/web/http/IPv6Ranges.java b/core-ng/src/main/java/core/framework/internal/web/http/IPv6Ranges.java
@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 
 public class IPv6Ranges implements IPRanges {
     static boolean withinRanges(LongLong[] ranges, LongLong value) {
@@ -135,5 +136,17 @@ public int compareTo(LongLong other) {
             int result = Long.compare(high, other.high);
             return result != 0 ? result : Long.compare(low, other.low);
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || getClass() != o.getClass()) return false;
+            LongLong longLong = (LongLong) o;
+            return low == longLong.low && high == longLong.high;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(high, low);
+        }
     }
 }
diff --git a/core-ng/src/main/java/core/framework/internal/web/response/ResponseHandler.java b/core-ng/src/main/java/core/framework/internal/web/response/ResponseHandler.java
@@ -14,6 +14,7 @@
 import io.undertow.server.handlers.CookieSameSiteMode;
 import io.undertow.util.HeaderMap;
 import io.undertow.util.HttpString;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,7 +76,7 @@ private void putCookies(ResponseImpl response, HttpServerExchange exchange) {
         }
     }
 
-    CookieImpl cookie(CookieSpec spec, String value) {
+    CookieImpl cookie(CookieSpec spec, @Nullable String value) {
         var cookie = new CookieImpl(spec.name);
         if (value == null) {
             cookie.setMaxAge(0);
diff --git a/core-ng/src/main/java/core/framework/internal/web/response/ResponseImpl.java b/core-ng/src/main/java/core/framework/internal/web/response/ResponseImpl.java
@@ -7,6 +7,7 @@
 import core.framework.web.Response;
 import io.undertow.util.Headers;
 import io.undertow.util.HttpString;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 import java.util.Optional;
@@ -17,7 +18,9 @@
 public final class ResponseImpl implements Response {
     public final Body body;
     final Map<HttpString, String> headers = Maps.newHashMap();
+    @Nullable
     Map<CookieSpec, String> cookies;
+    @Nullable
     private ContentType contentType;
     private HTTPStatus status = HTTPStatus.OK;
 
@@ -42,7 +45,7 @@ public Optional<String> header(String name) {
     }
 
     @Override
-    public Response header(String name, String value) {
+    public Response header(String name, @Nullable String value) {
         if (Headers.CONTENT_TYPE.equalToString(name)) throw new Error("must not use header() to update content type, please use response.contentType()");
         headers.put(new HttpString(name), value);
         return this;
@@ -61,7 +64,7 @@ public Response contentType(ContentType contentType) {
     }
 
     @Override
-    public Response cookie(CookieSpec spec, String value) {
+    public Response cookie(CookieSpec spec, @Nullable String value) {
         if (cookies == null) cookies = Maps.newHashMap();
         cookies.put(spec, value);
         return this;
diff --git a/core-ng/src/main/java/core/framework/internal/web/site/MimeTypes.java b/core-ng/src/main/java/core/framework/internal/web/site/MimeTypes.java
@@ -3,6 +3,7 @@
 import core.framework.http.ContentType;
 import core.framework.util.ASCII;
 import core.framework.util.Maps;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Map;
 
@@ -49,6 +50,7 @@ final class MimeTypes {
         MIME_TYPES.put("zip", ContentType.create("application/zip", null));
     }
 
+    @Nullable
     static ContentType get(String fileName) {
         int index = fileName.lastIndexOf('.');
         if (index > 0 && index + 1 < fileName.length()) {
diff --git a/core-ng/src/main/java/core/framework/internal/web/site/StaticDirectoryController.java b/core-ng/src/main/java/core/framework/internal/web/site/StaticDirectoryController.java
@@ -5,6 +5,7 @@
 import core.framework.web.Request;
 import core.framework.web.Response;
 import core.framework.web.exception.NotFoundException;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,6 +20,7 @@
 public final class StaticDirectoryController implements StaticContentController {
     private final Logger logger = LoggerFactory.getLogger(StaticDirectoryController.class);
     private final Path contentDirectory;
+    @Nullable
     String cacheHeader;
 
     public StaticDirectoryController(Path contentDirectory) {
diff --git a/core-ng/src/main/java/core/framework/web/WebContext.java b/core-ng/src/main/java/core/framework/web/WebContext.java
@@ -6,6 +6,7 @@
  * @author neo
  */
 public interface WebContext {
+    @Nullable
     Object get(String key);     // context is used to pass value from interceptor to controller/ws, key will be static and deterministic, that's why here is designed to return Object, not Optional<T>
 
     void put(String key, Object value);

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`import io.undertow.server.handlers.CookieSameSiteMode;`
`15`	`15`	`import io.undertow.util.HeaderMap;`
`16`	`16`	`import io.undertow.util.HttpString;`
	`17`	`+import org.jspecify.annotations.Nullable;`
`17`	`18`	`import org.slf4j.Logger;`
`18`	`19`	`import org.slf4j.LoggerFactory;`
`19`	`20`
`@@ -75,7 +76,7 @@ private void putCookies(ResponseImpl response, HttpServerExchange exchange) {`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`
`78`		`- CookieImpl cookie(CookieSpec spec, String value) {`
	`79`	`+ CookieImpl cookie(CookieSpec spec, @Nullable String value) {`
`79`	`80`	`var cookie = new CookieImpl(spec.name);`
`80`	`81`	`if (value == null) {`
`81`	`82`	`cookie.setMaxAge(0);`