cleanup for supporting ES 6.0, 6.1, 6.2, 6.3

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

Author: jugal-chauhan

RFS/src/testFixtures/java/org/opensearch/migrations/bulkload/SupportedClusters.java

@@ -19,21 +19,21 @@
 public class SupportedClusters {
     private static List<ContainerVersion> sources() {
         return List.of(
-//            SearchClusterContainer.ES_V5_6_16,
-//            SearchClusterContainer.ES_V6_8_23
-//            SearchClusterContainer.ES_V7_10_2,
-//            SearchClusterContainer.ES_V7_17,
-//            SearchClusterContainer.ES_V8_17,
-//            SearchClusterContainer.OS_V1_3_16
+            SearchClusterContainer.ES_V5_6_16,
+            SearchClusterContainer.ES_V6_8_23,
+            SearchClusterContainer.ES_V7_10_2,
+            SearchClusterContainer.ES_V7_17,
+            SearchClusterContainer.ES_V8_17,
+            SearchClusterContainer.OS_V1_3_16
         );
     }
 
     public static List<ContainerVersion> extendedSources() {
         return List.of(
-//                SearchClusterContainer.ES_V7_9,
-//                SearchClusterContainer.ES_V7_8,
-//                SearchClusterContainer.ES_V7_7,
-//                SearchClusterContainer.ES_V7_4,
+                SearchClusterContainer.ES_V7_9,
+                SearchClusterContainer.ES_V7_8,
+                SearchClusterContainer.ES_V7_7,
+                SearchClusterContainer.ES_V7_4,
                 SearchClusterContainer.ES_V7_1,
                 SearchClusterContainer.ES_V6_7,
                 SearchClusterContainer.ES_V6_5,
@@ -42,9 +42,6 @@ public static List<ContainerVersion> extendedSources() {
                 SearchClusterContainer.ES_V6_2,
                 SearchClusterContainer.ES_V6_1,
                 SearchClusterContainer.ES_V6_0
-//                SearchClusterContainer.ES_V5_5,
-//                SearchClusterContainer.ES_V5_3,
-//                SearchClusterContainer.ES_V5_1
         );
     }
 

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

@@ -94,18 +94,6 @@ public class SearchClusterContainer extends GenericContainer<SearchClusterContai
         "docker.elastic.co/elasticsearch/elasticsearch:5.6.16",
         Version.fromString("ES 5.6.16")
     );
-    public static final ContainerVersion ES_V5_5 = new Elasticsearch5Version(
-            "docker.elastic.co/elasticsearch/elasticsearch:5.5.2",
-            Version.fromString("ES 5.5.2")
-    );
-    public static final ContainerVersion ES_V5_3 = new Elasticsearch5Version(
-            "docker.elastic.co/elasticsearch/elasticsearch:5.3.2",
-            Version.fromString("ES 5.3.2")
-    );
-    public static final ContainerVersion ES_V5_1 = new Elasticsearch5Version(
-            "docker.elastic.co/elasticsearch/elasticsearch:5.1.2",
-            Version.fromString("ES 5.1.2")
-    );
 
     public static final ContainerVersion ES_V2_4_6 = new OlderElasticsearchVersion(
         "elasticsearch:2.4.6",

transformation/src/main/java/org/opensearch/migrations/VersionMatchers.java

@@ -9,22 +9,18 @@ public class VersionMatchers {
     public static final Predicate<Version> isES_2_X = VersionMatchers.matchesMajorVersion(Version.fromString("ES 2.4"));
     public static final Predicate<Version> isES_5_X = VersionMatchers.matchesMajorVersion(Version.fromString("ES 5.6"));
     public static final Predicate<Version> isES_6_X = VersionMatchers.matchesMajorVersion(Version.fromString("ES 6.8"));
-<<<<<<< Updated upstream
-=======
     public static final Predicate<Version> isES_6_0_to_6_1 = VersionMatchers.equalOrGreaterThanMinorVersion(Version.fromString("ES 6.0"))
-                                                            .and(VersionMatchers.equalOrLessThanMinorVersion(Version.fromString("ES 6.1")));
+                                                                .and(VersionMatchers.equalOrLessThanMinorVersion(Version.fromString("ES 6.1")));
     public static final Predicate<Version> isES_6_2_X = VersionMatchers.equalOrGreaterThanMinorVersion(Version.fromString("ES 6.2"))
                                                             .and(VersionMatchers.equalOrLessThanMinorVersion(Version.fromString("ES 6.2")));
-    public static final Predicate<Version> equalOrGreaterThanES_6_5 = VersionMatchers.equalOrGreaterThanMinorVersion(Version.fromString("ES 6.5"));
->>>>>>> Stashed changes
     public static final Predicate<Version> equalOrBetween_ES_6_0_and_6_5 = VersionMatchers.equalOrGreaterThanMinorVersion(Version.fromString("ES 6.0"))
-            .and(VersionMatchers.equalOrLessThanMinorVersion(Version.fromString("ES 6.5")));
+                                                                                .and(VersionMatchers.equalOrLessThanMinorVersion(Version.fromString("ES 6.5")));
     public static final Predicate<Version> equalOrGreaterThanES_6_5 = VersionMatchers.equalOrGreaterThanMinorVersion(Version.fromString("ES 6.5"));
     public static final Predicate<Version> isES_7_X = VersionMatchers.matchesMajorVersion(Version.fromString("ES 7.10"));
     public static final Predicate<Version> isES_7_10 = VersionMatchers.matchesMinorVersion(Version.fromString("ES 7.10.2"));
     public static final Predicate<Version> isES_8_X = VersionMatchers.matchesMajorVersion(Version.fromString("ES 8.17"));
     public static final Predicate<Version> equalOrBetween_ES_7_0_and_7_8 = VersionMatchers.equalOrGreaterThanMinorVersion(Version.fromString("ES 7.0"))
-                                                                .and(VersionMatchers.equalOrLessThanMinorVersion(Version.fromString("ES 7.8")));
+                                                                                .and(VersionMatchers.equalOrLessThanMinorVersion(Version.fromString("ES 7.8")));
     public static final Predicate<Version> equalOrGreaterThanES_7_9 = VersionMatchers.equalOrGreaterThanMinorVersion(Version.fromString("ES 7.9"));
 
     public static final Predicate<Version> isOS_1_X = VersionMatchers.matchesMajorVersion(Version.fromString("OS 1.0.0"));