Use boolean isOpenSearch instead of String distribution in RemoteVersion

Simplifies the RemoteVersion class by replacing the distribution string field
with a boolean flag, making the code more readable and maintainable.

Signed-off-by: Hyunsang Han <[email protected]>

Author: HyunSangHan

modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java

@@ -300,12 +300,14 @@ public void setCausedBy(Throwable causedBy) {
         a -> (RemoteVersion) a[0]
     );
     static {
-        ConstructingObjectParser<RemoteVersion, MediaType> versionParser = new ConstructingObjectParser<>("version", true, a -> {
-            String distribution = (String) a[0];
-            String number = (String) a[1];
-            String cleanNumber = number.replace("-SNAPSHOT", "").replaceFirst("-(alpha\\d+|beta\\d+|rc\\d+)", "");
-            return RemoteVersion.fromString(cleanNumber, distribution);
-        });
+        ConstructingObjectParser<RemoteVersion, MediaType> versionParser = new ConstructingObjectParser<>(
+            "version",
+            true,
+            a -> RemoteVersion.fromString(
+                ((String) a[1]).replace("-SNAPSHOT", "").replaceFirst("-(alpha\\d+|beta\\d+|rc\\d+)", ""),
+                a[0] != null
+            )
+        );
         versionParser.declareStringOrNull(optionalConstructorArg(), new ParseField("distribution"));
         versionParser.declareString(constructorArg(), new ParseField("number"));
         MAIN_ACTION_PARSER.declareObject(constructorArg(), versionParser, new ParseField("version"));

modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteVersion.java

@@ -8,7 +8,6 @@
 
 package org.opensearch.index.reindex.remote;
 
-import java.util.Locale;
 import java.util.Objects;
 
 /**
@@ -21,37 +20,37 @@ public final class RemoteVersion implements Comparable<RemoteVersion> {
     private final int major;
     private final int minor;
     private final int revision;
-    private final String distribution;
+    final boolean isOpenSearch;
 
     // Common version constants for backward compatibility
-    public static final RemoteVersion ELASTICSEARCH_0_20_5 = new RemoteVersion(0, 20, 5, null);
-    public static final RemoteVersion ELASTICSEARCH_0_90_13 = new RemoteVersion(0, 90, 13, null);
-    public static final RemoteVersion ELASTICSEARCH_1_0_0 = new RemoteVersion(1, 0, 0, null);
-    public static final RemoteVersion ELASTICSEARCH_1_7_5 = new RemoteVersion(1, 7, 5, null);
-    public static final RemoteVersion ELASTICSEARCH_2_0_0 = new RemoteVersion(2, 0, 0, null);
-    public static final RemoteVersion ELASTICSEARCH_2_1_0 = new RemoteVersion(2, 1, 0, null);
-    public static final RemoteVersion ELASTICSEARCH_2_3_3 = new RemoteVersion(2, 3, 3, null);
-    public static final RemoteVersion ELASTICSEARCH_5_0_0 = new RemoteVersion(5, 0, 0, null);
-    public static final RemoteVersion ELASTICSEARCH_6_0_0 = new RemoteVersion(6, 0, 0, null);
-    public static final RemoteVersion ELASTICSEARCH_6_3_0 = new RemoteVersion(6, 3, 0, null);
-    public static final RemoteVersion ELASTICSEARCH_7_0_0 = new RemoteVersion(7, 0, 0, null);
+    public static final RemoteVersion ELASTICSEARCH_0_20_5 = new RemoteVersion(0, 20, 5, false);
+    public static final RemoteVersion ELASTICSEARCH_0_90_13 = new RemoteVersion(0, 90, 13, false);
+    public static final RemoteVersion ELASTICSEARCH_1_0_0 = new RemoteVersion(1, 0, 0, false);
+    public static final RemoteVersion ELASTICSEARCH_1_7_5 = new RemoteVersion(1, 7, 5, false);
+    public static final RemoteVersion ELASTICSEARCH_2_0_0 = new RemoteVersion(2, 0, 0, false);
+    public static final RemoteVersion ELASTICSEARCH_2_1_0 = new RemoteVersion(2, 1, 0, false);
+    public static final RemoteVersion ELASTICSEARCH_2_3_3 = new RemoteVersion(2, 3, 3, false);
+    public static final RemoteVersion ELASTICSEARCH_5_0_0 = new RemoteVersion(5, 0, 0, false);
+    public static final RemoteVersion ELASTICSEARCH_6_0_0 = new RemoteVersion(6, 0, 0, false);
+    public static final RemoteVersion ELASTICSEARCH_6_3_0 = new RemoteVersion(6, 3, 0, false);
+    public static final RemoteVersion ELASTICSEARCH_7_0_0 = new RemoteVersion(7, 0, 0, false);
 
     // OpenSearch versions
-    public static final RemoteVersion OPENSEARCH_1_0_0 = new RemoteVersion(1, 0, 0, "opensearch");
-    public static final RemoteVersion OPENSEARCH_2_0_0 = new RemoteVersion(2, 0, 0, "opensearch");
-    public static final RemoteVersion OPENSEARCH_3_1_0 = new RemoteVersion(3, 1, 0, "opensearch");
+    public static final RemoteVersion OPENSEARCH_1_0_0 = new RemoteVersion(1, 0, 0, true);
+    public static final RemoteVersion OPENSEARCH_2_0_0 = new RemoteVersion(2, 0, 0, true);
+    public static final RemoteVersion OPENSEARCH_3_1_0 = new RemoteVersion(3, 1, 0, true);
 
-    public RemoteVersion(int major, int minor, int revision, String distribution) {
+    public RemoteVersion(int major, int minor, int revision, boolean isOpenSearch) {
         this.major = major;
         this.minor = minor;
         this.revision = revision;
-        this.distribution = distribution != null ? distribution.toLowerCase(Locale.ROOT) : "elasticsearch";
+        this.isOpenSearch = isOpenSearch;
     }
 
     /**
      * Parse version string like "7.10.2" or "1.0.0"
      */
-    public static RemoteVersion fromString(String version, String distribution) {
+    public static RemoteVersion fromString(String version, boolean isOpenSearch) {
         if (version == null || version.trim().isEmpty()) {
             throw new IllegalArgumentException("Version string cannot be null or empty");
         }
@@ -69,16 +68,12 @@ public static RemoteVersion fromString(String version, String distribution) {
             int minor = Integer.parseInt(parts[1]);
             int revision = parts.length > 2 ? Integer.parseInt(parts[2]) : 0;
 
-            return new RemoteVersion(major, minor, revision, distribution);
+            return new RemoteVersion(major, minor, revision, isOpenSearch);
         } catch (NumberFormatException e) {
             throw new IllegalArgumentException("Invalid version format: " + version, e);
         }
     }
 
-    public static RemoteVersion fromString(String version) {
-        return fromString(version, "elasticsearch");
-    }
-
     public boolean before(RemoteVersion other) {
         return this.compareTo(other) < 0;
     }
@@ -95,14 +90,6 @@ public boolean after(RemoteVersion other) {
         return this.compareTo(other) > 0;
     }
 
-    public boolean isOpenSearch() {
-        return "opensearch".equals(distribution);
-    }
-
-    public boolean isElasticsearch() {
-        return "elasticsearch".equals(distribution);
-    }
-
     @Override
     public int compareTo(RemoteVersion other) {
         if (other == null) {
@@ -131,12 +118,12 @@ public boolean equals(Object obj) {
             return false;
         }
         RemoteVersion that = (RemoteVersion) obj;
-        return major == that.major && minor == that.minor && revision == that.revision && Objects.equals(distribution, that.distribution);
+        return major == that.major && minor == that.minor && revision == that.revision && Objects.equals(isOpenSearch, that.isOpenSearch);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(major, minor, revision, distribution);
+        return Objects.hash(major, minor, revision, isOpenSearch);
     }
 
     @Override
@@ -155,8 +142,4 @@ public int getMinor() {
     public int getRevision() {
         return revision;
     }
-
-    public String getDistribution() {
-        return distribution;
-    }
 }