Linting improvements

DocumentsFromSnapshotMigration/src/main/java/org/opensearch/migrations/RfsMigrateDocuments.java

@@ -263,7 +263,8 @@ public static DocumentsRunner.CompletionStatus run(Function<Path, LuceneDocument
                                                        ShardMetadata.Factory shardMetadataFactory,
                                                        SnapshotShardUnpacker.Factory unpackerFactory,
                                                        long maxShardSizeBytes,
-                                                       RootDocumentMigrationContext rootDocumentContext) throws Exception
+                                                       RootDocumentMigrationContext rootDocumentContext)
+        throws IOException, InterruptedException, NoWorkLeftException
     {
         var scopedWorkCoordinator = new ScopedWorkCoordinator(workCoordinator, leaseExpireTrigger);
         confirmShardPrepIsComplete(indexMetadataFactory,

DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/ParallelDocumentMigrationsTest.java

@@ -34,10 +34,10 @@
 @Slf4j
 public class ParallelDocumentMigrationsTest extends SourceTestBase {
 
-    final static List<SearchClusterContainer.ContainerVersion> SOURCE_IMAGES = List.of(
+    static final List<SearchClusterContainer.ContainerVersion> SOURCE_IMAGES = List.of(
         SearchClusterContainer.ES_V7_10_2
     );
-    final static List<SearchClusterContainer.ContainerVersion> TARGET_IMAGES = List.of(SearchClusterContainer.OS_V2_14_0);
+    static final List<SearchClusterContainer.ContainerVersion> TARGET_IMAGES = List.of(SearchClusterContainer.OS_V2_14_0);
 
     public static Stream<Arguments> makeDocumentMigrationArgs() {
         List<Object[]> sourceImageArgs = SOURCE_IMAGES.stream()

DocumentsFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/SourceTestBase.java

@@ -49,9 +49,9 @@
 @Slf4j
 public class SourceTestBase {
     public static final String GENERATOR_BASE_IMAGE = "migrations/elasticsearch_client_test_console:latest";
-    public final static int MAX_SHARD_SIZE_BYTES = 64 * 1024 * 1024;
+    public static final int MAX_SHARD_SIZE_BYTES = 64 * 1024 * 1024;
     public static final String SOURCE_SERVER_ALIAS = "source";
-    public final static long TOLERABLE_CLIENT_SERVER_CLOCK_DIFFERENCE_SECONDS = 3600;
+    public static final long TOLERABLE_CLIENT_SERVER_CLOCK_DIFFERENCE_SECONDS = 3600;
 
     protected static Object[] makeParamsForBase(SearchClusterContainer.ContainerVersion baseSourceImage) {
         return new Object[] {

RFS/src/main/java/org/opensearch/migrations/bulkload/common/ByteArrayIndexInput.java

@@ -45,7 +45,7 @@
         if (l < 0) {
             throw new IllegalArgumentException("Seeking to negative position: " + pos);
         } else if (l > length) {
-            throw new EOFException("seek past EOF");
+            throw new EOFException();
         }
         pos = (int) l;
     }
@@ -78,15 +78,15 @@
     @Override
     public byte readByte() throws IOException {
         if (pos >= offset + length) {
-            throw new EOFException("seek past EOF");
+            throw new EOFException();
         }
         return bytes[offset + pos++];
     }
 
     @Override
     public void readBytes(final byte[] b, final int offset, int len) throws IOException {
         if (pos + len > this.offset + length) {
-            throw new EOFException("seek past EOF");
+            throw new EOFException();
         }
         System.arraycopy(bytes, this.offset + pos, b, offset, len);
         pos += len;

RFS/src/main/java/org/opensearch/migrations/bulkload/common/InvalidResponse.java

@@ -17,9 +17,9 @@
 
 @Slf4j
 public class InvalidResponse extends RfsException {
-    private static final Pattern unknownSetting = Pattern.compile("unknown setting \\[(.+?)\\].+");
+    private static final Pattern UNKNOWN_SETTING = Pattern.compile("unknown setting \\[(.+?)\\].+");
     private static final ObjectMapper objectMapper = new ObjectMapper();
-    private final HttpResponse response;
+    private final transient HttpResponse response;
 
     public InvalidResponse(String message, HttpResponse response) {
         super(message);
@@ -41,22 +41,18 @@ public Set<String> getIllegalArguments() {
             errorBody.map(InvalidResponse::getUnknownSetting).ifPresent(interimResults::add);
 
             // Check root cause errors
-            errorBody.map(node -> node.get("root_cause")).ifPresent(nodes -> {
+            errorBody.map(node -> node.get("root_cause")).ifPresent(nodes ->
                 nodes.forEach(
-                    node -> {
-                        Optional.of(node).map(InvalidResponse::getUnknownSetting).ifPresent(interimResults::add);
-                    }
-                );
-            });
+                    node -> Optional.of(node).map(InvalidResponse::getUnknownSetting).ifPresent(interimResults::add)
+                )
+            );
 
             // Check all suppressed errors
-            errorBody.map(node -> node.get("suppressed")).ifPresent(nodes -> {
+            errorBody.map(node -> node.get("suppressed")).ifPresent(nodes ->
                 nodes.forEach(
-                    node -> {
-                        Optional.of(node).map(InvalidResponse::getUnknownSetting).ifPresent(interimResults::add);
-                    }
-                );
-            });
+                    node ->
+                        Optional.of(node).map(InvalidResponse::getUnknownSetting).ifPresent(interimResults::add)
+                ));
 
             var onlyExpectedErrors = interimResults.stream()
                 .map(Entry::getKey)
@@ -82,7 +78,7 @@ private static Map.Entry<String, String> getUnknownSetting(JsonNode json) {
             }
             return Map.entry(typeNode, reasonNode);
         }).map(entry -> {
-            var matcher = unknownSetting.matcher(entry.getValue().asText());
+            var matcher = UNKNOWN_SETTING.matcher(entry.getValue().asText());
             if (!matcher.matches()) {
                 return null;
             }

RFS/src/main/java/org/opensearch/migrations/bulkload/common/LuceneDocumentsReader.java

@@ -154,61 +154,65 @@
     }
 
     protected RfsLuceneDocument getDocument(IndexReader reader, int docId, boolean isLive) {
+        Document document;
         try {
-            Document document = reader.document(docId);
-            String id = null;
-            BytesRef sourceBytes = null;
-            try {
-                for (var field : document.getFields()) {
-                    String fieldName = field.name();
-                    switch (fieldName) {
-                        case "_id": {
-                            // ES 6+
-                            var idBytes = field.binaryValue();
-                            id = Uid.decodeId(idBytes.bytes);
-                            break;
-                        }
-                        case "_uid": {
-                            // ES 5
-                            id = field.stringValue();
-                            break;
-                        }
-                        case "_source": {
-                            // All versions (?)
-                            sourceBytes = field.binaryValue();
-                            break;
-                        }
-                    }
-                }
-                if (id == null) {
-                    log.atError().setMessage("Document with index" + docId + " does not have an id. Skipping").log();
-                    return null;  // Skip documents with missing id
-                }
+            document = reader.document(docId);
+        } catch (IOException e) {
+            log.atError().setMessage("Failed to read document at Lucene index location {}").addArgument(docId).setCause(e).log();
+            return null;
+        }
 
-                if (sourceBytes == null || sourceBytes.bytes.length == 0) {
-                    log.atWarn().setMessage("Document {} doesn't have the _source field enabled").addArgument(id).log();
-                    return null;  // Skip these
+        String id = null;
+        BytesRef sourceBytes = null;
+        try {
+            for (var field : document.getFields()) {
+                String fieldName = field.name();
+                switch (fieldName) {
+                    case "_id": {
+                        // ES 6+
+                        var idBytes = field.binaryValue();
+                        id = Uid.decodeId(idBytes.bytes);
+                        break;
+                    }
+                    case "_uid": {
+                        // ES 5
+                        id = field.stringValue();
+                        break;
+                    }
+                    case "_source": {
+                        // All versions (?)
+                        sourceBytes = field.binaryValue();
+                        break;
+                    }
+                    default:
+                        break;
                 }
-
-                log.atDebug().setMessage("Reading document {}").addArgument(id).log();
-            } catch (Exception e) {
-                StringBuilder errorMessage = new StringBuilder();
-                errorMessage.append("Unable to parse Document id from Document.  The Document's Fields: ");
-                document.getFields().forEach(f -> errorMessage.append(f.name()).append(", "));
-                log.atError().setMessage(errorMessage.toString()).setCause(e).log();
-                return null; // Skip documents with invalid id
+            }
+            if (id == null) {
+                log.atError().setMessage("Document with index" + docId + " does not have an id. Skipping").log();
+                return null;  // Skip documents with missing id
             }
 
-            if (!isLive) {
-                log.atDebug().setMessage("Document {} is not live").addArgument(id).log();
-                return null; // Skip these
+            if (sourceBytes == null || sourceBytes.bytes.length == 0) {
+                log.atWarn().setMessage("Document {} doesn't have the _source field enabled").addArgument(id).log();
+                return null;  // Skip these
             }
 
-            log.atDebug().setMessage("Document {} read successfully").addArgument(id).log();
-            return new RfsLuceneDocument(id, sourceBytes.utf8ToString());
-        } catch (Exception e) {
-            log.atError().setMessage("Failed to read document at Lucene index location {}").addArgument(docId).setCause(e).log();
-            return null;
+            log.atDebug().setMessage("Reading document {}").addArgument(id).log();
+        } catch (RuntimeException e) {
+            StringBuilder errorMessage = new StringBuilder();
+            errorMessage.append("Unable to parse Document id from Document.  The Document's Fields: ");
+            document.getFields().forEach(f -> errorMessage.append(f.name()).append(", "));
+            log.atError().setMessage(errorMessage.toString()).setCause(e).log();
+            return null; // Skip documents with invalid id
+        }
+
+        if (!isLive) {
+            log.atDebug().setMessage("Document {} is not live").addArgument(id).log();
+            return null; // Skip these
         }
+
+        log.atDebug().setMessage("Document {} read successfully").addArgument(id).log();
+        return new RfsLuceneDocument(id, sourceBytes.utf8ToString());
     }
 }