Remove ValuesSourceType argument to ValuesSourceAggregationBuilder (#48638)

not-napoleon · web-flow · commit db9f53f7c6bb · 2019-10-31T15:17:37.000-04:00
diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java
@@ -61,7 +61,7 @@ public class ChildrenAggregationBuilder
      *            the type of children documents
      */
     public ChildrenAggregationBuilder(String name, String childType) {
-        super(name, ValuesSourceType.BYTES, ValueType.STRING);
+        super(name, ValueType.STRING);
         if (childType == null) {
             throw new IllegalArgumentException("[childType] must not be null: [" + name + "]");
         }
diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregationBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregationBuilder.java
@@ -61,7 +61,7 @@ public class ParentAggregationBuilder
      *            the type of children documents
      */
     public ParentAggregationBuilder(String name, String childType) {
-        super(name, ValuesSourceType.BYTES, ValueType.STRING);
+        super(name, ValueType.STRING);
         if (childType == null) {
             throw new IllegalArgumentException("[childType] must not be null: [" + name + "]");
         }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java
@@ -70,7 +70,7 @@ public static ObjectParser<GeoGridAggregationBuilder, Void> createParser(String
     }
 
     public GeoGridAggregationBuilder(String name) {
-        super(name, ValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
+        super(name, ValueType.GEOPOINT);
     }
 
     protected GeoGridAggregationBuilder(GeoGridAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java
@@ -134,7 +134,7 @@ public AutoDateHistogramAggregationBuilder setMinimumIntervalExpression(String m
 
     /** Create a new builder with the given name. */
     public AutoDateHistogramAggregationBuilder(String name) {
-        super(name, ValuesSourceType.NUMERIC, ValueType.DATE);
+        super(name, ValueType.DATE);
     }
 
     /** Read from a stream, for internal use only. */
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java
@@ -130,7 +130,7 @@ public static DateHistogramAggregationBuilder parse(String aggregationName, XCon
 
     /** Create a new builder with the given name. */
     public DateHistogramAggregationBuilder(String name) {
-        super(name, ValuesSourceType.ANY, ValueType.DATE);
+        super(name, ValueType.DATE);
     }
 
     protected DateHistogramAggregationBuilder(DateHistogramAggregationBuilder clone,
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java
@@ -104,7 +104,7 @@ protected ValuesSourceType resolveScriptAny(Script script) {
 
     /** Create a new builder with the given name. */
     public HistogramAggregationBuilder(String name) {
-        super(name, ValuesSourceType.ANY, ValueType.NUMERIC);
+        super(name, ValueType.NUMERIC);
     }
 
     protected HistogramAggregationBuilder(HistogramAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java
@@ -54,7 +54,7 @@ public static MissingAggregationBuilder parse(String aggregationName, XContentPa
     }
 
     public MissingAggregationBuilder(String name, ValueType targetValueType) {
-        super(name, ValuesSourceType.ANY, targetValueType);
+        super(name, targetValueType);
     }
 
     protected MissingAggregationBuilder(MissingAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java
@@ -45,7 +45,7 @@ public abstract class AbstractRangeBuilder<AB extends AbstractRangeBuilder<AB, R
     protected boolean keyed = false;
 
     protected AbstractRangeBuilder(String name, InternalRange.Factory<?, ?> rangeFactory) {
-        super(name, rangeFactory.getValueSourceType(), rangeFactory.getValueType());
+        super(name, rangeFactory.getValueType());
         this.rangeFactory = rangeFactory;
     }
 
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java
@@ -230,7 +230,7 @@ public GeoDistanceAggregationBuilder(String name, GeoPoint origin) {
 
     private GeoDistanceAggregationBuilder(String name, GeoPoint origin,
                                           InternalRange.Factory<InternalGeoDistance.Bucket, InternalGeoDistance> rangeFactory) {
-        super(name, rangeFactory.getValueSourceType(), rangeFactory.getValueType());
+        super(name, rangeFactory.getValueType());
         this.origin = origin;
     }
 
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java
@@ -220,7 +220,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     private List<Range> ranges = new ArrayList<>();
 
     public IpRangeAggregationBuilder(String name) {
-        super(name, ValuesSourceType.BYTES, ValueType.IP);
+        super(name, ValueType.IP);
     }
 
     protected IpRangeAggregationBuilder(IpRangeAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java
@@ -62,7 +62,7 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
     private String executionHint = null;
 
     public DiversifiedAggregationBuilder(String name) {
-        super(name, ValuesSourceType.ANY, null);
+        super(name, null);
     }
 
     protected DiversifiedAggregationBuilder(DiversifiedAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java
@@ -116,7 +116,7 @@ public AggregationBuilder parse(String aggregationName, XContentParser parser) t
     private SignificanceHeuristic significanceHeuristic = DEFAULT_SIGNIFICANCE_HEURISTIC;
 
     public SignificantTermsAggregationBuilder(String name, ValueType valueType) {
-        super(name, ValuesSourceType.ANY, valueType);
+        super(name, valueType);
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregationBuilder.java
@@ -72,7 +72,7 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
     private double precision = 0.001;
 
     public RareTermsAggregationBuilder(String name, ValueType valueType) {
-        super(name, ValuesSourceType.ANY, valueType);
+        super(name, valueType);
     }
 
     private RareTermsAggregationBuilder(RareTermsAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java
@@ -109,7 +109,7 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
     private boolean showTermDocCountError = false;
 
     public TermsAggregationBuilder(String name, ValueType valueType) {
-        super(name, ValuesSourceType.ANY, valueType);
+        super(name, valueType);
     }
 
     protected TermsAggregationBuilder(TermsAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsAggregationBuilder.java
@@ -56,7 +56,7 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
     private boolean wrapLongitude = true;
 
     public GeoBoundsAggregationBuilder(String name) {
-        super(name, ValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
+        super(name, ValueType.GEOPOINT);
     }
 
     protected GeoBoundsAggregationBuilder(GeoBoundsAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java
@@ -41,7 +41,7 @@ public abstract static class LeafOnly<VS extends ValuesSource, AB extends Values
             extends ValuesSourceAggregationBuilder<VS, AB> {
 
         protected LeafOnly(String name, ValuesSourceType valuesSourceType, ValueType targetValueType) {
-            super(name, valuesSourceType, targetValueType);
+            super(name, targetValueType);
         }
 
         protected LeafOnly(LeafOnly<VS, AB> clone, Builder factoriesBuilder, Map<String, Object> metaData) {
@@ -74,7 +74,6 @@ public final AB subAggregations(Builder subFactories) {
         }
     }
 
-    private final ValuesSourceType valuesSourceType;
     private final ValueType targetValueType;
     private String field = null;
     private Script script = null;
@@ -84,19 +83,14 @@ public final AB subAggregations(Builder subFactories) {
     private ZoneId timeZone = null;
     protected ValuesSourceConfig<VS> config;
 
-    protected ValuesSourceAggregationBuilder(String name, ValuesSourceType valuesSourceType, ValueType targetValueType) {
+    protected ValuesSourceAggregationBuilder(String name, ValueType targetValueType) {
         super(name);
-        if (valuesSourceType == null) {
-            throw new IllegalArgumentException("[valuesSourceType] must not be null: [" + name + "]");
-        }
-        this.valuesSourceType = valuesSourceType;
         this.targetValueType = targetValueType;
     }
 
     protected ValuesSourceAggregationBuilder(ValuesSourceAggregationBuilder<VS, AB> clone,
                                              Builder factoriesBuilder, Map<String, Object> metaData) {
         super(clone, factoriesBuilder, metaData);
-        this.valuesSourceType = clone.valuesSourceType;
         this.targetValueType = clone.targetValueType;
         this.field = clone.field;
         this.valueType = clone.valueType;
@@ -116,7 +110,6 @@ protected ValuesSourceAggregationBuilder(ValuesSourceAggregationBuilder<VS, AB>
     protected ValuesSourceAggregationBuilder(StreamInput in, ValuesSourceType valuesSourceType, ValueType targetValueType)
             throws IOException {
         super(in);
-        this.valuesSourceType = valuesSourceType;
         if (serializeTargetValueType(in.getVersion())) {
             this.targetValueType = in.readOptionalWriteable(ValueType::readFromStream);
         } else {
@@ -133,7 +126,6 @@ protected ValuesSourceAggregationBuilder(StreamInput in, ValuesSourceType values
         super(in);
         // TODO: Can we get rid of this constructor and always use the three value version? Does this assert provide any value?
         assert serializeTargetValueType(in.getVersion()) : "Wrong read constructor called for subclass that serializes its targetValueType";
-        this.valuesSourceType = valuesSourceType;
         this.targetValueType = in.readOptionalWriteable(ValueType::readFromStream);
         read(in);
     }
@@ -377,7 +369,7 @@ public final XContentBuilder internalXContent(XContentBuilder builder, Params pa
     @Override
     public int hashCode() {
         return Objects.hash(super.hashCode(), field, format, missing, script,
-            targetValueType, timeZone, valueType, valuesSourceType);
+            targetValueType, timeZone, valueType);
     }
 
     @Override
@@ -386,8 +378,7 @@ public boolean equals(Object obj) {
         if (obj == null || getClass() != obj.getClass()) return false;
         if (super.equals(obj) == false) return false;
         ValuesSourceAggregationBuilder<?, ?> other = (ValuesSourceAggregationBuilder<?, ?>) obj;
-        return Objects.equals(valuesSourceType, other.valuesSourceType)
-            && Objects.equals(field, other.field)
+        return Objects.equals(field, other.field)
             && Objects.equals(format, other.format)
             && Objects.equals(missing, other.missing)
             && Objects.equals(script, other.script)
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/MockDeprecatedAggregationBuilder.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/MockDeprecatedAggregationBuilder.java
@@ -21,7 +21,6 @@
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
-import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 
 import java.io.IOException;
 import java.util.Map;
@@ -45,7 +44,7 @@ protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, O
     }
 
     public MockDeprecatedAggregationBuilder() {
-        super(NAME, ValuesSourceType.NUMERIC, ValueType.NUMERIC);
+        super(NAME, ValueType.NUMERIC);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public class ChildrenAggregationBuilder`
`61`	`61`	`* the type of children documents`
`62`	`62`	`*/`
`63`	`63`	`public ChildrenAggregationBuilder(String name, String childType) {`
`64`		`- super(name, ValuesSourceType.BYTES, ValueType.STRING);`
	`64`	`+ super(name, ValueType.STRING);`
`65`	`65`	`if (childType == null) {`
`66`	`66`	`throw new IllegalArgumentException("[childType] must not be null: [" + name + "]");`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public class ParentAggregationBuilder`
`61`	`61`	`* the type of children documents`
`62`	`62`	`*/`
`63`	`63`	`public ParentAggregationBuilder(String name, String childType) {`
`64`		`- super(name, ValuesSourceType.BYTES, ValueType.STRING);`
	`64`	`+ super(name, ValueType.STRING);`
`65`	`65`	`if (childType == null) {`
`66`	`66`	`throw new IllegalArgumentException("[childType] must not be null: [" + name + "]");`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static ObjectParser<GeoGridAggregationBuilder, Void> createParser(String`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public GeoGridAggregationBuilder(String name) {`
`73`		`- super(name, ValuesSourceType.GEOPOINT, ValueType.GEOPOINT);`
	`73`	`+ super(name, ValueType.GEOPOINT);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`protected GeoGridAggregationBuilder(GeoGridAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public AutoDateHistogramAggregationBuilder setMinimumIntervalExpression(String m`
`134`	`134`
`135`	`135`	`/** Create a new builder with the given name. */`
`136`	`136`	`public AutoDateHistogramAggregationBuilder(String name) {`
`137`		`- super(name, ValuesSourceType.NUMERIC, ValueType.DATE);`
	`137`	`+ super(name, ValueType.DATE);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`/** Read from a stream, for internal use only. */`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public static DateHistogramAggregationBuilder parse(String aggregationName, XCon`
`130`	`130`
`131`	`131`	`/** Create a new builder with the given name. */`
`132`	`132`	`public DateHistogramAggregationBuilder(String name) {`
`133`		`- super(name, ValuesSourceType.ANY, ValueType.DATE);`
	`133`	`+ super(name, ValueType.DATE);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`protected DateHistogramAggregationBuilder(DateHistogramAggregationBuilder clone,`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ protected ValuesSourceType resolveScriptAny(Script script) {`
`104`	`104`
`105`	`105`	`/** Create a new builder with the given name. */`
`106`	`106`	`public HistogramAggregationBuilder(String name) {`
`107`		`- super(name, ValuesSourceType.ANY, ValueType.NUMERIC);`
	`107`	`+ super(name, ValueType.NUMERIC);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`protected HistogramAggregationBuilder(HistogramAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static MissingAggregationBuilder parse(String aggregationName, XContentPa`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public MissingAggregationBuilder(String name, ValueType targetValueType) {`
`57`		`- super(name, ValuesSourceType.ANY, targetValueType);`
	`57`	`+ super(name, targetValueType);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`protected MissingAggregationBuilder(MissingAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public abstract class AbstractRangeBuilder<AB extends AbstractRangeBuilder<AB, R`
`45`	`45`	`protected boolean keyed = false;`
`46`	`46`
`47`	`47`	`protected AbstractRangeBuilder(String name, InternalRange.Factory<?, ?> rangeFactory) {`
`48`		`- super(name, rangeFactory.getValueSourceType(), rangeFactory.getValueType());`
	`48`	`+ super(name, rangeFactory.getValueType());`
`49`	`49`	`this.rangeFactory = rangeFactory;`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public GeoDistanceAggregationBuilder(String name, GeoPoint origin) {`
`230`	`230`
`231`	`231`	`private GeoDistanceAggregationBuilder(String name, GeoPoint origin,`
`232`	`232`	`InternalRange.Factory<InternalGeoDistance.Bucket, InternalGeoDistance> rangeFactory) {`
`233`		`- super(name, rangeFactory.getValueSourceType(), rangeFactory.getValueType());`
	`233`	`+ super(name, rangeFactory.getValueType());`
`234`	`234`	`this.origin = origin;`
`235`	`235`	`}`
`236`	`236`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws`
`220`	`220`	`private List<Range> ranges = new ArrayList<>();`
`221`	`221`
`222`	`222`	`public IpRangeAggregationBuilder(String name) {`
`223`		`- super(name, ValuesSourceType.BYTES, ValueType.IP);`
	`223`	`+ super(name, ValueType.IP);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`protected IpRangeAggregationBuilder(IpRangeAggregationBuilder clone, Builder factoriesBuilder, Map<String, Object> metaData) {`