Remove LegacyESVersion.V_6_5_x constants

qa/full-cluster-restart/src/test/java/org/opensearch/upgrades/FullClusterRestartIT.java

@@ -90,7 +90,6 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.startsWith;
 
 /**
  * Tests to run before and after a full cluster restart. This is run twice,
@@ -705,9 +704,7 @@ public void testEmptyShard() throws IOException {
                 // before timing out
                 .put(INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "100ms")
                 .put(SETTING_ALLOCATION_MAX_RETRY.getKey(), "0"); // fail faster
-            if (getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-                settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
-            }
+            settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
             if (randomBoolean()) {
                 settings.put(IndexSettings.INDEX_TRANSLOG_RETENTION_SIZE_SETTING.getKey(), "-1");
             }
@@ -977,7 +974,7 @@ public void testSoftDeletes() throws Exception {
                 mappingsAndSettings.startObject("settings");
                 mappingsAndSettings.field("number_of_shards", 1);
                 mappingsAndSettings.field("number_of_replicas", 1);
-                if (getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_5_0) && randomBoolean()) {
+                if (randomBoolean()) {
                     mappingsAndSettings.field("soft_deletes.enabled", true);
                 }
                 mappingsAndSettings.endObject();
@@ -1125,21 +1122,7 @@ private void checkSnapshot(final String snapshotName, final int count, final Ver
             clearRoutingFromSettings.setJsonEntity("{\"persistent\":{\"cluster.routing.allocation.exclude.test_attr\": null}}");
             client().performRequest(clearRoutingFromSettings);
         } catch (WarningFailureException e) {
-            /*
-             * If this test is executed on the upgraded mode before testRemoteClusterSettingsUpgraded,
-             * we will hit a warning exception because we put some deprecated settings in that test.
-             */
-            if (isRunningAgainstOldCluster() == false
-                && getOldClusterVersion().before(LegacyESVersion.V_6_5_0)) {
-                for (String warning : e.getResponse().getWarnings()) {
-                    assertThat(warning, containsString(
-                        "setting was deprecated and will be removed in a future release! "
-                            + "See the breaking changes documentation for the next major version."));
-                    assertThat(warning, startsWith("[search.remote."));
-                }
-            } else {
-                throw e;
-            }
+            throw e;
         }
         client().performRequest(new Request("DELETE", "/_template/test_template"));
 
