Migrate from jsr305 to jspecify and error_prone_annotations

Author: linghengqian

Diff for: infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstance.java

@@ -24,7 +24,7 @@
 import org.apache.shardingsphere.infra.state.instance.InstanceState;
 import org.apache.shardingsphere.infra.state.instance.InstanceStateContext;
 
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArrayList;
 

Diff for: infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java

@@ -25,7 +25,7 @@
 import org.apache.shardingsphere.infra.state.instance.InstanceState;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
 
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.Properties;

Diff for: infra/parser/src/main/java/org/apache/shardingsphere/infra/parser/cache/SQLStatementCacheLoader.java

@@ -23,7 +23,7 @@
 import org.apache.shardingsphere.sql.parser.api.CacheOption;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * SQL statement cache loader.
@@ -36,7 +36,7 @@ public SQLStatementCacheLoader(final DatabaseType databaseType, final CacheOptio
         sqlStatementParserExecutor = new SQLStatementParserExecutor(databaseType, parseTreeCacheOption);
     }
 
-    @ParametersAreNonnullByDefault
+    @NullMarked
     @Override
     public SQLStatement load(final String sql) {
         return sqlStatementParserExecutor.parse(sql);

Diff for: kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/DataConsistencyCheckUtils.java

@@ -23,7 +23,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;

Diff for: kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/SingleTableInventoryCalculateParameter.java

@@ -26,7 +26,7 @@
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;

Diff for: kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilder.java

@@ -24,7 +24,7 @@
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

Diff for: kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCIncrementalTask.java

@@ -27,7 +27,7 @@
 import org.apache.shardingsphere.data.pipeline.core.task.TaskExecuteCallback;
 import org.apache.shardingsphere.data.pipeline.core.task.progress.IncrementalTaskProgress;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.concurrent.CompletableFuture;

Diff for: kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCInventoryTask.java

@@ -29,7 +29,7 @@
 import org.apache.shardingsphere.data.pipeline.core.task.TaskExecuteCallback;
 import org.apache.shardingsphere.data.pipeline.core.task.progress.InventoryTaskProgress;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;

Diff for: kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/planner/cache/ExecutionPlanCacheLoader.java

@@ -20,14 +20,14 @@
 import com.github.benmanes.caffeine.cache.CacheLoader;
 import org.apache.shardingsphere.sqlfederation.optimizer.SQLFederationExecutionPlan;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Execution plan cache loader.
  */
 public final class ExecutionPlanCacheLoader implements CacheLoader<ExecutionPlanCacheKey, SQLFederationExecutionPlan> {
 
-    @ParametersAreNonnullByDefault
+    @NullMarked
     @Override
     public SQLFederationExecutionPlan load(final ExecutionPlanCacheKey cacheKey) {
         return cacheKey.getSqlStatementCompiler().compile(cacheKey.getSqlStatement(), cacheKey.getDatabaseType());

Diff for: kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/planner/rule/transformation/PushFilterIntoScanRule.java

@@ -33,6 +33,7 @@
 /**
  * Push filter into scan rule.
  */
+@Value.Style(nullableAnnotation = "org.jspecify.annotations.Nullable", fallbackNullableAnnotation = org.jspecify.annotations.Nullable.class)
 @Value.Enclosing
 public final class PushFilterIntoScanRule extends RelRule<PushFilterIntoScanRule.Config> implements TransformationRule {
 

Diff for: kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/planner/rule/transformation/PushProjectIntoScanRule.java

@@ -33,6 +33,7 @@
 /**
  * Push project into scan rule.
  */
+@Value.Style(nullableAnnotation = "org.jspecify.annotations.Nullable", fallbackNullableAnnotation = org.jspecify.annotations.Nullable.class)
 @Value.Enclosing
 public final class PushProjectIntoScanRule extends RelRule<PushProjectIntoScanRule.Config> implements TransformationRule {
 

Diff for: mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java

@@ -22,7 +22,7 @@
 import org.apache.shardingsphere.infra.metadata.statistics.builder.ShardingSphereStatisticsFactory;
 import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistFacade;
 
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.errorprone.annotations.ThreadSafe;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**

Diff for: parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/cache/ParseTreeCacheLoader.java

@@ -22,7 +22,7 @@
 import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
 import org.apache.shardingsphere.sql.parser.core.database.parser.SQLParserExecutor;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Parse context cache loader.
@@ -35,7 +35,7 @@ public ParseTreeCacheLoader(final DatabaseType databaseType) {
         sqlParserExecutor = new SQLParserExecutor(databaseType);
     }
 
-    @ParametersAreNonnullByDefault
+    @NullMarked
     @Override
     public ParseASTNode load(final String sql) {
         return sqlParserExecutor.parse(sql);

Diff for: parser/sql/engine/src/test/java/org/apache/shardingsphere/sql/parser/api/SQLParserExecutorTest.java

@@ -25,7 +25,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.internal.configuration.plugins.Plugins;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -46,7 +46,7 @@ void assertParse() throws ReflectiveOperationException {
         LoadingCache<String, ParseASTNode> parseTreeCache = Caffeine.newBuilder().softValues().initialCapacity(128)
                 .maximumSize(1024L).build(new CacheLoader<String, ParseASTNode>() {
 
-                    @ParametersAreNonnullByDefault
+                    @NullMarked
                     @Override
                     public ParseASTNode load(final String sql) {
                         return sqlParserExecutor.parse(sql);

Diff for: parser/sql/engine/src/test/java/org/apache/shardingsphere/sql/parser/core/SQLParserEngineTest.java

@@ -23,7 +23,7 @@
 import org.apache.shardingsphere.sql.parser.core.database.parser.SQLParserExecutor;
 import org.junit.jupiter.api.Test;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -39,7 +39,7 @@ void assertParse() {
         LoadingCache<String, ParseASTNode> parseTreeCache = Caffeine.newBuilder().softValues()
                 .initialCapacity(128).maximumSize(1024L).build(new CacheLoader<String, ParseASTNode>() {
 
-                    @ParametersAreNonnullByDefault
+                    @NullMarked
                     @Override
                     public ParseASTNode load(final String sql) {
                         return sqlParserExecutor.parse(sql);

Diff for: pom.xml

@@ -66,7 +66,7 @@
         <sonar.exclusions>**/autogen/**/*</sonar.exclusions>
 
         <!-- 3rd party library versions -->
-        <guava.version>32.1.2-jre</guava.version>
+        <guava.version>33.4.6-jre</guava.version>
         <checker-qual.version>3.39.0</checker-qual.version>
         <error_prone_annotations.version>2.22.0</error_prone_annotations.version>
         <j2objc-annotations.version>1.3</j2objc-annotations.version>
@@ -119,7 +119,7 @@
         <commons-logging.version>1.2</commons-logging.version>
 
         <lombok.version>1.18.36</lombok.version>
-        <immutables.version>2.9.3</immutables.version>
+        <immutables.version>2.10.1</immutables.version>
 
         <postgresql.version>42.7.2</postgresql.version>
         <mysql-connector-java.version>8.3.0</mysql-connector-java.version>