Remove dead code from o.e.index.query (#116148)

Just a bunch of obvious dead code removal.

Author: original-brownbear

server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java

@@ -23,7 +23,6 @@
 import org.elasticsearch.common.geo.ShapeRelation;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.geometry.Geometry;
@@ -44,10 +43,6 @@
  * Base {@link QueryBuilder} that builds a Geometry Query
  */
 public abstract class AbstractGeometryQueryBuilder<QB extends AbstractGeometryQueryBuilder<QB>> extends AbstractQueryBuilder<QB> {
-    static final String TYPES_DEPRECATION_MESSAGE = "[types removal] Types are deprecated in [geo_shape] queries. "
-        + "The type should no longer be specified in the [indexed_shape] section.";
-    private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(AbstractGeometryQueryBuilder.class);
-
     public static final String DEFAULT_SHAPE_INDEX_NAME = "shapes";
     public static final String DEFAULT_SHAPE_FIELD_NAME = "shape";
     public static final ShapeRelation DEFAULT_SHAPE_RELATION = ShapeRelation.INTERSECTS;
@@ -59,7 +54,6 @@ public abstract class AbstractGeometryQueryBuilder<QB extends AbstractGeometryQu
     protected static final ParseField RELATION_FIELD = new ParseField("relation");
     protected static final ParseField INDEXED_SHAPE_FIELD = new ParseField("indexed_shape");
     protected static final ParseField SHAPE_ID_FIELD = new ParseField("id");
-    protected static final ParseField SHAPE_TYPE_FIELD = new ParseField("type");
     protected static final ParseField SHAPE_INDEX_FIELD = new ParseField("index");
     protected static final ParseField SHAPE_PATH_FIELD = new ParseField("path");
     protected static final ParseField SHAPE_ROUTING_FIELD = new ParseField("routing");
@@ -224,13 +218,6 @@ public Geometry shape() {
         return shape;
     }
 
-    /**
-     * @return the ID of the indexed Shape that will be used in the Query
-     */
-    public String indexedShapeId() {
-        return indexedShapeId;
-    }
-
     /**
      * Sets the name of the index where the indexed Shape can be found
      *
@@ -243,14 +230,6 @@ public QB indexedShapeIndex(String indexedShapeIndex) {
         return (QB) this;
     }
 
-    /**
-     * @return the index name for the indexed Shape that will be used in the
-     *         Query
-     */
-    public String indexedShapeIndex() {
-        return indexedShapeIndex;
-    }
-
     /**
      * Sets the path of the field in the indexed Shape document that has the Shape itself
      *
@@ -282,14 +261,6 @@ public QB indexedShapeRouting(String indexedShapeRouting) {
         return (QB) this;
     }
 
-    /**
-     * @return the optional routing to the indexed Shape that will be used in the
-     *         Query
-     */
-    public String indexedShapeRouting() {
-        return indexedShapeRouting;
-    }
-
     /**
      * Sets the relation of query shape and indexed shape.
      *
@@ -322,15 +293,6 @@ public AbstractGeometryQueryBuilder<QB> ignoreUnmapped(boolean ignoreUnmapped) {
         return this;
     }
 
-    /**
-     * Gets whether the query builder will ignore unmapped fields (and run a
-     * {@link MatchNoDocsQuery} in place of this query) or throw an exception if
-     * the field is unmapped.
-     */
-    public boolean ignoreUnmapped() {
-        return ignoreUnmapped;
-    }
-
     /** builds the appropriate lucene shape query */
     protected abstract Query buildShapeQuery(SearchExecutionContext context, MappedFieldType fieldType);
 

server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java

@@ -231,23 +231,11 @@ public CombinedFieldsQueryBuilder zeroTermsQuery(ZeroTermsQueryOption zeroTermsQ
         return this;
     }
 
-    public ZeroTermsQueryOption zeroTermsQuery() {
-        return zeroTermsQuery;
-    }
-
     public CombinedFieldsQueryBuilder autoGenerateSynonymsPhraseQuery(boolean enable) {
         this.autoGenerateSynonymsPhraseQuery = enable;
         return this;
     }
 
-    /**
-     * Whether phrase queries should be automatically generated for multi terms synonyms.
-     * Defaults to {@code true}.
-     */
-    public boolean autoGenerateSynonymsPhraseQuery() {
-        return autoGenerateSynonymsPhraseQuery;
-    }
-
     private static void validateFieldBoost(float boost) {
         if (boost < 1.0f) {
             throw new IllegalArgumentException("[" + NAME + "] requires field boosts to be >= 1.0");

server/src/main/java/org/elasticsearch/index/query/CoordinatorRewriteContext.java

@@ -154,11 +154,4 @@ public String getTierPreference() {
         return tier.isEmpty() == false ? tier : null;
     }
 
-    /**
-     * We're holding on to the index tier in the context as otherwise we'd need
-     * to re-parse it from the index settings when evaluating the _tier field.
-     */
-    public String tier() {
-        return tier;
-    }
 }

server/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java

@@ -68,7 +68,7 @@ public String fieldName() {
     }
 
     @Override
-    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) throws IOException {
+    protected QueryBuilder doIndexMetadataRewrite(QueryRewriteContext context) {
         if (getMappedFields(context, fieldName).isEmpty()) {
             return new MatchNoneQueryBuilder("The \"" + getName() + "\" query was rewritten to a \"match_none\" query.");
         } else {

server/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java

@@ -78,56 +78,6 @@ public FuzzyQueryBuilder(String fieldName, String value) {
         this(fieldName, (Object) value);
     }
 
-    /**
-     * Constructs a new fuzzy query.
-     *
-     * @param fieldName  The name of the field
-     * @param value The value of the text
-     */
-    public FuzzyQueryBuilder(String fieldName, int value) {
-        this(fieldName, (Object) value);
-    }
-
-    /**
-     * Constructs a new fuzzy query.
-     *
-     * @param fieldName  The name of the field
-     * @param value The value of the text
-     */
-    public FuzzyQueryBuilder(String fieldName, long value) {
-        this(fieldName, (Object) value);
-    }
-
-    /**
-     * Constructs a new fuzzy query.
-     *
-     * @param fieldName  The name of the field
-     * @param value The value of the text
-     */
-    public FuzzyQueryBuilder(String fieldName, float value) {
-        this(fieldName, (Object) value);
-    }
-
-    /**
-     * Constructs a new fuzzy query.
-     *
-     * @param fieldName  The name of the field
-     * @param value The value of the text
-     */
-    public FuzzyQueryBuilder(String fieldName, double value) {
-        this(fieldName, (Object) value);
-    }
-
-    /**
-     * Constructs a new fuzzy query.
-     *
-     * @param fieldName  The name of the field
-     * @param value The value of the text
-     */
-    public FuzzyQueryBuilder(String fieldName, boolean value) {
-        this(fieldName, (Object) value);
-    }
-
     /**
      * Constructs a new fuzzy query.
      *
@@ -193,19 +143,11 @@ public FuzzyQueryBuilder prefixLength(int prefixLength) {
         return this;
     }
 
-    public int prefixLength() {
-        return this.prefixLength;
-    }
-
     public FuzzyQueryBuilder maxExpansions(int maxExpansions) {
         this.maxExpansions = maxExpansions;
         return this;
     }
 
-    public int maxExpansions() {
-        return this.maxExpansions;
-    }
-
     public FuzzyQueryBuilder transpositions(boolean transpositions) {
         this.transpositions = transpositions;
         return this;
@@ -220,10 +162,6 @@ public FuzzyQueryBuilder rewrite(String rewrite) {
         return this;
     }
 
-    public String rewrite() {
-        return this.rewrite;
-    }
-
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject(NAME);

server/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java

@@ -23,7 +23,6 @@
 import org.elasticsearch.common.geo.SpatialStrategy;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.geometry.Rectangle;
 import org.elasticsearch.geometry.utils.Geohash;
 import org.elasticsearch.index.mapper.GeoShapeQueryable;
@@ -45,10 +44,6 @@
 public class GeoBoundingBoxQueryBuilder extends AbstractQueryBuilder<GeoBoundingBoxQueryBuilder> {
     public static final String NAME = "geo_bounding_box";
 
-    private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(GeoBoundingBoxQueryBuilder.class);
-
-    private static final String TYPE_PARAMETER_DEPRECATION_MESSAGE = "Deprecated parameter [type] used, it should no longer be specified.";
-
     /**
      * The default value for ignore_unmapped.
      */
@@ -204,13 +199,6 @@ public GeoBoundingBoxQueryBuilder setValidationMethod(GeoValidationMethod method
         return this;
     }
 
-    /**
-     * Returns geo coordinate validation method to use.
-     * */
-    public GeoValidationMethod getValidationMethod() {
-        return this.validationMethod;
-    }
-
     /** Returns the name of the field to base the bounding box computation on. */
     public String fieldName() {
         return this.fieldName;
@@ -226,15 +214,6 @@ public GeoBoundingBoxQueryBuilder ignoreUnmapped(boolean ignoreUnmapped) {
         return this;
     }
 
-    /**
-     * Gets whether the query builder will ignore unmapped fields (and run a
-     * {@link MatchNoDocsQuery} in place of this query) or throw an exception if
-     * the field is unmapped.
-     */
-    public boolean ignoreUnmapped() {
-        return ignoreUnmapped;
-    }
-
     QueryValidationException checkLatLon() {
         if (GeoValidationMethod.isIgnoreMalformed(validationMethod)) {
             return null;

server/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java

@@ -183,21 +183,11 @@ public GeoDistanceQueryBuilder geoDistance(GeoDistance geoDistance) {
         return this;
     }
 
-    /** Returns geo distance calculation type to use. */
-    public GeoDistance geoDistance() {
-        return this.geoDistance;
-    }
-
     /** Set validation method for geo coordinates. */
     public void setValidationMethod(GeoValidationMethod method) {
         this.validationMethod = method;
     }
 
-    /** Returns validation method for geo coordinates. */
-    public GeoValidationMethod getValidationMethod() {
-        return this.validationMethod;
-    }
-
     /**
      * Sets whether the query builder should ignore unmapped fields (and run a
      * {@link MatchNoDocsQuery} in place of this query) or throw an exception if
@@ -208,15 +198,6 @@ public GeoDistanceQueryBuilder ignoreUnmapped(boolean ignoreUnmapped) {
         return this;
     }
 
-    /**
-     * Gets whether the query builder will ignore unmapped fields (and run a
-     * {@link MatchNoDocsQuery} in place of this query) or throw an exception if
-     * the field is unmapped.
-     */
-    public boolean ignoreUnmapped() {
-        return ignoreUnmapped;
-    }
-
     @Override
     protected Query doToQuery(SearchExecutionContext context) throws IOException {
         MappedFieldType fieldType = context.getFieldType(fieldName);

server/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java

@@ -126,11 +126,6 @@ public GeoPolygonQueryBuilder setValidationMethod(GeoValidationMethod method) {
         return this;
     }
 
-    /** Returns the validation method to use for geo coordinates. */
-    public GeoValidationMethod getValidationMethod() {
-        return this.validationMethod;
-    }
-
     /**
      * Sets whether the query builder should ignore unmapped fields (and run a
      * {@link MatchNoDocsQuery} in place of this query) or throw an exception if
@@ -141,15 +136,6 @@ public GeoPolygonQueryBuilder ignoreUnmapped(boolean ignoreUnmapped) {
         return this;
     }
 
-    /**
-     * Gets whether the query builder will ignore unmapped fields (and run a
-     * {@link MatchNoDocsQuery} in place of this query) or throw an exception if
-     * the field is unmapped.
-     */
-    public boolean ignoreUnmapped() {
-        return ignoreUnmapped;
-    }
-
     @Override
     protected Query doToQuery(SearchExecutionContext context) throws IOException {
         MappedFieldType fieldType = context.getFieldType(fieldName);

server/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java

@@ -13,7 +13,6 @@
 import org.apache.lucene.search.Query;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.geo.GeometryParser;
 import org.elasticsearch.common.geo.ShapeRelation;
 import org.elasticsearch.common.geo.SpatialStrategy;
@@ -132,7 +131,7 @@ public GeoShapeQueryBuilder relation(ShapeRelation relation) {
      * @return this
      */
     public GeoShapeQueryBuilder strategy(SpatialStrategy strategy) {
-        if (strategy != null && strategy == SpatialStrategy.TERM && relation != ShapeRelation.INTERSECTS) {
+        if (strategy == SpatialStrategy.TERM && relation != ShapeRelation.INTERSECTS) {
             throw new IllegalArgumentException(
                 "strategy ["
                     + strategy.getStrategyName()
@@ -217,11 +216,7 @@ protected boolean parseXContentField(XContentParser parser) throws IOException {
             } else if (STRATEGY_FIELD.match(parser.currentName(), parser.getDeprecationHandler())) {
                 String strategyName = parser.text();
                 strategy = SpatialStrategy.fromString(strategyName);
-                if (strategy == null) {
-                    throw new ParsingException(parser.getTokenLocation(), "Unknown strategy [" + strategyName + " ]");
-                } else {
-                    this.strategy = strategy;
-                }
+                this.strategy = strategy;
                 return true;
             }
             return false;

server/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java

@@ -62,15 +62,4 @@ public static boolean isCoerce(GeoValidationMethod method) {
         return method == GeoValidationMethod.COERCE;
     }
 
-    /** Returns validation method corresponding to given coerce and ignoreMalformed values. */
-    public static GeoValidationMethod infer(boolean coerce, boolean ignoreMalformed) {
-        if (coerce) {
-            return GeoValidationMethod.COERCE;
-        } else if (ignoreMalformed) {
-            return GeoValidationMethod.IGNORE_MALFORMED;
-        } else {
-            return GeoValidationMethod.STRICT;
-        }
-    }
-
 }