@@ -1335,7 +1318,6 @@ protected void ensureGreenLongWait(String index) throws IOException {
     }
 
     public void testPeerRecoveryRetentionLeases() throws Exception {
-        assumeTrue(getOldClusterVersion() + " does not support soft deletes", getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_5_0));
         if (isRunningAgainstOldCluster()) {
             XContentBuilder settings = jsonBuilder();
             settings.startObject();
@@ -1428,9 +1410,7 @@ public void testRecoveryWithTranslogRetentionDisabled() throws Exception {
             final Settings.Builder settings = Settings.builder()
                 .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
                 .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1);
-            if (getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-                settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
-            }
+            settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
             if (randomBoolean()) {
                 settings.put(IndexSettings.INDEX_TRANSLOG_RETENTION_SIZE_SETTING.getKey(), "-1");
             }
@@ -1572,9 +1552,7 @@ public void testEnableSoftDeletesOnRestore() throws Exception {
             final Settings.Builder settings = Settings.builder()
                 .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
                 .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1);
-            if (getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-                settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
-            }
+            settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
             createIndex(index, settings.build());
             ensureGreen(index);
             int numDocs = randomIntBetween(0, 100);
@@ -1623,7 +1601,6 @@ public void testEnableSoftDeletesOnRestore() throws Exception {
     }
 
     public void testForbidDisableSoftDeletesOnRestore() throws Exception {
-        assumeTrue("soft deletes is introduced in 6.5", getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_5_0));
         final String snapshot = "snapshot-" + index;
         if (isRunningAgainstOldCluster()) {
             final Settings.Builder settings = Settings.builder()

qa/full-cluster-restart/src/test/java/org/opensearch/upgrades/FullClusterRestartSettingsUpgradeIT.java

@@ -58,7 +58,7 @@
 public class FullClusterRestartSettingsUpgradeIT extends AbstractFullClusterRestartTestCase {
 
     public void testRemoteClusterSettingsUpgraded() throws IOException {
-        assumeTrue("settings automatically upgraded since 6.5.0", getOldClusterVersion().before(LegacyESVersion.V_6_5_0));
+        assumeTrue("settings automatically upgraded since 6.5.0", getOldClusterVersion().before(LegacyESVersion.fromString("6.5.0")));
         if (isRunningAgainstOldCluster()) {
             final Request putSettingsRequest = new Request("PUT", "/_cluster/settings");
             try (XContentBuilder builder = jsonBuilder()) {

qa/translog-policy/src/test/java/org/opensearch/upgrades/TranslogPolicyIT.java

@@ -103,9 +103,7 @@ public void testEmptyIndex() throws Exception {
             final Settings.Builder settings = Settings.builder()
                 .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
                 .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, between(0, 1));
-            if (getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-                settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
-            }
+            settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
             if (randomBoolean()) {
                 settings.put(IndexSettings.INDEX_TRANSLOG_RETENTION_SIZE_SETTING.getKey(), "-1");
             }
@@ -121,9 +119,7 @@ public void testRecoverReplica() throws Exception {
             final Settings.Builder settings = Settings.builder()
                 .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
                 .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1);
-            if (getOldClusterVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-                settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
-            }
+            settings.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
             if (randomBoolean()) {
                 settings.put(IndexSettings.INDEX_TRANSLOG_RETENTION_SIZE_SETTING.getKey(), "-1");
             }

server/src/internalClusterTest/java/org/opensearch/index/seqno/PeerRecoveryRetentionLeaseCreationIT.java

@@ -31,7 +31,6 @@
 
 package org.opensearch.index.seqno;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.UUIDs;
@@ -75,12 +74,8 @@ public void testCanRecoverFromStoreWithoutPeerRecoveryRetentionLease() throws Ex
                     .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true)
                     .put(
                         IndexMetadata.SETTING_VERSION_CREATED,
-                        // simulate a version which supports soft deletes (v6.5.0-and-later) with which this node is compatible
-                        VersionUtils.randomVersionBetween(
-                            random(),
-                            Version.max(Version.CURRENT.minimumIndexCompatibilityVersion(), LegacyESVersion.V_6_5_0),
-                            Version.CURRENT
-                        )
+                        // simulate a version which supports soft deletes with which this node is compatible
+                        VersionUtils.randomVersionBetween(random(), Version.CURRENT.minimumIndexCompatibilityVersion(), Version.CURRENT)
                     )
             )
         );

server/src/main/java/org/opensearch/LegacyESVersion.java

@@ -46,11 +46,6 @@
  */
 public class LegacyESVersion extends Version {
 
-    public static final LegacyESVersion V_6_5_0 = new LegacyESVersion(6050099, org.apache.lucene.util.Version.LUCENE_7_5_0);
-    public static final LegacyESVersion V_6_5_1 = new LegacyESVersion(6050199, org.apache.lucene.util.Version.LUCENE_7_5_0);
-    public static final LegacyESVersion V_6_5_2 = new LegacyESVersion(6050299, org.apache.lucene.util.Version.LUCENE_7_5_0);
-    public static final LegacyESVersion V_6_5_3 = new LegacyESVersion(6050399, org.apache.lucene.util.Version.LUCENE_7_5_0);
-    public static final LegacyESVersion V_6_5_4 = new LegacyESVersion(6050499, org.apache.lucene.util.Version.LUCENE_7_5_0);
     public static final LegacyESVersion V_6_6_0 = new LegacyESVersion(6060099, org.apache.lucene.util.Version.LUCENE_7_6_0);
     public static final LegacyESVersion V_6_6_1 = new LegacyESVersion(6060199, org.apache.lucene.util.Version.LUCENE_7_6_0);
     public static final LegacyESVersion V_6_6_2 = new LegacyESVersion(6060299, org.apache.lucene.util.Version.LUCENE_7_6_0);

server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequest.java

@@ -111,14 +111,6 @@ public CreateIndexRequest(StreamInput in) throws IOException {
             String source = in.readString();
             mappings.put(type, source);
         }
-        if (in.getVersion().before(LegacyESVersion.V_6_5_0)) {
-            // This used to be the size of custom metadata classes
-            int customSize = in.readVInt();
-            assert customSize == 0 : "unexpected custom metadata when none is supported";
-            if (customSize > 0) {
-                throw new IllegalStateException("unexpected custom metadata when none is supported");
-            }
-        }
         int aliasesSize = in.readVInt();
         for (int i = 0; i < aliasesSize; i++) {
             aliases.add(new Alias(in));
@@ -472,10 +464,6 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeString(entry.getKey());
             out.writeString(entry.getValue());
         }
-        if (out.getVersion().before(LegacyESVersion.V_6_5_0)) {
-            // Size of custom index metadata, which is removed
-            out.writeVInt(0);
-        }
         out.writeVInt(aliases.size());
         for (Alias alias : aliases) {
             alias.writeTo(out);

server/src/main/java/org/opensearch/action/admin/indices/template/put/PutIndexTemplateRequest.java

@@ -31,7 +31,6 @@
 
 package org.opensearch.action.admin.indices.template.put;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.OpenSearchGenerationException;
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.action.ActionRequestValidationException;
@@ -114,14 +113,6 @@ public PutIndexTemplateRequest(StreamInput in) throws IOException {
             String mappingSource = in.readString();
             mappings.put(type, mappingSource);
         }
-        if (in.getVersion().before(LegacyESVersion.V_6_5_0)) {
-            // Used to be used for custom index metadata
-            int customSize = in.readVInt();
-            assert customSize == 0 : "expected not to have any custom metadata";
-            if (customSize > 0) {
-                throw new IllegalStateException("unexpected custom metadata when none is supported");
-            }
-        }
         int aliasesSize = in.readVInt();
         for (int i = 0; i < aliasesSize; i++) {
             aliases.add(new Alias(in));
@@ -502,9 +493,6 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeString(entry.getKey());
             out.writeString(entry.getValue());
         }
-        if (out.getVersion().before(LegacyESVersion.V_6_5_0)) {
-            out.writeVInt(0);
-        }
         out.writeVInt(aliases.size());
         for (Alias alias : aliases) {
             alias.writeTo(out);

server/src/main/java/org/opensearch/action/resync/ResyncReplicationRequest.java

@@ -31,8 +31,6 @@
 
 package org.opensearch.action.resync;
 
-import org.opensearch.LegacyESVersion;
-import org.opensearch.action.index.IndexRequest;
 import org.opensearch.action.support.replication.ReplicatedWriteRequest;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -55,11 +53,7 @@ public final class ResyncReplicationRequest extends ReplicatedWriteRequest<Resyn
     ResyncReplicationRequest(StreamInput in) throws IOException {
         super(in);
         trimAboveSeqNo = in.readZLong();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-            maxSeenAutoIdTimestampOnPrimary = in.readZLong();
-        } else {
-            maxSeenAutoIdTimestampOnPrimary = IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP;
-        }
+        maxSeenAutoIdTimestampOnPrimary = in.readZLong();
         operations = in.readArray(Translog.Operation::readOperation, Translog.Operation[]::new);
     }
 
@@ -91,9 +85,7 @@ public Translog.Operation[] getOperations() {
     public void writeTo(final StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeZLong(trimAboveSeqNo);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-            out.writeZLong(maxSeenAutoIdTimestampOnPrimary);
-        }
+        out.writeZLong(maxSeenAutoIdTimestampOnPrimary);
         out.writeArray(Translog.Operation::writeOperation, operations);
     }
 

server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java

@@ -36,7 +36,6 @@
 import org.apache.lucene.store.AlreadyClosedException;
 import org.opensearch.Assertions;
 import org.opensearch.ExceptionsHelper;
-import org.opensearch.LegacyESVersion;
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionListenerResponseHandler;
@@ -1449,13 +1448,7 @@ protected static final class ConcreteReplicaRequest<R extends TransportRequest>
         public ConcreteReplicaRequest(Writeable.Reader<R> requestReader, StreamInput in) throws IOException {
             super(requestReader, in);
             globalCheckpoint = in.readZLong();
-            if (in.getVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-                maxSeqNoOfUpdatesOrDeletes = in.readZLong();
-            } else {
-                // UNASSIGNED_SEQ_NO (-2) means uninitialized, and replicas will disable
-                // optimization using seq_no if its max_seq_no_of_updates is still uninitialized
-                maxSeqNoOfUpdatesOrDeletes = SequenceNumbers.UNASSIGNED_SEQ_NO;
-            }
+            maxSeqNoOfUpdatesOrDeletes = in.readZLong();
         }
 
         public ConcreteReplicaRequest(
@@ -1474,9 +1467,7 @@ public ConcreteReplicaRequest(
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeZLong(globalCheckpoint);
-            if (out.getVersion().onOrAfter(LegacyESVersion.V_6_5_0)) {
-                out.writeZLong(maxSeqNoOfUpdatesOrDeletes);
-            }
+            out.writeZLong(maxSeqNoOfUpdatesOrDeletes);
         }
 
         public long getGlobalCheckpoint() {