[Remove] various builder and mapping deprecations (#1752)

This commit removes the following deprecations and invalid tests:

* LegacyUpdateMappingIntegrationIT
* ShapeBuilder new z axis checks
* MatchPhrase new zeroTermsQuery checks
* TypeQuery utf8
* CompositeValuesSource format checks
* LegacyESVersionTests bumped to 6.8.15
* LegacyDynamicMapping, LegacySimilarity, LegacyMapperService tests

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

Author: nknize

server/src/internalClusterTest/java/org/opensearch/indices/mapping/LegacyUpdateMappingIntegrationIT.java

@@ -39,7 +39,6 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.opensearch.Assertions;
-import org.opensearch.LegacyESVersion;
 import org.opensearch.common.Strings;
 import org.opensearch.common.geo.GeoShapeType;
 import org.opensearch.common.geo.parsers.GeoWKTParser;
@@ -128,10 +127,7 @@ protected ShapeBuilder(StreamInput in) throws IOException {
     protected static Coordinate readFromStream(StreamInput in) throws IOException {
         double x = in.readDouble();
         double y = in.readDouble();
-        Double z = null;
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            z = in.readOptionalDouble();
-        }
+        Double z = in.readOptionalDouble();
         return z == null ? new Coordinate(x, y) : new Coordinate(x, y, z);
     }
 
@@ -146,9 +142,7 @@ public void writeTo(StreamOutput out) throws IOException {
     protected static void writeCoordinateTo(Coordinate coordinate, StreamOutput out) throws IOException {
         out.writeDouble(coordinate.x);
         out.writeDouble(coordinate.y);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            out.writeOptionalDouble(Double.isNaN(coordinate.z) ? null : coordinate.z);
-        }
+        out.writeOptionalDouble(Double.isNaN(coordinate.z) ? null : coordinate.z);
     }
 
     @SuppressWarnings("unchecked")

server/src/main/java/org/opensearch/common/geo/builders/ShapeBuilder.java

@@ -33,7 +33,6 @@
 package org.opensearch.index.query;
 
 import org.apache.lucene.search.Query;
-import org.opensearch.LegacyESVersion;
 import org.opensearch.common.ParseField;
 import org.opensearch.common.ParsingException;
 import org.opensearch.common.Strings;
@@ -85,9 +84,7 @@ public MatchPhraseQueryBuilder(StreamInput in) throws IOException {
         fieldName = in.readString();
         value = in.readGenericValue();
         slop = in.readVInt();
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            zeroTermsQuery = ZeroTermsQuery.readFromStream(in);
-        }
+        zeroTermsQuery = ZeroTermsQuery.readFromStream(in);
         analyzer = in.readOptionalString();
     }
 
@@ -96,9 +93,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         out.writeString(fieldName);
         out.writeGenericValue(value);
         out.writeVInt(slop);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            zeroTermsQuery.writeTo(out);
-        }
+        zeroTermsQuery.writeTo(out);
         out.writeOptionalString(analyzer);
     }
 

server/src/main/java/org/opensearch/index/query/MatchPhraseQueryBuilder.java

@@ -34,8 +34,6 @@
 
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.util.BytesRef;
-import org.opensearch.LegacyESVersion;
 import org.opensearch.common.ParseField;
 import org.opensearch.common.ParsingException;
 import org.opensearch.common.io.stream.StreamInput;
@@ -71,20 +69,12 @@ public TypeQueryBuilder(String type) {
      */
     public TypeQueryBuilder(StreamInput in) throws IOException {
         super(in);
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            type = in.readString();
-        } else {
-            type = in.readBytesRef().utf8ToString();
-        }
+        type = in.readString();
     }
 
     @Override
     protected void doWriteTo(StreamOutput out) throws IOException {
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            out.writeString(type);
-        } else {
-            out.writeBytesRef(new BytesRef(type));
-        }
+        out.writeString(type);
     }
 
     public String type() {

server/src/main/java/org/opensearch/index/query/TypeQueryBuilder.java

@@ -32,7 +32,6 @@
 
 package org.opensearch.search.aggregations.bucket.composite;
 
-import org.opensearch.LegacyESVersion;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
@@ -76,21 +75,9 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
         if (in.readBoolean()) {
             this.userValueTypeHint = ValueType.readFromStream(in);
         }
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
-            this.missingBucket = in.readBoolean();
-        } else {
-            this.missingBucket = false;
-        }
-        if (in.getVersion().before(LegacyESVersion.V_7_0_0)) {
-            // skip missing value for BWC
-            in.readGenericValue();
-        }
+        this.missingBucket = in.readBoolean();
         this.order = SortOrder.readFromStream(in);
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            this.format = in.readOptionalString();
-        } else {
-            this.format = null;
-        }
+        this.format = in.readOptionalString();
     }
 
     @Override
@@ -107,17 +94,9 @@ public final void writeTo(StreamOutput out) throws IOException {
         if (hasValueType) {
             userValueTypeHint.writeTo(out);
         }
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
-            out.writeBoolean(missingBucket);
-        }
-        if (out.getVersion().before(LegacyESVersion.V_7_0_0)) {
-            // write missing value for BWC
-            out.writeGenericValue(null);
-        }
+        out.writeBoolean(missingBucket);
         order.writeTo(out);
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            out.writeOptionalString(format);
-        }
+        out.writeOptionalString(format);
         innerWriteTo(out);
     }