Merge remote-tracking branch 'es/7.x' into enrich-7.x

Author: martijnvg

TESTING.asciidoc

@@ -374,6 +374,7 @@ These are the linux flavors supported, all of which we provide images for
 * debian-9 aka stretch, the current debian stable distribution
 * centos-6
 * centos-7
+* rhel-8
 * fedora-28
 * fedora-29
 * oel-6 aka Oracle Enterprise Linux 6

Vagrantfile

@@ -127,6 +127,12 @@ Vagrant.configure(2) do |config|
       sles_common config, box
     end
   end
+  'rhel-8'.tap do |box|
+    config.vm.define box, define_opts do |config|
+      config.vm.box = 'elastic/rhel-8-x86_64'
+      rpm_common config, box
+    end
+  end
 
   windows_2012r2_box = ENV['VAGRANT_WINDOWS_2012R2_BOX']
   if windows_2012r2_box && windows_2012r2_box.empty? == false

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

@@ -30,6 +30,7 @@ class VagrantTestPlugin implements Plugin<Project> {
             'oel-6',
             'oel-7',
             'opensuse-42',
+            'rhel-8',
             'sles-12',
             'ubuntu-1604',
             'ubuntu-1804'

buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ForbiddenPatternsTask.java

@@ -66,6 +66,7 @@ public class ForbiddenPatternsTask extends DefaultTask {
         .exclude("**/*.zip")
         .exclude("**/*.jks")
         .exclude("**/*.crt")
+        .exclude("**/*.keystore")
         .exclude("**/*.png");
 
     /*

buildSrc/version.properties

@@ -1,4 +1,4 @@
-elasticsearch     = 7.1.0
+elasticsearch     = 7.2.0
 lucene            = 8.0.0
 
 bundled_jdk       = 12.0.1+12@69cfe15208a647278a19ef0990eea691
@@ -20,7 +20,7 @@ slf4j             = 1.6.2
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 4.5.1
 
-netty             = 4.1.32.Final
+netty             = 4.1.35.Final
 joda              = 2.10.1
 
 # when updating this version, you need to ensure compatibility with:

client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformConfig.java

@@ -87,11 +87,11 @@ public static DataFrameTransformConfig forPreview(final SourceConfig source, fin
         return new DataFrameTransformConfig(null, source, null, pivotConfig, null);
     }
 
-    public DataFrameTransformConfig(final String id,
-                                    final SourceConfig source,
-                                    final DestConfig dest,
-                                    final PivotConfig pivotConfig,
-                                    final String description) {
+    DataFrameTransformConfig(final String id,
+                             final SourceConfig source,
+                             final DestConfig dest,
+                             final PivotConfig pivotConfig,
+                             final String description) {
         this.id = id;
         this.source = source;
         this.dest = dest;
@@ -170,4 +170,46 @@ public int hashCode() {
     public String toString() {
         return Strings.toString(this, true, true);
     }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        private String id;
+        private SourceConfig source;
+        private DestConfig dest;
+        private PivotConfig pivotConfig;
+        private String description;
+
+        public Builder setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder setSource(SourceConfig source) {
+            this.source = source;
+            return this;
+        }
+
+        public Builder setDest(DestConfig dest) {
+            this.dest = dest;
+            return this;
+        }
+
+        public Builder setPivotConfig(PivotConfig pivotConfig) {
+            this.pivotConfig = pivotConfig;
+            return this;
+        }
+
+        public Builder setDescription(String description) {
+            this.description = description;
+            return this;
+        }
+
+        public DataFrameTransformConfig build() {
+            return new DataFrameTransformConfig(id, source, dest, pivotConfig, description);
+        }
+    }
 }

client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/SourceConfig.java

@@ -23,6 +23,7 @@
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -76,7 +77,7 @@ public SourceConfig(String... index) {
      * @param index Any number of indices. At least one non-null, non-empty, index should be provided
      * @param queryConfig A QueryConfig object that contains the desired query. Defaults to MatchAll query.
      */
-    public SourceConfig(String[] index, QueryConfig queryConfig) {
+    SourceConfig(String[] index, QueryConfig queryConfig) {
         this.index = index;
         this.queryConfig = queryConfig;
     }
@@ -121,4 +122,46 @@ public int hashCode(){
         int hash = Arrays.hashCode(index);
         return 31 * hash + (queryConfig == null ? 0 : queryConfig.hashCode());
     }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private String[] index;
+        private QueryConfig queryConfig;
+
+        /**
+         * Sets what indices from which to fetch data
+         * @param index The indices from which to fetch data
+         * @return The {@link Builder} with indices set
+         */
+        public Builder setIndex(String... index) {
+            this.index = index;
+            return this;
+        }
+
+        /**
+         * Sets the {@link QueryConfig} object that references the desired query to use when fetching the data
+         * @param queryConfig The {@link QueryConfig} to use when fetching data
+         * @return The {@link Builder} with queryConfig set
+         */
+        public Builder setQueryConfig(QueryConfig queryConfig) {
+            this.queryConfig = queryConfig;
+            return this;
+        }
+
+        /**
+         * Sets the query to use when fetching the data. Convenience method for {@link #setQueryConfig(QueryConfig)}
+         * @param query The {@link QueryBuilder} to use when fetch data (overwrites the {@link QueryConfig})
+         * @return The {@link Builder} with queryConfig set
+         */
+        public Builder setQuery(QueryBuilder query) {
+            return this.setQueryConfig(new QueryConfig(query));
+        }
+
+        public SourceConfig build() {
+            return new SourceConfig(index, queryConfig);
+        }
+    }
 }

client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/pivot/DateHistogramGroupSource.java

@@ -20,6 +20,7 @@
 package org.elasticsearch.client.dataframe.transforms.pivot;
 
 import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;
@@ -34,51 +35,66 @@
 
 import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
 
+/**
+ * A grouping via a date histogram aggregation referencing a timefield
+ */
 public class DateHistogramGroupSource extends SingleGroupSource implements ToXContentObject {
 
     private static final ParseField TIME_ZONE = new ParseField("time_zone");
     private static final ParseField FORMAT = new ParseField("format");
 
     private static final ConstructingObjectParser<DateHistogramGroupSource, Void> PARSER =
-            new ConstructingObjectParser<>("date_histogram_group_source", true, (args) -> new DateHistogramGroupSource((String) args[0]));
+            new ConstructingObjectParser<>("date_histogram_group_source",
+                true,
+                (args) -> {
+                   String field = (String)args[0];
+                   long interval = 0;
+                   DateHistogramInterval dateHistogramInterval = null;
+                   if (args[1] instanceof Long) {
+                       interval = (Long)args[1];
+                   } else {
+                       dateHistogramInterval = (DateHistogramInterval) args[1];
+                   }
+                   ZoneId zoneId = (ZoneId) args[2];
+                   String format = (String) args[3];
+                   return new DateHistogramGroupSource(field, interval, dateHistogramInterval, format, zoneId);
+                });
 
     static {
         PARSER.declareString(optionalConstructorArg(), FIELD);
-        PARSER.declareField((histogram, interval) -> {
-            if (interval instanceof Long) {
-                histogram.setInterval((long) interval);
-            } else {
-                histogram.setDateHistogramInterval((DateHistogramInterval) interval);
-            }
-        }, p -> {
+        PARSER.declareField(optionalConstructorArg(), p -> {
             if (p.currentToken() == XContentParser.Token.VALUE_NUMBER) {
                 return p.longValue();
             } else {
                 return new DateHistogramInterval(p.text());
             }
         }, HistogramGroupSource.INTERVAL, ObjectParser.ValueType.LONG);
-        PARSER.declareField(DateHistogramGroupSource::setTimeZone, p -> {
+        PARSER.declareField(optionalConstructorArg(), p -> {
             if (p.currentToken() == XContentParser.Token.VALUE_STRING) {
                 return ZoneId.of(p.text());
             } else {
                 return ZoneOffset.ofHours(p.intValue());
             }
         }, TIME_ZONE, ObjectParser.ValueType.LONG);
 
-        PARSER.declareString(DateHistogramGroupSource::setFormat, FORMAT);
+        PARSER.declareString(optionalConstructorArg(), FORMAT);
     }
 
     public static DateHistogramGroupSource fromXContent(final XContentParser parser) {
         return PARSER.apply(parser, null);
     }
 
-    private long interval = 0;
-    private DateHistogramInterval dateHistogramInterval;
-    private String format;
-    private ZoneId timeZone;
+    private final long interval;
+    private final DateHistogramInterval dateHistogramInterval;
+    private final String format;
+    private final ZoneId timeZone;
 
-    public DateHistogramGroupSource(String field) {
+    DateHistogramGroupSource(String field, long interval, DateHistogramInterval dateHistogramInterval, String format, ZoneId timeZone) {
         super(field);
+        this.interval = interval;
+        this.dateHistogramInterval = dateHistogramInterval;
+        this.format = format;
+        this.timeZone = timeZone;
     }
 
     @Override
@@ -90,40 +106,18 @@ public long getInterval() {
         return interval;
     }
 
-    public void setInterval(long interval) {
-        if (interval < 1) {
-            throw new IllegalArgumentException("[interval] must be greater than or equal to 1.");
-        }
-        this.interval = interval;
-    }
-
     public DateHistogramInterval getDateHistogramInterval() {
         return dateHistogramInterval;
     }
 
-    public void setDateHistogramInterval(DateHistogramInterval dateHistogramInterval) {
-        if (dateHistogramInterval == null) {
-            throw new IllegalArgumentException("[dateHistogramInterval] must not be null");
-        }
-        this.dateHistogramInterval = dateHistogramInterval;
-    }
-
     public String getFormat() {
         return format;
     }
 
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
     public ZoneId getTimeZone() {
         return timeZone;
     }
 
-    public void setTimeZone(ZoneId timeZone) {
-        this.timeZone = timeZone;
-    }
-
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
@@ -168,4 +162,88 @@ public boolean equals(Object other) {
     public int hashCode() {
         return Objects.hash(field, interval, dateHistogramInterval, timeZone, format);
     }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        private String field;
+        private long interval = 0;
+        private DateHistogramInterval dateHistogramInterval;
+        private String format;
+        private ZoneId timeZone;
+
+        /**
+         * The field with which to construct the date histogram grouping
+         * @param field The field name
+         * @return The {@link Builder} with the field set.
+         */
+        public Builder setField(String field) {
+            this.field = field;
+            return this;
+        }
+
+        /**
+         * Set the interval for the DateHistogram grouping
+         * @param interval the time interval in milliseconds
+         * @return the {@link Builder} with the interval set.
+         */
+        public Builder setInterval(long interval) {
+            if (interval < 1) {
+                throw new IllegalArgumentException("[interval] must be greater than or equal to 1.");
+            }
+            this.interval = interval;
+            return this;
+        }
+
+        /**
+         * Set the interval for the DateHistogram grouping
+         * @param timeValue The time value to use as the interval
+         * @return the {@link Builder} with the interval set.
+         */
+        public Builder setInterval(TimeValue timeValue) {
+            return setInterval(timeValue.getMillis());
+        }
+
+        /**
+         * Sets the interval of the DateHistogram grouping
+         *
+         * If this DateHistogramInterval is set, it supersedes the #{@link DateHistogramGroupSource#getInterval()}
+         * @param dateHistogramInterval the DateHistogramInterval to set
+         * @return The {@link Builder} with the dateHistogramInterval set.
+         */
+        public Builder setDateHistgramInterval(DateHistogramInterval dateHistogramInterval) {
+            if (dateHistogramInterval == null) {
+                throw new IllegalArgumentException("[dateHistogramInterval] must not be null");
+            }
+            this.dateHistogramInterval = dateHistogramInterval;
+            return this;
+        }
+
+        /**
+         * Set the optional String formatting for the time interval.
+         * @param format The format of the output for the time interval key
+         * @return The {@link Builder} with the format set.
+         */
+        public Builder setFormat(String format) {
+            this.format = format;
+            return this;
+        }
+
+        /**
+         * Sets the time zone to use for this aggregation
+         * @param timeZone The zoneId for the timeZone
+         * @return The {@link Builder} with the timeZone set.
+         */
+        public Builder setTimeZone(ZoneId timeZone) {
+            this.timeZone = timeZone;
+            return this;
+        }
+
+        public DateHistogramGroupSource build() {
+            return new DateHistogramGroupSource(field, interval, dateHistogramInterval, format, timeZone);
+        }
+    }
 }