Merge branch 'master' into refresh-without-lock

Author: dnhatn

.ci/bwcVersions

@@ -10,6 +10,7 @@ BWC_VERSION:
   - "7.3.2"
   - "7.4.0"
   - "7.4.1"
+  - "7.4.2"
   - "7.5.0"
   - "7.6.0"
   - "8.0.0"

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

@@ -827,6 +827,8 @@ class BuildPlugin implements Plugin<Project> {
                     } else {
                         nonInputProperties.systemProperty('runtime.java', "${-> (ext.get('runtimeJavaVersion') as JavaVersion).getMajorVersion()}")
                     }
+                    //TODO remove once jvm.options are added to test system properties
+                    test.systemProperty ('java.locale.providers','SPI,COMPAT')
                 }
 
                 test.jvmArgumentProviders.add(nonInputProperties)
@@ -861,8 +863,6 @@ class BuildPlugin implements Plugin<Project> {
                         'tests.security.manager': 'true',
                         'jna.nosys': 'true'
 
-                //TODO remove once jvm.options are added to test system properties
-                test.systemProperty ('java.locale.providers','SPI,COMPAT')
 
                 // ignore changing test seed when build is passed -Dignore.tests.seed for cacheability experimentation
                 if (System.getProperty('ignore.tests.seed') != null) {

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy

@@ -24,7 +24,6 @@ import org.elasticsearch.gradle.testclusters.RestTestRunnerTask
 import org.elasticsearch.gradle.tool.Boilerplate
 import org.elasticsearch.gradle.tool.ClasspathUtils
 import org.gradle.api.DefaultTask
-import org.gradle.api.JavaVersion
 import org.gradle.api.Task
 import org.gradle.api.file.FileCopyDetails
 import org.gradle.api.tasks.Copy

client/rest-high-level/build.gradle

@@ -1,3 +1,5 @@
+import org.elasticsearch.gradle.test.RestIntegTestTask
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -106,11 +108,22 @@ File nodeTrustStore = file("./testnode.jks")
 File pkiTrustCert = file("./src/test/resources/org/elasticsearch/client/security/delegate_pki/testRootCA.crt")
 
 integTest.runner {
+  systemProperty 'tests.rest.async', 'false'
   systemProperty 'tests.rest.cluster.username', System.getProperty('tests.rest.cluster.username', 'test_user')
   systemProperty 'tests.rest.cluster.password', System.getProperty('tests.rest.cluster.password', 'test-password')
 }
 
-testClusters.integTest {
+RestIntegTestTask asyncIntegTest = tasks.create("asyncIntegTest", RestIntegTestTask) {
+  runner {
+    systemProperty 'tests.rest.async', 'true'
+    systemProperty 'tests.rest.cluster.username', System.getProperty('tests.rest.cluster.username', 'test_user')
+    systemProperty 'tests.rest.cluster.password', System.getProperty('tests.rest.cluster.password', 'test-password')
+  }
+}
+
+check.dependsOn(asyncIntegTest)
+
+testClusters.all {
   testDistribution = 'DEFAULT'
   systemProperty 'es.scripting.update.ctx_in_params', 'false'
   setting 'reindex.remote.whitelist', '[ "[::1]:*", "127.0.0.1:*" ]'
@@ -130,10 +143,10 @@ testClusters.integTest {
   setting 'indices.lifecycle.poll_interval', '1000ms'
   keystore 'xpack.security.transport.ssl.truststore.secure_password', 'testnode'
   extraConfigFile 'roles.yml', file('roles.yml')
-  user username:  System.getProperty('tests.rest.cluster.username', 'test_user'),
-          password:  System.getProperty('tests.rest.cluster.password', 'test-password'),
-          role:  System.getProperty('tests.rest.cluster.role', 'admin')
-  user username:  'admin_user', password: 'admin-password'
+  user username: System.getProperty('tests.rest.cluster.username', 'test_user'),
+          password: System.getProperty('tests.rest.cluster.password', 'test-password'),
+          role: System.getProperty('tests.rest.cluster.role', 'admin')
+  user username: 'admin_user', password: 'admin-password'
 
   extraConfigFile nodeCert.name, nodeCert
   extraConfigFile nodeTrustStore.name, nodeTrustStore

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

@@ -26,6 +26,7 @@
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.client.indices.CreateIndexRequest;
+import org.elasticsearch.common.Booleans;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -52,6 +53,7 @@
 public abstract class ESRestHighLevelClientTestCase extends ESRestTestCase {
 
     private static RestHighLevelClient restHighLevelClient;
+    private static boolean async = Booleans.parseBoolean(System.getProperty("tests.rest.async", "false"));
 
     @Before
     public void initHighLevelClient() throws IOException {
@@ -78,20 +80,20 @@ protected static <Req, Resp> Resp execute(Req request, SyncMethod<Req, Resp> syn
                                        AsyncMethod<Req, Resp> asyncMethod) throws IOException {
         return execute(request, syncMethod, asyncMethod, RequestOptions.DEFAULT);
     }
-    
+
     /**
      * Executes the provided request using either the sync method or its async variant, both provided as functions
      */
     protected static <Req, Resp> Resp execute(Req request, SyncMethod<Req, Resp> syncMethod,
                                        AsyncMethod<Req, Resp> asyncMethod, RequestOptions options) throws IOException {
-        if (randomBoolean()) {
+        if (async == false) {
             return syncMethod.execute(request, options);
         } else {
             PlainActionFuture<Resp> future = PlainActionFuture.newFuture();
             asyncMethod.execute(request, options, future);
             return future.actionGet();
         }
-    }    
+    }
 
     /**
      * Executes the provided request using either the sync method or its async
@@ -100,7 +102,7 @@ protected static <Req, Resp> Resp execute(Req request, SyncMethod<Req, Resp> syn
      */
     protected static <Resp> Resp execute(SyncMethodNoRequest<Resp> syncMethodNoRequest, AsyncMethodNoRequest<Resp> asyncMethodNoRequest,
             RequestOptions requestOptions) throws IOException {
-        if (randomBoolean()) {
+        if (async == false) {
             return syncMethodNoRequest.execute(requestOptions);
         } else {
             PlainActionFuture<Resp> future = PlainActionFuture.newFuture();

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

@@ -194,7 +194,7 @@ public void testGetLicense() throws Exception {
             //end::get-license-response
 
             assertThat(currentLicense, containsString("trial"));
-            assertThat(currentLicense, containsString("integTest"));
+            assertThat(currentLicense, containsString("ntegTest"));
         }
         {
             GetLicenseRequest request = new GetLicenseRequest();
@@ -233,7 +233,7 @@ public void onFailure(Exception e) {
             String currentLicense = response.getLicenseDefinition();
             assertThat(currentLicense, startsWith("{"));
             assertThat(currentLicense, containsString("trial"));
-            assertThat(currentLicense, containsString("integTest"));
+            assertThat(currentLicense, containsString("ntegTest"));
             assertThat(currentLicense, endsWith("}"));
         }
     }

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

@@ -203,6 +203,7 @@ public void testGetUsers() throws Exception {
             // 9 users are expected to be returned
             // test_users (3): user1, user2, user3
             // system_users (6): elastic, beats_system, apm_system, logstash_system, kibana, remote_monitoring_user
+            logger.info(users);
             assertThat(users.size(), equalTo(9));
         }
 

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

@@ -48,6 +48,7 @@
 import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.cluster.SnapshotsInProgress;
 import org.elasticsearch.cluster.metadata.RepositoryMetaData;
+import org.elasticsearch.common.Booleans;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentType;
@@ -457,7 +458,12 @@ public void testSnapshotVerifyRepository() throws IOException {
         List<VerifyRepositoryResponse.NodeView> repositoryMetaDataResponse = response.getNodes();
         // end::verify-repository-response
         assertThat(1, equalTo(repositoryMetaDataResponse.size()));
-        assertThat("integTest-0", equalTo(repositoryMetaDataResponse.get(0).getName()));
+        final boolean async = Booleans.parseBoolean(System.getProperty("tests.rest.async", "false"));
+        if (async) {
+            assertThat("asyncIntegTest-0", equalTo(repositoryMetaDataResponse.get(0).getName()));
+        } else {
+            assertThat("integTest-0", equalTo(repositoryMetaDataResponse.get(0).getName()));
+        }
     }
 
     public void testSnapshotVerifyRepositoryAsync() throws InterruptedException {

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

@@ -18,48 +18,23 @@
  */
 package org.elasticsearch.client.license;
 
-import org.elasticsearch.client.AbstractHlrcWriteableXContentTestCase;
-import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.client.AbstractResponseTestCase;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.protocol.xpack.license.LicensesStatus;
+import org.elasticsearch.common.xcontent.XContentType;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Predicate;
 
-public class PutLicenseResponseTests extends AbstractHlrcWriteableXContentTestCase<
-    org.elasticsearch.protocol.xpack.license.PutLicenseResponse, PutLicenseResponse> {
-
-    @Override
-    public org.elasticsearch.client.license.PutLicenseResponse doHlrcParseInstance(XContentParser parser) throws IOException {
-        return org.elasticsearch.client.license.PutLicenseResponse.fromXContent(parser);
-    }
-
-    @Override
-    public org.elasticsearch.protocol.xpack.license.PutLicenseResponse convertHlrcToInternal(
-        org.elasticsearch.client.license.PutLicenseResponse instance) {
-        return new org.elasticsearch.protocol.xpack.license.PutLicenseResponse(instance.isAcknowledged(),
-            org.elasticsearch.protocol.xpack.license.LicensesStatus.valueOf(instance.status().name()),
-            instance.acknowledgeHeader(), instance.acknowledgeMessages());
-    }
-
-    @Override
-    protected boolean supportsUnknownFields() {
-        return true;
-    }
+import static org.hamcrest.Matchers.equalTo;
 
-    @Override
-    protected Predicate<String> getRandomFieldsExcludeFilter() {
-        // The structure of the response is such that unknown fields inside acknowledge cannot be supported since they
-        // are treated as messages from new services
-        return p -> p.startsWith("acknowledge");
-    }
+public class PutLicenseResponseTests extends AbstractResponseTestCase<
+    org.elasticsearch.protocol.xpack.license.PutLicenseResponse, PutLicenseResponse> {
 
     @Override
-    protected org.elasticsearch.protocol.xpack.license.PutLicenseResponse createTestInstance() {
+    protected org.elasticsearch.protocol.xpack.license.PutLicenseResponse createServerTestInstance(XContentType xContentType) {
         boolean acknowledged = randomBoolean();
         org.elasticsearch.protocol.xpack.license.LicensesStatus status =
             randomFrom(org.elasticsearch.protocol.xpack.license.LicensesStatus.VALID,
@@ -97,45 +72,18 @@ private static Map<String, String[]> randomAckMessages() {
     }
 
     @Override
-    protected Writeable.Reader<org.elasticsearch.protocol.xpack.license.PutLicenseResponse> instanceReader() {
-        return org.elasticsearch.protocol.xpack.license.PutLicenseResponse::new;
+    protected PutLicenseResponse doParseToClientInstance(XContentParser parser) throws IOException {
+        return PutLicenseResponse.fromXContent(parser);
     }
 
     @Override
-    protected org.elasticsearch.protocol.xpack.license.PutLicenseResponse mutateInstance(
-        org.elasticsearch.protocol.xpack.license.PutLicenseResponse response) {
-        @SuppressWarnings("unchecked")
-        Function<org.elasticsearch.protocol.xpack.license.PutLicenseResponse,
-            org.elasticsearch.protocol.xpack.license.PutLicenseResponse> mutator = randomFrom(
-            r -> new org.elasticsearch.protocol.xpack.license.PutLicenseResponse(
-                r.isAcknowledged() == false,
-                r.status(),
-                r.acknowledgeHeader(),
-                r.acknowledgeMessages()),
-            r -> new org.elasticsearch.protocol.xpack.license.PutLicenseResponse(
-                r.isAcknowledged(),
-                mutateStatus(r.status()),
-                r.acknowledgeHeader(),
-                r.acknowledgeMessages()),
-            r -> {
-                if (r.acknowledgeMessages().isEmpty()) {
-                    return new org.elasticsearch.protocol.xpack.license.PutLicenseResponse(
-                        r.isAcknowledged(),
-                        r.status(),
-                        randomAlphaOfLength(10),
-                        randomAckMessages()
-                    );
-                } else {
-                    return new org.elasticsearch.protocol.xpack.license.PutLicenseResponse(r.isAcknowledged(), r.status());
-                }
-            }
-
-        );
-        return mutator.apply(response);
-    }
-
-    private org.elasticsearch.protocol.xpack.license.LicensesStatus mutateStatus(
-        org.elasticsearch.protocol.xpack.license.LicensesStatus status) {
-        return randomValueOtherThan(status, () -> randomFrom(LicensesStatus.values()));
+    protected void assertInstances(org.elasticsearch.protocol.xpack.license.PutLicenseResponse serverTestInstance,
+                                   PutLicenseResponse clientInstance) {
+        assertThat(serverTestInstance.status().name(), equalTo(clientInstance.status().name()));
+        assertThat(serverTestInstance.acknowledgeHeader(), equalTo(clientInstance.acknowledgeHeader()));
+        assertThat(serverTestInstance.acknowledgeMessages().keySet(), equalTo(clientInstance.acknowledgeMessages().keySet()));
+        for(Map.Entry<String, String[]> entry: serverTestInstance.acknowledgeMessages().entrySet()) {
+            assertTrue(Arrays.equals(entry.getValue(), clientInstance.acknowledgeMessages().get(entry.getKey())));
+        }
     }
 }