cleanup to remove ES 5x related stuff

Signed-off-by: Jugal Chauhan <[email protected]>

Author: jugal-chauhan

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

@@ -34,10 +34,10 @@ public class EndToEndTest extends SourceTestBase {
     @TempDir
     private File localDirectory;
 
-     private static Stream<Arguments> scenarios() {
-         return SupportedClusters.supportedPairs(true).stream()
-                 .map(migrationPair -> Arguments.of(migrationPair.source(), migrationPair.target()));
-     }
+    private static Stream<Arguments> scenarios() {
+        return SupportedClusters.supportedPairs(true).stream()
+                .map(migrationPair -> Arguments.of(migrationPair.source(), migrationPair.target()));
+    }
 
     @ParameterizedTest(name = "Source {0} to Target {1}")
     @MethodSource(value = "scenarios")

RFS/src/main/java/org/opensearch/migrations/bulkload/version_es_6_8/ShardMetadataFactory_ES_6_8.java

@@ -26,9 +26,6 @@ public ShardMetadata fromJsonNode(JsonNode root, String indexId, String indexNam
 
         try {
             ObjectNode objectNodeRoot = (ObjectNode) root;
-            System.out.println("====== START Smile Decoded JSON for indexId=" + indexId + ", shardId=" + shardId + " ======");
-            System.out.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectNodeRoot));
-            System.out.println("====== END Smile JSON ======");
             ShardMetadataData_ES_6_8.DataRaw shardMetadataRaw = objectMapper.treeToValue(
                 objectNodeRoot,
                 ShardMetadataData_ES_6_8.DataRaw.class

RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java

@@ -74,23 +74,23 @@ public class SearchClusterContainer extends GenericContainer<SearchClusterContai
             Version.fromString("ES 6.4.3")
     );
     public static final ContainerVersion ES_V6_3 = new ElasticsearchOssVersion(
-            "docker.elastic.co/elasticsearch/elasticsearch:6.3.2", // TODO: Doesn't resolve
+            "docker.elastic.co/elasticsearch/elasticsearch:6.3.2",
             Version.fromString("ES 6.3")
     );
     public static final ContainerVersion ES_V6_2 = new ElasticsearchOssVersion(
-            "elasticsearch-oss:6.2.4",  // Matches your local image
-            Version.fromString("ES 6.2.4")  // Must match image tag for fallback lookup
+            "elasticsearch-oss:6.2.4",  // Matches local image
+            Version.fromString("ES 6.2.4")
     );
     public static final ContainerVersion ES_V6_1 = new ElasticsearchOssVersion(
-            "elasticsearch-oss:6.1.4",  // Matches your local image
-            Version.fromString("ES 6.1.4")  // <-- not ES 6.1
+            "elasticsearch-oss:6.1.4",  // Matches local image
+            Version.fromString("ES 6.1.4")
     );
     public static final ContainerVersion ES_V6_0 = new ElasticsearchOssVersion(
-            "elasticsearch-oss:6.0.1",  // Matches your local image
-            Version.fromString("ES 6.0.1")  // <-- not ES 6.0
+            "elasticsearch-oss:6.0.1",  // Matches local image
+            Version.fromString("ES 6.0.1")
     );
 
-    public static final ContainerVersion ES_V5_6_16 = new Elasticsearch5Version(
+    public static final ContainerVersion ES_V5_6_16 = new ElasticsearchVersion(
         "docker.elastic.co/elasticsearch/elasticsearch:5.6.16",
         Version.fromString("ES 5.6.16")
     );
@@ -133,14 +133,6 @@ private enum INITIALIZATION_FLAVOR {
             new ImmutableMap.Builder<String, String>().putAll(BASE.getEnvVariables())
                 .put("bootstrap.system_call_filter", "false")
                 .build()),
-        ELASTICSEARCH_5(
-            new ImmutableMap.Builder<String, String>().putAll(BASE.getEnvVariables())
-                .put("xpack.security.enabled", "false")
-                .put("xpack.watcher.enabled", "false")
-                .put("xpack.monitoring.enabled", "false")
-                .put("xpack.ml.enabled", "false")
-                .put("bootstrap.system_call_filter", "false")
-                .build()),
         ELASTICSEARCH_8(
             new ImmutableMap.Builder<String, String>().putAll(BASE.getEnvVariables())
                 .put("xpack.security.enabled", "false")
@@ -327,12 +319,6 @@ public ElasticsearchVersion(String imageName, Version version) {
         }
     }
 
-    public static class Elasticsearch5Version extends ContainerVersion {
-        public Elasticsearch5Version(String imageName, Version version) {
-            super(imageName, version, INITIALIZATION_FLAVOR.ELASTICSEARCH_5, "elasticsearch");
-        }
-    }
-
     public static class Elasticsearch8Version extends ContainerVersion {
         public Elasticsearch8Version(String imageName, Version version) {
             super(imageName, version, INITIALIZATION_FLAVOR.ELASTICSEARCH_8, "elasticsearch");