Parse user type hints directly to ValuesSourceTypes

client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java

@@ -92,7 +92,7 @@
 import org.elasticsearch.script.mustache.SearchTemplateRequest;
 import org.elasticsearch.search.Scroll;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.support.ValueType;
+import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.collapse.CollapseBuilder;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
@@ -1079,7 +1079,7 @@ public static SearchSourceBuilder createTestSearchSourceBuilder() {
                 }
                 if (randomBoolean()) {
                     searchSourceBuilder.aggregation(new TermsAggregationBuilder(randomAlphaOfLengthBetween(3, 10))
-                            .userValueTypeHint(ValueType.STRING)
+                            .userValueTypeHint(CoreValuesSourceType.ValueType.STRING)
                             .field(randomAlphaOfLengthBetween(3, 10)));
                 }
                 if (randomBoolean()) {

client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java

@@ -75,8 +75,8 @@
 import org.elasticsearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.WeightedAvg;
 import org.elasticsearch.search.aggregations.metrics.WeightedAvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.aggregations.support.MultiValuesSourceFieldConfig;
-import org.elasticsearch.search.aggregations.support.ValueType;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
@@ -260,7 +260,7 @@ public void testSearchMatchQuery() throws IOException {
     public void testSearchWithTermsAgg() throws IOException {
         SearchRequest searchRequest = new SearchRequest();
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-        searchSourceBuilder.aggregation(new TermsAggregationBuilder("agg1").userValueTypeHint(ValueType.STRING)
+        searchSourceBuilder.aggregation(new TermsAggregationBuilder("agg1").userValueTypeHint(CoreValuesSourceType.ValueType.STRING)
             .field("type.keyword"));
         searchSourceBuilder.size(0);
         searchRequest.source(searchSourceBuilder);
@@ -284,7 +284,7 @@ public void testSearchWithTermsAgg() throws IOException {
     public void testSearchWithRareTermsAgg() throws IOException {
         SearchRequest searchRequest = new SearchRequest();
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-        searchSourceBuilder.aggregation(new RareTermsAggregationBuilder("agg1").userValueTypeHint(ValueType.STRING)
+        searchSourceBuilder.aggregation(new RareTermsAggregationBuilder("agg1").userValueTypeHint(CoreValuesSourceType.ValueType.STRING)
             .field("type.keyword").maxDocCount(2));
         searchSourceBuilder.size(0);
         searchRequest.source(searchSourceBuilder);
@@ -373,7 +373,7 @@ public void testSearchWithRangeAgg() throws IOException {
     public void testSearchWithTermsAndRangeAgg() throws IOException {
         SearchRequest searchRequest = new SearchRequest("index");
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-        TermsAggregationBuilder agg = new TermsAggregationBuilder("agg1").userValueTypeHint(ValueType.STRING).field("type.keyword");
+        TermsAggregationBuilder agg = new TermsAggregationBuilder("agg1").userValueTypeHint(CoreValuesSourceType.ValueType.STRING).field("type.keyword");
         agg.subAggregation(new RangeAggregationBuilder("subagg").field("num")
                 .addRange("first", 0, 30).addRange("second", 31, 200));
         searchSourceBuilder.aggregation(agg);
@@ -427,7 +427,7 @@ public void testSearchWithTermsAndRangeAgg() throws IOException {
     public void testSearchWithTermsAndWeightedAvg() throws IOException {
         SearchRequest searchRequest = new SearchRequest("index");
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-        TermsAggregationBuilder agg = new TermsAggregationBuilder("agg1").userValueTypeHint(ValueType.STRING).field("type.keyword");
+        TermsAggregationBuilder agg = new TermsAggregationBuilder("agg1").userValueTypeHint(CoreValuesSourceType.ValueType.STRING).field("type.keyword");
         agg.subAggregation(new WeightedAvgAggregationBuilder("subagg")
             .value(new MultiValuesSourceFieldConfig.Builder().setFieldName("num").build())
             .weight(new MultiValuesSourceFieldConfig.Builder().setFieldName("num2").build())
@@ -554,10 +554,10 @@ public void testSearchWithParentJoin() throws IOException {
         client().performRequest(new Request(HttpPost.METHOD_NAME, "/_refresh"));
 
         TermsAggregationBuilder leafTermAgg = new TermsAggregationBuilder("top-names")
-                .userValueTypeHint(ValueType.STRING)
+                .userValueTypeHint(CoreValuesSourceType.ValueType.STRING)
                 .field("owner.display_name.keyword").size(10);
         ChildrenAggregationBuilder childrenAgg = new ChildrenAggregationBuilder("to-answers", "answer").subAggregation(leafTermAgg);
-        TermsAggregationBuilder termsAgg = new TermsAggregationBuilder("top-tags").userValueTypeHint(ValueType.STRING)
+        TermsAggregationBuilder termsAgg = new TermsAggregationBuilder("top-tags").userValueTypeHint(CoreValuesSourceType.ValueType.STRING)
                 .field("tags.keyword")
                 .size(10).subAggregation(childrenAgg);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
@@ -770,17 +770,17 @@ public void testMultiSearch() throws Exception {
     public void testMultiSearch_withAgg() throws Exception {
         MultiSearchRequest multiSearchRequest = new MultiSearchRequest();
         SearchRequest searchRequest1 = new SearchRequest("index1");
-        searchRequest1.source().size(0).aggregation(new TermsAggregationBuilder("name").userValueTypeHint(ValueType.STRING)
+        searchRequest1.source().size(0).aggregation(new TermsAggregationBuilder("name").userValueTypeHint(CoreValuesSourceType.ValueType.STRING)
                 .field("field.keyword")
                 .order(BucketOrder.key(true)));
         multiSearchRequest.add(searchRequest1);
         SearchRequest searchRequest2 = new SearchRequest("index2");
-        searchRequest2.source().size(0).aggregation(new TermsAggregationBuilder("name").userValueTypeHint(ValueType.STRING)
+        searchRequest2.source().size(0).aggregation(new TermsAggregationBuilder("name").userValueTypeHint(CoreValuesSourceType.ValueType.STRING)
                 .field("field.keyword")
                 .order(BucketOrder.key(true)));
         multiSearchRequest.add(searchRequest2);
         SearchRequest searchRequest3 = new SearchRequest("index3");
-        searchRequest3.source().size(0).aggregation(new TermsAggregationBuilder("name").userValueTypeHint(ValueType.STRING)
+        searchRequest3.source().size(0).aggregation(new TermsAggregationBuilder("name").userValueTypeHint(CoreValuesSourceType.ValueType.STRING)
                 .field("field.keyword")
                 .order(BucketOrder.key(true)));
         multiSearchRequest.add(searchRequest3);

modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsParser.java

@@ -22,7 +22,7 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.search.MultiValueMode;
 import org.elasticsearch.search.aggregations.support.ArrayValuesSourceParser.NumericValuesSourceParser;
-import org.elasticsearch.search.aggregations.support.ValueType;
+import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 
 import java.io.IOException;
@@ -50,7 +50,7 @@ protected boolean token(String aggregationName, String currentFieldName, XConten
 
     @Override
     protected MatrixStatsAggregationBuilder createFactory(String aggregationName, ValuesSourceType valuesSourceType,
-                                                          ValueType targetValueType, Map<ParseField, Object> otherOptions) {
+                                                          CoreValuesSourceType.ValueType targetValueType, Map<ParseField, Object> otherOptions) {
         MatrixStatsAggregationBuilder builder = new MatrixStatsAggregationBuilder(aggregationName);
         String mode = (String)otherOptions.get(MULTIVALUE_MODE_FIELD);
         if (mode != null) {

modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java

@@ -21,6 +21,7 @@
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationInitializationException;
@@ -79,7 +80,7 @@ public final BucketCardinality bucketCardinality() {
     /* The parser doesn't support setting userValueTypeHint (aka valueType), but we do serialize and deserialize it, so keeping it around
     for now so as to not break BWC.  Future refactors should feel free to remove this field. --Tozzi 2020-01-16
      */
-    private ValueType userValueTypeHint = null;
+    private CoreValuesSourceType.ValueType userValueTypeHint = null;
     private String format = null;
     private Object missing = null;
     private Map<String, Object> missingMap = Collections.emptyMap();
@@ -110,7 +111,7 @@ protected ArrayValuesSourceAggregationBuilder(StreamInput in)
     @SuppressWarnings("unchecked")
     private void read(StreamInput in) throws IOException {
         fields = (ArrayList<String>)in.readGenericValue();
-        userValueTypeHint = in.readOptionalWriteable(ValueType::readFromStream);
+        userValueTypeHint = in.readOptionalWriteable(CoreValuesSourceType.ValueType::readFromStream);
         format = in.readOptionalString();
         missingMap = in.readMap();
     }
@@ -225,7 +226,7 @@ public final XContentBuilder internalXContent(XContentBuilder builder, Params pa
             builder.field(CommonFields.FORMAT.getPreferredName(), format);
         }
         if (userValueTypeHint != null) {
-            builder.field(CommonFields.VALUE_TYPE.getPreferredName(), userValueTypeHint.getPreferredName());
+            builder.field(CommonFields.VALUE_TYPE.getPreferredName(), userValueTypeHint.getCoreValuesSourceType().typeName());
         }
         doXContentBody(builder, params);
         builder.endObject();

modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceParser.java

@@ -38,29 +38,29 @@ public abstract class ArrayValuesSourceParser<VS extends ValuesSource> implement
     public abstract static class NumericValuesSourceParser extends ArrayValuesSourceParser<ValuesSource.Numeric> {
 
         protected NumericValuesSourceParser(boolean formattable) {
-            super(formattable, CoreValuesSourceType.NUMERIC, ValueType.NUMERIC);
+            super(formattable, CoreValuesSourceType.NUMERIC, CoreValuesSourceType.ValueType.NUMERIC);
         }
     }
 
     public abstract static class BytesValuesSourceParser extends ArrayValuesSourceParser<ValuesSource.Bytes> {
 
         protected BytesValuesSourceParser(boolean formattable) {
-            super(formattable, CoreValuesSourceType.BYTES, ValueType.STRING);
+            super(formattable, CoreValuesSourceType.BYTES, CoreValuesSourceType.ValueType.STRING);
         }
     }
 
     public abstract static class GeoPointValuesSourceParser extends ArrayValuesSourceParser<ValuesSource.GeoPoint> {
 
         protected GeoPointValuesSourceParser(boolean formattable) {
-            super(formattable, CoreValuesSourceType.GEOPOINT, ValueType.GEOPOINT);
+            super(formattable, CoreValuesSourceType.GEOPOINT, CoreValuesSourceType.ValueType.GEOPOINT);
         }
     }
 
     private boolean formattable = false;
     private ValuesSourceType valuesSourceType = null;
-    private ValueType targetValueType = null;
+    private CoreValuesSourceType.ValueType targetValueType = null;
 
-    private ArrayValuesSourceParser(boolean formattable, ValuesSourceType valuesSourceType, ValueType targetValueType) {
+    private ArrayValuesSourceParser(boolean formattable, ValuesSourceType valuesSourceType, CoreValuesSourceType.ValueType targetValueType) {
         this.valuesSourceType = valuesSourceType;
         this.targetValueType = targetValueType;
         this.formattable = formattable;
@@ -188,13 +188,13 @@ private void parseMissingAndAdd(final String aggregationName, final String curre
      */
     protected abstract ArrayValuesSourceAggregationBuilder<?> createFactory(String aggregationName,
                                                                             ValuesSourceType valuesSourceType,
-                                                                            ValueType targetValueType,
+                                                                            CoreValuesSourceType.ValueType targetValueType,
                                                                             Map<ParseField, Object> otherOptions);
 
     /**
      * Allows subclasses of {@link ArrayValuesSourceParser} to parse extra
      * parameters and store them in a {@link Map} which will later be passed to
-     * {@link #createFactory(String, ValuesSourceType, ValueType, Map)}.
+     * {@link #createFactory(String, ValuesSourceType, CoreValuesSourceType.ValueType, Map)}.
      *
      * @param aggregationName
      *            the name of the aggregation
@@ -207,7 +207,7 @@ protected abstract ArrayValuesSourceAggregationBuilder<?> createFactory(String a
      * @param otherOptions
      *            a {@link Map} of options to be populated by successive calls
      *            to this method which will then be passed to the
-     *            {@link #createFactory(String, ValuesSourceType, ValueType, Map)}
+     *            {@link #createFactory(String, ValuesSourceType, CoreValuesSourceType.ValueType, Map)}
      *            method
      * @return <code>true</code> if the current token was correctly parsed,
      *         <code>false</code> otherwise

qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java

@@ -69,7 +69,7 @@
 import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
 import org.elasticsearch.search.aggregations.pipeline.DerivativePipelineAggregationBuilder;
 import org.elasticsearch.search.aggregations.pipeline.MaxBucketPipelineAggregationBuilder;
-import org.elasticsearch.search.aggregations.support.ValueType;
+import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.collapse.CollapseBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
@@ -529,32 +529,32 @@ public void testTermsAggsWithProfile() throws Exception {
     private static SearchSourceBuilder buildTermsAggsSource() {
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
         sourceBuilder.size(0);
-        TermsAggregationBuilder cluster = new TermsAggregationBuilder("cluster123").userValueTypeHint(ValueType.STRING);
+        TermsAggregationBuilder cluster = new TermsAggregationBuilder("cluster123").userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         cluster.field("_index");
-        TermsAggregationBuilder type = new TermsAggregationBuilder("type").userValueTypeHint(ValueType.STRING);
+        TermsAggregationBuilder type = new TermsAggregationBuilder("type").userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         type.field("type.keyword");
         type.showTermDocCountError(true);
         type.order(BucketOrder.key(true));
         cluster.subAggregation(type);
         sourceBuilder.aggregation(cluster);
 
-        TermsAggregationBuilder tags = new TermsAggregationBuilder("tags").userValueTypeHint(ValueType.STRING);
+        TermsAggregationBuilder tags = new TermsAggregationBuilder("tags").userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         tags.field("tags.keyword");
         tags.showTermDocCountError(true);
         tags.size(100);
         sourceBuilder.aggregation(tags);
 
-        TermsAggregationBuilder tags2 = new TermsAggregationBuilder("tags").userValueTypeHint(ValueType.STRING);
+        TermsAggregationBuilder tags2 = new TermsAggregationBuilder("tags").userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         tags2.field("tags.keyword");
         tags.subAggregation(tags2);
 
         FilterAggregationBuilder answers = new FilterAggregationBuilder("answers", new TermQueryBuilder("type", "answer"));
         TermsAggregationBuilder answerPerQuestion = new TermsAggregationBuilder("answer_per_question")
-            .userValueTypeHint(ValueType.STRING);
+            .userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         answerPerQuestion.showTermDocCountError(true);
         answerPerQuestion.field("questionId.keyword");
         answers.subAggregation(answerPerQuestion);
-        TermsAggregationBuilder answerPerUser = new TermsAggregationBuilder("answer_per_user").userValueTypeHint(ValueType.STRING);
+        TermsAggregationBuilder answerPerUser = new TermsAggregationBuilder("answer_per_user").userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         answerPerUser.field("user.keyword");
         answerPerUser.size(30);
         answerPerUser.showTermDocCountError(true);
@@ -569,7 +569,7 @@ public void testDateHistogram() throws Exception {
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
         sourceBuilder.size(0);
         searchRequest.source(sourceBuilder);
-        TermsAggregationBuilder tags = new TermsAggregationBuilder("tags").userValueTypeHint(ValueType.STRING);
+        TermsAggregationBuilder tags = new TermsAggregationBuilder("tags").userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         tags.field("tags.keyword");
         tags.showTermDocCountError(true);
         DateHistogramAggregationBuilder creation = new DateHistogramAggregationBuilder("creation");
@@ -586,7 +586,7 @@ public void testCardinalityAgg() throws Exception {
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
         sourceBuilder.size(0);
         searchRequest.source(sourceBuilder);
-        CardinalityAggregationBuilder tags = new CardinalityAggregationBuilder("tags").userValueTypeHint(ValueType.STRING);
+        CardinalityAggregationBuilder tags = new CardinalityAggregationBuilder("tags").userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         tags.field("tags.keyword");
         sourceBuilder.aggregation(tags);
         duelSearch(searchRequest, CCSDuelIT::assertAggs);
@@ -625,7 +625,7 @@ public void testTopHits() throws Exception {
         topHits.size(10);
         topHits.sort("creationDate", SortOrder.DESC);
         topHits.sort("id", SortOrder.ASC);
-        TermsAggregationBuilder tags = new TermsAggregationBuilder("tags").userValueTypeHint(ValueType.STRING);
+        TermsAggregationBuilder tags = new TermsAggregationBuilder("tags").userValueTypeHint(CoreValuesSourceType.ValueType.STRING);
         tags.field("tags.keyword");
         tags.size(10);
         tags.subAggregation(topHits);

server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java

@@ -63,7 +63,7 @@
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.InternalMax;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
-import org.elasticsearch.search.aggregations.support.ValueType;
+import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.fetch.FetchSubPhase;
 import org.elasticsearch.search.fetch.FetchSubPhaseProcessor;
@@ -241,7 +241,7 @@ public void testFinalReduce()  {
         SearchSourceBuilder source = new SearchSourceBuilder();
         source.size(0);
         originalRequest.source(source);
-        TermsAggregationBuilder terms = new TermsAggregationBuilder("terms").userValueTypeHint(ValueType.NUMERIC);
+        TermsAggregationBuilder terms = new TermsAggregationBuilder("terms").userValueTypeHint(CoreValuesSourceType.ValueType.NUMERIC);
         terms.field("price");
         terms.size(1);
         source.aggregation(terms);