You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fa...@apache.org on 2024/07/03 03:21:51 UTC
(flink) branch master updated (af3e39fa4ce -> b782acfb9c0)
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
from af3e39fa4ce [FLINK-35735][sql-gateway] Don't list all catalogs when closing session (#25010)
new 1db333158b8 [FLINK-35733] Change org.jetbrains.annotations.NotNull/Nullable to javax.annotation.Nonnull/Nullable
new b782acfb9c0 [FLINK-35733][tools] Add the Nonnull & Nullable annotations check rule.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../impl/context/DefaultProcessingTimeManagerTest.java | 5 +++--
.../confluent/debezium/DebeziumAvroFormatFactoryTest.java | 5 +++--
.../org/apache/flink/formats/csv/DataStreamCsvITCase.java | 7 ++++---
.../parquet/utils/SerializableConfigurationTest.java | 3 ++-
.../flink/runtime/checkpoint/hooks/MasterHooksTest.java | 4 ++--
.../runtime/io/network/partition/ResultPartitionTest.java | 5 +++--
.../partition/TestingSubpartitionCreatedViewReader.java | 2 +-
.../network/partition/UnionResultSubpartitionViewTest.java | 3 ++-
.../partition/hybrid/tiered/file/DiskIOSchedulerTest.java | 5 +++--
.../operators/coordination/ComponentClosingUtilsTest.java | 5 +++--
.../runtime/operators/coordination/EventReceivingTasks.java | 4 ++--
.../adaptive/MockStateWithoutExecutionGraphContext.java | 3 ++-
.../apache/flink/state/forst/ForStDBOperationTestBase.java | 3 ++-
.../flink/table/client/cli/CliTableauResultViewTest.java | 5 +++--
.../table/gateway/api/utils/MockedSqlGatewayService.java | 2 +-
.../planner/factories/TestUpdateDeleteTableFactory.java | 2 +-
.../planner/functions/BuiltInAggregateFunctionTestBase.java | 4 ++--
.../plan/nodes/exec/common/CommonExecSinkITCase.java | 5 +++--
.../flink/test/checkpointing/RestoreUpgradedJobITCase.java | 5 +++--
.../flink/test/checkpointing/SavepointFormatITCase.java | 5 +++--
.../runtime/RecordAttributesPropagationITCase.java | 3 ++-
tools/maven/checkstyle.xml | 13 +++++++++++++
22 files changed, 63 insertions(+), 35 deletions(-)
(flink) 01/02: [FLINK-35733] Change org.jetbrains.annotations.NotNull/Nullable to javax.annotation.Nonnull/Nullable
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1db333158b8d0d338e4d116d39c65466066ef0c7
Author: Roc Marshal <fl...@126.com>
AuthorDate: Mon Jul 1 13:12:10 2024 +0800
[FLINK-35733] Change org.jetbrains.annotations.NotNull/Nullable to javax.annotation.Nonnull/Nullable
---
.../datastream/impl/context/DefaultProcessingTimeManagerTest.java | 5 +++--
.../registry/confluent/debezium/DebeziumAvroFormatFactoryTest.java | 5 +++--
.../java/org/apache/flink/formats/csv/DataStreamCsvITCase.java | 7 ++++---
.../flink/formats/parquet/utils/SerializableConfigurationTest.java | 3 ++-
.../org/apache/flink/runtime/checkpoint/hooks/MasterHooksTest.java | 4 ++--
.../flink/runtime/io/network/partition/ResultPartitionTest.java | 5 +++--
.../io/network/partition/TestingSubpartitionCreatedViewReader.java | 2 +-
.../io/network/partition/UnionResultSubpartitionViewTest.java | 3 ++-
.../network/partition/hybrid/tiered/file/DiskIOSchedulerTest.java | 5 +++--
.../runtime/operators/coordination/ComponentClosingUtilsTest.java | 5 +++--
.../flink/runtime/operators/coordination/EventReceivingTasks.java | 4 ++--
.../scheduler/adaptive/MockStateWithoutExecutionGraphContext.java | 3 ++-
.../org/apache/flink/state/forst/ForStDBOperationTestBase.java | 3 ++-
.../apache/flink/table/client/cli/CliTableauResultViewTest.java | 5 +++--
.../flink/table/gateway/api/utils/MockedSqlGatewayService.java | 2 +-
.../table/planner/factories/TestUpdateDeleteTableFactory.java | 2 +-
.../table/planner/functions/BuiltInAggregateFunctionTestBase.java | 4 ++--
.../table/planner/plan/nodes/exec/common/CommonExecSinkITCase.java | 5 +++--
.../apache/flink/test/checkpointing/RestoreUpgradedJobITCase.java | 5 +++--
.../org/apache/flink/test/checkpointing/SavepointFormatITCase.java | 5 +++--
.../test/streaming/runtime/RecordAttributesPropagationITCase.java | 3 ++-
21 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/flink-datastream/src/test/java/org/apache/flink/datastream/impl/context/DefaultProcessingTimeManagerTest.java b/flink-datastream/src/test/java/org/apache/flink/datastream/impl/context/DefaultProcessingTimeManagerTest.java
index 6eb95f9b4ee..80646a8a2a8 100644
--- a/flink-datastream/src/test/java/org/apache/flink/datastream/impl/context/DefaultProcessingTimeManagerTest.java
+++ b/flink-datastream/src/test/java/org/apache/flink/datastream/impl/context/DefaultProcessingTimeManagerTest.java
@@ -22,9 +22,10 @@ import org.apache.flink.runtime.state.VoidNamespace;
import org.apache.flink.streaming.api.operators.KeyContext;
import org.apache.flink.streaming.api.operators.TestInternalTimerService;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nonnull;
+
import static org.assertj.core.api.Assertions.assertThat;
/** Tests for {@link DefaultProcessingTimeManager}. */
@@ -58,7 +59,7 @@ class DefaultProcessingTimeManagerTest {
assertThat(timerService.numProcessingTimeTimers()).isZero();
}
- @NotNull
+ @Nonnull
private static TestInternalTimerService<Integer, VoidNamespace> getTimerService() {
return new TestInternalTimerService<>(
new KeyContext() {
diff --git a/flink-formats/flink-avro-confluent-registry/src/test/java/org/apache/flink/formats/avro/registry/confluent/debezium/DebeziumAvroFormatFactoryTest.java b/flink-formats/flink-avro-confluent-registry/src/test/java/org/apache/flink/formats/avro/registry/confluent/debezium/DebeziumAvroFormatFactoryTest.java
index b39cc1e283f..e7a263ab421 100644
--- a/flink-formats/flink-avro-confluent-registry/src/test/java/org/apache/flink/formats/avro/registry/confluent/debezium/DebeziumAvroFormatFactoryTest.java
+++ b/flink-formats/flink-avro-confluent-registry/src/test/java/org/apache/flink/formats/avro/registry/confluent/debezium/DebeziumAvroFormatFactoryTest.java
@@ -32,9 +32,10 @@ import org.apache.flink.table.runtime.connector.source.ScanRuntimeProviderContex
import org.apache.flink.table.runtime.typeutils.InternalTypeInfo;
import org.apache.flink.table.types.logical.RowType;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nonnull;
+
import java.util.HashMap;
import java.util.Map;
@@ -203,7 +204,7 @@ class DebeziumAvroFormatFactoryTest {
assertThrows(IllegalArgumentException.class, () -> createSerializationSchema(options));
}
- @NotNull
+ @Nonnull
private Map<String, String> getRegistryConfigs() {
final Map<String, String> registryConfigs = new HashMap<>();
registryConfigs.put("basic.auth.user.info", "something1");
diff --git a/flink-formats/flink-csv/src/test/java/org/apache/flink/formats/csv/DataStreamCsvITCase.java b/flink-formats/flink-csv/src/test/java/org/apache/flink/formats/csv/DataStreamCsvITCase.java
index 6b8c722fe1a..fc1364bb5e9 100644
--- a/flink-formats/flink-csv/src/test/java/org/apache/flink/formats/csv/DataStreamCsvITCase.java
+++ b/flink-formats/flink-csv/src/test/java/org/apache/flink/formats/csv/DataStreamCsvITCase.java
@@ -44,12 +44,13 @@ import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.csv.Csv
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.csv.CsvSchema;
import org.apache.commons.io.FileUtils;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.io.TempDir;
+import javax.annotation.Nonnull;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -217,7 +218,7 @@ public class DataStreamCsvITCase {
assertThat(result).containsExactlyInAnyOrder(CSV_LINES);
}
- @NotNull
+ @Nonnull
private String[] getResultsFromSinkFiles(File outDir) throws IOException {
final Map<File, String> contents = getFileContentByPath(outDir);
@@ -355,7 +356,7 @@ public class DataStreamCsvITCase {
return getResultsFromStream(stream);
}
- @NotNull
+ @Nonnull
private static <T> List<T> getResultsFromStream(DataStream<T> stream) throws Exception {
final ClientAndIterator<T> client =
DataStreamUtils.collectWithClient(stream, "Bounded Results Fetch");
diff --git a/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/utils/SerializableConfigurationTest.java b/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/utils/SerializableConfigurationTest.java
index b51a23dd644..4f4691c6a34 100644
--- a/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/utils/SerializableConfigurationTest.java
+++ b/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/utils/SerializableConfigurationTest.java
@@ -19,9 +19,10 @@
package org.apache.flink.formats.parquet.utils;
import org.apache.hadoop.conf.Configuration;
-import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nullable;
+
import java.io.IOException;
import java.net.URL;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/hooks/MasterHooksTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/hooks/MasterHooksTest.java
index 321d44c8386..5aea06c3465 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/hooks/MasterHooksTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/hooks/MasterHooksTest.java
@@ -21,9 +21,9 @@ package org.apache.flink.runtime.checkpoint.hooks;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.runtime.checkpoint.MasterTriggerRestoreHook;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.net.URL;
@@ -169,7 +169,7 @@ class MasterHooksTest {
Runnable command;
@Override
- public void execute(@NotNull Runnable command) {
+ public void execute(@Nonnull Runnable command) {
this.command = command;
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/ResultPartitionTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/ResultPartitionTest.java
index 8132f64897d..15182d83c7c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/ResultPartitionTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/ResultPartitionTest.java
@@ -34,11 +34,12 @@ import org.apache.flink.runtime.io.network.buffer.BufferPool;
import org.apache.flink.runtime.io.network.buffer.NetworkBufferPool;
import org.apache.flink.runtime.util.EnvironmentInformation;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nonnull;
+
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -909,7 +910,7 @@ class ResultPartitionTest {
}
}
- @NotNull
+ @Nonnull
private BufferBuilder getFinishedBufferBuilder(
PipelinedResultPartition resultPartition, int bufferSize) throws Exception {
BufferBuilder bufferBuilder = resultPartition.requestBufferBuilderBlocking();
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/TestingSubpartitionCreatedViewReader.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/TestingSubpartitionCreatedViewReader.java
index 54303a78c2f..1c6376c912c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/TestingSubpartitionCreatedViewReader.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/TestingSubpartitionCreatedViewReader.java
@@ -24,7 +24,7 @@ import org.apache.flink.runtime.io.network.partition.consumer.InputChannel;
import org.apache.flink.runtime.io.network.partition.consumer.InputChannelID;
import org.apache.flink.util.Preconditions;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
import java.io.IOException;
import java.util.Iterator;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionViewTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionViewTest.java
index 8f9d2ceee26..d498fa4b13a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionViewTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/UnionResultSubpartitionViewTest.java
@@ -21,10 +21,11 @@ package org.apache.flink.runtime.io.network.partition;
import org.apache.flink.runtime.io.network.buffer.Buffer;
import org.apache.flink.runtime.io.network.util.TestBufferFactory;
-import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nullable;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/DiskIOSchedulerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/DiskIOSchedulerTest.java
index de7e18b28df..a8302a6ea04 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/DiskIOSchedulerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/file/DiskIOSchedulerTest.java
@@ -33,11 +33,12 @@ import org.apache.flink.runtime.io.network.partition.hybrid.tiered.netty.Testing
import org.apache.flink.runtime.io.network.partition.hybrid.tiered.tier.disk.DiskIOScheduler;
import org.apache.flink.util.ExceptionUtils;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nonnull;
+
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
@@ -305,7 +306,7 @@ class DiskIOSchedulerTest {
private static class TestingScheduledExecutorService
extends ManuallyTriggeredScheduledExecutorService {
@Override
- @NotNull
+ @Nonnull
public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
if (super.isTerminated()) {
throw new RejectedExecutionException();
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/ComponentClosingUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/ComponentClosingUtilsTest.java
index 9219eb52602..66ad98cabfa 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/ComponentClosingUtilsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/ComponentClosingUtilsTest.java
@@ -21,10 +21,11 @@ package org.apache.flink.runtime.operators.coordination;
import org.apache.flink.core.testutils.ManuallyTriggeredScheduledExecutorService;
import org.apache.flink.util.clock.ManualClock;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nonnull;
+
import java.time.Duration;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -135,7 +136,7 @@ class ComponentClosingUtilsTest {
}
@Override
- public @NotNull List<Runnable> shutdownNow() {
+ public @Nonnull List<Runnable> shutdownNow() {
forcefullyShutdownCount++;
return super.shutdownNow();
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/EventReceivingTasks.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/EventReceivingTasks.java
index 15659cb5c6e..f9b2f4de354 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/EventReceivingTasks.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/coordination/EventReceivingTasks.java
@@ -29,7 +29,7 @@ import org.apache.flink.util.concurrent.FutureUtils;
import org.apache.flink.util.concurrent.ScheduledExecutor;
import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter;
-import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.ArrayList;
@@ -277,7 +277,7 @@ public class EventReceivingTasks implements SubtaskAccess.SubtaskAccessFactory {
public void assertRunningInMainThread() {}
@Override
- public void execute(@NotNull Runnable command) {
+ public void execute(@Nonnull Runnable command) {
scheduledExecutor.execute(command);
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/MockStateWithoutExecutionGraphContext.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/MockStateWithoutExecutionGraphContext.java
index 75dbab9a804..a397f07ad5a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/MockStateWithoutExecutionGraphContext.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/adaptive/MockStateWithoutExecutionGraphContext.java
@@ -23,10 +23,11 @@ import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph;
import org.apache.flink.runtime.executiongraph.ErrorInfo;
import org.apache.flink.runtime.rest.handler.legacy.utils.ArchivedExecutionGraphBuilder;
-import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
+import javax.annotation.Nullable;
+
import java.util.function.Consumer;
/** Mock the {@link StateWithoutExecutionGraph.Context}. */
diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBOperationTestBase.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBOperationTestBase.java
index bba4777dced..73b914ebe52 100644
--- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBOperationTestBase.java
+++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBOperationTestBase.java
@@ -37,7 +37,6 @@ import org.apache.flink.util.function.BiFunctionWithException;
import org.apache.flink.util.function.FunctionWithException;
import org.apache.flink.util.function.ThrowingConsumer;
-import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
@@ -46,6 +45,8 @@ import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.ColumnFamilyOptions;
import org.rocksdb.RocksDB;
+import javax.annotation.Nullable;
+
import java.nio.file.Path;
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
diff --git a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliTableauResultViewTest.java b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliTableauResultViewTest.java
index 103439c5853..3725e02ac43 100644
--- a/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliTableauResultViewTest.java
+++ b/flink-table/flink-sql-client/src/test/java/org/apache/flink/table/client/cli/CliTableauResultViewTest.java
@@ -38,12 +38,13 @@ import org.apache.flink.testutils.executor.TestExecutorExtension;
import org.apache.flink.types.Row;
import org.apache.flink.types.RowKind;
-import org.jetbrains.annotations.NotNull;
import org.jline.terminal.Terminal;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
+import javax.annotation.Nonnull;
+
import java.io.ByteArrayOutputStream;
import java.math.BigDecimal;
import java.sql.Timestamp;
@@ -723,7 +724,7 @@ class CliTableauResultViewTest {
assertThat(changelogResult.closed).isTrue();
}
- @NotNull
+ @Nonnull
private TestChangelogResult createNewTestChangelogResult() {
TestChangelogResult collectResult =
new TestChangelogResult(
diff --git a/flink-table/flink-sql-gateway-api/src/test/java/org/apache/flink/table/gateway/api/utils/MockedSqlGatewayService.java b/flink-table/flink-sql-gateway-api/src/test/java/org/apache/flink/table/gateway/api/utils/MockedSqlGatewayService.java
index c62e33e732c..348cf80df16 100644
--- a/flink-table/flink-sql-gateway-api/src/test/java/org/apache/flink/table/gateway/api/utils/MockedSqlGatewayService.java
+++ b/flink-table/flink-sql-gateway-api/src/test/java/org/apache/flink/table/gateway/api/utils/MockedSqlGatewayService.java
@@ -37,7 +37,7 @@ import org.apache.flink.table.gateway.api.results.TableInfo;
import org.apache.flink.table.gateway.api.session.SessionEnvironment;
import org.apache.flink.table.gateway.api.session.SessionHandle;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
import java.util.List;
import java.util.Map;
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestUpdateDeleteTableFactory.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestUpdateDeleteTableFactory.java
index 6603a7071a8..f84930d731c 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestUpdateDeleteTableFactory.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestUpdateDeleteTableFactory.java
@@ -62,7 +62,7 @@ import org.apache.flink.table.types.DataType;
import org.apache.flink.types.RowKind;
import org.apache.flink.util.Preconditions;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInAggregateFunctionTestBase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInAggregateFunctionTestBase.java
index bbb2d24fcb2..58ec16dac50 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInAggregateFunctionTestBase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/BuiltInAggregateFunctionTestBase.java
@@ -44,7 +44,6 @@ import org.apache.flink.types.RowKind;
import org.apache.flink.util.CloseableIterator;
import org.apache.flink.util.CollectionUtil;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.function.Executable;
@@ -53,6 +52,7 @@ import org.junit.jupiter.api.parallel.ExecutionMode;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -511,7 +511,7 @@ abstract class BuiltInAggregateFunctionTestBase {
return tEnv.sqlQuery(stringBuilder.toString()).execute();
}
- @NotNull
+ @Nonnull
private static List<ResolvedExpression> recreateSelectList(
AggregateQueryOperation aggQueryOperation,
ProjectQueryOperation projectQueryOperation) {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecSinkITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecSinkITCase.java
index 28e6e068b9f..f5b31cb66a7 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecSinkITCase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecSinkITCase.java
@@ -54,12 +54,13 @@ import org.apache.flink.testutils.junit.extensions.parameterized.ParameterizedTe
import org.apache.flink.testutils.junit.extensions.parameterized.Parameters;
import org.apache.flink.types.Row;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
+import javax.annotation.Nullable;
+
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
@@ -511,7 +512,7 @@ class CommonExecSinkITCase {
};
}
- @NotNull
+ @Nullable
private TableFactoryHarness.SinkBase buildDataStreamSinkProvider(
SharedReference<List<RowData>> fetched) {
return new TableFactoryHarness.SinkBase() {
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RestoreUpgradedJobITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RestoreUpgradedJobITCase.java
index ed850297a9d..881dd0a16ea 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RestoreUpgradedJobITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/RestoreUpgradedJobITCase.java
@@ -41,7 +41,6 @@ import org.apache.flink.testutils.junit.SharedObjects;
import org.apache.flink.testutils.junit.SharedReference;
import org.apache.flink.util.TestLogger;
-import org.jetbrains.annotations.NotNull;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -49,6 +48,8 @@ import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import javax.annotation.Nonnull;
+
import java.util.Iterator;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicLong;
@@ -165,7 +166,7 @@ public class RestoreUpgradedJobITCase extends TestLogger {
return PARALLELISM * expectedBeforeSavepointResult;
}
- @NotNull
+ @Nonnull
private String runOriginalJob() throws Exception {
Configuration conf = new Configuration();
// TODO: remove this after FLINK-32081
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointFormatITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointFormatITCase.java
index 5de077b9431..b106011c085 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointFormatITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointFormatITCase.java
@@ -49,7 +49,6 @@ import org.apache.flink.test.util.MiniClusterWithClientResource;
import org.apache.flink.testutils.logging.LoggerAuditingExtension;
import org.apache.flink.util.TestLogger;
-import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
@@ -59,6 +58,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
+import javax.annotation.Nonnull;
+
import java.nio.file.Path;
import java.util.LinkedList;
import java.util.List;
@@ -271,7 +272,7 @@ public class SavepointFormatITCase extends TestLogger {
}
}
- @NotNull
+ @Nonnull
private Predicate<OperatorState> hasKeyedState() {
return op ->
op.hasSubtaskStates()
diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/RecordAttributesPropagationITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/RecordAttributesPropagationITCase.java
index 733d79b8f78..b8250690872 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/RecordAttributesPropagationITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/RecordAttributesPropagationITCase.java
@@ -38,9 +38,10 @@ import org.apache.flink.streaming.runtime.streamrecord.RecordAttributes;
import org.apache.flink.streaming.runtime.streamrecord.RecordAttributesBuilder;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
-import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
+import javax.annotation.Nullable;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
(flink) 02/02: [FLINK-35733][tools] Add the Nonnull & Nullable annotations check rule.
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit b782acfb9c04a18d8adb8e6596bd22e0e5ebe5c3
Author: Roc Marshal <fl...@126.com>
AuthorDate: Mon Jul 1 22:53:35 2024 +0800
[FLINK-35733][tools] Add the Nonnull & Nullable annotations check rule.
---
tools/maven/checkstyle.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index 45feb7100ba..5e017454ed1 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -229,6 +229,19 @@ This file is based on the checkstyle file of Apache Beam.
<property name="message" value="Static import functions from Guava Preconditions"/>
</module>
+ <!--
+ The Nullable & Nonnull annotations check.
+ -->
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="^import org.jetbrains.annotations.Nullable;$"/>
+ <property name="message" value="Use import javax.annotation.Nullable"/>
+ </module>
+
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="^import org.jetbrains.annotations.NotNull;$"/>
+ <property name="message" value="Use import javax.annotation.Nonnull"/>
+ </module>
+
<!--
JAVADOC CHECKS