Merge branch 'master' into pr/37940

* master:
  Expose retention leases in shard stats (elastic#37991)
  Make primary terms fields private in index shard (elastic#38036)
  ML: Add reason field in JobTaskState (elastic#38029)
  Log flush_stats and commit_stats in testMaybeFlush
  HLRC: Fix strict setting exception handling (elastic#37247)
  Test: Enable strict deprecation on all tests (elastic#36558)
  Removes typed calls from YAML REST tests (elastic#37611)
  Switch default time format for ingest from Joda to Java for v7 (elastic#37934)
  Remove deprecated Plugin#onModule extension points (elastic#37866)
  Geo: Fix Empty Geometry Collection Handling (elastic#37978)

Author: jasontedor

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

@@ -1671,15 +1671,16 @@ protected final ElasticsearchStatusException parseResponseException(ResponseExce
         Response response = responseException.getResponse();
         HttpEntity entity = response.getEntity();
         ElasticsearchStatusException elasticsearchException;
+        RestStatus restStatus = RestStatus.fromCode(response.getStatusLine().getStatusCode());
+
         if (entity == null) {
             elasticsearchException = new ElasticsearchStatusException(
-                    responseException.getMessage(), RestStatus.fromCode(response.getStatusLine().getStatusCode()), responseException);
+                    responseException.getMessage(), restStatus, responseException);
         } else {
             try {
                 elasticsearchException = parseEntity(entity, BytesRestResponse::errorFromXContent);
                 elasticsearchException.addSuppressed(responseException);
             } catch (Exception e) {
-                RestStatus restStatus = RestStatus.fromCode(response.getStatusLine().getStatusCode());
                 elasticsearchException = new ElasticsearchStatusException("Unable to parse response body", restStatus, responseException);
                 elasticsearchException.addSuppressed(e);
             }

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

@@ -0,0 +1,73 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.client;
+
+import org.apache.http.HttpHost;
+import org.apache.http.ProtocolVersion;
+import org.apache.http.RequestLine;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.message.BasicRequestLine;
+import org.apache.http.message.BasicStatusLine;
+import org.elasticsearch.test.ESTestCase;
+import org.junit.Before;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class MockRestHighLevelTests extends ESTestCase {
+    private RestHighLevelClient client;
+    private static final List<String> WARNINGS = Collections.singletonList("Some Warning");
+
+    @Before
+    private void setupClient() throws IOException {
+        final RestClient mockClient = mock(RestClient.class);
+        final Response mockResponse = mock(Response.class);
+
+        when(mockResponse.getHost()).thenReturn(new HttpHost("localhost", 9200));
+        when(mockResponse.getWarnings()).thenReturn(WARNINGS);
+
+        ProtocolVersion protocol = new ProtocolVersion("HTTP", 1, 1);
+        when(mockResponse.getStatusLine()).thenReturn(new BasicStatusLine(protocol, 200, "OK"));
+
+        RequestLine requestLine = new BasicRequestLine(HttpGet.METHOD_NAME, "/_blah", protocol);
+        when(mockResponse.getRequestLine()).thenReturn(requestLine);
+
+        WarningFailureException expectedException = new WarningFailureException(mockResponse);
+        doThrow(expectedException).when(mockClient).performRequest(any());
+
+        client = new RestHighLevelClient(mockClient, RestClient::close, Collections.emptyList());
+    }
+
+    public void testWarningFailure() {
+        WarningFailureException exception = expectThrows(WarningFailureException.class,
+            () -> client.info(RequestOptions.DEFAULT));
+        assertThat(exception.getMessage(), equalTo("method [GET], host [http://localhost:9200], URI [/_blah], " +
+            "status line [HTTP/1.1 200 OK]"));
+        assertNull(exception.getCause());
+        assertThat(exception.getResponse().getWarnings(), equalTo(WARNINGS));
+    }
+}

client/rest/src/main/java/org/elasticsearch/client/ResponseException.java

@@ -32,7 +32,7 @@
  */
 public final class ResponseException extends IOException {
 
-    private Response response;
+    private final Response response;
 
     public ResponseException(Response response) throws IOException {
         super(buildMessage(response));
@@ -49,7 +49,7 @@ public ResponseException(Response response) throws IOException {
         this.response = e.getResponse();
     }
 
-    private static String buildMessage(Response response) throws IOException {
+    static String buildMessage(Response response) throws IOException {
         String message = String.format(Locale.ROOT,
             "method [%s], host [%s], URI [%s], status line [%s]",
             response.getRequestLine().getMethod(),

client/rest/src/main/java/org/elasticsearch/client/RestClient.java

@@ -301,7 +301,7 @@ public void completed(HttpResponse httpResponse) {
                     if (isSuccessfulResponse(statusCode) || ignoreErrorCodes.contains(response.getStatusLine().getStatusCode())) {
                         onResponse(node);
                         if (thisWarningsHandler.warningsShouldFailRequest(response.getWarnings())) {
-                            listener.onDefinitiveFailure(new ResponseException(response));
+                            listener.onDefinitiveFailure(new WarningFailureException(response));
                         } else {
                             listener.onSuccess(response);
                         }
@@ -686,6 +686,9 @@ Response get() throws IOException {
                  * like the asynchronous API. We wrap the exception so that the caller's
                  * signature shows up in any exception we throw.
                  */
+                if (exception instanceof WarningFailureException) {
+                    throw new WarningFailureException((WarningFailureException) exception);
+                }
                 if (exception instanceof ResponseException) {
                     throw new ResponseException((ResponseException) exception);
                 }

client/rest/src/main/java/org/elasticsearch/client/WarningFailureException.java

@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.client;
+
+import java.io.IOException;
+
+import static org.elasticsearch.client.ResponseException.buildMessage;
+
+/**
+ * This exception is used to indicate that one or more {@link Response#getWarnings()} exist
+ * and is typically used when the {@link RestClient} is set to fail by setting
+ * {@link RestClientBuilder#setStrictDeprecationMode(boolean)} to `true`.
+ */
+// This class extends RuntimeException in order to deal with wrapping that is done in FutureUtils on exception.
+// if the exception is not of type ElasticsearchException or RuntimeException it will be wrapped in a UncategorizedExecutionException
+public final class WarningFailureException extends RuntimeException {
+
+    private final Response response;
+
+    public WarningFailureException(Response response) throws IOException {
+        super(buildMessage(response));
+        this.response = response;
+    }
+
+    /**
+     * Wrap a {@linkplain WarningFailureException} with another one with the current
+     * stack trace. This is used during synchronous calls so that the caller
+     * ends up in the stack trace of the exception thrown.
+     */
+    WarningFailureException(WarningFailureException e) {
+        super(e.getMessage(), e);
+        this.response = e.getResponse();
+    }
+
+    /**
+     * Returns the {@link Response} that caused this exception to be thrown.
+     */
+    public Response getResponse() {
+        return response;
+    }
+}

client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java

@@ -421,9 +421,9 @@ private void assertDeprecationWarnings(List<String> warningHeaderTexts, List<Str
         if (expectFailure) {
             try {
                 restClient.performRequest(request);
-                fail("expected ResponseException from warnings");
+                fail("expected WarningFailureException from warnings");
                 return;
-            } catch (ResponseException e) {
+            } catch (WarningFailureException e) {
                 if (false == warningBodyTexts.isEmpty()) {
                     assertThat(e.getMessage(), containsString("\nWarnings: " + warningBodyTexts));
                 }

libs/geo/src/main/java/org/elasticsearch/geo/utils/WellKnownText.java

@@ -121,6 +121,10 @@ public Void visit(MultiLine multiLine) {
 
                 @Override
                 public Void visit(MultiPoint multiPoint) {
+                    if (multiPoint.isEmpty()) {
+                        sb.append(EMPTY);
+                        return null;
+                    }
                     // walk through coordinates:
                     sb.append(LPAREN);
                     visitPoint(multiPoint.get(0).getLon(), multiPoint.get(0).getLat());

modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml

@@ -2,29 +2,27 @@
 "Empty Bucket Aggregation":
   - do:
       indices.create:
+        include_type_name: false
         index: empty_bucket_idx
         body:
           settings:
             number_of_shards: "3"
           mappings:
-            test:
-              "properties":
-                "value":
-                  "type": "integer"
-                "val1":
-                  "type": "double"
+            "properties":
+              "value":
+                "type": "integer"
+              "val1":
+                "type": "double"
 
   - do:
       index:
         index:  empty_bucket_idx
-        type:   test
         id:     1
         body:   { "value": 0, "val1": 3.1 }
 
   - do:
       index:
         index:  empty_bucket_idx
-        type:   test
         id:     2
         body:   { "value": 2, "val1": -3.1 }
 

modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml

@@ -3,20 +3,20 @@ setup:
 
   - do:
       indices.create:
+        include_type_name: false
         index: test
         body:
           settings:
             number_of_shards: 3
             number_of_routing_shards: 3
           mappings:
-            test:
-              "properties":
-                "val1":
-                  "type": "double"
-                "val2":
-                  "type": "double"
-                "val3":
-                  "type": "double"
+            "properties":
+              "val1":
+                "type": "double"
+              "val2":
+                "type": "double"
+              "val3":
+                "type": "double"
 
   - do:
       indices.create:
@@ -28,91 +28,76 @@ setup:
   - do:
       index:
         index:  test
-        type:   test
         id:     1
         body:   { "val1": 1.9, "val2": 3.1, "val3": 2.3 }
   - do:
       index:
         index:  test
-        type:   test
         id:     2
         body:   { "val1": -5.2, "val2": -3.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     3
         body:   { "val1": -5.2, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     4
         body:   { "val1": 18.3, "val2": 104.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     5
         body:   { "val1": -53.2, "val2": -322.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     6
         body:   { "val1": -578.9, "val2": 69.9, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     7
         body:   { "val1": 16.2, "val2": 17.2, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     8
         body:   { "val1": -4222.63, "val2": 316.44, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     9
         body:   { "val1": -59999.55, "val2": -3163.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     10
         body:   { "val1": 782.7, "val2": 789.7, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     11
         body:   { "val1": -1.2, "val2": 6.3, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     12
         body:   { "val1": 0, "val2": 1.11, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     13
         body:   { "val1": 0.1, "val2": 0.92, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     14
         body:   { "val1": 0.12, "val2": -82.4, "val3": 2.3}
   - do:
       index:
         index:  test
-        type:   test
         id:     15
         body:   { "val1": 98.2, "val2": 32.4, "val3": 2.3}