fix: use java.annotation instead of findgbugs.

project-tsurugi · Jan 7, 2025 · 38a0373 · 38a0373
1 parent aab8048
commit 38a0373
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/...dump/core/src/main/java/com/tsurugidb/tools/tgdump/core/engine/DumpOperationDispatch.java b/...dump/core/src/main/java/com/tsurugidb/tools/tgdump/core/engine/DumpOperationDispatch.java
@@ -23,14 +23,14 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nonnull;
+
 import com.tsurugidb.tools.common.diagnostic.DiagnosticException;
 import com.tsurugidb.tools.tgdump.core.model.DumpTarget;
 import com.tsurugidb.tools.tgdump.core.model.DumpTarget.TargetType;
 import com.tsurugidb.tsubakuro.sql.SqlClient;
 import com.tsurugidb.tsubakuro.sql.Transaction;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * An implementation of {@link DumpOperation} for dispatching by its tarrget type.
  */
@@ -42,7 +42,7 @@ class DumpOperationDispatch implements DumpOperation {
      * Creates a new instance.
      * @param elements the elements to dispatch
      */
-    DumpOperationDispatch(@NonNull Map<TargetType, DumpOperation> elements) {
+    DumpOperationDispatch(@Nonnull Map<TargetType, DumpOperation> elements) {
         Objects.requireNonNull(elements);
         this.elements = elements.isEmpty() ? Map.of() : new EnumMap<>(elements);
     }
@@ -52,12 +52,12 @@ class DumpOperationDispatch implements DumpOperation {
      * @param type the target type
      * @return the operation for the specified target type, or {@code empty} if not found
      */
-    public Optional<DumpOperation> getOperation(@NonNull DumpTarget.TargetType type) {
+    public Optional<DumpOperation> getOperation(@Nonnull DumpTarget.TargetType type) {
         Objects.requireNonNull(type);
         return Optional.ofNullable(elements.get(type));
     }
 
-    private DumpOperation getOperationStrict(@NonNull DumpTarget target) {
+    private DumpOperation getOperationStrict(@Nonnull DumpTarget target) {
         return getOperation(target.getTargetType())
                 .orElseThrow(() -> new UnsupportedOperationException(MessageFormat.format(
                     "unsupported target type: {0} in {1}", 
@@ -80,7 +80,7 @@ public boolean isEmpty() {
     }
 
     @Override
-    public void register(@NonNull SqlClient client, @NonNull DumpMonitor monitor, @NonNull DumpTarget target)
+    public void register(@Nonnull SqlClient client, @Nonnull DumpMonitor monitor, @Nonnull DumpTarget target)
             throws InterruptedException, DiagnosticException {
         Objects.requireNonNull(client);
         Objects.requireNonNull(monitor);
@@ -90,10 +90,10 @@ public void register(@NonNull SqlClient client, @NonNull DumpMonitor monitor, @N
 
     @Override
     public void execute(
-            @NonNull SqlClient client,
-            @NonNull Transaction transaction,
-            @NonNull DumpMonitor monitor,
-            @NonNull DumpTarget target)
+            @Nonnull SqlClient client,
+            @Nonnull Transaction transaction,
+            @Nonnull DumpMonitor monitor,
+            @Nonnull DumpTarget target)
             throws InterruptedException, DiagnosticException {
         Objects.requireNonNull(client);
         Objects.requireNonNull(transaction);

diff --git a/.../tgdump/core/src/main/java/com/tsurugidb/tools/tgdump/core/engine/QueryDumpOperation.java b/.../tgdump/core/src/main/java/com/tsurugidb/tools/tgdump/core/engine/QueryDumpOperation.java
@@ -24,6 +24,8 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.annotation.Nonnull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,8 +40,6 @@
 import com.tsurugidb.tsubakuro.sql.Transaction;
 import com.tsurugidb.tsubakuro.sql.exception.CompileException;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * An implementation of {@link DumpOperation} for SQL text.
  */
@@ -58,7 +58,7 @@ class QueryDumpOperation implements DumpOperation {
      * @param dumpProfile the dump operation settings
      * @param createTargetDirectories whether or not to create dump target directories before the dump operations
      */
-    QueryDumpOperation(@NonNull DumpProfile dumpProfile, boolean createTargetDirectories) {
+    QueryDumpOperation(@Nonnull DumpProfile dumpProfile, boolean createTargetDirectories) {
         Objects.requireNonNull(dumpProfile);
         this.dumpProfile = dumpProfile;
         this.createTargetDirectories = createTargetDirectories;
@@ -80,7 +80,7 @@ private static void checkTargetType(DumpTarget target) {
     }
 
     @Override
-    public void register(@NonNull SqlClient client, @NonNull DumpMonitor monitor, @NonNull DumpTarget target)
+    public void register(@Nonnull SqlClient client, @Nonnull DumpMonitor monitor, @Nonnull DumpTarget target)
             throws InterruptedException, DiagnosticException {
         Objects.requireNonNull(client);
         Objects.requireNonNull(monitor);
@@ -111,10 +111,10 @@ public void register(@NonNull SqlClient client, @NonNull DumpMonitor monitor, @N
 
     @Override
     public void execute(
-            @NonNull SqlClient client,
-            @NonNull Transaction transaction,
-            @NonNull DumpMonitor monitor,
-            @NonNull DumpTarget target)
+            @Nonnull SqlClient client,
+            @Nonnull Transaction transaction,
+            @Nonnull DumpMonitor monitor,
+            @Nonnull DumpTarget target)
             throws InterruptedException, DiagnosticException {
         Objects.requireNonNull(client);
         Objects.requireNonNull(transaction);

diff --git a/...mp/core/src/main/java/com/tsurugidb/tools/tgdump/core/engine/QueryDumpTargetSelector.java b/...mp/core/src/main/java/com/tsurugidb/tools/tgdump/core/engine/QueryDumpTargetSelector.java
@@ -25,14 +25,13 @@
 import java.util.function.Function;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.tsurugidb.tools.tgdump.core.model.DumpTarget;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * Computes dump destination directories from each SQL text.
  */

diff --git a/.../tgdump/core/src/main/java/com/tsurugidb/tools/tgdump/core/engine/TableDumpOperation.java b/.../tgdump/core/src/main/java/com/tsurugidb/tools/tgdump/core/engine/TableDumpOperation.java
@@ -25,6 +25,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nonnull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,8 +43,6 @@
 import com.tsurugidb.tsubakuro.sql.exception.CompileException;
 import com.tsurugidb.tsubakuro.sql.exception.TargetNotFoundException;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * An implementation of {@link DumpOperation} for table dump.
  */
@@ -63,7 +63,7 @@ class TableDumpOperation implements DumpOperation {
      * @param dumpProfile the dump operation settings
      * @param createTargetDirectories whether or not to create dump target directories before the dump operations
      */
-    TableDumpOperation(@NonNull DumpProfile dumpProfile, boolean createTargetDirectories) {
+    TableDumpOperation(@Nonnull DumpProfile dumpProfile, boolean createTargetDirectories) {
         Objects.requireNonNull(dumpProfile);
         this.dumpProfile = dumpProfile;
         this.createTargetDirectories = createTargetDirectories;
@@ -90,7 +90,7 @@ private static void checkTargetType(DumpTarget target) {
     }
 
     @Override
-    public void register(@NonNull SqlClient client, @NonNull DumpMonitor monitor, @NonNull DumpTarget target)
+    public void register(@Nonnull SqlClient client, @Nonnull DumpMonitor monitor, @Nonnull DumpTarget target)
             throws InterruptedException, DiagnosticException {
         Objects.requireNonNull(client);
         Objects.requireNonNull(monitor);
@@ -120,10 +120,10 @@ public void register(@NonNull SqlClient client, @NonNull DumpMonitor monitor, @N
 
     @Override
     public void execute(
-            @NonNull SqlClient client,
-            @NonNull Transaction transaction,
-            @NonNull DumpMonitor monitor,
-            @NonNull DumpTarget target)
+            @Nonnull SqlClient client,
+            @Nonnull Transaction transaction,
+            @Nonnull DumpMonitor monitor,
+            @Nonnull DumpTarget target)
             throws InterruptedException, DiagnosticException {
         Objects.requireNonNull(client);
         Objects.requireNonNull(transaction);