Skip to content

Commit 0e396dc

Browse files
committed
Merge branch 'master' into 2019-09-11-retry-s3-download-on-partial-content
2 parents f97cec8 + 5105db4 commit 0e396dc

File tree

609 files changed

+4397
-2356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

609 files changed

+4397
-2356
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/info/GenerateGlobalBuildInfoTask.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ public RegularFileProperty getFipsJvmFile() {
120120

121121
@TaskAction
122122
public void generate() {
123-
String javaVendor = System.getProperty("java.vendor");
123+
String javaVendorVersion = System.getProperty("java.vendor.version", System.getProperty("java.vendor"));
124124
String gradleJavaVersion = System.getProperty("java.version");
125-
String gradleJavaVersionDetails = javaVendor + " " + gradleJavaVersion + " [" + System.getProperty("java.vm.name")
125+
String gradleJavaVersionDetails = javaVendorVersion + " " + gradleJavaVersion + " [" + System.getProperty("java.vm.name")
126126
+ " " + System.getProperty("java.vm.version") + "]";
127127

128128
String compilerJavaVersionDetails = gradleJavaVersionDetails;
@@ -231,8 +231,10 @@ private void writeToFile(File file, String content) {
231231
*/
232232
private String findJavaVersionDetails(File javaHome) {
233233
String versionInfoScript = "print(" +
234-
"java.lang.System.getProperty(\"java.vendor\") + \" \" + java.lang.System.getProperty(\"java.version\") + " +
235-
"\" [\" + java.lang.System.getProperty(\"java.vm.name\") + \" \" + java.lang.System.getProperty(\"java.vm.version\") + \"]\");";
234+
"java.lang.System.getProperty(\"java.vendor.version\", java.lang.System.getProperty(\"java.vendor\")) + \" \" + " +
235+
"java.lang.System.getProperty(\"java.version\") + \" [\" + " +
236+
"java.lang.System.getProperty(\"java.vm.name\") + \" \" + " +
237+
"java.lang.System.getProperty(\"java.vm.version\") + \"]\");";
236238
return runJavaAsScript(javaHome, versionInfoScript).trim();
237239
}
238240

buildSrc/version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ bouncycastle = 1.61
3232
# test dependencies
3333
randomizedrunner = 2.7.1
3434
junit = 4.12
35-
httpclient = 4.5.8
36-
httpcore = 4.4.11
35+
httpclient = 4.5.10
36+
httpcore = 4.4.12
3737
httpasyncclient = 4.1.4
3838
commonslogging = 1.1.3
3939
commonscodec = 1.11

client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameClient.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121

2222
import org.elasticsearch.action.ActionListener;
2323
import org.elasticsearch.client.core.AcknowledgedResponse;
24-
import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest;
25-
import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest;
26-
import org.elasticsearch.client.dataframe.GetDataFrameTransformResponse;
27-
import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest;
28-
import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsResponse;
29-
import org.elasticsearch.client.dataframe.PreviewDataFrameTransformRequest;
30-
import org.elasticsearch.client.dataframe.PreviewDataFrameTransformResponse;
31-
import org.elasticsearch.client.dataframe.PutDataFrameTransformRequest;
32-
import org.elasticsearch.client.dataframe.StartDataFrameTransformRequest;
33-
import org.elasticsearch.client.dataframe.StartDataFrameTransformResponse;
34-
import org.elasticsearch.client.dataframe.StopDataFrameTransformRequest;
35-
import org.elasticsearch.client.dataframe.StopDataFrameTransformResponse;
36-
import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest;
37-
import org.elasticsearch.client.dataframe.UpdateDataFrameTransformResponse;
24+
import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest;
25+
import org.elasticsearch.client.transform.GetDataFrameTransformRequest;
26+
import org.elasticsearch.client.transform.GetDataFrameTransformResponse;
27+
import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest;
28+
import org.elasticsearch.client.transform.GetDataFrameTransformStatsResponse;
29+
import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest;
30+
import org.elasticsearch.client.transform.PreviewDataFrameTransformResponse;
31+
import org.elasticsearch.client.transform.PutDataFrameTransformRequest;
32+
import org.elasticsearch.client.transform.StartDataFrameTransformRequest;
33+
import org.elasticsearch.client.transform.StartDataFrameTransformResponse;
34+
import org.elasticsearch.client.transform.StopDataFrameTransformRequest;
35+
import org.elasticsearch.client.transform.StopDataFrameTransformResponse;
36+
import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest;
37+
import org.elasticsearch.client.transform.UpdateDataFrameTransformResponse;
3838

3939
import java.io.IOException;
4040
import java.util.Collections;
@@ -55,7 +55,7 @@ public final class DataFrameClient {
5555
* Create data frame transform documentation</a>
5656
*
5757
* @param request The PutDataFrameTransformRequest containing the
58-
* {@link org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig}.
58+
* {@link org.elasticsearch.client.transform.transforms.DataFrameTransformConfig}.
5959
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
6060
* @return An AcknowledgedResponse object indicating request success
6161
* @throws IOException when there is a serialization issue sending the request or receiving the response
@@ -75,7 +75,7 @@ public AcknowledgedResponse putDataFrameTransform(PutDataFrameTransformRequest r
7575
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/put-data-frame-transform.html">
7676
* Create data frame transform documentation</a>
7777
* @param request The PutDataFrameTransformRequest containing the
78-
* {@link org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig}.
78+
* {@link org.elasticsearch.client.transform.transforms.DataFrameTransformConfig}.
7979
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
8080
* @param listener Listener to be notified upon request completion
8181
* @return cancellable that may be used to cancel the request
@@ -98,7 +98,7 @@ public Cancellable putDataFrameTransformAsync(PutDataFrameTransformRequest reque
9898
* Create data frame transform documentation</a>
9999
*
100100
* @param request The UpdateDataFrameTransformRequest containing the
101-
* {@link org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate}.
101+
* {@link org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate}.
102102
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
103103
* @return An UpdateDataFrameTransformResponse object containing the updated configuration
104104
* @throws IOException when there is a serialization issue sending the request or receiving the response
@@ -119,7 +119,7 @@ public UpdateDataFrameTransformResponse updateDataFrameTransform(UpdateDataFrame
119119
* see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/update-data-frame-transform.html">
120120
* Create data frame transform documentation</a>
121121
* @param request The UpdateDataFrameTransformRequest containing the
122-
* {@link org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate}.
122+
* {@link org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate}.
123123
* @param options Additional request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
124124
* @param listener Listener to be notified upon request completion
125125
* @return cancellable that may be used to cancel the request

client/rest-high-level/src/main/java/org/elasticsearch/client/DataFrameRequestConverters.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@
2424
import org.apache.http.client.methods.HttpPost;
2525
import org.apache.http.client.methods.HttpPut;
2626
import org.elasticsearch.client.core.PageParams;
27-
import org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest;
28-
import org.elasticsearch.client.dataframe.GetDataFrameTransformRequest;
29-
import org.elasticsearch.client.dataframe.GetDataFrameTransformStatsRequest;
30-
import org.elasticsearch.client.dataframe.PreviewDataFrameTransformRequest;
31-
import org.elasticsearch.client.dataframe.PutDataFrameTransformRequest;
32-
import org.elasticsearch.client.dataframe.StartDataFrameTransformRequest;
33-
import org.elasticsearch.client.dataframe.StopDataFrameTransformRequest;
34-
import org.elasticsearch.client.dataframe.UpdateDataFrameTransformRequest;
27+
import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest;
28+
import org.elasticsearch.client.transform.GetDataFrameTransformRequest;
29+
import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest;
30+
import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest;
31+
import org.elasticsearch.client.transform.PutDataFrameTransformRequest;
32+
import org.elasticsearch.client.transform.StartDataFrameTransformRequest;
33+
import org.elasticsearch.client.transform.StopDataFrameTransformRequest;
34+
import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest;
3535
import org.elasticsearch.common.Strings;
3636

3737
import java.io.IOException;
3838

3939
import static org.elasticsearch.client.RequestConverters.REQUEST_BODY_CONTENT_TYPE;
4040
import static org.elasticsearch.client.RequestConverters.createEntity;
41-
import static org.elasticsearch.client.dataframe.DeleteDataFrameTransformRequest.FORCE;
42-
import static org.elasticsearch.client.dataframe.GetDataFrameTransformRequest.ALLOW_NO_MATCH;
43-
import static org.elasticsearch.client.dataframe.PutDataFrameTransformRequest.DEFER_VALIDATION;
41+
import static org.elasticsearch.client.transform.DeleteDataFrameTransformRequest.FORCE;
42+
import static org.elasticsearch.client.transform.GetDataFrameTransformRequest.ALLOW_NO_MATCH;
43+
import static org.elasticsearch.client.transform.PutDataFrameTransformRequest.DEFER_VALIDATION;
4444

4545
final class DataFrameRequestConverters {
4646

client/rest-high-level/src/main/java/org/elasticsearch/client/ml/GetDataFrameAnalyticsStatsResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
import org.elasticsearch.ElasticsearchException;
2323
import org.elasticsearch.action.TaskOperationFailure;
24-
import org.elasticsearch.client.dataframe.AcknowledgedTasksResponse;
2524
import org.elasticsearch.client.ml.dataframe.DataFrameAnalyticsStats;
25+
import org.elasticsearch.client.transform.AcknowledgedTasksResponse;
2626
import org.elasticsearch.common.Nullable;
2727
import org.elasticsearch.common.ParseField;
2828
import org.elasticsearch.common.xcontent.ConstructingObjectParser;

client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/DataFrameAnalyticsConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package org.elasticsearch.client.ml.dataframe;
2121

2222
import org.elasticsearch.Version;
23-
import org.elasticsearch.client.dataframe.transforms.util.TimeUtil;
23+
import org.elasticsearch.client.transform.transforms.util.TimeUtil;
2424
import org.elasticsearch.common.Nullable;
2525
import org.elasticsearch.common.ParseField;
2626
import org.elasticsearch.common.Strings;
+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.ElasticsearchException;
2323
import org.elasticsearch.action.TaskOperationFailure;
+3-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

22-
import org.elasticsearch.client.dataframe.transforms.SyncConfig;
23-
import org.elasticsearch.client.dataframe.transforms.TimeSyncConfig;
22+
import org.elasticsearch.client.transform.transforms.SyncConfig;
23+
import org.elasticsearch.client.transform.transforms.TimeSyncConfig;
2424
import org.elasticsearch.common.ParseField;
2525
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
2626
import org.elasticsearch.plugins.spi.NamedXContentProvider;
+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.client.Validatable;
2323
import org.elasticsearch.client.ValidationException;
+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.client.Validatable;
2323
import org.elasticsearch.client.ValidationException;
+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

22-
import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig;
22+
import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig;
2323
import org.elasticsearch.common.Nullable;
2424
import org.elasticsearch.common.ParseField;
2525
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.client.Validatable;
2323
import org.elasticsearch.client.ValidationException;
+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.ElasticsearchException;
2323
import org.elasticsearch.action.TaskOperationFailure;
24-
import org.elasticsearch.client.dataframe.transforms.DataFrameTransformStats;
24+
import org.elasticsearch.client.transform.transforms.DataFrameTransformStats;
2525
import org.elasticsearch.common.Nullable;
2626
import org.elasticsearch.common.ParseField;
2727
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.client.Validatable;
2323
import org.elasticsearch.client.ValidationException;
24-
import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig;
24+
import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig;
2525
import org.elasticsearch.common.xcontent.ToXContent;
2626
import org.elasticsearch.common.xcontent.ToXContentObject;
2727
import org.elasticsearch.common.xcontent.XContentBuilder;
+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.common.xcontent.XContentParser;
2323

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.client.Validatable;
2323
import org.elasticsearch.client.ValidationException;
24-
import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig;
24+
import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig;
2525
import org.elasticsearch.common.xcontent.ToXContentObject;
2626
import org.elasticsearch.common.xcontent.XContentBuilder;
2727

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.client.Validatable;
2323
import org.elasticsearch.client.ValidationException;
+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.ElasticsearchException;
2323
import org.elasticsearch.action.TaskOperationFailure;
+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.client.Validatable;
2323
import org.elasticsearch.client.ValidationException;
+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.ElasticsearchException;
2323
import org.elasticsearch.action.TaskOperationFailure;
+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

2222
import org.elasticsearch.client.Validatable;
2323
import org.elasticsearch.client.ValidationException;
24-
import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfigUpdate;
24+
import org.elasticsearch.client.transform.transforms.DataFrameTransformConfigUpdate;
2525
import org.elasticsearch.common.xcontent.ToXContentObject;
2626
import org.elasticsearch.common.xcontent.XContentBuilder;
2727

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe;
20+
package org.elasticsearch.client.transform;
2121

22-
import org.elasticsearch.client.dataframe.transforms.DataFrameTransformConfig;
22+
import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig;
2323
import org.elasticsearch.common.xcontent.XContentParser;
2424

2525
import java.util.Objects;
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe.transforms;
20+
package org.elasticsearch.client.transform.transforms;
2121

2222
import org.elasticsearch.common.ParseField;
2323
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe.transforms;
20+
package org.elasticsearch.client.transform.transforms;
2121

2222
import org.elasticsearch.client.core.IndexerJobStats;
2323
import org.elasticsearch.common.ParseField;
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe.transforms;
20+
package org.elasticsearch.client.transform.transforms;
2121

2222
import org.elasticsearch.common.ParseField;
2323
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe.transforms;
20+
package org.elasticsearch.client.transform.transforms;
2121

22-
import org.elasticsearch.client.dataframe.transforms.util.TimeUtil;
22+
import org.elasticsearch.client.transform.transforms.util.TimeUtil;
2323
import org.elasticsearch.common.Nullable;
2424
import org.elasticsearch.common.ParseField;
2525
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe.transforms;
20+
package org.elasticsearch.client.transform.transforms;
2121

2222
import org.elasticsearch.Version;
23-
import org.elasticsearch.client.dataframe.transforms.pivot.PivotConfig;
24-
import org.elasticsearch.client.dataframe.transforms.util.TimeUtil;
23+
import org.elasticsearch.client.transform.transforms.pivot.PivotConfig;
24+
import org.elasticsearch.client.transform.transforms.util.TimeUtil;
2525
import org.elasticsearch.common.Nullable;
2626
import org.elasticsearch.common.ParseField;
2727
import org.elasticsearch.common.Strings;
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.client.dataframe.transforms;
20+
package org.elasticsearch.client.transform.transforms;
2121

2222
import org.elasticsearch.common.Nullable;
2323
import org.elasticsearch.common.Strings;

0 commit comments

Comments
 (0)