This is an automated email from the ASF dual-hosted git repository.
sk0x50 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 081a4e1b203 IGNITE-23226 Remove using javax.annotation.Nullable (#7342)
081a4e1b203 is described below
commit 081a4e1b2032fbb09bfad90d69a0828dcefea98d
Author: Slava Koptilin <[email protected]>
AuthorDate: Mon Jan 5 11:57:24 2026 +0200
IGNITE-23226 Remove using javax.annotation.Nullable (#7342)
---
.../commands/recovery/partitions/restart/RestartPartitionsMixin.java | 2 +-
.../java/org/apache/ignite/internal/table/ItColumnNameMappingTest.java | 3 +--
.../internal/configuration/compatibility/framework/ConfigNode.java | 2 +-
.../compatibility/framework/ConfigurationTreeComparator.java | 2 +-
.../compatibility/framework/ConfigurationTreeScanner.java | 2 +-
.../ignite/internal/sql/engine/datatypes/ItDateTimeCastFormatTest.java | 2 +-
.../java/org/apache/ignite/internal/sql/engine/prepare/QueryPlan.java | 2 +-
.../sql/engine/prepare/ddl/ClusterWideNodeFilterValidator.java | 2 +-
.../ignite/internal/sql/engine/prepare/ddl/NodeFilterValidator.java | 2 +-
.../apache/ignite/internal/sql/engine/util/format/ParsedFields.java | 2 +-
.../internal/sql/engine/planner/datatypes/BaseTypeCoercionTest.java | 2 +-
.../ignite/internal/sql/engine/type/IgniteTypeFactorySelfTest.java | 2 +-
12 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/restart/RestartPartitionsMixin.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/restart/RestartPartitionsMixin.java
index c9a23afc7bf..ac6eef5027b 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/restart/RestartPartitionsMixin.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/recovery/partitions/restart/RestartPartitionsMixin.java
@@ -27,7 +27,7 @@ import static
org.apache.ignite.internal.cli.commands.Options.Constants.RECOVERY
import static
org.apache.ignite.internal.cli.commands.Options.Constants.RECOVERY_ZONE_NAME_OPTION_DESC;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
import picocli.CommandLine.Option;
/** Arguments for recovery restart partitions command. */
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItColumnNameMappingTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItColumnNameMappingTest.java
index 89a5f46799d..d5cab3d0727 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItColumnNameMappingTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItColumnNameMappingTest.java
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import javax.annotation.Nullable;
import org.apache.ignite.Ignite;
import org.apache.ignite.internal.ClusterPerClassIntegrationTest;
import org.apache.ignite.lang.MarshallerException;
@@ -30,6 +29,7 @@ import org.apache.ignite.table.KeyValueView;
import org.apache.ignite.table.RecordView;
import org.apache.ignite.table.Table;
import org.apache.ignite.table.Tuple;
+import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -201,7 +201,6 @@ public class ItColumnNameMappingTest extends
ClusterPerClassIntegrationTest {
assertEquals(expectedValue, tuple.valueOrDefault("columnname", null));
assertEquals(expectedValue, tuple.valueOrDefault("COLUMNNAME", null));
assertEquals(expectedValue, tuple.valueOrDefault("ColumnName", null));
- ;
assertNull(tuple.valueOrDefault("\"columnname\"", null));
assertEquals(expectedValue, tuple.valueOrDefault("\"COLUMNNAME\"",
null));
diff --git
a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigNode.java
b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigNode.java
index cdcef29a085..e2d03ddf284 100644
---
a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigNode.java
+++
b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigNode.java
@@ -30,8 +30,8 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
import org.apache.ignite.configuration.annotation.ConfigurationType;
+import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
/**
diff --git
a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeComparator.java
b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeComparator.java
index 8c576a8a7ac..a2607e1bab8 100644
---
a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeComparator.java
+++
b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeComparator.java
@@ -31,10 +31,10 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
import org.apache.ignite.configuration.ConfigurationModule;
import org.apache.ignite.configuration.KeyIgnorer;
import
org.apache.ignite.internal.configuration.compatibility.framework.ConfigNode.Node;
+import org.jetbrains.annotations.Nullable;
/**
* Compares two configuration trees (snapshot and current).
diff --git
a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeScanner.java
b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeScanner.java
index 58889383bc1..e60e1566fac 100644
---
a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeScanner.java
+++
b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/compatibility/framework/ConfigurationTreeScanner.java
@@ -40,7 +40,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.annotation.Nullable;
import org.apache.ignite.configuration.ConfigurationModule;
import org.apache.ignite.configuration.annotation.AbstractConfiguration;
import org.apache.ignite.configuration.annotation.Config;
@@ -58,6 +57,7 @@ import org.apache.ignite.configuration.annotation.Value;
import
org.apache.ignite.internal.configuration.compatibility.framework.ConfigNode.Attributes;
import
org.apache.ignite.internal.configuration.compatibility.framework.ConfigNode.Flags;
import org.apache.ignite.internal.configuration.util.ConfigurationUtil;
+import org.jetbrains.annotations.Nullable;
/**
* Provides method to extract metadata from project configuration classes.
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/ItDateTimeCastFormatTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/ItDateTimeCastFormatTest.java
index fdb76c2f210..ff35430f576 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/ItDateTimeCastFormatTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/ItDateTimeCastFormatTest.java
@@ -34,11 +34,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.annotation.Nullable;
import org.apache.ignite.Ignite;
import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.sql.SqlException;
+import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/QueryPlan.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/QueryPlan.java
index 088bb9ed1d1..7c37a1996a9 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/QueryPlan.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/QueryPlan.java
@@ -17,11 +17,11 @@
package org.apache.ignite.internal.sql.engine.prepare;
-import javax.annotation.Nullable;
import org.apache.ignite.internal.sql.engine.SqlQueryType;
import
org.apache.ignite.internal.sql.engine.prepare.partitionawareness.PartitionAwarenessMetadata;
import
org.apache.ignite.internal.sql.engine.prepare.pruning.PartitionPruningMetadata;
import org.apache.ignite.sql.ResultSetMetadata;
+import org.jetbrains.annotations.Nullable;
/**
* QueryPlan interface.
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/ClusterWideNodeFilterValidator.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/ClusterWideNodeFilterValidator.java
index 25232542680..3b3dc738d9d 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/ClusterWideNodeFilterValidator.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/ClusterWideNodeFilterValidator.java
@@ -26,11 +26,11 @@ import static
org.apache.ignite.lang.ErrorGroups.Sql.STMT_VALIDATION_ERR;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nullable;
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyService;
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologySnapshot;
import org.apache.ignite.internal.distributionzones.NodeWithAttributes;
import org.apache.ignite.sql.SqlException;
+import org.jetbrains.annotations.Nullable;
/**
* Node filter validator that checks presence of nodes matching given node
filter across cluster.
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/NodeFilterValidator.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/NodeFilterValidator.java
index da5195a8012..cf6eb5ccab1 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/NodeFilterValidator.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/NodeFilterValidator.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.sql.engine.prepare.ddl;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
/**
* Common validator for node filter. This is the best-effort validation
because the topology may change before the actual
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/format/ParsedFields.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/format/ParsedFields.java
index 81f0a1bfe7b..1f3fe6511f4 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/format/ParsedFields.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/format/ParsedFields.java
@@ -30,9 +30,9 @@ import java.util.EnumMap;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
import org.apache.calcite.util.mapping.IntPair;
import
org.apache.ignite.internal.sql.engine.util.format.DateTimeTemplateField.FieldKind;
+import org.jetbrains.annotations.Nullable;
/**
* Parsed fields.
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/datatypes/BaseTypeCoercionTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/datatypes/BaseTypeCoercionTest.java
index ad1ef2e2092..5e148188837 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/datatypes/BaseTypeCoercionTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/datatypes/BaseTypeCoercionTest.java
@@ -33,7 +33,6 @@ import java.util.Objects;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.annotation.Nullable;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.Join;
import org.apache.calcite.rel.core.Project;
@@ -72,6 +71,7 @@ import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.hamcrest.TypeSafeDiagnosingMatcher;
+import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.params.provider.Arguments;
/** Base class for testing types coercion. */
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactorySelfTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactorySelfTest.java
index ef19da832aa..88827067b1e 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactorySelfTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactorySelfTest.java
@@ -24,11 +24,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.stream.Stream;
-import javax.annotation.Nullable;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.ignite.internal.sql.engine.util.Commons;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
+import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
