diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java index 9f558913e7461..0abac4e6394cf 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java @@ -58,12 +58,9 @@ public void apply(Project project) { Provider bwcTaskThrottleProvider = project.getGradle() .getSharedServices() .registerIfAbsent(BWC_TASK_THROTTLE_SERVICE, BwcTaskThrottle.class, spec -> spec.getMaxParallelUsages().set(1)); - BuildParams.getBwcVersions() - .forPreviousUnreleased( - (BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> { - configureBwcProject(project.project(unreleasedVersion.gradleProjectPath), unreleasedVersion, bwcTaskThrottleProvider); - } - ); + BuildParams.getBwcVersions().forPreviousUnreleased((BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> { + configureBwcProject(project.project(unreleasedVersion.gradleProjectPath), unreleasedVersion, bwcTaskThrottleProvider); + }); } private void configureBwcProject( diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java index bae71484b48f9..4c035827bb7aa 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java @@ -32,13 +32,9 @@ public void apply(Project project) { Provider dockerSupportServiceProvider = project.getGradle() .getSharedServices() - .registerIfAbsent( - DOCKER_SUPPORT_SERVICE_NAME, - DockerSupportService.class, - spec -> spec.parameters( - params -> { params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE)); } - ) - ); + .registerIfAbsent(DOCKER_SUPPORT_SERVICE_NAME, DockerSupportService.class, spec -> spec.parameters(params -> { + params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE)); + })); // Ensure that if we are trying to run any DockerBuildTask tasks, we assert an available Docker installation exists project.getGradle().getTaskGraph().whenReady(graph -> { diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java index 7f9e9bcc313de..5b15dd3c4de75 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java @@ -143,7 +143,7 @@ public class LicenseAnalyzer { + "NONINFRINGEMENT\\. IN NO EVENT SHALL THE AUTHORS OR " + "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR " + "OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n") - .replaceAll("\\s+", "\\\\s*"), + .replaceAll("\\s+", "\\\\s*"), Pattern.DOTALL ) ), diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/UpdateVersionsTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/UpdateVersionsTask.java index 4f6c82afd03e5..92e1109611686 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/UpdateVersionsTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/UpdateVersionsTask.java @@ -227,14 +227,9 @@ static Optional addVersionConstant(CompilationUnit versionJava, .stream() .map(f -> Map.entry(f, parseVersionField(f.getVariable(0).getNameAsString()))) .filter(e -> e.getValue().isPresent()) - .collect( - Collectors.toMap( - e -> e.getValue().get(), - Map.Entry::getKey, - (v1, v2) -> { throw new IllegalArgumentException("Duplicate version constants " + v1); }, - TreeMap::new - ) - ); + .collect(Collectors.toMap(e -> e.getValue().get(), Map.Entry::getKey, (v1, v2) -> { + throw new IllegalArgumentException("Duplicate version constants " + v1); + }, TreeMap::new)); // find the version this should be inserted after var previousVersion = versions.lowerEntry(version); diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java index 36cc4cdcbf63a..0e2e05b808c32 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java @@ -188,13 +188,9 @@ public void apply(Project project) { // windows boxes get windows distributions, and linux boxes get linux distributions if (isWindows(vmProject)) { - configureVMWrapperTasks( - vmProject, - windowsTestTasks, - depsTasks, - wrapperTask -> { vmLifecyleTasks.get(ARCHIVE).configure(t -> t.dependsOn(wrapperTask)); }, - vmDependencies - ); + configureVMWrapperTasks(vmProject, windowsTestTasks, depsTasks, wrapperTask -> { + vmLifecyleTasks.get(ARCHIVE).configure(t -> t.dependsOn(wrapperTask)); + }, vmDependencies); } else { for (var entry : linuxTestTasks.entrySet()) { ElasticsearchDistributionType type = entry.getKey(); diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/MainResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/MainResponse.java index 0e16c6d71a82b..bf7b1a665e098 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/MainResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/MainResponse.java @@ -19,7 +19,9 @@ public class MainResponse { private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( MainResponse.class.getName(), true, - args -> { return new MainResponse((String) args[0], (Version) args[1], (String) args[2], (String) args[3], (String) args[4]); } + args -> { + return new MainResponse((String) args[0], (Version) args[1], (String) args[2], (String) args[3], (String) args[4]); + } ); static { diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsResponse.java index dba303c32ddac..abe07d56a2f3c 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsResponse.java @@ -240,7 +240,9 @@ public static final class FieldStatistics { private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( "field_statistics", true, - args -> { return new FieldStatistics((long) args[0], (int) args[1], (long) args[2]); } + args -> { + return new FieldStatistics((long) args[0], (int) args[1], (long) args[2]); + } ); static { @@ -411,11 +413,9 @@ public int hashCode() { public static final class Token { - private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( - "token", - true, - args -> { return new Token((Integer) args[0], (Integer) args[1], (Integer) args[2], (String) args[3]); } - ); + private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>("token", true, args -> { + return new Token((Integer) args[0], (Integer) args[1], (Integer) args[2], (String) args[3]); + }); static { PARSER.declareInt(optionalConstructorArg(), new ParseField("start_offset")); PARSER.declareInt(optionalConstructorArg(), new ParseField("end_offset")); diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/LifecyclePolicy.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/LifecyclePolicy.java index d5124c3bebfcb..20b9174f6e9d2 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/LifecyclePolicy.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/LifecyclePolicy.java @@ -45,12 +45,9 @@ public class LifecyclePolicy implements ToXContentObject { private static Map> ALLOWED_ACTIONS = new HashMap<>(); static { - PARSER.declareNamedObjects( - ConstructingObjectParser.constructorArg(), - (p, c, n) -> Phase.parse(p, n), - v -> { throw new IllegalArgumentException("ordered " + PHASES_FIELD.getPreferredName() + " are not supported"); }, - PHASES_FIELD - ); + PARSER.declareNamedObjects(ConstructingObjectParser.constructorArg(), (p, c, n) -> Phase.parse(p, n), v -> { + throw new IllegalArgumentException("ordered " + PHASES_FIELD.getPreferredName() + " are not supported"); + }, PHASES_FIELD); ALLOWED_ACTIONS.put( "hot", diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/Phase.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/Phase.java index bce3849b82264..9e250de862080 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/Phase.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/Phase.java @@ -52,7 +52,9 @@ public class Phase implements ToXContentObject { PARSER.declareNamedObjects( ConstructingObjectParser.constructorArg(), (p, c, n) -> p.namedObject(LifecycleAction.class, n, null), - v -> { throw new IllegalArgumentException("ordered " + ACTIONS_FIELD.getPreferredName() + " are not supported"); }, + v -> { + throw new IllegalArgumentException("ordered " + ACTIONS_FIELD.getPreferredName() + " are not supported"); + }, ACTIONS_FIELD ); } diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/security/GetApiKeyResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/security/GetApiKeyResponse.java index 09465373521cb..bcbba2ee0ae35 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/security/GetApiKeyResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/security/GetApiKeyResponse.java @@ -62,10 +62,9 @@ public boolean equals(Object obj) { } @SuppressWarnings("unchecked") - static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( - "get_api_key_response", - args -> { return (args[0] == null) ? GetApiKeyResponse.emptyResponse() : new GetApiKeyResponse((List) args[0]); } - ); + static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>("get_api_key_response", args -> { + return (args[0] == null) ? GetApiKeyResponse.emptyResponse() : new GetApiKeyResponse((List) args[0]); + }); static { PARSER.declareObjectArray(optionalConstructorArg(), (p, c) -> ApiKey.fromXContent(p), new ParseField("api_keys")); } diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/security/HasPrivilegesResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/security/HasPrivilegesResponse.java index d139498d6dc99..f6abdf53a7d44 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/security/HasPrivilegesResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/security/HasPrivilegesResponse.java @@ -52,10 +52,9 @@ private static Map checkMap(Object argument, int depth) { if (argument instanceof Map) { Map map = (Map) argument; if (depth == 0) { - map.values() - .stream() - .filter(val -> (val instanceof Boolean) == false) - .forEach(val -> { throw new IllegalArgumentException("Map value [" + val + "] in [" + map + "] is not a Boolean"); }); + map.values().stream().filter(val -> (val instanceof Boolean) == false).forEach(val -> { + throw new IllegalArgumentException("Map value [" + val + "] in [" + map + "] is not a Boolean"); + }); } else { map.values().stream().forEach(val -> checkMap(val, depth - 1)); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java index 2e45531bffcd9..cc07b2ec23ae9 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java @@ -687,10 +687,9 @@ public void testIndex() throws IOException { assertEquals("_doc", indexResponse.getType()); assertEquals("with_create_op_type", indexResponse.getId()); - ElasticsearchStatusException exception = expectThrows( - ElasticsearchStatusException.class, - () -> { execute(indexRequest, highLevelClient()::index, highLevelClient()::indexAsync); } - ); + ElasticsearchStatusException exception = expectThrows(ElasticsearchStatusException.class, () -> { + execute(indexRequest, highLevelClient()::index, highLevelClient()::indexAsync); + }); assertEquals(RestStatus.CONFLICT, exception.status()); assertEquals( diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/ReindexIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/ReindexIT.java index eff6cae79cc52..31e1f7049d153 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/ReindexIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/ReindexIT.java @@ -88,10 +88,9 @@ public void testReindex() throws IOException { reindexRequest.setRefresh(true); reindexRequest.setRequireAlias(true); - ElasticsearchStatusException exception = expectThrows( - ElasticsearchStatusException.class, - () -> { execute(reindexRequest, highLevelClient()::reindex, highLevelClient()::reindexAsync); } - ); + ElasticsearchStatusException exception = expectThrows(ElasticsearchStatusException.class, () -> { + execute(reindexRequest, highLevelClient()::reindex, highLevelClient()::reindexAsync); + }); assertEquals(RestStatus.NOT_FOUND, exception.status()); assertEquals( diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java index 9cd7db5638048..75e6c63a45256 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java @@ -512,13 +512,9 @@ public void testPerformRequestOnSuccess() throws IOException { { IOException ioe = expectThrows( IOException.class, - () -> restHighLevelClient.performRequest( - mainRequest, - requestConverter, - RequestOptions.DEFAULT, - response -> { throw new IllegalStateException(); }, - Collections.emptySet() - ) + () -> restHighLevelClient.performRequest(mainRequest, requestConverter, RequestOptions.DEFAULT, response -> { + throw new IllegalStateException(); + }, Collections.emptySet()) ); assertEquals( "Unable to parse response body for Response{requestLine=GET / http/1.1, host=http://localhost:9200, " @@ -660,13 +656,9 @@ public void testPerformRequestOnResponseExceptionWithIgnoresErrorNoBody() throws when(restClient.performRequest(any(Request.class))).thenThrow(responseException); ElasticsearchException elasticsearchException = expectThrows( ElasticsearchException.class, - () -> restHighLevelClient.performRequest( - mainRequest, - requestConverter, - RequestOptions.DEFAULT, - response -> { throw new IllegalStateException(); }, - Collections.singleton(404) - ) + () -> restHighLevelClient.performRequest(mainRequest, requestConverter, RequestOptions.DEFAULT, response -> { + throw new IllegalStateException(); + }, Collections.singleton(404)) ); assertEquals(RestStatus.NOT_FOUND, elasticsearchException.status()); assertSame(responseException, elasticsearchException.getCause()); @@ -683,13 +675,9 @@ public void testPerformRequestOnResponseExceptionWithIgnoresErrorValidBody() thr when(restClient.performRequest(any(Request.class))).thenThrow(responseException); ElasticsearchException elasticsearchException = expectThrows( ElasticsearchException.class, - () -> restHighLevelClient.performRequest( - mainRequest, - requestConverter, - RequestOptions.DEFAULT, - response -> { throw new IllegalStateException(); }, - Collections.singleton(404) - ) + () -> restHighLevelClient.performRequest(mainRequest, requestConverter, RequestOptions.DEFAULT, response -> { + throw new IllegalStateException(); + }, Collections.singleton(404)) ); assertEquals(RestStatus.NOT_FOUND, elasticsearchException.status()); assertSame(responseException, elasticsearchException.getSuppressed()[0]); @@ -1163,7 +1151,7 @@ public void testApiNamingConventions() throws Exception { && // IndicesClientIT.getIndexTemplate should be renamed "getTemplate" in version 8.0 when we // can get rid of 7.0's deprecated "getTemplate" - apiName.equals("indices.get_index_template") == false + apiName.equals("indices.get_index_template") == false && org.elasticsearch.core.List.of( "indices.data_streams_stats", "indices.delete_data_stream", diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/CreateApiKeyResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/CreateApiKeyResponseTests.java index efa559a43bc6a..4b4deb1560244 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/CreateApiKeyResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/CreateApiKeyResponseTests.java @@ -70,19 +70,12 @@ public void testEqualsHashCode() { final Instant expiration = Instant.ofEpochMilli(10000); CreateApiKeyResponse createApiKeyResponse = new CreateApiKeyResponse(name, id, apiKey, expiration); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - createApiKeyResponse, - (original) -> { - return new CreateApiKeyResponse(original.getName(), original.getId(), original.getKey(), original.getExpiration()); - } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - createApiKeyResponse, - (original) -> { - return new CreateApiKeyResponse(original.getName(), original.getId(), original.getKey(), original.getExpiration()); - }, - CreateApiKeyResponseTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(createApiKeyResponse, (original) -> { + return new CreateApiKeyResponse(original.getName(), original.getId(), original.getKey(), original.getExpiration()); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(createApiKeyResponse, (original) -> { + return new CreateApiKeyResponse(original.getName(), original.getId(), original.getKey(), original.getExpiration()); + }, CreateApiKeyResponseTests::mutateTestItem); } private static CreateApiKeyResponse mutateTestItem(CreateApiKeyResponse original) { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DelegatePkiAuthenticationRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DelegatePkiAuthenticationRequestTests.java index 38cd07fc0de1d..ec498e49163ca 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DelegatePkiAuthenticationRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DelegatePkiAuthenticationRequestTests.java @@ -35,10 +35,9 @@ public class DelegatePkiAuthenticationRequestTests extends AbstractRequestTestCa org.elasticsearch.xpack.core.security.action.DelegatePkiAuthenticationRequest> { public void testEmptyOrNullCertificateChain() throws Exception { - IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { new DelegatePkiAuthenticationRequest((List) null); } - ); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + new DelegatePkiAuthenticationRequest((List) null); + }); assertThat(e.getMessage(), is("certificate chain must not be empty or null")); e = expectThrows(IllegalArgumentException.class, () -> { new DelegatePkiAuthenticationRequest(Collections.emptyList()); }); assertThat(e.getMessage(), is("certificate chain must not be empty or null")); diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteRoleMappingRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteRoleMappingRequestTests.java index 7e9e180337c2f..73d16ebe677b0 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteRoleMappingRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteRoleMappingRequestTests.java @@ -39,16 +39,13 @@ public void testEqualsHashCode() { final DeleteRoleMappingRequest deleteRoleMappingRequest = new DeleteRoleMappingRequest(name, refreshPolicy); assertNotNull(deleteRoleMappingRequest); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - deleteRoleMappingRequest, - (original) -> { return new DeleteRoleMappingRequest(original.getName(), original.getRefreshPolicy()); } - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(deleteRoleMappingRequest, (original) -> { + return new DeleteRoleMappingRequest(original.getName(), original.getRefreshPolicy()); + }); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - deleteRoleMappingRequest, - (original) -> { return new DeleteRoleMappingRequest(original.getName(), original.getRefreshPolicy()); }, - DeleteRoleMappingRequestTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(deleteRoleMappingRequest, (original) -> { + return new DeleteRoleMappingRequest(original.getName(), original.getRefreshPolicy()); + }, DeleteRoleMappingRequestTests::mutateTestItem); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteRoleMappingResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteRoleMappingResponseTests.java index d3efb947dcbd4..7bf438ff2d42e 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteRoleMappingResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteRoleMappingResponseTests.java @@ -35,16 +35,13 @@ public void testEqualsHashCode() { final boolean found = randomBoolean(); final DeleteRoleMappingResponse deleteRoleMappingResponse = new DeleteRoleMappingResponse(found); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - deleteRoleMappingResponse, - (original) -> { return new DeleteRoleMappingResponse(original.isFound()); } - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(deleteRoleMappingResponse, (original) -> { + return new DeleteRoleMappingResponse(original.isFound()); + }); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - deleteRoleMappingResponse, - (original) -> { return new DeleteRoleMappingResponse(original.isFound()); }, - DeleteRoleMappingResponseTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(deleteRoleMappingResponse, (original) -> { + return new DeleteRoleMappingResponse(original.isFound()); + }, DeleteRoleMappingResponseTests::mutateTestItem); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteUserRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteUserRequestTests.java index da80cd5b51054..ee8d7547e0180 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteUserRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/DeleteUserRequestTests.java @@ -49,16 +49,13 @@ public void testEqualsHashCode() { final DeleteUserRequest deleteUserRequest = new DeleteUserRequest(name, refreshPolicy); assertNotNull(deleteUserRequest); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - deleteUserRequest, - (original) -> { return new DeleteUserRequest(original.getName(), original.getRefreshPolicy()); } - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(deleteUserRequest, (original) -> { + return new DeleteUserRequest(original.getName(), original.getRefreshPolicy()); + }); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - deleteUserRequest, - (original) -> { return new DeleteUserRequest(original.getName(), original.getRefreshPolicy()); }, - DeleteUserRequestTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(deleteUserRequest, (original) -> { + return new DeleteUserRequest(original.getName(), original.getRefreshPolicy()); + }, DeleteUserRequestTests::mutateTestItem); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRoleMappingsRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRoleMappingsRequestTests.java index ffdd73e91be18..966eb887bfc2a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRoleMappingsRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRoleMappingsRequestTests.java @@ -34,15 +34,12 @@ public void testEqualsHashCode() { final String[] roleMappingNames = randomArray(noOfRoleMappingNames, String[]::new, () -> randomAlphaOfLength(5)); final GetRoleMappingsRequest getRoleMappingsRequest = new GetRoleMappingsRequest(roleMappingNames); assertNotNull(getRoleMappingsRequest); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getRoleMappingsRequest, - (original) -> { return new GetRoleMappingsRequest(original.getRoleMappingNames().toArray(new String[0])); } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getRoleMappingsRequest, - (original) -> { return new GetRoleMappingsRequest(original.getRoleMappingNames().toArray(new String[0])); }, - GetRoleMappingsRequestTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getRoleMappingsRequest, (original) -> { + return new GetRoleMappingsRequest(original.getRoleMappingNames().toArray(new String[0])); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getRoleMappingsRequest, (original) -> { + return new GetRoleMappingsRequest(original.getRoleMappingNames().toArray(new String[0])); + }, GetRoleMappingsRequestTests::mutateTestItem); } private static GetRoleMappingsRequest mutateTestItem(GetRoleMappingsRequest original) { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRolesRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRolesRequestTests.java index c616770de23ca..4e8cec820816c 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRolesRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRolesRequestTests.java @@ -27,15 +27,12 @@ public void testEqualsHashCode() { final String[] roles = randomArray(0, 5, String[]::new, () -> randomAlphaOfLength(5)); final GetRolesRequest getRolesRequest = new GetRolesRequest(roles); assertNotNull(getRolesRequest); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getRolesRequest, - (original) -> { return new GetRolesRequest(original.getRoleNames().toArray(new String[0])); } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getRolesRequest, - (original) -> { return new GetRolesRequest(original.getRoleNames().toArray(new String[0])); }, - GetRolesRequestTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getRolesRequest, (original) -> { + return new GetRolesRequest(original.getRoleNames().toArray(new String[0])); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getRolesRequest, (original) -> { + return new GetRolesRequest(original.getRoleNames().toArray(new String[0])); + }, GetRolesRequestTests::mutateTestItem); } private static GetRolesRequest mutateTestItem(GetRolesRequest original) { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRolesResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRolesResponseTests.java index 768b26f720d25..c7614c094dcc5 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRolesResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetRolesResponseTests.java @@ -123,15 +123,12 @@ public void testEqualsHashCode() { transientMetadata2.put("other_transient_key", "other_transient_value"); transientMetadataMap.put(role2.getName(), transientMetadata); final GetRolesResponse getRolesResponse = new GetRolesResponse(roles, transientMetadataMap); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getRolesResponse, - (original) -> { return new GetRolesResponse(original.getRoles(), original.getTransientMetadataMap()); } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getRolesResponse, - (original) -> { return new GetRolesResponse(original.getRoles(), original.getTransientMetadataMap()); }, - GetRolesResponseTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getRolesResponse, (original) -> { + return new GetRolesResponse(original.getRoles(), original.getTransientMetadataMap()); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getRolesResponse, (original) -> { + return new GetRolesResponse(original.getRoles(), original.getTransientMetadataMap()); + }, GetRolesResponseTests::mutateTestItem); } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetUsersRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetUsersRequestTests.java index 53dfd3b1c1284..ea3131acaed10 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetUsersRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetUsersRequestTests.java @@ -26,15 +26,12 @@ public void testEqualsHashCode() { final String[] users = randomArray(0, 5, String[]::new, () -> randomAlphaOfLength(5)); final GetUsersRequest getUsersRequest = new GetUsersRequest(users); assertNotNull(getUsersRequest); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getUsersRequest, - (original) -> { return new GetUsersRequest(original.getUsernames().toArray(new String[0])); } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getUsersRequest, - (original) -> { return new GetUsersRequest(original.getUsernames().toArray(new String[0])); }, - GetUsersRequestTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getUsersRequest, (original) -> { + return new GetUsersRequest(original.getUsernames().toArray(new String[0])); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getUsersRequest, (original) -> { + return new GetUsersRequest(original.getUsernames().toArray(new String[0])); + }, GetUsersRequestTests::mutateTestItem); } private static GetUsersRequest mutateTestItem(GetUsersRequest original) { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetUsersResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetUsersResponseTests.java index 868333de71196..893910cf4c10e 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetUsersResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/GetUsersResponseTests.java @@ -126,15 +126,12 @@ public void testEqualsHashCode() { enabledUsers.add(user2); final GetUsersResponse getUsersResponse = new GetUsersResponse(users, enabledUsers); assertNotNull(getUsersResponse); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getUsersResponse, - (original) -> { return new GetUsersResponse(original.getUsers(), original.getEnabledUsers()); } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - getUsersResponse, - (original) -> { return new GetUsersResponse(original.getUsers(), original.getEnabledUsers()); }, - GetUsersResponseTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getUsersResponse, (original) -> { + return new GetUsersResponse(original.getUsers(), original.getEnabledUsers()); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(getUsersResponse, (original) -> { + return new GetUsersResponse(original.getUsers(), original.getEnabledUsers()); + }, GetUsersResponseTests::mutateTestItem); } private static GetUsersResponse mutateTestItem(GetUsersResponse original) { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/InvalidateApiKeyResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/InvalidateApiKeyResponseTests.java index da7a7327cf993..021d914f2584a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/InvalidateApiKeyResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/InvalidateApiKeyResponseTests.java @@ -90,27 +90,20 @@ public void testEqualsHashCode() { errors ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - invalidateApiKeyResponse, - (original) -> { - return new InvalidateApiKeyResponse( - original.getInvalidatedApiKeys(), - original.getPreviouslyInvalidatedApiKeys(), - original.getErrors() - ); - } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - invalidateApiKeyResponse, - (original) -> { - return new InvalidateApiKeyResponse( - original.getInvalidatedApiKeys(), - original.getPreviouslyInvalidatedApiKeys(), - original.getErrors() - ); - }, - InvalidateApiKeyResponseTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(invalidateApiKeyResponse, (original) -> { + return new InvalidateApiKeyResponse( + original.getInvalidatedApiKeys(), + original.getPreviouslyInvalidatedApiKeys(), + original.getErrors() + ); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(invalidateApiKeyResponse, (original) -> { + return new InvalidateApiKeyResponse( + original.getInvalidatedApiKeys(), + original.getPreviouslyInvalidatedApiKeys(), + original.getErrors() + ); + }, InvalidateApiKeyResponseTests::mutateTestItem); } private static InvalidateApiKeyResponse mutateTestItem(InvalidateApiKeyResponse original) { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/PutPrivilegesRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/PutPrivilegesRequestTests.java index 2d731d71ba56a..682cbd125cfb3 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/PutPrivilegesRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/PutPrivilegesRequestTests.java @@ -142,10 +142,9 @@ public void testEqualsHashCode() { final RefreshPolicy refreshPolicy = randomFrom(RefreshPolicy.values()); PutPrivilegesRequest putPrivilegesRequest = new PutPrivilegesRequest(privileges, refreshPolicy); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - putPrivilegesRequest, - (original) -> { return new PutPrivilegesRequest(privileges, refreshPolicy); } - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(putPrivilegesRequest, (original) -> { + return new PutPrivilegesRequest(privileges, refreshPolicy); + }); EqualsHashCodeTestUtils.checkEqualsAndHashCode(putPrivilegesRequest, (original) -> { return new PutPrivilegesRequest( original.getPrivileges().values().stream().flatMap(List::stream).collect(Collectors.toList()), diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/user/privileges/GlobalOperationPrivilegeTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/user/privileges/GlobalOperationPrivilegeTests.java index 5a6f05ebad062..248771da5c569 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/security/user/privileges/GlobalOperationPrivilegeTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/security/user/privileges/GlobalOperationPrivilegeTests.java @@ -49,15 +49,12 @@ public void testEqualsHashCode() { final Map privilege = Collections.singletonMap(randomAlphaOfLength(4), randomAlphaOfLength(5)); GlobalOperationPrivilege globalOperationPrivilege = new GlobalOperationPrivilege(category, operation, privilege); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - globalOperationPrivilege, - (original) -> { return new GlobalOperationPrivilege(original.getCategory(), original.getOperation(), original.getRaw()); } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - globalOperationPrivilege, - (original) -> { return new GlobalOperationPrivilege(original.getCategory(), original.getOperation(), original.getRaw()); }, - GlobalOperationPrivilegeTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(globalOperationPrivilege, (original) -> { + return new GlobalOperationPrivilege(original.getCategory(), original.getOperation(), original.getRaw()); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(globalOperationPrivilege, (original) -> { + return new GlobalOperationPrivilege(original.getCategory(), original.getOperation(), original.getRaw()); + }, GlobalOperationPrivilegeTests::mutateTestItem); } private static GlobalOperationPrivilege mutateTestItem(GlobalOperationPrivilege original) { diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index a8d3fe220073a..ac02ae4aec073 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -38,6 +38,6 @@ shadow-plugin = "com.github.breskeby:shadow:3b035f2" spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" } spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" } spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" } -spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.11.0" +spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2" xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 12861a9fe4df2..bfa484aee079d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -169,6 +169,16 @@ + + + + + + + + + + @@ -184,16 +194,31 @@ + + + + + + + + + + + + + + + @@ -619,6 +644,11 @@ + + + + + @@ -634,6 +664,11 @@ + + + + + @@ -699,6 +734,11 @@ + + + + + @@ -849,6 +889,11 @@ + + + + + @@ -1044,6 +1089,11 @@ + + + + + @@ -1054,6 +1104,11 @@ + + + + + @@ -1209,6 +1264,11 @@ + + + + + @@ -1324,6 +1384,16 @@ + + + + + + + + + + @@ -2349,6 +2419,11 @@ + + + + + @@ -3290,6 +3365,11 @@ + + + + + @@ -3395,11 +3475,21 @@ + + + + + + + + + + @@ -3505,16 +3595,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3525,26 +3640,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3555,16 +3705,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3655,6 +3830,11 @@ + + + + + @@ -3695,6 +3875,11 @@ + + + + + @@ -3710,16 +3895,31 @@ + + + + + + + + + + + + + + + @@ -4010,6 +4210,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java index f1da9d2364b0b..8078bcb7ff7aa 100644 --- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java @@ -218,10 +218,9 @@ public void testShingleFilters() { .build(); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); - expectThrows( - IllegalArgumentException.class, - () -> { indexAnalyzers = createTestAnalysis(idxSettings, settings, new CommonAnalysisPlugin()).indexAnalyzers; } - ); + expectThrows(IllegalArgumentException.class, () -> { + indexAnalyzers = createTestAnalysis(idxSettings, settings, new CommonAnalysisPlugin()).indexAnalyzers; + }); } @@ -279,7 +278,9 @@ public void testPreconfiguredTokenFilters() throws IOException { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, "Expected exception for factory " + tf.getName(), - () -> { tf.get(idxSettings, null, tf.getName(), settings).getSynonymFilter(); } + () -> { + tf.get(idxSettings, null, tf.getName(), settings).getSynonymFilter(); + } ); assertEquals(tf.getName(), "Token filter [" + tf.getName() + "] cannot be used to parse synonyms", e.getMessage()); } else { diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpCacheTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpCacheTests.java index 4d68ac7806edf..438353be737b9 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpCacheTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpCacheTests.java @@ -51,11 +51,9 @@ public void testThrowsFunctionsException() { GeoIpCache cache = new GeoIpCache(1); IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> cache.putIfAbsent( - InetAddresses.forString("127.0.0.1"), - "path/to/db", - ip -> { throw new IllegalArgumentException("bad"); } - ) + () -> cache.putIfAbsent(InetAddresses.forString("127.0.0.1"), "path/to/db", ip -> { + throw new IllegalArgumentException("bad"); + }) ); assertEquals("bad", ex.getMessage()); } diff --git a/modules/lang-painless/spi/src/test/java/org/elasticsearch/painless/WhitelistLoaderTests.java b/modules/lang-painless/spi/src/test/java/org/elasticsearch/painless/WhitelistLoaderTests.java index ddd69bb828a61..afef1e4716ec7 100644 --- a/modules/lang-painless/spi/src/test/java/org/elasticsearch/painless/WhitelistLoaderTests.java +++ b/modules/lang-painless/spi/src/test/java/org/elasticsearch/painless/WhitelistLoaderTests.java @@ -25,23 +25,15 @@ public class WhitelistLoaderTests extends ESTestCase { public void testUnknownAnnotations() { Map parsers = new HashMap<>(WhitelistAnnotationParser.BASE_ANNOTATION_PARSERS); - RuntimeException expected = expectThrows( - RuntimeException.class, - () -> { WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.elasticsearch.painless.annotation.unknown"); } - ); + RuntimeException expected = expectThrows(RuntimeException.class, () -> { + WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.elasticsearch.painless.annotation.unknown"); + }); assertEquals("invalid annotation: parser not found for [unknownAnnotation] [@unknownAnnotation]", expected.getCause().getMessage()); assertEquals(IllegalArgumentException.class, expected.getCause().getClass()); - expected = expectThrows( - RuntimeException.class, - () -> { - WhitelistLoader.loadFromResourceFiles( - Whitelist.class, - parsers, - "org.elasticsearch.painless.annotation.unknown_with_options" - ); - } - ); + expected = expectThrows(RuntimeException.class, () -> { + WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.elasticsearch.painless.annotation.unknown_with_options"); + }); assertEquals( "invalid annotation: parser not found for [unknownAnnotationWithMessage] [@unknownAnnotationWithMessage[arg=\"arg value\"]]", expected.getCause().getMessage() diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java index 5717aea33fd89..fc42caa364588 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java @@ -132,21 +132,13 @@ public void testMegamorphic() throws Throwable { map.put("a", "b"); assertEquals(2, (int) handle.invokeExact((Object) map)); - final IllegalArgumentException iae = expectThrows( - IllegalArgumentException.class, - () -> { Integer.toString((int) handle.invokeExact(new Object())); } - ); + final IllegalArgumentException iae = expectThrows(IllegalArgumentException.class, () -> { + Integer.toString((int) handle.invokeExact(new Object())); + }); assertEquals("dynamic method [java.lang.Object, size/0] not found", iae.getMessage()); - assertTrue( - "Does not fail inside ClassValue.computeValue()", - Arrays.stream(iae.getStackTrace()) - .anyMatch( - e -> { - return e.getMethodName().equals("computeValue") - && e.getClassName().startsWith("org.elasticsearch.painless.DefBootstrap$PIC$"); - } - ) - ); + assertTrue("Does not fail inside ClassValue.computeValue()", Arrays.stream(iae.getStackTrace()).anyMatch(e -> { + return e.getMethodName().equals("computeValue") && e.getClassName().startsWith("org.elasticsearch.painless.DefBootstrap$PIC$"); + })); } // test operators with null guards diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionRefTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionRefTests.java index 11d995a9b4ec7..8a5b6a3229d9d 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionRefTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionRefTests.java @@ -244,18 +244,16 @@ public void testInterfaceStaticMethod() { } public void testMethodMissing() { - Exception e = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("List l = [2, 1]; l.sort(Integer::bogus); return l.get(0);"); } - ); + Exception e = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("List l = [2, 1]; l.sort(Integer::bogus); return l.get(0);"); + }); assertThat(e.getMessage(), containsString("function reference [Integer::bogus/2] matching [java.util.Comparator")); } public void testQualifiedMethodMissing() { - Exception e = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("List l = [2, 1]; l.sort(java.time.Instant::bogus); return l.get(0);", false); } - ); + Exception e = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("List l = [2, 1]; l.sort(java.time.Instant::bogus); return l.get(0);", false); + }); assertThat( e.getMessage(), containsString("function reference [java.time.Instant::bogus/2] matching [java.util.Comparator, compare/2") @@ -263,26 +261,23 @@ public void testQualifiedMethodMissing() { } public void testClassMissing() { - Exception e = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("List l = [2, 1]; l.sort(Bogus::bogus); return l.get(0);", false); } - ); + Exception e = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("List l = [2, 1]; l.sort(Bogus::bogus); return l.get(0);", false); + }); assertThat(e.getMessage(), endsWith("variable [Bogus] is not defined")); } public void testQualifiedClassMissing() { - Exception e = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("List l = [2, 1]; l.sort(org.joda.time.BogusDateTime::bogus); return l.get(0);", false); } - ); + Exception e = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("List l = [2, 1]; l.sort(org.joda.time.BogusDateTime::bogus); return l.get(0);", false); + }); assertEquals("variable [org.joda.time.BogusDateTime] is not defined", e.getMessage()); } public void testNotFunctionalInterface() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("List l = new ArrayList(); l.add(2); l.add(1); l.add(Integer::bogus); return l.get(0);"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("List l = new ArrayList(); l.add(2); l.add(1); l.add(Integer::bogus); return l.get(0);"); + }); assertThat( expected.getMessage(), containsString("cannot convert function reference [Integer::bogus] to a non-functional interface [def]") @@ -290,17 +285,15 @@ public void testNotFunctionalInterface() { } public void testIncompatible() { - expectScriptThrows( - ClassCastException.class, - () -> { exec("List l = new ArrayList(); l.add(2); l.add(1); l.sort(String::startsWith); return l.get(0);"); } - ); + expectScriptThrows(ClassCastException.class, () -> { + exec("List l = new ArrayList(); l.add(2); l.add(1); l.sort(String::startsWith); return l.get(0);"); + }); } public void testWrongArity() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("Optional.empty().orElseGet(String::startsWith);"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("Optional.empty().orElseGet(String::startsWith);"); + }); assertThat( expected.getMessage(), containsString("function reference [String::startsWith/0] matching [java.util.function.Supplier") @@ -308,18 +301,16 @@ public void testWrongArity() { } public void testWrongArityNotEnough() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("List l = new ArrayList(); l.add(2); l.add(1); l.sort(String::isEmpty);"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("List l = new ArrayList(); l.add(2); l.add(1); l.sort(String::isEmpty);"); + }); assertThat(expected.getMessage(), containsString("function reference [String::isEmpty/2] matching [java.util.Comparator")); } public void testWrongArityDef() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("def y = Optional.empty(); return y.orElseGet(String::startsWith);"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("def y = Optional.empty(); return y.orElseGet(String::startsWith);"); + }); assertThat( expected.getMessage(), containsString("function reference [String::startsWith/0] matching [java.util.function.Supplier") @@ -327,38 +318,33 @@ public void testWrongArityDef() { } public void testWrongArityNotEnoughDef() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("def l = new ArrayList(); l.add(2); l.add(1); l.sort(String::isEmpty);"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("def l = new ArrayList(); l.add(2); l.add(1); l.sort(String::isEmpty);"); + }); assertThat(expected.getMessage(), containsString("function reference [String::isEmpty/2] matching [java.util.Comparator")); } public void testReturnVoid() { - Throwable expected = expectScriptThrows( - ClassCastException.class, - () -> { exec("StringBuilder b = new StringBuilder(); List l = [1, 2]; l.stream().mapToLong(b::setLength).sum();"); } - ); + Throwable expected = expectScriptThrows(ClassCastException.class, () -> { + exec("StringBuilder b = new StringBuilder(); List l = [1, 2]; l.stream().mapToLong(b::setLength).sum();"); + }); assertThat(expected.getMessage(), containsString("Cannot cast from [void] to [long].")); } public void testReturnVoidDef() { - Exception expected = expectScriptThrows( - LambdaConversionException.class, - () -> { exec("StringBuilder b = new StringBuilder(); def l = [1, 2]; l.stream().mapToLong(b::setLength);"); } - ); + Exception expected = expectScriptThrows(LambdaConversionException.class, () -> { + exec("StringBuilder b = new StringBuilder(); def l = [1, 2]; l.stream().mapToLong(b::setLength);"); + }); assertThat(expected.getMessage(), containsString("lambda expects return type [long], but found return type [void]")); - expected = expectScriptThrows( - LambdaConversionException.class, - () -> { exec("def b = new StringBuilder(); def l = [1, 2]; l.stream().mapToLong(b::setLength);"); } - ); + expected = expectScriptThrows(LambdaConversionException.class, () -> { + exec("def b = new StringBuilder(); def l = [1, 2]; l.stream().mapToLong(b::setLength);"); + }); assertThat(expected.getMessage(), containsString("lambda expects return type [long], but found return type [void]")); - expected = expectScriptThrows( - LambdaConversionException.class, - () -> { exec("def b = new StringBuilder(); List l = [1, 2]; l.stream().mapToLong(b::setLength);"); } - ); + expected = expectScriptThrows(LambdaConversionException.class, () -> { + exec("def b = new StringBuilder(); List l = [1, 2]; l.stream().mapToLong(b::setLength);"); + }); assertThat(expected.getMessage(), containsString("lambda expects return type [long], but found return type [void]")); } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionTests.java index 6a4ec00d340a5..13c521eb94d83 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionTests.java @@ -59,10 +59,9 @@ public void testReturnsAreUnboxedIfNeeded() { } public void testDuplicates() { - Exception expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("void test(int x) {x = 2;} void test(def y) {y = 3;} test()"); } - ); + Exception expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("void test(int x) {x = 2;} void test(def y) {y = 3;} test()"); + }); assertThat(expected.getMessage(), containsString("found duplicate function")); } @@ -86,23 +85,20 @@ public void testInfiniteLoop() { public void testReturnVoid() { assertEquals(null, exec("void test(StringBuilder b, int i) {b.setLength(i)} test(new StringBuilder(), 1)")); - Exception expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("int test(StringBuilder b, int i) {b.setLength(i)} test(new StringBuilder(), 1)"); } - ); + Exception expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("int test(StringBuilder b, int i) {b.setLength(i)} test(new StringBuilder(), 1)"); + }); assertEquals( "invalid function definition: " + "not all paths provide a return value for function [test] with [2] parameters", expected.getMessage() ); - expected = expectScriptThrows( - ClassCastException.class, - () -> { exec("int test(StringBuilder b, int i) {return b.setLength(i)} test(new StringBuilder(), 1)"); } - ); + expected = expectScriptThrows(ClassCastException.class, () -> { + exec("int test(StringBuilder b, int i) {return b.setLength(i)} test(new StringBuilder(), 1)"); + }); assertEquals("Cannot cast from [void] to [int].", expected.getMessage()); - expected = expectScriptThrows( - ClassCastException.class, - () -> { exec("def test(StringBuilder b, int i) {return b.setLength(i)} test(new StringBuilder(), 1)"); } - ); + expected = expectScriptThrows(ClassCastException.class, () -> { + exec("def test(StringBuilder b, int i) {return b.setLength(i)} test(new StringBuilder(), 1)"); + }); assertEquals("Cannot cast from [void] to [def].", expected.getMessage()); } } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/GeneralCastTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/GeneralCastTests.java index 3cc1492bbebe2..221e21da862f5 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/GeneralCastTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/GeneralCastTests.java @@ -269,14 +269,12 @@ public void testIllegalExplicitConversionsDef() { } public void testIllegalVoidCasts() { - expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("def map = ['a': 1,'b': 2,'c': 3]; map.c = Collections.sort(new ArrayList(map.keySet()));"); } - ); - expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("Map map = ['a': 1,'b': 2,'c': 3]; def x = new HashMap(); x.put(1, map.clear());"); } - ); + expectScriptThrows(IllegalArgumentException.class, () -> { + exec("def map = ['a': 1,'b': 2,'c': 3]; map.c = Collections.sort(new ArrayList(map.keySet()));"); + }); + expectScriptThrows(IllegalArgumentException.class, () -> { + exec("Map map = ['a': 1,'b': 2,'c': 3]; def x = new HashMap(); x.put(1, map.clear());"); + }); } public void testBoxedDefCalls() { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java index 84b608e9c67b5..1ac1ce9c3a749 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java @@ -149,28 +149,19 @@ public void testTwoCaptures() { } public void testCapturesAreReadOnly() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { - exec( - "List l = new ArrayList(); l.add(1); l.add(1); " + "return l.stream().mapToInt(x -> { l = null; return x + 1 }).sum();" - ); - } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("List l = new ArrayList(); l.add(1); l.add(1); " + "return l.stream().mapToInt(x -> { l = null; return x + 1 }).sum();"); + }); assertTrue(expected.getMessage().contains("is read-only")); } /** Lambda parameters shouldn't be able to mask a variable already in scope */ public void testNoParamMasking() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { - exec( - "int x = 0; List l = new ArrayList(); l.add(1); l.add(1); " - + "return l.stream().mapToInt(x -> { x += 1; return x }).sum();" - ); - } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec( + "int x = 0; List l = new ArrayList(); l.add(1); l.add(1); " + "return l.stream().mapToInt(x -> { x += 1; return x }).sum();" + ); + }); assertTrue(expected.getMessage().contains("already defined")); } @@ -190,36 +181,30 @@ public void testNestedCaptureParams() { } public void testWrongArity() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - false, - () -> { exec("Optional.empty().orElseGet(x -> x);"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, false, () -> { + exec("Optional.empty().orElseGet(x -> x);"); + }); assertTrue(expected.getMessage().contains("Incorrect number of parameters")); } public void testWrongArityDef() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("def y = Optional.empty(); return y.orElseGet(x -> x);"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("def y = Optional.empty(); return y.orElseGet(x -> x);"); + }); assertTrue(expected.getMessage(), expected.getMessage().contains("due to an incorrect number of arguments")); } public void testWrongArityNotEnough() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - false, - () -> { exec("List l = new ArrayList(); l.add(1); l.add(1); " + "return l.stream().mapToInt(() -> 5).sum();"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, false, () -> { + exec("List l = new ArrayList(); l.add(1); l.add(1); " + "return l.stream().mapToInt(() -> 5).sum();"); + }); assertTrue(expected.getMessage().contains("Incorrect number of parameters")); } public void testWrongArityNotEnoughDef() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("def l = new ArrayList(); l.add(1); l.add(1); " + "return l.stream().mapToInt(() -> 5).sum();"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("def l = new ArrayList(); l.add(1); l.add(1); " + "return l.stream().mapToInt(() -> 5).sum();"); + }); assertTrue(expected.getMessage(), expected.getMessage().contains("due to an incorrect number of arguments")); } @@ -284,19 +269,17 @@ public void testReservedCapture() { } public void testReturnVoid() { - Throwable expected = expectScriptThrows( - ClassCastException.class, - () -> { exec("StringBuilder b = new StringBuilder(); List l = [1, 2]; l.stream().mapToLong(i -> b.setLength(i))"); } - ); + Throwable expected = expectScriptThrows(ClassCastException.class, () -> { + exec("StringBuilder b = new StringBuilder(); List l = [1, 2]; l.stream().mapToLong(i -> b.setLength(i))"); + }); assertThat(expected.getMessage(), containsString("Cannot cast from [void] to [long].")); } public void testReturnVoidDef() { // If we can catch the error at compile time we do - Exception expected = expectScriptThrows( - ClassCastException.class, - () -> { exec("StringBuilder b = new StringBuilder(); def l = [1, 2]; l.stream().mapToLong(i -> b.setLength(i))"); } - ); + Exception expected = expectScriptThrows(ClassCastException.class, () -> { + exec("StringBuilder b = new StringBuilder(); def l = [1, 2]; l.stream().mapToLong(i -> b.setLength(i))"); + }); assertThat(expected.getMessage(), containsString("Cannot cast from [void] to [def].")); // Otherwise we convert the void into a null diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/OverloadTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/OverloadTests.java index b9d45a9af7328..9885ccf86c3f5 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/OverloadTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/OverloadTests.java @@ -14,20 +14,18 @@ public class OverloadTests extends ScriptTestCase { public void testMethod() { // assertEquals(2, exec("return 'abc123abc'.indexOf('c');")); // assertEquals(8, exec("return 'abc123abc'.indexOf('c', 3);")); - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("return 'abc123abc'.indexOf('c', 3, 'bogus');"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("return 'abc123abc'.indexOf('c', 3, 'bogus');"); + }); assertTrue(expected.getMessage().contains("[java.lang.String, indexOf/3]")); } public void testMethodDynamic() { assertEquals(2, exec("def x = 'abc123abc'; return x.indexOf('c');")); assertEquals(8, exec("def x = 'abc123abc'; return x.indexOf('c', 3);")); - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("def x = 'abc123abc'; return x.indexOf('c', 3, 'bogus');"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("def x = 'abc123abc'; return x.indexOf('c', 3, 'bogus');"); + }); assertTrue(expected.getMessage().contains("dynamic method [java.lang.String, indexOf/3] not found")); } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/StringTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/StringTests.java index 5bf140cb5d05a..ccf0d1970e9b8 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/StringTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/StringTests.java @@ -158,11 +158,9 @@ public void testStringAndCharacter() { assertEquals('c', exec("String s = \"c\"; (char)s")); assertEquals('c', exec("String s = 'c'; (char)s")); - ClassCastException expected = expectScriptThrows( - ClassCastException.class, - false, - () -> { assertEquals("cc", exec("return (String)(char)\"cc\"")); } - ); + ClassCastException expected = expectScriptThrows(ClassCastException.class, false, () -> { + assertEquals("cc", exec("return (String)(char)\"cc\"")); + }); assertTrue(expected.getMessage().contains("cannot cast java.lang.String with length not equal to one to char")); expected = expectScriptThrows(ClassCastException.class, false, () -> { assertEquals("cc", exec("return (String)(char)'cc'")); }); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java index f709649d0e338..24b86d0a2fcbe 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java @@ -36,10 +36,9 @@ public void testDefNullPointer() { assertEquals(npe.getMessage(), "cannot access method/field [intValue] from a null def reference"); npe = expectScriptThrows(NullPointerException.class, () -> { exec("def x = [1, null]; for (y in x) y.intValue(); return null;"); }); assertEquals(npe.getMessage(), "cannot access method/field [intValue] from a null def reference"); - npe = expectScriptThrows( - NullPointerException.class, - () -> { exec("def x = [1, 2L, 3.0, 'test', (byte)1, (short)1, (char)1, null]; for (y in x) y.toString(); return null;"); } - ); + npe = expectScriptThrows(NullPointerException.class, () -> { + exec("def x = [1, 2L, 3.0, 'test', (byte)1, (short)1, (char)1, null]; for (y in x) y.toString(); return null;"); + }); assertEquals(npe.getMessage(), "cannot access method/field [toString] from a null def reference"); } @@ -50,10 +49,9 @@ public void testDefNullPointer() { public void testScriptStack() { for (String type : new String[] { "String", "def " }) { // trigger NPE at line 1 of the script - ScriptException exception = expectThrows( - ScriptException.class, - () -> { exec(type + " x = null; boolean y = x.isEmpty();\n" + "return y;"); } - ); + ScriptException exception = expectThrows(ScriptException.class, () -> { + exec(type + " x = null; boolean y = x.isEmpty();\n" + "return y;"); + }); // null deref at x.isEmpty(), the '.' is offset 30 assertScriptElementColumn(30, exception); assertScriptStack(exception, "y = x.isEmpty();\n", " ^---- HERE"); @@ -77,12 +75,9 @@ public void testScriptStack() { assertThat(exception.getCause(), instanceOf(NullPointerException.class)); // trigger NPE at line 4 in script (inside conditional) - exception = expectThrows( - ScriptException.class, - () -> { - exec(type + " x = null;\n" + "boolean y = false;\n" + "if (!y) {\n" + " y = x.isEmpty();\n" + "}\n" + "return y;"); - } - ); + exception = expectThrows(ScriptException.class, () -> { + exec(type + " x = null;\n" + "boolean y = false;\n" + "if (!y) {\n" + " y = x.isEmpty();\n" + "}\n" + "return y;"); + }); // null deref at x.isEmpty(), the '.' is offset 53 assertScriptElementColumn(53, exception); assertScriptStack(exception, "y = x.isEmpty();\n}\n", " ^---- HERE"); @@ -114,10 +109,9 @@ public void testInvalidShift() { } public void testBogusParameter() { - IllegalArgumentException expected = expectThrows( - IllegalArgumentException.class, - () -> { exec("return 5;", null, Collections.singletonMap("bogusParameterKey", "bogusParameterValue"), true); } - ); + IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> { + exec("return 5;", null, Collections.singletonMap("bogusParameterKey", "bogusParameterValue"), true); + }); assertTrue(expected.getMessage().contains("Unrecognized compile-time parameter")); } @@ -171,10 +165,9 @@ public void testLoopLimits() { } public void testIllegalDynamicMethod() { - IllegalArgumentException expected = expectScriptThrows( - IllegalArgumentException.class, - () -> { exec("def x = 'test'; return x.getClass().toString()"); } - ); + IllegalArgumentException expected = expectScriptThrows(IllegalArgumentException.class, () -> { + exec("def x = 'test'; return x.getClass().toString()"); + }); assertTrue(expected.getMessage().contains("dynamic method [java.lang.String, getClass/0] not found")); } @@ -217,10 +210,9 @@ public void testOutOfMemoryError() { } public void testStackOverflowError() { - ErrorCauseWrapper e = expectScriptThrows( - ErrorCauseWrapper.class, - () -> { exec("void recurse(int x, int y) {recurse(x, y)} recurse(1, 2);"); } - ); + ErrorCauseWrapper e = expectScriptThrows(ErrorCauseWrapper.class, () -> { + exec("void recurse(int x, int y) {recurse(x, y)} recurse(1, 2);"); + }); assertThat(e.realCause.getClass(), equalTo(StackOverflowError.class)); } diff --git a/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java b/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java index 93a1605e83cb8..e9eceb9c29bfb 100644 --- a/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java @@ -405,10 +405,9 @@ public void testPercolatorQueryExistingDocumentSourceDisabled() throws Exception client().admin().indices().prepareRefresh().get(); logger.info("percolating empty doc with source disabled"); - IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { client().prepareSearch().setQuery(new PercolateQueryBuilder("query", "test", "type", "1", null, null, null)).get(); } - ); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + client().prepareSearch().setQuery(new PercolateQueryBuilder("query", "test", "type", "1", null, null, null)).get(); + }); assertThat(e.getMessage(), containsString("source disabled")); } diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java index e72682aa21cbd..6b712b214a65c 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java @@ -243,31 +243,27 @@ protected Map getObjectsHoldingArbitraryContent() { } public void testRequiredParameters() { - IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { new PercolateQueryBuilder(null, new BytesArray("{}"), XContentType.JSON); } - ); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + new PercolateQueryBuilder(null, new BytesArray("{}"), XContentType.JSON); + }); assertThat(e.getMessage(), equalTo("[field] is a required argument")); e = expectThrows(IllegalArgumentException.class, () -> new PercolateQueryBuilder("_field", "_document_type", null, null)); assertThat(e.getMessage(), equalTo("[document] is a required argument")); - e = expectThrows( - IllegalArgumentException.class, - () -> { new PercolateQueryBuilder(null, null, "_index", "_type", "_id", null, null, null); } - ); + e = expectThrows(IllegalArgumentException.class, () -> { + new PercolateQueryBuilder(null, null, "_index", "_type", "_id", null, null, null); + }); assertThat(e.getMessage(), equalTo("[field] is a required argument")); - e = expectThrows( - IllegalArgumentException.class, - () -> { new PercolateQueryBuilder("_field", "_document_type", null, "_type", "_id", null, null, null); } - ); + e = expectThrows(IllegalArgumentException.class, () -> { + new PercolateQueryBuilder("_field", "_document_type", null, "_type", "_id", null, null, null); + }); assertThat(e.getMessage(), equalTo("[index] is a required argument")); - e = expectThrows( - IllegalArgumentException.class, - () -> { new PercolateQueryBuilder("_field", "_document_type", "_index", "_type", null, null, null, null); } - ); + e = expectThrows(IllegalArgumentException.class, () -> { + new PercolateQueryBuilder("_field", "_document_type", "_index", "_type", null, null, null, null); + }); assertThat(e.getMessage(), equalTo("[id] is a required argument")); } diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java index 8eb98b561ab61..99b74b7f74bb7 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java @@ -581,14 +581,9 @@ public void testQueryWithRewrite() throws Exception { ) ); BytesRef qbSource = doc.rootDoc().getFields(fieldType.queryBuilderField.name())[0].binaryValue(); - SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ); + SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()); PlainActionFuture future = new PlainActionFuture<>(); Rewriteable.rewriteAndFetch(queryBuilder, searchExecutionContext, future); assertQueryBuilder(qbSource, future.get()); diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/DiscountedCumulativeGain.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/DiscountedCumulativeGain.java index 3b387fc347717..6275a4f87d5e4 100644 --- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/DiscountedCumulativeGain.java +++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/DiscountedCumulativeGain.java @@ -258,11 +258,9 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t return builder; } - private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( - NAME, - true, - args -> { return new Detail((Double) args[0], (Double) args[1] != null ? (Double) args[1] : 0.0d, (Integer) args[2]); } - ); + private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>(NAME, true, args -> { + return new Detail((Double) args[0], (Double) args[1] != null ? (Double) args[1] : 0.0d, (Integer) args[2]); + }); static { PARSER.declareDouble(constructorArg(), DCG_FIELD); diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRank.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRank.java index a62f3eb95bc2e..17fedc67ef48e 100644 --- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRank.java +++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRank.java @@ -238,11 +238,9 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t return builder.field(UNRATED_FIELD.getPreferredName(), this.unratedDocs); } - private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( - NAME, - true, - args -> { return new Detail((Integer) args[0]); } - ); + private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>(NAME, true, args -> { + return new Detail((Integer) args[0]); + }); static { PARSER.declareInt(constructorArg(), UNRATED_FIELD); diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/MeanReciprocalRank.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/MeanReciprocalRank.java index 43b4565e84820..86714257f66d1 100644 --- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/MeanReciprocalRank.java +++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/MeanReciprocalRank.java @@ -195,11 +195,9 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t return builder.field(FIRST_RELEVANT_RANK_FIELD.getPreferredName(), firstRelevantRank); } - private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( - NAME, - true, - args -> { return new Detail((Integer) args[0]); } - ); + private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>(NAME, true, args -> { + return new Detail((Integer) args[0]); + }); static { PARSER.declareInt(constructorArg(), FIRST_RELEVANT_RANK_FIELD); diff --git a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/DiscountedCumulativeGainTests.java b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/DiscountedCumulativeGainTests.java index aa1e82541dfd9..1106d9274d43b 100644 --- a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/DiscountedCumulativeGainTests.java +++ b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/DiscountedCumulativeGainTests.java @@ -338,11 +338,9 @@ public void testSerialization() throws IOException { } public void testEqualsAndHash() throws IOException { - checkEqualsAndHashCode( - createTestItem(), - original -> { return new DiscountedCumulativeGain(original.getNormalize(), original.getUnknownDocRating(), original.getK()); }, - DiscountedCumulativeGainTests::mutateTestItem - ); + checkEqualsAndHashCode(createTestItem(), original -> { + return new DiscountedCumulativeGain(original.getNormalize(), original.getUnknownDocRating(), original.getK()); + }, DiscountedCumulativeGainTests::mutateTestItem); } private static DiscountedCumulativeGain mutateTestItem(DiscountedCumulativeGain original) { diff --git a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRankTests.java b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRankTests.java index 05ee6495c0d6f..59147d87116a0 100644 --- a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRankTests.java +++ b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/ExpectedReciprocalRankTests.java @@ -196,11 +196,9 @@ public void testSerialization() throws IOException { } public void testEqualsAndHash() throws IOException { - checkEqualsAndHashCode( - createTestItem(), - original -> { return new ExpectedReciprocalRank(original.getMaxRelevance(), original.getUnknownDocRating(), original.getK()); }, - ExpectedReciprocalRankTests::mutateTestItem - ); + checkEqualsAndHashCode(createTestItem(), original -> { + return new ExpectedReciprocalRank(original.getMaxRelevance(), original.getUnknownDocRating(), original.getK()); + }, ExpectedReciprocalRankTests::mutateTestItem); } private static ExpectedReciprocalRank mutateTestItem(ExpectedReciprocalRank original) { diff --git a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RatedDocumentTests.java b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RatedDocumentTests.java index c3e33d0e77e56..0cfc2541a0572 100644 --- a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RatedDocumentTests.java +++ b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RatedDocumentTests.java @@ -67,11 +67,9 @@ public void testSerialization() throws IOException { } public void testEqualsAndHash() throws IOException { - checkEqualsAndHashCode( - createRatedDocument(), - original -> { return new RatedDocument(original.getIndex(), original.getDocID(), original.getRating()); }, - RatedDocumentTests::mutateTestItem - ); + checkEqualsAndHashCode(createRatedDocument(), original -> { + return new RatedDocument(original.getIndex(), original.getDocID(), original.getRating()); + }, RatedDocumentTests::mutateTestItem); } private static RatedDocument mutateTestItem(RatedDocument original) { diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/index/reindex/BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests.java b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/index/reindex/BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests.java index e314e37d704a6..729aeef48e335 100644 --- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/index/reindex/BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests.java +++ b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/index/reindex/BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests.java @@ -106,7 +106,9 @@ public void testUpdateByQuery() throws Exception { scriptEnabled, updateByQuery(), true, - (bulkByScrollResponse, updatedDocCount) -> { assertThat(bulkByScrollResponse.getUpdated(), is((long) updatedDocCount)); } + (bulkByScrollResponse, updatedDocCount) -> { + assertThat(bulkByScrollResponse.getUpdated(), is((long) updatedDocCount)); + } ); } @@ -128,7 +130,9 @@ public void testReindex() throws Exception { scriptEnabled, reindexRequestBuilder, false, - (bulkByScrollResponse, reindexDocCount) -> { assertThat(bulkByScrollResponse.getCreated(), is((long) reindexDocCount)); } + (bulkByScrollResponse, reindexDocCount) -> { + assertThat(bulkByScrollResponse.getCreated(), is((long) reindexDocCount)); + } ); } @@ -140,7 +144,9 @@ public void testDeleteByQuery() throws Exception { false, deleteByQuery(), true, - (bulkByScrollResponse, deletedDocCount) -> { assertThat(bulkByScrollResponse.getDeleted(), is((long) deletedDocCount)); } + (bulkByScrollResponse, deletedDocCount) -> { + assertThat(bulkByScrollResponse.getDeleted(), is((long) deletedDocCount)); + } ); } diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/ClientScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/ClientScrollableHitSourceTests.java index df9723b7ea89b..59ba084fd83fe 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ClientScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ClientScrollableHitSourceTests.java @@ -84,10 +84,9 @@ private static class ExpectedException extends RuntimeException { public void testRetryFail() { int retries = randomInt(10); - ExpectedException ex = expectThrows( - ExpectedException.class, - () -> { dotestBasicsWithRetry(retries, retries + 1, retries + 1, e -> { throw new ExpectedException(e); }); } - ); + ExpectedException ex = expectThrows(ExpectedException.class, () -> { + dotestBasicsWithRetry(retries, retries + 1, retries + 1, e -> { throw new ExpectedException(e); }); + }); assertThat(ex.getCause(), instanceOf(EsRejectedExecutionException.class)); } diff --git a/modules/repository-url/src/test/java/org/elasticsearch/common/blobstore/url/http/URLHttpClientTests.java b/modules/repository-url/src/test/java/org/elasticsearch/common/blobstore/url/http/URLHttpClientTests.java index 452197ad093f1..79edf5242da95 100644 --- a/modules/repository-url/src/test/java/org/elasticsearch/common/blobstore/url/http/URLHttpClientTests.java +++ b/modules/repository-url/src/test/java/org/elasticsearch/common/blobstore/url/http/URLHttpClientTests.java @@ -248,11 +248,9 @@ public void testInvalidErrorMessageCharsetIsIgnored() { } private URLHttpClient.HttpResponse executeRequest(String endpoint) throws Exception { - return AccessController.doPrivileged( - (PrivilegedExceptionAction) () -> { - return httpClient.get(getURIForEndpoint(endpoint), Collections.emptyMap()); - } - ); + return AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + return httpClient.get(getURIForEndpoint(endpoint), Collections.emptyMap()); + }); } private URI getURIForEndpoint(String endpoint) throws Exception { diff --git a/modules/runtime-fields-common/src/main/java/org/elasticsearch/runtimefields/NamedGroupExtractor.java b/modules/runtime-fields-common/src/main/java/org/elasticsearch/runtimefields/NamedGroupExtractor.java index 26c1dc3178d5c..0b6cce90f2ba2 100644 --- a/modules/runtime-fields-common/src/main/java/org/elasticsearch/runtimefields/NamedGroupExtractor.java +++ b/modules/runtime-fields-common/src/main/java/org/elasticsearch/runtimefields/NamedGroupExtractor.java @@ -104,12 +104,9 @@ public Grok run() { throw new IllegalArgumentException("emitted warnings: " + warnings); } - return new Grok( - Grok.getBuiltinPatterns(false), - pattern, - watchdog, - w -> { throw new IllegalArgumentException("grok [" + pattern + "] emitted a warning: " + w); } - ); + return new Grok(Grok.getBuiltinPatterns(false), pattern, watchdog, w -> { + throw new IllegalArgumentException("grok [" + pattern + "] emitted a warning: " + w); + }); } catch (RuntimeException e) { throw new IllegalArgumentException("error compiling grok pattern [" + pattern + "]: " + e.getMessage(), e); } diff --git a/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerTransportTests.java b/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerTransportTests.java index af0143e40e309..ad6846c2ad412 100644 --- a/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerTransportTests.java +++ b/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerTransportTests.java @@ -688,7 +688,9 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th settings, dispatcher, httpValidator, - (restRequest, threadContext) -> { throw new AssertionError("Request dispatched but shouldn't"); } + (restRequest, threadContext) -> { + throw new AssertionError("Request dispatched but shouldn't"); + } ) ) { transport.start(); @@ -744,7 +746,9 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th Netty4HttpServerTransport transport = getTestNetty4HttpServerTransport( dispatcher, failureHeadersValidator, - (restRequest, threadContext) -> { throw new AssertionError("Request that failed validation should not be dispatched"); } + (restRequest, threadContext) -> { + throw new AssertionError("Request that failed validation should not be dispatched"); + } ) ) { transport.start(); diff --git a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/IcuAnalyzerTests.java b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/IcuAnalyzerTests.java index 6db465a9cac17..5d584870d5f05 100644 --- a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/IcuAnalyzerTests.java +++ b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/IcuAnalyzerTests.java @@ -66,10 +66,9 @@ public void testBadSettings() { Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).put("mode", "wrong").build(); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); - IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { new IcuAnalyzerProvider(idxSettings, null, "icu", settings); } - ); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + new IcuAnalyzerProvider(idxSettings, null, "icu", settings); + }); assertThat(e.getMessage(), containsString("Unknown mode [wrong] in analyzer [icu], expected one of [compose, decompose]")); diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureClientProviderTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureClientProviderTests.java index 5c957511bbbe3..e9b438339f361 100644 --- a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureClientProviderTests.java +++ b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureClientProviderTests.java @@ -92,10 +92,9 @@ public void testCanNotCreateAClientWithSecondaryLocationWithoutAProperEndpoint() LocationMode locationMode = LocationMode.SECONDARY_ONLY; RequestRetryOptions requestRetryOptions = new RequestRetryOptions(); - expectThrows( - IllegalArgumentException.class, - () -> { azureClientProvider.createClient(storageSettings, locationMode, requestRetryOptions, null, EMPTY_CONSUMER); } - ); + expectThrows(IllegalArgumentException.class, () -> { + azureClientProvider.createClient(storageSettings, locationMode, requestRetryOptions, null, EMPTY_CONSUMER); + }); } private static String encodeKey(final String value) { diff --git a/plugins/repository-hdfs/src/javaRestTest/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java b/plugins/repository-hdfs/src/javaRestTest/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java index 5b0beaf0c992a..cfc264f450399 100644 --- a/plugins/repository-hdfs/src/javaRestTest/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java +++ b/plugins/repository-hdfs/src/javaRestTest/java/org/elasticsearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java @@ -51,9 +51,9 @@ public void testHAFailoverWithRepository() throws Exception { String nn2Port = "10002"; if (ports.length() > 0) { final Path path = PathUtils.get(ports); - final List lines = AccessController.doPrivileged( - (PrivilegedExceptionAction>) () -> { return Files.readAllLines(path); } - ); + final List lines = AccessController.doPrivileged((PrivilegedExceptionAction>) () -> { + return Files.readAllLines(path); + }); nn1Port = lines.get(0); nn2Port = lines.get(1); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java index 8d094b5704d70..ab7d9b0532342 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java @@ -491,14 +491,12 @@ public void waitForTaskCompletion(Task task) {} if (index != null) { index.join(); } - assertBusy( - () -> { - assertEquals( - emptyList(), - client().admin().cluster().prepareListTasks().setActions("indices:data/write/index*").get().getTasks() - ); - } - ); + assertBusy(() -> { + assertEquals( + emptyList(), + client().admin().cluster().prepareListTasks().setActions("indices:data/write/index*").get().getTasks() + ); + }); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java index 996ca84725b30..c1d5b338d061f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java @@ -81,18 +81,9 @@ protected Map, Object>> pluginScripts() { scripts.put("ctx._source.field2 = 'value2'", vars -> srcScript(vars, source -> source.replace("field2", "value2"))); - scripts.put( - "throw script exception on unknown var", - vars -> { - throw new ScriptException( - "message", - null, - Collections.emptyList(), - "exception on unknown var", - CustomScriptPlugin.NAME - ); - } - ); + scripts.put("throw script exception on unknown var", vars -> { + throw new ScriptException("message", null, Collections.emptyList(), "exception on unknown var", CustomScriptPlugin.NAME); + }); scripts.put("ctx.op = \"none\"", vars -> ((Map) vars.get("ctx")).put("op", "none")); scripts.put("ctx.op = \"delete\"", vars -> ((Map) vars.get("ctx")).put("op", "delete")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java index b2f037b8984f3..935338db5c242 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java @@ -75,11 +75,9 @@ public Collection createComponents( IndexNameExpressionResolver expressionResolver, Supplier repositoriesServiceSupplier ) { - clusterService.getClusterSettings() - .addSettingsUpdateConsumer( - UPDATE_TEMPLATE_DUMMY_SETTING, - integer -> { logger.debug("the template dummy setting was updated to {}", integer); } - ); + clusterService.getClusterSettings().addSettingsUpdateConsumer(UPDATE_TEMPLATE_DUMMY_SETTING, integer -> { + logger.debug("the template dummy setting was updated to {}", integer); + }); return super.createComponents( client, clusterService, diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java index 00423f408e027..0d7415505ff22 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java @@ -152,11 +152,9 @@ public void testLockTryingToDelete() throws Exception { final LockObtainFailedException exception = expectThrows( LockObtainFailedException.class, - () -> env.deleteShardDirectoryUnderLock( - sLock, - indexSettings, - indexPaths -> { assert false : "should not be called " + indexPaths; } - ) + () -> env.deleteShardDirectoryUnderLock(sLock, indexSettings, indexPaths -> { + assert false : "should not be called " + indexPaths; + }) ); assertThat(exception.getMessage(), exception.getMessage(), containsString("unable to acquire write.lock")); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java index dfde7f8e5c8b2..80f69eca9c3e8 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java @@ -263,10 +263,9 @@ public void testInvalidIndexName() { } public void testDocumentWithBlankFieldName() { - MapperParsingException e = expectThrows( - MapperParsingException.class, - () -> { client().prepareIndex("test", "type", "1").setSource("", "value1_2").execute().actionGet(); } - ); + MapperParsingException e = expectThrows(MapperParsingException.class, () -> { + client().prepareIndex("test", "type", "1").setSource("", "value1_2").execute().actionGet(); + }); assertThat(e.getMessage(), containsString("failed to parse")); assertThat(e.getRootCause().getMessage(), containsString("field name cannot be an empty string")); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java index d33af7369cc1d..512140ec3d9cb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java @@ -112,11 +112,9 @@ public static class DummySettingPlugin extends Plugin { @Override public void onIndexModule(IndexModule indexModule) { - indexModule.addSettingsUpdateConsumer( - DUMMY_SETTING, - (s) -> {}, - (s) -> { if (s.equals("boom")) throw new IllegalArgumentException("this setting goes boom"); } - ); + indexModule.addSettingsUpdateConsumer(DUMMY_SETTING, (s) -> {}, (s) -> { + if (s.equals("boom")) throw new IllegalArgumentException("this setting goes boom"); + }); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java index ba5b574ed42ae..6452af134f6d6 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/TransportPostFeatureUpgradeAction.java @@ -93,14 +93,13 @@ protected void masterOperation( SYSTEM_INDEX_UPGRADE_TASK_NAME, SYSTEM_INDEX_UPGRADE_TASK_NAME, new SystemIndexMigrationTaskParams(), - ActionListener.wrap( - startedTask -> { listener.onResponse(new PostFeatureUpgradeResponse(true, featuresToMigrate, null, null)); }, - ex -> { - logger.error("failed to start system index upgrade task", ex); + ActionListener.wrap(startedTask -> { + listener.onResponse(new PostFeatureUpgradeResponse(true, featuresToMigrate, null, null)); + }, ex -> { + logger.error("failed to start system index upgrade task", ex); - listener.onResponse(new PostFeatureUpgradeResponse(false, null, null, new ElasticsearchException(ex))); - } - ) + listener.onResponse(new PostFeatureUpgradeResponse(false, null, null, new ElasticsearchException(ex))); + }) ); } else { listener.onResponse(new PostFeatureUpgradeResponse(false, null, "No system indices require migration", null)); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java index d661f2a1e8bbd..5c5a2e38ca518 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java @@ -33,7 +33,9 @@ public class ClusterUpdateSettingsResponse extends AcknowledgedResponse { private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( "cluster_update_settings_response", true, - args -> { return new ClusterUpdateSettingsResponse((boolean) args[0], (Settings) args[1], (Settings) args[2]); } + args -> { + return new ClusterUpdateSettingsResponse((boolean) args[0], (Settings) args[1], (Settings) args[2]); + } ); static { declareAcknowledgedField(PARSER); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java index d811ac993a5d3..985d304ff25be 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java @@ -188,11 +188,9 @@ private static Analyzer getAnalyzer(AnalyzeAction.Request request, AnalysisRegis MappedFieldType fieldType = indexService.mapperService().fieldType(request.field()); if (fieldType != null) { if (fieldType instanceof StringFieldType) { - return indexService.mapperService() - .indexAnalyzer( - fieldType.name(), - f -> { throw new IllegalArgumentException("No analyzer configured for field " + fieldType.name()); } - ); + return indexService.mapperService().indexAnalyzer(fieldType.name(), f -> { + throw new IllegalArgumentException("No analyzer configured for field " + fieldType.name()); + }); } else { throw new IllegalArgumentException( "Can't process field [" + request.field() + "], Analysis requests are only supported on tokenized fields" diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/create/AutoCreateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/AutoCreateAction.java index c8830bc76b05f..57db3197a6675 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/create/AutoCreateAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/create/AutoCreateAction.java @@ -106,7 +106,9 @@ protected void masterOperation(CreateIndexRequest request, ClusterState state, A new String[] { indexName }, ActiveShardCount.DEFAULT, request.timeout(), - shardsAcked -> { finalListener.onResponse(new CreateIndexResponse(true, shardsAcked, indexName)); }, + shardsAcked -> { + finalListener.onResponse(new CreateIndexResponse(true, shardsAcked, indexName)); + }, finalListener::onFailure ); } else { diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java index e3aa0a53f2676..50d90818427fc 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java @@ -48,10 +48,9 @@ void executeDocument( pipeline.getMetadata(), verbosePipelineProcessor ); - ingestDocument.executePipeline( - verbosePipeline, - (result, e) -> { handler.accept(new SimulateDocumentVerboseResult(processorResultList), e); } - ); + ingestDocument.executePipeline(verbosePipeline, (result, e) -> { + handler.accept(new SimulateDocumentVerboseResult(processorResultList), e); + }); } else { ingestDocument.executePipeline(pipeline, (result, e) -> { if (e == null) { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java index 876adef67a896..cc671d06e9ef8 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java @@ -79,7 +79,9 @@ public void migrateToDataStream( new String[] { writeIndexName }, ActiveShardCount.DEFAULT, request.masterNodeTimeout(), - shardsAcked -> { finalListener.onResponse(AcknowledgedResponse.TRUE); }, + shardsAcked -> { + finalListener.onResponse(AcknowledgedResponse.TRUE); + }, finalListener::onFailure ); } else { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/NodesShutdownMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/NodesShutdownMetadata.java index bbbbff441331d..057791f49ff2c 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/NodesShutdownMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/NodesShutdownMetadata.java @@ -52,12 +52,9 @@ public class NodesShutdownMetadata implements Metadata.Custom { }); static { - PARSER.declareNamedObjects( - ConstructingObjectParser.constructorArg(), - (p, c, n) -> SingleNodeShutdownMetadata.parse(p), - v -> { throw new IllegalArgumentException("ordered " + NODES_FIELD.getPreferredName() + " are not supported"); }, - NODES_FIELD - ); + PARSER.declareNamedObjects(ConstructingObjectParser.constructorArg(), (p, c, n) -> SingleNodeShutdownMetadata.parse(p), v -> { + throw new IllegalArgumentException("ordered " + NODES_FIELD.getPreferredName() + " are not supported"); + }, NODES_FIELD); } public static NodesShutdownMetadata fromXContent(XContentParser parser) { diff --git a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java index 4122d08f83ee7..bc751fd9188a9 100644 --- a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java +++ b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java @@ -872,11 +872,9 @@ private ClusterTasksResult executeTasks(TaskInputs taskInputs, ClusterSt ); if (Assertions.ENABLED) { ClusterTasksResult finalClusterTasksResult = clusterTasksResult; - taskInputs.updateTasks.forEach( - updateTask -> { - assert finalClusterTasksResult.executionResults.containsKey(updateTask.task) : "missing task result for " + updateTask; - } - ); + taskInputs.updateTasks.forEach(updateTask -> { + assert finalClusterTasksResult.executionResults.containsKey(updateTask.task) : "missing task result for " + updateTask; + }); } return clusterTasksResult; diff --git a/server/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java b/server/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java index 436203602da83..fff10ffbf3c20 100644 --- a/server/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java +++ b/server/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java @@ -52,14 +52,9 @@ public void submitTasks(List tasks, @Nullable TimeValue t : "tasks submitted in a batch should share the same batching key: " + tasks; // convert to an identity map to check for dups based on task identity final Map tasksIdentity = tasks.stream() - .collect( - Collectors.toMap( - BatchedTask::getTask, - Function.identity(), - (a, b) -> { throw new IllegalStateException("cannot add duplicate task: " + a); }, - IdentityHashMap::new - ) - ); + .collect(Collectors.toMap(BatchedTask::getTask, Function.identity(), (a, b) -> { + throw new IllegalStateException("cannot add duplicate task: " + a); + }, IdentityHashMap::new)); synchronized (tasksPerBatchingKey) { LinkedHashSet existingTasks = tasksPerBatchingKey.computeIfAbsent( diff --git a/server/src/main/java/org/elasticsearch/common/util/Maps.java b/server/src/main/java/org/elasticsearch/common/util/Maps.java index b01e9e51597ce..b0196166126dd 100644 --- a/server/src/main/java/org/elasticsearch/common/util/Maps.java +++ b/server/src/main/java/org/elasticsearch/common/util/Maps.java @@ -148,15 +148,9 @@ private static Map flatten(List list, boolean ordered, S Function keyMapper, Function valueMapper ) { - return Collectors.collectingAndThen( - Collectors.toMap( - keyMapper, - valueMapper, - (v1, v2) -> { throw new IllegalStateException("Duplicate key (attempted merging values " + v1 + " and " + v2 + ")"); }, - () -> new TreeMap() - ), - Collections::unmodifiableNavigableMap - ); + return Collectors.collectingAndThen(Collectors.toMap(keyMapper, valueMapper, (v1, v2) -> { + throw new IllegalStateException("Duplicate key (attempted merging values " + v1 + " and " + v2 + ")"); + }, () -> new TreeMap()), Collections::unmodifiableNavigableMap); } /** @@ -170,15 +164,9 @@ private static Map flatten(List list, boolean ordered, S Function keyMapper, Function valueMapper ) { - return Collectors.collectingAndThen( - Collectors.toMap( - keyMapper, - valueMapper, - (v1, v2) -> { throw new IllegalStateException("Duplicate key (attempted merging values " + v1 + " and " + v2 + ")"); }, - (Supplier>) LinkedHashMap::new - ), - Collections::unmodifiableMap - ); + return Collectors.collectingAndThen(Collectors.toMap(keyMapper, valueMapper, (v1, v2) -> { + throw new IllegalStateException("Duplicate key (attempted merging values " + v1 + " and " + v2 + ")"); + }, (Supplier>) LinkedHashMap::new), Collections::unmodifiableMap); } } diff --git a/server/src/main/java/org/elasticsearch/index/IndexModule.java b/server/src/main/java/org/elasticsearch/index/IndexModule.java index 62c799f427690..1bab4fd681594 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexModule.java +++ b/server/src/main/java/org/elasticsearch/index/IndexModule.java @@ -571,7 +571,9 @@ public MapperService newIndexMapperService( xContentRegistry, new SimilarityService(indexSettings, scriptService, similarities), mapperRegistry, - () -> { throw new UnsupportedOperationException("no index query shard context available"); }, + () -> { + throw new UnsupportedOperationException("no index query shard context available"); + }, () -> false, scriptService ); diff --git a/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java b/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java index 6680b817798e1..a403e2a4af320 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java +++ b/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java @@ -238,10 +238,9 @@ public Sort buildIndexSort( } IndexFieldData fieldData; try { - fieldData = fieldDataLookup.apply( - ft, - () -> { throw new UnsupportedOperationException("index sorting not supported on runtime field [" + ft.name() + "]"); } - ); + fieldData = fieldDataLookup.apply(ft, () -> { + throw new UnsupportedOperationException("index sorting not supported on runtime field [" + ft.name() + "]"); + }); } catch (Exception e) { throw new IllegalArgumentException("docvalues not found for index sort field:[" + sortSpec.field + "]", e); } diff --git a/server/src/main/java/org/elasticsearch/index/IndexWarmer.java b/server/src/main/java/org/elasticsearch/index/IndexWarmer.java index fb7544062b32d..34d97c15bea01 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexWarmer.java +++ b/server/src/main/java/org/elasticsearch/index/IndexWarmer.java @@ -120,7 +120,9 @@ public TerminationHandle warmReader(final IndexShard indexShard, final Elasticse IndexFieldData.Global ifd = indexFieldDataService.getForField( fieldType, indexFieldDataService.index().getName(), - () -> { throw new UnsupportedOperationException("search lookup not available when warming an index"); } + () -> { + throw new UnsupportedOperationException("search lookup not available when warming an index"); + } ); IndexFieldData global = ifd.loadGlobal(reader); if (reader.leaves().isEmpty() == false) { diff --git a/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java b/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java index 6ab3c327b6970..b76ae2b51f38d 100644 --- a/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java +++ b/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java @@ -616,7 +616,9 @@ public IndexAnalyzers build( charFilterFactoryFactories, tokenizerFactoryFactories ), - (k, v) -> { throw new IllegalStateException("already registered analyzer with name: " + entry.getKey()); } + (k, v) -> { + throw new IllegalStateException("already registered analyzer with name: " + entry.getKey()); + } ); } for (Map.Entry> entry : normalizerProviders.entrySet()) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RuntimeField.java b/server/src/main/java/org/elasticsearch/index/mapper/RuntimeField.java index fb1811d2a8678..2b40f4700a7d3 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RuntimeField.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RuntimeField.java @@ -213,14 +213,9 @@ static Map collectFieldTypes(Collection r throw new IllegalStateException("Found sub-fields with name not belonging to the parent field they are part of " + names); } return runtimeField.asMappedFieldTypes(); - }) - .collect( - Collectors.toMap( - MappedFieldType::name, - mappedFieldType -> mappedFieldType, - (t, t2) -> { throw new IllegalArgumentException("Found two runtime fields with same name [" + t.name() + "]"); } - ) - ); + }).collect(Collectors.toMap(MappedFieldType::name, mappedFieldType -> mappedFieldType, (t, t2) -> { + throw new IllegalArgumentException("Found two runtime fields with same name [" + t.name() + "]"); + })); } static Function initializerNotSupported() { diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java index e3f1f9ea45802..d2b900d37c96f 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -3351,10 +3351,9 @@ public static Analyzer buildIndexAnalyzer(MapperService mapperService) { return new DelegatingAnalyzerWrapper(Analyzer.PER_FIELD_REUSE_STRATEGY) { @Override protected Analyzer getWrappedAnalyzer(String fieldName) { - return mapperService.indexAnalyzer( - fieldName, - f -> { throw new IllegalArgumentException("Field [" + fieldName + "] has no associated analyzer"); } - ); + return mapperService.indexAnalyzer(fieldName, f -> { + throw new IllegalArgumentException("Field [" + fieldName + "] has no associated analyzer"); + }); } }; } diff --git a/server/src/main/java/org/elasticsearch/index/translog/Translog.java b/server/src/main/java/org/elasticsearch/index/translog/Translog.java index 751101e2c9f51..dae1da1b9f091 100644 --- a/server/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/server/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -2003,11 +2003,15 @@ public static String createEmptyTranslog( EMPTY_TRANSLOG_BUFFER_SIZE, minTranslogGeneration, initialGlobalCheckpoint, - () -> { throw new UnsupportedOperationException(); }, + () -> { + throw new UnsupportedOperationException(); + }, () -> { throw new UnsupportedOperationException(); }, primaryTerm, new TragicExceptionHolder(), - seqNo -> { throw new UnsupportedOperationException(); }, + seqNo -> { + throw new UnsupportedOperationException(); + }, BigArrays.NON_RECYCLING_INSTANCE ); writer.close(); diff --git a/server/src/main/java/org/elasticsearch/repositories/IndexSnapshotsService.java b/server/src/main/java/org/elasticsearch/repositories/IndexSnapshotsService.java index 2e82d57f3b98a..05607931546af 100644 --- a/server/src/main/java/org/elasticsearch/repositories/IndexSnapshotsService.java +++ b/server/src/main/java/org/elasticsearch/repositories/IndexSnapshotsService.java @@ -42,13 +42,11 @@ public void getLatestSuccessfulSnapshotForShard( ShardId shardId, ActionListener> originalListener ) { - final ActionListener> listener = originalListener.delegateResponse( - (delegate, err) -> { - delegate.onFailure( - new RepositoryException(repositoryName, "Unable to find the latest snapshot for shard [" + shardId + "]", err) - ); - } - ); + final ActionListener> listener = originalListener.delegateResponse((delegate, err) -> { + delegate.onFailure( + new RepositoryException(repositoryName, "Unable to find the latest snapshot for shard [" + shardId + "]", err) + ); + }); final Repository repository = getRepository(repositoryName); if (repository == null) { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DoubleValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DoubleValuesSource.java index e1b15f0db93ea..1b36c3056d447 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DoubleValuesSource.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DoubleValuesSource.java @@ -136,11 +136,9 @@ void setAfter(Comparable value) { } else if (value instanceof Number) { afterValue = ((Number) value).doubleValue(); } else { - afterValue = format.parseDouble( - value.toString(), - false, - () -> { throw new IllegalArgumentException("now() is not supported in [after] key"); } - ); + afterValue = format.parseDouble(value.toString(), false, () -> { + throw new IllegalArgumentException("now() is not supported in [after] key"); + }); } } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileValuesSource.java index 174e684bcabad..63b9b84e9e375 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileValuesSource.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileValuesSource.java @@ -46,11 +46,9 @@ void setAfter(Comparable value) { } else if (value instanceof Number) { afterValue = ((Number) value).longValue(); } else { - afterValue = format.parseLong( - value.toString(), - false, - () -> { throw new IllegalArgumentException("now() is not supported in [after] key"); } - ); + afterValue = format.parseLong(value.toString(), false, () -> { + throw new IllegalArgumentException("now() is not supported in [after] key"); + }); } } } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java index 8e8831b75106c..964e72c260d08 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java @@ -513,11 +513,9 @@ static Object formatObject(Object obj, DocValueFormat format) { } else { formatted = format.format(value); } - parsed = format.parseLong( - formatted.toString(), - false, - () -> { throw new UnsupportedOperationException("Using now() is not supported in after keys"); } - ); + parsed = format.parseLong(formatted.toString(), false, () -> { + throw new UnsupportedOperationException("Using now() is not supported in after keys"); + }); if (parsed.equals(((Number) obj).longValue()) == false) { throw new IllegalArgumentException( "Format [" @@ -541,11 +539,9 @@ static Object formatObject(Object obj, DocValueFormat format) { } else { formatted = format.format(value); } - parsed = format.parseDouble( - formatted.toString(), - false, - () -> { throw new UnsupportedOperationException("Using now() is not supported in after keys"); } - ); + parsed = format.parseDouble(formatted.toString(), false, () -> { + throw new UnsupportedOperationException("Using now() is not supported in after keys"); + }); if (parsed.equals(((Number) obj).doubleValue()) == false) { throw new IllegalArgumentException( "Format [" diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/LongValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/LongValuesSource.java index 821958f10b3ef..f1525f4afa3da 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/LongValuesSource.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/LongValuesSource.java @@ -153,11 +153,9 @@ void setAfter(Comparable value) { afterValue = null; } else { // parse the value from a string in case it is a date or a formatted unsigned long. - afterValue = format.parseLong( - value.toString(), - false, - () -> { throw new IllegalArgumentException("now() is not supported in [after] key"); } - ); + afterValue = format.parseLong(value.toString(), false, () -> { + throw new IllegalArgumentException("now() is not supported in [after] key"); + }); } } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java index 9b5cf04ec8dc5..799932ede4f89 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java @@ -297,32 +297,27 @@ public void collect(int doc, long owningBucketOrd) throws IOException { @Override public InternalAggregation[] buildAggregations(long[] owningBucketOrds) throws IOException { - return buildAggregationsForVariableBuckets( - owningBucketOrds, - bucketOrds, - (bucketValue, docCount, subAggregationResults) -> { - return new InternalDateHistogram.Bucket(bucketValue, docCount, keyed, formatter, subAggregationResults); - }, - (owningBucketOrd, buckets) -> { - // the contract of the histogram aggregation is that shards must return buckets ordered by key in ascending order - CollectionUtil.introSort(buckets, BucketOrder.key(true).comparator()); + return buildAggregationsForVariableBuckets(owningBucketOrds, bucketOrds, (bucketValue, docCount, subAggregationResults) -> { + return new InternalDateHistogram.Bucket(bucketValue, docCount, keyed, formatter, subAggregationResults); + }, (owningBucketOrd, buckets) -> { + // the contract of the histogram aggregation is that shards must return buckets ordered by key in ascending order + CollectionUtil.introSort(buckets, BucketOrder.key(true).comparator()); - InternalDateHistogram.EmptyBucketInfo emptyBucketInfo = minDocCount == 0 - ? new InternalDateHistogram.EmptyBucketInfo(rounding.withoutOffset(), buildEmptySubAggregations(), extendedBounds) - : null; - return new InternalDateHistogram( - name, - buckets, - order, - minDocCount, - rounding.offset(), - emptyBucketInfo, - formatter, - keyed, - metadata() - ); - } - ); + InternalDateHistogram.EmptyBucketInfo emptyBucketInfo = minDocCount == 0 + ? new InternalDateHistogram.EmptyBucketInfo(rounding.withoutOffset(), buildEmptySubAggregations(), extendedBounds) + : null; + return new InternalDateHistogram( + name, + buckets, + order, + minDocCount, + rounding.offset(), + emptyBucketInfo, + formatter, + keyed, + metadata() + ); + }); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java index 80c7ee1e405f7..adaedc990c113 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java @@ -474,7 +474,7 @@ Aggregator create( && ordinalsValuesSource.supportsGlobalOrdinalsMapping() && // we use the static COLLECT_SEGMENT_ORDS to allow tests to force specific optimizations - (COLLECT_SEGMENT_ORDS != null ? COLLECT_SEGMENT_ORDS.booleanValue() : ratio <= 0.5 && maxOrd <= 2048)) { + (COLLECT_SEGMENT_ORDS != null ? COLLECT_SEGMENT_ORDS.booleanValue() : ratio <= 0.5 && maxOrd <= 2048)) { /* * We can use the low cardinality execution mode iff this aggregator: * - has no sub-aggregator AND diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/DerivativePipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/DerivativePipelineAggregator.java index 7e07bacf4dc81..b5caf4b760ade 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/DerivativePipelineAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/DerivativePipelineAggregator.java @@ -92,9 +92,9 @@ public InternalAggregation reduce(InternalAggregation aggregation, ReduceContext if (xAxisUnits != null) { xDiff = (thisBucketKey.doubleValue() - lastBucketKey.doubleValue()) / xAxisUnits; } - final List aggs = StreamSupport.stream(bucket.getAggregations().spliterator(), false) - .map((p) -> { return (InternalAggregation) p; }) - .collect(Collectors.toList()); + final List aggs = StreamSupport.stream(bucket.getAggregations().spliterator(), false).map((p) -> { + return (InternalAggregation) p; + }).collect(Collectors.toList()); aggs.add(new InternalDerivative(name(), gradient, xDiff, formatter, metadata())); Bucket newBucket = factory.createBucket(factory.getKey(bucket), bucket.getDocCount(), InternalAggregations.from(aggs)); newBuckets.add(newBucket); diff --git a/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java b/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java index 461c60a98cc3b..ed2111d7ce7ed 100644 --- a/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java +++ b/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java @@ -53,7 +53,9 @@ public class FeatureMigrationResults implements Metadata.Custom { PARSER.declareNamedObjects( ConstructingObjectParser.constructorArg(), (p, c, n) -> new Tuple<>(n, SingleFeatureMigrationResult.fromXContent(p)), - v -> { throw new IllegalArgumentException("ordered " + RESULTS_FIELD.getPreferredName() + " are not supported"); }, + v -> { + throw new IllegalArgumentException("ordered " + RESULTS_FIELD.getPreferredName() + " are not supported"); + }, RESULTS_FIELD ); } diff --git a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationInfo.java b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationInfo.java index 891876e125749..42691a1ab2482 100644 --- a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationInfo.java +++ b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationInfo.java @@ -264,7 +264,9 @@ private static Settings copySettingsForNewIndex(Settings currentIndexSettings, I .filter(Objects::nonNull) .filter(setting -> setting.getProperties().contains(Setting.Property.NotCopyableOnResize) == false) .filter(setting -> setting.getProperties().contains(Setting.Property.PrivateIndex) == false) - .forEach(setting -> { newIndexSettings.put(setting.getKey(), currentIndexSettings.get(setting.getKey())); }); + .forEach(setting -> { + newIndexSettings.put(setting.getKey(), currentIndexSettings.get(setting.getKey())); + }); return newIndexSettings.build(); } diff --git a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java index 798f896c65b6d..566ca1da84e39 100644 --- a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java +++ b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrator.java @@ -301,16 +301,13 @@ private void recordIndexMigrationSuccess(SystemIndexMigrationInfo lastMigrationI MigrationResultsUpdateTask updateTask = MigrationResultsUpdateTask.upsert( lastMigrationInfo.getFeatureName(), SingleFeatureMigrationResult.success(), - ActionListener.wrap( - state -> { - prepareNextIndex( - state, - clusterState -> migrateSingleIndex(clusterState, this::finishIndexAndLoop), - lastMigrationInfo.getFeatureName() - ); - }, - this::markAsFailed - ) + ActionListener.wrap(state -> { + prepareNextIndex( + state, + clusterState -> migrateSingleIndex(clusterState, this::finishIndexAndLoop), + lastMigrationInfo.getFeatureName() + ); + }, this::markAsFailed) ); updateTask.submit(clusterService); } diff --git a/server/src/test/java/org/elasticsearch/action/ActionListenerTests.java b/server/src/test/java/org/elasticsearch/action/ActionListenerTests.java index 1ee9d4e8e653a..03b7f9b29ac15 100644 --- a/server/src/test/java/org/elasticsearch/action/ActionListenerTests.java +++ b/server/src/test/java/org/elasticsearch/action/ActionListenerTests.java @@ -242,10 +242,9 @@ public void onFailure(Exception e) { assertThat(assertionError.getCause(), instanceOf(IllegalArgumentException.class)); assertNull(exReference.get()); - assertionError = expectThrows( - AssertionError.class, - () -> ActionListener.completeWith(listener, () -> { throw new IllegalArgumentException(); }) - ); + assertionError = expectThrows(AssertionError.class, () -> ActionListener.completeWith(listener, () -> { + throw new IllegalArgumentException(); + })); assertThat(assertionError.getCause(), instanceOf(IllegalArgumentException.class)); assertThat(exReference.get(), instanceOf(IllegalArgumentException.class)); } diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java index 8463b9033c9a0..21ec5fbf6a930 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java @@ -366,10 +366,9 @@ public void testGetIndexAnalyserWithoutIndexAnalyzers() { public void testGetFieldAnalyzerWithoutIndexAnalyzers() { AnalyzeAction.Request req = new AnalyzeAction.Request().field("field").text("text"); - IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { TransportAnalyzeAction.analyze(req, registry, null, maxTokenCount); } - ); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + TransportAnalyzeAction.analyze(req, registry, null, maxTokenCount); + }); assertEquals(e.getMessage(), "analysis based on a specific field requires an index"); } diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java index e7922f22e19bd..fb32e99bdfb50 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java @@ -50,10 +50,9 @@ public void tearDown() throws Exception { public void testSetSource() throws IOException { CreateIndexRequestBuilder builder = new CreateIndexRequestBuilder(this.testClient, CreateIndexAction.INSTANCE); - ElasticsearchParseException e = expectThrows( - ElasticsearchParseException.class, - () -> { builder.setSource("{\"" + KEY + "\" : \"" + VALUE + "\"}", XContentType.JSON); } - ); + ElasticsearchParseException e = expectThrows(ElasticsearchParseException.class, () -> { + builder.setSource("{\"" + KEY + "\" : \"" + VALUE + "\"}", XContentType.JSON); + }); assertEquals(String.format(Locale.ROOT, "unknown key [%s] for create index", KEY), e.getMessage()); builder.setSource("{\"settings\" : {\"" + KEY + "\" : \"" + VALUE + "\"}}", XContentType.JSON); diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexActionTests.java index 6a9caee49c1c4..679d263cbc9b7 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexActionTests.java @@ -87,7 +87,9 @@ public void testIncludeDefaults() { "index.refresh_interval should be set as we are including defaults", defaultsResponse.getSetting(indexName, "index.refresh_interval") ), - exception -> { throw new AssertionError(exception); } + exception -> { + throw new AssertionError(exception); + } ) ); } @@ -102,7 +104,9 @@ public void testDoNotIncludeDefaults() { "index.refresh_interval should be null as it was never set", noDefaultsResponse.getSetting(indexName, "index.refresh_interval") ), - exception -> { throw new AssertionError(exception); } + exception -> { + throw new AssertionError(exception); + } ) ); } diff --git a/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestParserTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestParserTests.java index aba5bceca9fc2..5ce3d817c36db 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestParserTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestParserTests.java @@ -35,49 +35,19 @@ public void testIndexRequest() throws IOException { }, req -> fail(), req -> fail()); assertTrue(parsed.get()); - parser.parse( - request, - "foo", - null, - null, - null, - true, - false, - XContentType.JSON, - indexRequest -> { assertTrue(indexRequest.isRequireAlias()); }, - req -> fail(), - req -> fail() - ); + parser.parse(request, "foo", null, null, null, true, false, XContentType.JSON, indexRequest -> { + assertTrue(indexRequest.isRequireAlias()); + }, req -> fail(), req -> fail()); request = new BytesArray("{ \"index\":{ \"_id\": \"bar\", \"require_alias\": true } }\n{}\n"); - parser.parse( - request, - "foo", - null, - null, - null, - null, - false, - XContentType.JSON, - indexRequest -> { assertTrue(indexRequest.isRequireAlias()); }, - req -> fail(), - req -> fail() - ); + parser.parse(request, "foo", null, null, null, null, false, XContentType.JSON, indexRequest -> { + assertTrue(indexRequest.isRequireAlias()); + }, req -> fail(), req -> fail()); request = new BytesArray("{ \"index\":{ \"_id\": \"bar\", \"require_alias\": false } }\n{}\n"); - parser.parse( - request, - "foo", - null, - null, - null, - true, - false, - XContentType.JSON, - indexRequest -> { assertFalse(indexRequest.isRequireAlias()); }, - req -> fail(), - req -> fail() - ); + parser.parse(request, "foo", null, null, null, true, false, XContentType.JSON, indexRequest -> { + assertFalse(indexRequest.isRequireAlias()); + }, req -> fail(), req -> fail()); } public void testDeleteRequest() throws IOException { @@ -106,49 +76,19 @@ public void testUpdateRequest() throws IOException { }, req -> fail()); assertTrue(parsed.get()); - parser.parse( - request, - "foo", - null, - null, - null, - true, - false, - XContentType.JSON, - req -> fail(), - updateRequest -> { assertTrue(updateRequest.isRequireAlias()); }, - req -> fail() - ); + parser.parse(request, "foo", null, null, null, true, false, XContentType.JSON, req -> fail(), updateRequest -> { + assertTrue(updateRequest.isRequireAlias()); + }, req -> fail()); request = new BytesArray("{ \"update\":{ \"_id\": \"bar\", \"require_alias\": true } }\n{}\n"); - parser.parse( - request, - "foo", - null, - null, - null, - null, - false, - XContentType.JSON, - req -> fail(), - updateRequest -> { assertTrue(updateRequest.isRequireAlias()); }, - req -> fail() - ); + parser.parse(request, "foo", null, null, null, null, false, XContentType.JSON, req -> fail(), updateRequest -> { + assertTrue(updateRequest.isRequireAlias()); + }, req -> fail()); request = new BytesArray("{ \"update\":{ \"_id\": \"bar\", \"require_alias\": false } }\n{}\n"); - parser.parse( - request, - "foo", - null, - null, - null, - true, - false, - XContentType.JSON, - req -> fail(), - updateRequest -> { assertFalse(updateRequest.isRequireAlias()); }, - req -> fail() - ); + parser.parse(request, "foo", null, null, null, true, false, XContentType.JSON, req -> fail(), updateRequest -> { + assertFalse(updateRequest.isRequireAlias()); + }, req -> fail()); } public void testBarfOnLackOfTrailingNewline() { diff --git a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java index efed42893d04f..8f3519103a9b5 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java @@ -71,12 +71,9 @@ public void testAllFail() { bulkRequest.add(new IndexRequest("can't")); bulkRequest.add(new DeleteRequest("do").version(0).versionType(VersionType.EXTERNAL)); bulkRequest.add(new UpdateRequest("nothin", randomAlphaOfLength(5), randomAlphaOfLength(5))); - indicesThatCannotBeCreatedTestCase( - newHashSet("no", "can't", "do", "nothin"), - bulkRequest, - index -> true, - index -> { throw new IndexNotFoundException("Can't make it because I say so"); } - ); + indicesThatCannotBeCreatedTestCase(newHashSet("no", "can't", "do", "nothin"), bulkRequest, index -> true, index -> { + throw new IndexNotFoundException("Can't make it because I say so"); + }); } public void testSomeFail() { diff --git a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java index 7125d2809424b..a054c51bea4e0 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java @@ -260,11 +260,9 @@ public void testIngestSkipped() throws Exception { public void testSingleItemBulkActionIngestSkipped() throws Exception { IndexRequest indexRequest = new IndexRequest("index", "type", "id"); indexRequest.source(emptyMap()); - singleItemBulkWriteAction.execute( - null, - indexRequest, - ActionListener.wrap(response -> {}, exception -> { throw new AssertionError(exception); }) - ); + singleItemBulkWriteAction.execute(null, indexRequest, ActionListener.wrap(response -> {}, exception -> { + throw new AssertionError(exception); + })); assertTrue(action.isExecuted); verifyNoMoreInteractions(ingestService); } @@ -726,12 +724,9 @@ public void testIngestCallbackExceptionHandled() throws Exception { AtomicBoolean responseCalled = new AtomicBoolean(false); AtomicBoolean failureCalled = new AtomicBoolean(false); - ActionTestUtils.execute( - action, - null, - bulkRequest, - ActionListener.wrap(response -> { responseCalled.set(true); }, e -> { failureCalled.set(true); }) - ); + ActionTestUtils.execute(action, null, bulkRequest, ActionListener.wrap(response -> { responseCalled.set(true); }, e -> { + failureCalled.set(true); + })); // check failure works, and passes through to the listener assertFalse(action.isExecuted); // haven't executed yet diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java index f8e596238679e..2325c2ba55d1e 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java @@ -63,10 +63,9 @@ public void testSkipSearchShards() throws InterruptedException { int numShards = 10; AtomicReference searchResponse = new AtomicReference<>(); - ActionListener responseListener = ActionListener.wrap( - searchResponse::set, - (e) -> { throw new AssertionError("unexpected", e); } - ); + ActionListener responseListener = ActionListener.wrap(searchResponse::set, (e) -> { + throw new AssertionError("unexpected", e); + }); DiscoveryNode primaryNode = new DiscoveryNode("node_1", buildNewFakeTransportAddress(), Version.CURRENT); DiscoveryNode replicaNode = new DiscoveryNode("node_2", buildNewFakeTransportAddress(), Version.CURRENT); @@ -284,7 +283,9 @@ public void testFanOutAndCollect() throws InterruptedException { AtomicReference response = new AtomicReference<>(); ActionListener responseListener = ActionListener.wrap( searchResponse -> response.set((TestSearchResponse) searchResponse), - (e) -> { throw new AssertionError("unexpected", e); } + (e) -> { + throw new AssertionError("unexpected", e); + } ); DiscoveryNode primaryNode = new DiscoveryNode("node_1", buildNewFakeTransportAddress(), Version.CURRENT); DiscoveryNode replicaNode = new DiscoveryNode("node_2", buildNewFakeTransportAddress(), Version.CURRENT); @@ -615,10 +616,9 @@ public void testSkipUnavailableSearchShards() throws InterruptedException { request.allowPartialSearchResults(true); AtomicReference searchResponse = new AtomicReference<>(); - ActionListener responseListener = ActionListener.wrap( - searchResponse::set, - (e) -> { throw new AssertionError("unexpected", e); } - ); + ActionListener responseListener = ActionListener.wrap(searchResponse::set, (e) -> { + throw new AssertionError("unexpected", e); + }); DiscoveryNode primaryNode = new DiscoveryNode("node_1", buildNewFakeTransportAddress(), Version.CURRENT); final int numUnavailableSkippedShards = randomIntBetween(1, 10); diff --git a/server/src/test/java/org/elasticsearch/client/OriginSettingClientTests.java b/server/src/test/java/org/elasticsearch/client/OriginSettingClientTests.java index 60fece2bcb099..2f83bf62b5b16 100644 --- a/server/src/test/java/org/elasticsearch/client/OriginSettingClientTests.java +++ b/server/src/test/java/org/elasticsearch/client/OriginSettingClientTests.java @@ -53,9 +53,8 @@ protected void } private ActionListener listenerThatAssertsOriginNotSet(ThreadContext threadContext) { - return ActionListener.wrap( - r -> { assertNull(threadContext.getTransient(ThreadContext.ACTION_ORIGIN_TRANSIENT_NAME)); }, - e -> { fail("didn't expect to fail but: " + e); } - ); + return ActionListener.wrap(r -> { assertNull(threadContext.getTransient(ThreadContext.ACTION_ORIGIN_TRANSIENT_NAME)); }, e -> { + fail("didn't expect to fail but: " + e); + }); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java b/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java index ddceec304dbc8..2be3fad43951d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java @@ -62,12 +62,9 @@ protected PrioritizedEsThreadPoolExecutor createThreadPoolExecutor() { } }; - final MasterService masterService = new FakeThreadPoolMasterService( - "test", - "masterService", - threadPool, - r -> { fail("master service should not run any tasks"); } - ); + final MasterService masterService = new FakeThreadPoolMasterService("test", "masterService", threadPool, r -> { + fail("master service should not run any tasks"); + }); final ClusterService clusterService = new ClusterService(settings, clusterSettings, masterService, clusterApplierService); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java index 8355638973d90..b764b111fe6ff 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java @@ -104,9 +104,9 @@ public void testBootstrapsAutomaticallyWithDefaultConfiguration() { settings.put(UNCONFIGURED_BOOTSTRAP_TIMEOUT_SETTING.getKey(), timeout + "ms"); } - final AtomicReference>> discoveredNodesSupplier = new AtomicReference<>( - () -> { throw new AssertionError("should not be called yet"); } - ); + final AtomicReference>> discoveredNodesSupplier = new AtomicReference<>(() -> { + throw new AssertionError("should not be called yet"); + }); final AtomicBoolean bootstrapped = new AtomicBoolean(); ClusterBootstrapService clusterBootstrapService = new ClusterBootstrapService( @@ -160,13 +160,9 @@ public void testDoesNothingByDefaultOnMasterIneligibleNodes() { } private void testDoesNothingWithSettings(Settings.Builder builder) { - ClusterBootstrapService clusterBootstrapService = new ClusterBootstrapService( - builder.build(), - transportService, - () -> { throw new AssertionError("should not be called"); }, - () -> false, - vc -> { throw new AssertionError("should not be called"); } - ); + ClusterBootstrapService clusterBootstrapService = new ClusterBootstrapService(builder.build(), transportService, () -> { + throw new AssertionError("should not be called"); + }, () -> false, vc -> { throw new AssertionError("should not be called"); }); transportService.start(); clusterBootstrapService.scheduleUnconfiguredBootstrap(); deterministicTaskQueue.runAllTasks(); @@ -185,7 +181,9 @@ public void testDoesNothingByDefaultIfZen1NodesDiscovered() { transportService, () -> Stream.of(localNode, zen1Node).collect(Collectors.toSet()), () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); clusterBootstrapService.scheduleUnconfiguredBootstrap(); @@ -199,7 +197,9 @@ public void testThrowsExceptionOnDuplicates() { transportService, Collections::emptyList, () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); }); @@ -328,7 +328,9 @@ public void testDoesNotBootstrapIfNoNodesDiscovered() { transportService, Collections::emptyList, () -> true, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); @@ -351,7 +353,9 @@ public void testDoesNotBootstrapIfTwoOfFiveNodesDiscovered() { transportService, () -> Stream.of(otherNode1).collect(Collectors.toList()), () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); @@ -375,7 +379,9 @@ public void testDoesNotBootstrapIfThreeOfSixNodesDiscovered() { transportService, () -> Stream.of(otherNode1, otherNode2).collect(Collectors.toList()), () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); @@ -391,7 +397,9 @@ public void testDoesNotBootstrapIfAlreadyBootstrapped() { transportService, () -> Stream.of(otherNode1, otherNode2).collect(Collectors.toList()), () -> true, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); @@ -415,7 +423,9 @@ public void testDoesNotBootstrapsOnNonMasterNode() { transportService, () -> Stream.of(localNode, otherNode1, otherNode2).collect(Collectors.toList()), () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); clusterBootstrapService.onFoundPeersUpdated(); @@ -428,7 +438,9 @@ public void testDoesNotBootstrapsIfLocalNodeNotInInitialMasterNodes() { transportService, () -> Stream.of(localNode, otherNode1, otherNode2).collect(Collectors.toList()), () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); clusterBootstrapService.onFoundPeersUpdated(); @@ -441,7 +453,9 @@ public void testDoesNotBootstrapsIfNotConfigured() { transportService, () -> Stream.of(localNode, otherNode1, otherNode2).collect(Collectors.toList()), () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); clusterBootstrapService.scheduleUnconfiguredBootstrap(); @@ -465,7 +479,9 @@ public void testDoesNotBootstrapsIfZen1NodesDiscovered() { transportService, () -> Stream.of(otherNode1, otherNode2, zen1Node).collect(Collectors.toList()), () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); @@ -507,7 +523,9 @@ public void testCancelsBootstrapIfRequirementMatchesMultipleNodes() { transportService, discoveredNodes::get, () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); @@ -530,7 +548,9 @@ public void testCancelsBootstrapIfNodeMatchesMultipleRequirements() { transportService, discoveredNodes::get, () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); @@ -616,7 +636,9 @@ public void testDoesNotJustMatchEverything() { transportService, Collections::emptyList, () -> false, - vc -> { throw new AssertionError("should not be called"); } + vc -> { + throw new AssertionError("should not be called"); + } ); transportService.start(); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java index b3e2cb7d4f0ce..807bf995ec350 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java @@ -1566,11 +1566,9 @@ public void testClusterCannotFormWithFailingJoinValidation() { nodes.stream().map(ClusterNode::getLocalNode).map(DiscoveryNode::getId).collect(Collectors.toSet()) ) == false, () -> randomSubsetOf(cluster.clusterNodes) - ).forEach( - cn -> cn.extraJoinValidators.add( - (discoveryNode, clusterState) -> { throw new IllegalArgumentException("join validation failed"); } - ) - ); + ).forEach(cn -> cn.extraJoinValidators.add((discoveryNode, clusterState) -> { + throw new IllegalArgumentException("join validation failed"); + })); cluster.bootstrapIfNecessary(); cluster.runFor(10000, "failing join validation"); assertTrue(cluster.clusterNodes.stream().allMatch(cn -> cn.getLastAppliedClusterState().version() == 0)); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java index 152db2845465a..ae53b986f685e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java @@ -109,7 +109,9 @@ protected void onSendRequest(long requestId, String action, TransportRequest req settings, transportService, fcr -> { assert false : fcr; }, - (node, reason) -> { assert false : node; }, + (node, reason) -> { + assert false : node; + }, () -> new StatusInfo(StatusInfo.Status.HEALTHY, "healthy-info") ); @@ -721,7 +723,9 @@ public void testPreferMasterNodes() { Settings.EMPTY, transportService, fcr -> { assert false : fcr; }, - (node, reason) -> { assert false : node; }, + (node, reason) -> { + assert false : node; + }, () -> new StatusInfo(HEALTHY, "healthy-info") ); followersChecker.setCurrentNodes(discoveryNodes); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java index ceec8c25c24ac..d6b47d6fe2635 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java @@ -72,7 +72,9 @@ public void testJoinDeduplication() { transportService, () -> 0L, () -> null, - (joinRequest, joinCallback) -> { throw new AssertionError(); }, + (joinRequest, joinCallback) -> { + throw new AssertionError(); + }, startJoinRequest -> { throw new AssertionError(); }, Collections.emptyList(), (s, p, r) -> {}, @@ -226,7 +228,9 @@ private void assertJoinValidationRejectsMismatchedClusterUUID(String actionName) transportService, () -> 0L, () -> localClusterState, - (joinRequest, joinCallback) -> { throw new AssertionError(); }, + (joinRequest, joinCallback) -> { + throw new AssertionError(); + }, startJoinRequest -> { throw new AssertionError(); }, Collections.emptyList(), (s, p, r) -> {}, @@ -326,7 +330,9 @@ public void testJoinFailureOnUnhealthyNodes() { transportService, () -> 0L, () -> null, - (joinRequest, joinCallback) -> { throw new AssertionError(); }, + (joinRequest, joinCallback) -> { + throw new AssertionError(); + }, startJoinRequest -> { throw new AssertionError(); }, Collections.emptyList(), (s, p, r) -> {}, diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java index 83f48e0c7e2c0..153c39cedf292 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java @@ -493,14 +493,9 @@ public void testJoinUpdateVotingConfigExclusion() throws Exception { ) ); - assertTrue( - MasterServiceTests.discoveryState(masterService) - .getVotingConfigExclusions() - .stream() - .anyMatch( - exclusion -> { return "knownNodeName".equals(exclusion.getNodeName()) && "newNodeId".equals(exclusion.getNodeId()); } - ) - ); + assertTrue(MasterServiceTests.discoveryState(masterService).getVotingConfigExclusions().stream().anyMatch(exclusion -> { + return "knownNodeName".equals(exclusion.getNodeName()) && "newNodeId".equals(exclusion.getNodeId()); + })); } private ClusterState buildStateWithVotingConfigExclusion( diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java index 6e4399154843d..b6d0633df88db 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java @@ -728,9 +728,9 @@ public void testParseMappingsAppliesDataFromTemplateAndRequest() throws Exceptio } public void testAggregateSettingsAppliesSettingsFromTemplatesAndRequest() { - IndexTemplateMetadata templateMetadata = addMatchingTemplate( - builder -> { builder.settings(Settings.builder().put("template_setting", "value1")); } - ); + IndexTemplateMetadata templateMetadata = addMatchingTemplate(builder -> { + builder.settings(Settings.builder().put("template_setting", "value1")); + }); ImmutableOpenMap.Builder templatesBuilder = ImmutableOpenMap.builder(); templatesBuilder.put("template_1", templateMetadata); Metadata metadata = new Metadata.Builder().templates(templatesBuilder.build()).build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java index 0a9e26d89feb2..180efbcecb55d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java @@ -162,8 +162,9 @@ public void testRandomClusterPromotesNewestReplica() throws InterruptedException // Pick a random subset of primaries to fail List shardsToFail = new ArrayList<>(); List failedPrimaries = randomSubsetOf(primaries); - failedPrimaries.stream() - .forEach(sr -> { shardsToFail.add(new FailedShard(randomFrom(sr), "failed primary", new Exception(), randomBoolean())); }); + failedPrimaries.stream().forEach(sr -> { + shardsToFail.add(new FailedShard(randomFrom(sr), "failed primary", new Exception(), randomBoolean())); + }); logger.info("--> state before failing shards: {}", state); state = cluster.applyFailedShards(state, shardsToFail); diff --git a/server/src/test/java/org/elasticsearch/common/geo/GeoJsonSerializationTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoJsonSerializationTests.java index 3a71d9a892f8d..1a1b8f7d240d3 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/GeoJsonSerializationTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/GeoJsonSerializationTests.java @@ -77,7 +77,9 @@ private void xContentTest(Supplier instanceSupplier) throws IOExceptio AbstractXContentTestCase.xContentTester( this::createParser, () -> new GeometryWrapper(instanceSupplier.get()), - (geometryWrapper, xContentBuilder) -> { geometryWrapper.toXContent(xContentBuilder, ToXContent.EMPTY_PARAMS); }, + (geometryWrapper, xContentBuilder) -> { + geometryWrapper.toXContent(xContentBuilder, ToXContent.EMPTY_PARAMS); + }, GeometryWrapper::fromXContent ).supportsUnknownFields(true).test(); } diff --git a/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java index 6f69991a668af..e76624b508720 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java @@ -269,13 +269,9 @@ public void testValidator() { } public void testValidatorForFilteredStringSetting() { - final Setting filteredStringSetting = new Setting<>( - "foo.bar", - "foobar", - Function.identity(), - value -> { throw new SettingsException("validate always fails"); }, - Property.Filtered - ); + final Setting filteredStringSetting = new Setting<>("foo.bar", "foobar", Function.identity(), value -> { + throw new SettingsException("validate always fails"); + }, Property.Filtered); final Settings settings = Settings.builder().put(filteredStringSetting.getKey(), filteredStringSetting.getKey() + " value").build(); final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> filteredStringSetting.get(settings)); @@ -1227,16 +1223,14 @@ public void testGroupSettingUpdaterValidator() { validator ); - IllegalArgumentException illegal = expectThrows( - IllegalArgumentException.class, - () -> { updater.getValue(Settings.builder().put("prefix.foo.suffix", 5).put("abc", 2).build(), Settings.EMPTY); } - ); + IllegalArgumentException illegal = expectThrows(IllegalArgumentException.class, () -> { + updater.getValue(Settings.builder().put("prefix.foo.suffix", 5).put("abc", 2).build(), Settings.EMPTY); + }); assertEquals("foo and 2 can't go together", illegal.getMessage()); - illegal = expectThrows( - IllegalArgumentException.class, - () -> { updater.getValue(Settings.builder().put("prefix.bar.suffix", 6).put("abc", 3).build(), Settings.EMPTY); } - ); + illegal = expectThrows(IllegalArgumentException.class, () -> { + updater.getValue(Settings.builder().put("prefix.bar.suffix", 6).put("abc", 3).build(), Settings.EMPTY); + }); assertEquals("no bar", illegal.getMessage()); Settings s = updater.getValue( diff --git a/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java index 78f1025a836d7..fdb5015da4b7d 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java @@ -568,19 +568,17 @@ public void testYamlLegacyList() throws IOException { public void testIndentation() throws Exception { String yaml = "/org/elasticsearch/common/settings/loader/indentation-settings.yml"; - ElasticsearchParseException e = expectThrows( - ElasticsearchParseException.class, - () -> { Settings.builder().loadFromStream(yaml, getClass().getResourceAsStream(yaml), false); } - ); + ElasticsearchParseException e = expectThrows(ElasticsearchParseException.class, () -> { + Settings.builder().loadFromStream(yaml, getClass().getResourceAsStream(yaml), false); + }); assertTrue(e.getMessage(), e.getMessage().contains("malformed")); } public void testIndentationWithExplicitDocumentStart() throws Exception { String yaml = "/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml"; - ElasticsearchParseException e = expectThrows( - ElasticsearchParseException.class, - () -> { Settings.builder().loadFromStream(yaml, getClass().getResourceAsStream(yaml), false); } - ); + ElasticsearchParseException e = expectThrows(ElasticsearchParseException.class, () -> { + Settings.builder().loadFromStream(yaml, getClass().getResourceAsStream(yaml), false); + }); assertTrue(e.getMessage(), e.getMessage().contains("malformed")); } diff --git a/server/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java b/server/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java index cda8fa58943be..51f6d0e0aa370 100644 --- a/server/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java +++ b/server/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java @@ -197,10 +197,9 @@ public void testMultipleSeedsProviders() { } public void testLazyConstructionSeedsProvider() { - DummyHostsProviderPlugin plugin = () -> Collections.singletonMap( - "custom", - () -> { throw new AssertionError("created hosts provider which was not selected"); } - ); + DummyHostsProviderPlugin plugin = () -> Collections.singletonMap("custom", () -> { + throw new AssertionError("created hosts provider which was not selected"); + }); newModule(Settings.EMPTY, Collections.singletonList(plugin)); } diff --git a/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java index d4e613ff81de0..2910db325541d 100644 --- a/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java +++ b/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java @@ -272,11 +272,9 @@ public void testDeleteSafe() throws Exception { expectThrows( ShardLockObtainFailedException.class, - () -> env.deleteShardDirectorySafe( - new ShardId(index, 0), - idxSettings, - shardPaths -> { assert false : "should not be called " + shardPaths; } - ) + () -> env.deleteShardDirectorySafe(new ShardId(index, 0), idxSettings, shardPaths -> { + assert false : "should not be called " + shardPaths; + }) ); for (Path path : env.indexPaths(index)) { @@ -300,12 +298,9 @@ public void testDeleteSafe() throws Exception { expectThrows( ShardLockObtainFailedException.class, - () -> env.deleteIndexDirectorySafe( - index, - randomIntBetween(0, 10), - idxSettings, - indexPaths -> { assert false : "should not be called " + indexPaths; } - ) + () -> env.deleteIndexDirectorySafe(index, randomIntBetween(0, 10), idxSettings, indexPaths -> { + assert false : "should not be called " + indexPaths; + }) ); fooLock.close(); diff --git a/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java index f7fa10613c5bf..d32e8356c7c5f 100644 --- a/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java +++ b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java @@ -90,9 +90,9 @@ public void testCustomMetadataNoChange() { public void testIndexTemplateValidation() { Metadata metadata = randomMetadata(); - MetadataUpgrader metadataUpgrader = new MetadataUpgrader( - Collections.singletonList(customs -> { throw new IllegalStateException("template is incompatible"); }) - ); + MetadataUpgrader metadataUpgrader = new MetadataUpgrader(Collections.singletonList(customs -> { + throw new IllegalStateException("template is incompatible"); + })); String message = expectThrows( IllegalStateException.class, () -> GatewayMetaState.upgradeMetadata(metadata, new MockIndexMetadataVerifier(false), metadataUpgrader) diff --git a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java index 67ad452ad0b61..7a4324baa1fd2 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java @@ -73,8 +73,9 @@ public void testSettingsUpdateValidator() { Setting integerSetting = Setting.intSetting("index.test.setting.int", -1, Property.Dynamic, Property.IndexScope); IndexMetadata metadata = newIndexMeta("index", theSettings); IndexSettings settings = newIndexSettings(newIndexMeta("index", theSettings), Settings.EMPTY, integerSetting); - settings.getScopedSettings() - .addSettingsUpdateConsumer(integerSetting, integer::set, (i) -> { if (i == 42) throw new AssertionError("boom"); }); + settings.getScopedSettings().addSettingsUpdateConsumer(integerSetting, integer::set, (i) -> { + if (i == 42) throw new AssertionError("boom"); + }); assertEquals(version, settings.getIndexVersionCreated()); assertEquals("0xdeadbeef", settings.getUUID()); @@ -627,15 +628,15 @@ public void testArchivedSettingsValidation() { } public void testArchiveBrokenIndexSettings() { - Settings settings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS.archiveUnknownOrInvalidSettings( - Settings.EMPTY, - e -> { assert false : "should not have been invoked, no unknown settings"; }, - (e, ex) -> { assert false : "should not have been invoked, no invalid settings"; } - ); + Settings settings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS.archiveUnknownOrInvalidSettings(Settings.EMPTY, e -> { + assert false : "should not have been invoked, no unknown settings"; + }, (e, ex) -> { assert false : "should not have been invoked, no invalid settings"; }); assertSame(settings, Settings.EMPTY); settings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS.archiveUnknownOrInvalidSettings( Settings.builder().put("index.refresh_interval", "-200").build(), - e -> { assert false : "should not have been invoked, no invalid settings"; }, + e -> { + assert false : "should not have been invoked, no invalid settings"; + }, (e, ex) -> { assertThat(e.getKey(), equalTo("index.refresh_interval")); assertThat(e.getValue(), equalTo("-200")); @@ -646,11 +647,9 @@ public void testArchiveBrokenIndexSettings() { assertNull(settings.get("index.refresh_interval")); Settings prevSettings = settings; // no double archive - settings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS.archiveUnknownOrInvalidSettings( - prevSettings, - e -> { assert false : "should not have been invoked, no unknown settings"; }, - (e, ex) -> { assert false : "should not have been invoked, no invalid settings"; } - ); + settings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS.archiveUnknownOrInvalidSettings(prevSettings, e -> { + assert false : "should not have been invoked, no unknown settings"; + }, (e, ex) -> { assert false : "should not have been invoked, no invalid settings"; }); assertSame(prevSettings, settings); settings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS.archiveUnknownOrInvalidSettings( diff --git a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java index 0c0be33622d25..e9af3c5476204 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java @@ -462,13 +462,10 @@ public Map> getTokenFilters() { .build(); IndexSettings exceptionSettings = IndexSettingsModule.newIndexSettings("index", indexSettings); - IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { - new AnalysisModule(TestEnvironment.newEnvironment(settings), singletonList(plugin)).getAnalysisRegistry() - .build(exceptionSettings); - } - ); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + new AnalysisModule(TestEnvironment.newEnvironment(settings), singletonList(plugin)).getAnalysisRegistry() + .build(exceptionSettings); + }); assertEquals("Cannot use token filter [exception]", e.getMessage()); } diff --git a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java index 5c931016e79e8..ccb2c79dd4963 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java @@ -35,9 +35,9 @@ public class CompletionStatsCacheTests extends ESTestCase { public void testExceptionsAreNotCached() { final AtomicInteger openCount = new AtomicInteger(); - final CompletionStatsCache completionStatsCache = new CompletionStatsCache( - () -> { throw new ElasticsearchException("simulated " + openCount.incrementAndGet()); } - ); + final CompletionStatsCache completionStatsCache = new CompletionStatsCache(() -> { + throw new ElasticsearchException("simulated " + openCount.incrementAndGet()); + }); assertThat(expectThrows(ElasticsearchException.class, completionStatsCache::get).getMessage(), equalTo("simulated 1")); assertThat(expectThrows(ElasticsearchException.class, completionStatsCache::get).getMessage(), equalTo("simulated 2")); diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java index f51d2e8b0ef8d..c543fd7903179 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java @@ -303,10 +303,9 @@ private void doTestRequireDocValues(MappedFieldType ft) { if (ft.hasDocValues()) { ifds.getForField(ft, "test", () -> { throw new UnsupportedOperationException(); }); // no exception } else { - IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> ifds.getForField(ft, "test", () -> { throw new UnsupportedOperationException(); }) - ); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> ifds.getForField(ft, "test", () -> { + throw new UnsupportedOperationException(); + })); assertThat(e.getMessage(), containsString("doc values")); } } finally { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java index 2c32364b90c0d..bf829499fd998 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java @@ -152,10 +152,9 @@ public void testConcurrentMergeTest() throws Throwable { final MapperService mapperService = createMapperService(mapping(b -> {})); final DocumentMapper documentMapper = mapperService.documentMapper(); - expectThrows( - IllegalArgumentException.class, - () -> documentMapper.mappers().indexAnalyzer("non_existing_field", f -> { throw new IllegalArgumentException(); }) - ); + expectThrows(IllegalArgumentException.class, () -> documentMapper.mappers().indexAnalyzer("non_existing_field", f -> { + throw new IllegalArgumentException(); + })); final AtomicBoolean stopped = new AtomicBoolean(false); final CyclicBarrier barrier = new CyclicBarrier(2); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java index 47c0f6e51eaf3..c2928150e854c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java @@ -52,10 +52,9 @@ public void testEnableFieldData() throws IOException { MapperService mapperService = createMapperService(() -> enabled[0], mapping(b -> {})); IdFieldMapper.IdFieldType ft = (IdFieldMapper.IdFieldType) mapperService.fieldType("_id"); - IllegalArgumentException exc = expectThrows( - IllegalArgumentException.class, - () -> ft.fielddataBuilder("test", () -> { throw new UnsupportedOperationException(); }).build(null, null) - ); + IllegalArgumentException exc = expectThrows(IllegalArgumentException.class, () -> ft.fielddataBuilder("test", () -> { + throw new UnsupportedOperationException(); + }).build(null, null)); assertThat(exc.getMessage(), containsString(IndicesService.INDICES_ID_FIELD_DATA_ENABLED_SETTING.getKey())); assertFalse(ft.isAggregatable()); @@ -68,21 +67,19 @@ public void testEnableFieldData() throws IOException { public void testFetchIdFieldValue() throws IOException { MapperService mapperService = createMapperService(fieldMapping(b -> b.field("type", "keyword"))); String id = randomAlphaOfLength(12); - withLuceneIndex( - mapperService, - iw -> { iw.addDocument(mapperService.documentMapper().parse(source(id, b -> b.field("field", "value"), null)).rootDoc()); }, - iw -> { - SearchLookup lookup = new SearchLookup(mapperService::fieldType, fieldDataLookup()); - SearchExecutionContext searchExecutionContext = mock(SearchExecutionContext.class); - when(searchExecutionContext.lookup()).thenReturn(lookup); - IdFieldMapper.IdFieldType ft = (IdFieldMapper.IdFieldType) mapperService.fieldType("_id"); - ValueFetcher valueFetcher = ft.valueFetcher(searchExecutionContext, null); - IndexSearcher searcher = newSearcher(iw); - LeafReaderContext context = searcher.getIndexReader().leaves().get(0); - lookup.source().setSegmentAndDocument(context, 0); - valueFetcher.setNextReader(context); - assertEquals(Collections.singletonList(id), valueFetcher.fetchValues(lookup.source(), List.of())); - } - ); + withLuceneIndex(mapperService, iw -> { + iw.addDocument(mapperService.documentMapper().parse(source(id, b -> b.field("field", "value"), null)).rootDoc()); + }, iw -> { + SearchLookup lookup = new SearchLookup(mapperService::fieldType, fieldDataLookup()); + SearchExecutionContext searchExecutionContext = mock(SearchExecutionContext.class); + when(searchExecutionContext.lookup()).thenReturn(lookup); + IdFieldMapper.IdFieldType ft = (IdFieldMapper.IdFieldType) mapperService.fieldType("_id"); + ValueFetcher valueFetcher = ft.valueFetcher(searchExecutionContext, null); + IndexSearcher searcher = newSearcher(iw); + LeafReaderContext context = searcher.getIndexReader().leaves().get(0); + lookup.source().setSegmentAndDocument(context, 0); + valueFetcher.setNextReader(context); + assertEquals(Collections.singletonList(id), valueFetcher.fetchValues(lookup.source(), List.of())); + }); } } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldMapperTests.java index 8bb355c12d0ba..5b2971272a151 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldMapperTests.java @@ -45,22 +45,20 @@ public void testDefaults() throws IOException { public void testFetchIgnoredFieldValue() throws IOException { MapperService mapperService = createMapperService(fieldMapping(b -> b.field("type", "keyword").field("ignore_above", 3))); - withLuceneIndex( - mapperService, - iw -> { iw.addDocument(mapperService.documentMapper().parse(source(b -> b.field("field", "value"))).rootDoc()); }, - iw -> { - SearchLookup lookup = new SearchLookup(mapperService::fieldType, fieldDataLookup()); - SearchExecutionContext searchExecutionContext = mock(SearchExecutionContext.class); - when(searchExecutionContext.lookup()).thenReturn(lookup); - IgnoredFieldMapper.IgnoredFieldType ft = (IgnoredFieldMapper.IgnoredFieldType) mapperService.fieldType("_ignored"); - ValueFetcher valueFetcher = ft.valueFetcher(searchExecutionContext, null); - IndexSearcher searcher = newSearcher(iw); - LeafReaderContext context = searcher.getIndexReader().leaves().get(0); - lookup.source().setSegmentAndDocument(context, 0); - valueFetcher.setNextReader(context); - assertEquals(List.of("field"), valueFetcher.fetchValues(lookup.source(), List.of())); - } - ); + withLuceneIndex(mapperService, iw -> { + iw.addDocument(mapperService.documentMapper().parse(source(b -> b.field("field", "value"))).rootDoc()); + }, iw -> { + SearchLookup lookup = new SearchLookup(mapperService::fieldType, fieldDataLookup()); + SearchExecutionContext searchExecutionContext = mock(SearchExecutionContext.class); + when(searchExecutionContext.lookup()).thenReturn(lookup); + IgnoredFieldMapper.IgnoredFieldType ft = (IgnoredFieldMapper.IgnoredFieldType) mapperService.fieldType("_ignored"); + ValueFetcher valueFetcher = ft.valueFetcher(searchExecutionContext, null); + IndexSearcher searcher = newSearcher(iw); + LeafReaderContext context = searcher.getIndexReader().leaves().get(0); + lookup.source().setSegmentAndDocument(context, 0); + valueFetcher.setNextReader(context); + assertEquals(List.of("field"), valueFetcher.fetchValues(lookup.source(), List.of())); + }); } } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java index 304a1373511b5..0344eba97e5ef 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java @@ -40,7 +40,9 @@ private static MappingParser createMappingParser(Settings settings, NamedXConten mapperRegistry.getMapperParsers()::get, mapperRegistry.getRuntimeFieldParsers()::get, indexSettings.getIndexVersionCreated(), - () -> { throw new UnsupportedOperationException(); }, + () -> { + throw new UnsupportedOperationException(); + }, null, scriptService, indexAnalyzers, diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java index 68c7c04b61b59..bcb849067c767 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java @@ -531,10 +531,9 @@ public void doTestIndexSortRangeQueries(NumberType type, Supplier valueS // Create an index writer configured with the same index sort. NumberFieldType fieldType = new NumberFieldType("field", type); - IndexNumericFieldData fielddata = (IndexNumericFieldData) fieldType.fielddataBuilder( - "index", - () -> { throw new UnsupportedOperationException(); } - ).build(null, null); + IndexNumericFieldData fielddata = (IndexNumericFieldData) fieldType.fielddataBuilder("index", () -> { + throw new UnsupportedOperationException(); + }).build(null, null); SortField sortField = fielddata.sortField(null, MultiValueMode.MIN, null, randomBoolean()); IndexWriterConfig writerConfig = new IndexWriterConfig(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java index a09bb8352cdac..dba22b7a65bd2 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java @@ -268,7 +268,9 @@ private static TestMapper fromMapping(String mapping, Version version, boolean f ScriptCompiler.NONE, mapperService.getIndexAnalyzers(), mapperService.getIndexSettings(), - () -> { throw new UnsupportedOperationException(); } + () -> { + throw new UnsupportedOperationException(); + } ); if (fromDynamicTemplate) { pc = new MappingParserContext.DynamicTemplateParserContext(pc); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java index 65781a6511e35..0a278e645e396 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java @@ -537,10 +537,9 @@ public void testEagerGlobalOrdinals() throws IOException { public void testFielddata() throws IOException { MapperService disabledMapper = createMapperService(fieldMapping(this::minimalMapping)); - Exception e = expectThrows( - IllegalArgumentException.class, - () -> disabledMapper.fieldType("field").fielddataBuilder("test", () -> { throw new UnsupportedOperationException(); }) - ); + Exception e = expectThrows(IllegalArgumentException.class, () -> disabledMapper.fieldType("field").fielddataBuilder("test", () -> { + throw new UnsupportedOperationException(); + })); assertThat(e.getMessage(), containsString("Text fields are not optimised for operations that require per-document field data")); MapperService enabledMapper = createMapperService(fieldMapping(b -> b.field("type", "text").field("fielddata", true))); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java index 89ff659472cfc..ad9471adf327c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java @@ -77,7 +77,9 @@ public void testMultiFieldWithinMultiField() throws IOException { ScriptCompiler.NONE, mapperService.getIndexAnalyzers(), mapperService.getIndexSettings(), - () -> { throw new UnsupportedOperationException(); } + () -> { + throw new UnsupportedOperationException(); + } ); TextFieldMapper.PARSER.parse("some-field", fieldNode, olderContext); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedIndexFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedIndexFieldDataTests.java index 64dc0e2c9c3ef..59a55b600f58a 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedIndexFieldDataTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedIndexFieldDataTests.java @@ -70,11 +70,9 @@ public void onCache(ShardId shardId, String fieldName, Accountable ramUsage) { DirectoryReader reader = ElasticsearchDirectoryReader.wrap(DirectoryReader.open(writer), new ShardId("test", "_na_", 1)); // Load global field data for subfield 'key'. - IndexFieldData ifd1 = ifdService.getForField( - fieldType1, - "test", - () -> { throw new UnsupportedOperationException("search lookup not available"); } - ); + IndexFieldData ifd1 = ifdService.getForField(fieldType1, "test", () -> { + throw new UnsupportedOperationException("search lookup not available"); + }); assertTrue(ifd1 instanceof KeyedFlattenedFieldData); KeyedFlattenedFieldData fieldData1 = (KeyedFlattenedFieldData) ifd1; @@ -84,11 +82,9 @@ public void onCache(ShardId shardId, String fieldName, Accountable ramUsage) { // Load global field data for the subfield 'other_key'. MappedFieldType fieldType2 = fieldMapper.fieldType().getChildFieldType("other_key"); - IndexFieldData ifd2 = ifdService.getForField( - fieldType2, - "test", - () -> { throw new UnsupportedOperationException("search lookup not available"); } - ); + IndexFieldData ifd2 = ifdService.getForField(fieldType2, "test", () -> { + throw new UnsupportedOperationException("search lookup not available"); + }); assertTrue(ifd2 instanceof KeyedFlattenedFieldData); KeyedFlattenedFieldData fieldData2 = (KeyedFlattenedFieldData) ifd2; diff --git a/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java index 876f5759741e1..3cd18e016f0e5 100644 --- a/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java @@ -213,12 +213,9 @@ static InnerHitBuilder mutate(InnerHitBuilder original) throws IOException { }); modifiers.add(() -> { if (randomBoolean()) { - copy.setScriptFields( - randomValueOtherThan( - copy.getScriptFields(), - () -> { return new HashSet<>(randomListStuff(16, InnerHitBuilderTests::randomScript)); } - ) - ); + copy.setScriptFields(randomValueOtherThan(copy.getScriptFields(), () -> { + return new HashSet<>(randomListStuff(16, InnerHitBuilderTests::randomScript)); + })); } else { SearchSourceBuilder.ScriptField script = randomScript(); copy.addScriptField(script.fieldName(), script.script()); diff --git a/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryParserTests.java b/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryParserTests.java index aeaec0c093dd9..94baf3a239b1f 100644 --- a/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryParserTests.java @@ -92,14 +92,9 @@ public void setup() throws IOException { } public void testCrossFieldMultiMatchQuery() throws IOException { - SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ); + SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()); searchExecutionContext.setAllowUnmappedFields(true); for (float tieBreaker : new float[] { 0.0f, 0.5f }) { Query parsedQuery = multiMatchQuery("banon").field("name.first", 2) @@ -124,21 +119,9 @@ public void testBlendTerms() { Term[] terms = new Term[] { new Term("foo", "baz"), new Term("bar", "baz") }; float[] boosts = new float[] { 2, 3 }; Query expected = BlendedTermQuery.dismaxBlendedQuery(terms, boosts, 1.0f); - Query actual = MultiMatchQueryParser.blendTerm( - indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ), - new BytesRef("baz"), - null, - 1f, - false, - Arrays.asList(new FieldAndBoost(ft1, 2), new FieldAndBoost(ft2, 3)) - ); + Query actual = MultiMatchQueryParser.blendTerm(indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()), new BytesRef("baz"), null, 1f, false, Arrays.asList(new FieldAndBoost(ft1, 2), new FieldAndBoost(ft2, 3))); assertEquals(expected, actual); } @@ -150,21 +133,9 @@ public void testBlendTermsWithFieldBoosts() { Term[] terms = new Term[] { new Term("foo", "baz"), new Term("bar", "baz") }; float[] boosts = new float[] { 200, 30 }; Query expected = BlendedTermQuery.dismaxBlendedQuery(terms, boosts, 1.0f); - Query actual = MultiMatchQueryParser.blendTerm( - indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ), - new BytesRef("baz"), - null, - 1f, - false, - Arrays.asList(new FieldAndBoost(ft1, 2), new FieldAndBoost(ft2, 3)) - ); + Query actual = MultiMatchQueryParser.blendTerm(indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()), new BytesRef("baz"), null, 1f, false, Arrays.asList(new FieldAndBoost(ft1, 2), new FieldAndBoost(ft2, 3))); assertEquals(expected, actual); } @@ -185,21 +156,9 @@ public Query termQuery(Object value, SearchExecutionContext context) { ), 1f ); - Query actual = MultiMatchQueryParser.blendTerm( - indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ), - new BytesRef("baz"), - null, - 1f, - true, - Arrays.asList(new FieldAndBoost(ft1, 2), new FieldAndBoost(ft2, 3)) - ); + Query actual = MultiMatchQueryParser.blendTerm(indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()), new BytesRef("baz"), null, 1f, true, Arrays.asList(new FieldAndBoost(ft1, 2), new FieldAndBoost(ft2, 3))); assertEquals(expected, actual); } @@ -212,21 +171,9 @@ public Query termQuery(Object value, SearchExecutionContext context) { }; expectThrows( IllegalArgumentException.class, - () -> MultiMatchQueryParser.blendTerm( - indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ), - new BytesRef("baz"), - null, - 1f, - false, - Arrays.asList(new FieldAndBoost(ft, 1)) - ) + () -> MultiMatchQueryParser.blendTerm(indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()), new BytesRef("baz"), null, 1f, false, Arrays.asList(new FieldAndBoost(ft, 1))) ); } @@ -243,33 +190,16 @@ public Query termQuery(Object value, SearchExecutionContext context) { Query expectedDisjunct1 = BlendedTermQuery.dismaxBlendedQuery(terms, boosts, 1.0f); Query expectedDisjunct2 = new BoostQuery(new MatchAllDocsQuery(), 3); Query expected = new DisjunctionMaxQuery(Arrays.asList(expectedDisjunct2, expectedDisjunct1), 1.0f); - Query actual = MultiMatchQueryParser.blendTerm( - indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ), - new BytesRef("baz"), - null, - 1f, - false, - Arrays.asList(new FieldAndBoost(ft1, 2), new FieldAndBoost(ft2, 3)) - ); + Query actual = MultiMatchQueryParser.blendTerm(indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()), new BytesRef("baz"), null, 1f, false, Arrays.asList(new FieldAndBoost(ft1, 2), new FieldAndBoost(ft2, 3))); assertEquals(expected, actual); } public void testMultiMatchCrossFieldsWithSynonyms() throws IOException { - SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ); + SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()); MultiMatchQueryParser parser = new MultiMatchQueryParser(searchExecutionContext); parser.setAnalyzer(new MockSynonymAnalyzer()); @@ -300,14 +230,9 @@ public void testMultiMatchCrossFieldsWithSynonyms() throws IOException { } public void testCrossFieldsWithSynonymsPhrase() throws IOException { - SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ); + SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()); MultiMatchQueryParser parser = new MultiMatchQueryParser(searchExecutionContext); parser.setAnalyzer(new MockSynonymAnalyzer()); Map fieldNames = new HashMap<>(); @@ -397,14 +322,9 @@ public void testKeywordSplitQueriesOnWhitespace() throws IOException { .endObject() ); mapperService.merge("type", new CompressedXContent(mapping), MapperService.MergeReason.MAPPING_UPDATE); - SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext( - randomInt(20), - 0, - null, - () -> { throw new UnsupportedOperationException(); }, - null, - emptyMap() - ); + SearchExecutionContext searchExecutionContext = indexService.newSearchExecutionContext(randomInt(20), 0, null, () -> { + throw new UnsupportedOperationException(); + }, null, emptyMap()); MultiMatchQueryParser parser = new MultiMatchQueryParser(searchExecutionContext); Map fieldNames = new HashMap<>(); fieldNames.put("field", 1.0f); diff --git a/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java index ceaede694c9b3..66d5245a7fd39 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java @@ -601,11 +601,9 @@ public void testFailingListenerAfterTimeout() throws InterruptedException { }).when(mockLogger).warn(any(String.class), any(RuntimeException.class)); final GlobalCheckpointListeners globalCheckpointListeners = new GlobalCheckpointListeners(shardId, scheduler, mockLogger); final TimeValue timeout = TimeValue.timeValueMillis(randomIntBetween(1, 50)); - globalCheckpointListeners.add( - NO_OPS_PERFORMED, - maybeMultipleInvocationProtectingListener((g, e) -> { throw new RuntimeException("failure"); }), - timeout - ); + globalCheckpointListeners.add(NO_OPS_PERFORMED, maybeMultipleInvocationProtectingListener((g, e) -> { + throw new RuntimeException("failure"); + }), timeout); latch.await(); final ArgumentCaptor message = ArgumentCaptor.forClass(String.class); final ArgumentCaptor t = ArgumentCaptor.forClass(RuntimeException.class); diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 9c7e1e9fa0a97..646b859b516a8 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -2742,11 +2742,9 @@ public void testReaderWrapperWorksWithGlobalOrdinals() throws IOException { indicesFieldDataCache, new NoneCircuitBreakerService() ); - IndexFieldData.Global ifd = indexFieldDataService.getForField( - foo, - "test", - () -> { throw new UnsupportedOperationException("search lookup not available"); } - ); + IndexFieldData.Global ifd = indexFieldDataService.getForField(foo, "test", () -> { + throw new UnsupportedOperationException("search lookup not available"); + }); FieldDataStats before = shard.fieldData().stats("foo"); assertThat(before.getMemorySizeInBytes(), equalTo(0L)); FieldDataStats after = null; diff --git a/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java b/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java index 9eb9e4a1e29fc..b2c5336d70cad 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java @@ -115,7 +115,9 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest SearchOperationListener throwingListener = (SearchOperationListener) Proxy.newProxyInstance( SearchOperationListener.class.getClassLoader(), new Class[] { SearchOperationListener.class }, - (a, b, c) -> { throw new RuntimeException(); } + (a, b, c) -> { + throw new RuntimeException(); + } ); int throwingListeners = 0; final List indexingOperationListeners = new ArrayList<>(Arrays.asList(listener, listener)); diff --git a/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java index 27943a037576b..5fd1712100c51 100644 --- a/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java +++ b/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java @@ -88,10 +88,9 @@ public double execute( ) { StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); - if (Arrays.stream(stackTraceElements) - .anyMatch( - ste -> { return ste.getClassName().endsWith(".TermScorer") && ste.getMethodName().equals("score"); } - ) == false) { + if (Arrays.stream(stackTraceElements).anyMatch(ste -> { + return ste.getClassName().endsWith(".TermScorer") && ste.getMethodName().equals("score"); + }) == false) { // this might happen when computing max scores return Float.MAX_VALUE; } @@ -187,10 +186,9 @@ public double execute( ) { StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); - if (Arrays.stream(stackTraceElements) - .anyMatch( - ste -> { return ste.getClassName().endsWith(".TermScorer") && ste.getMethodName().equals("score"); } - ) == false) { + if (Arrays.stream(stackTraceElements).anyMatch(ste -> { + return ste.getClassName().endsWith(".TermScorer") && ste.getMethodName().equals("score"); + }) == false) { // this might happen when computing max scores return Float.MAX_VALUE; } diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java index 05732e27216d6..74caa35d82999 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java @@ -153,7 +153,9 @@ public void testWriteFileChunksConcurrently() throws Exception { r.content(), r.lastChunk(), r.totalTranslogOps(), - ActionListener.wrap(ignored -> {}, e -> { throw new AssertionError(e); }) + ActionListener.wrap(ignored -> {}, e -> { + throw new AssertionError(e); + }) ); } } catch (Exception e) { diff --git a/server/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java b/server/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java index 43c5ac21e6607..9ecd9c0d69c8f 100644 --- a/server/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java +++ b/server/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java @@ -51,9 +51,9 @@ public void testEmpty() throws Exception { public void testSingleProcessor() throws Exception { LongSupplier relativeTimeProvider = mock(LongSupplier.class); when(relativeTimeProvider.getAsLong()).thenReturn(0L, TimeUnit.MILLISECONDS.toNanos(1)); - TestProcessor processor = new TestProcessor( - ingestDocument -> { assertStats(0, ingestDocument.getFieldValue("compoundProcessor", CompoundProcessor.class), 1, 0, 0, 0); } - ); + TestProcessor processor = new TestProcessor(ingestDocument -> { + assertStats(0, ingestDocument.getFieldValue("compoundProcessor", CompoundProcessor.class), 1, 0, 0, 0); + }); CompoundProcessor compoundProcessor = new CompoundProcessor(relativeTimeProvider, processor); ingestDocument.setFieldValue("compoundProcessor", compoundProcessor); // ugly hack to assert current count = 1 assertThat(compoundProcessor.getProcessors().size(), equalTo(1)); diff --git a/server/src/test/java/org/elasticsearch/ingest/ConditionalProcessorTests.java b/server/src/test/java/org/elasticsearch/ingest/ConditionalProcessorTests.java index aca5c1c8f77b7..1b94d5eda8183 100644 --- a/server/src/test/java/org/elasticsearch/ingest/ConditionalProcessorTests.java +++ b/server/src/test/java/org/elasticsearch/ingest/ConditionalProcessorTests.java @@ -190,13 +190,9 @@ public String getDescription() { } public void testPrecompiledError() { - ScriptService scriptService = MockScriptService.singleContext( - IngestConditionalScript.CONTEXT, - code -> { - throw new ScriptException("bad script", new ParseException("error", 0), org.elasticsearch.core.List.of(), "", "lang", null); - }, - org.elasticsearch.core.Map.of() - ); + ScriptService scriptService = MockScriptService.singleContext(IngestConditionalScript.CONTEXT, code -> { + throw new ScriptException("bad script", new ParseException("error", 0), org.elasticsearch.core.List.of(), "", "lang", null); + }, org.elasticsearch.core.Map.of()); Script script = new Script(ScriptType.INLINE, "lang", "foo", org.elasticsearch.core.Map.of()); ScriptException e = expectThrows(ScriptException.class, () -> new ConditionalProcessor(null, null, script, scriptService, null)); assertThat(e.getMessage(), equalTo("bad script")); diff --git a/server/src/test/java/org/elasticsearch/ingest/PipelineProcessorTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineProcessorTests.java index f999bbc2f8d4e..430dcac4d9292 100644 --- a/server/src/test/java/org/elasticsearch/ingest/PipelineProcessorTests.java +++ b/server/src/test/java/org/elasticsearch/ingest/PipelineProcessorTests.java @@ -151,26 +151,16 @@ public void testPipelineProcessorWithPipelineChain() throws Exception { null, null, null, - new CompoundProcessor( - true, - Arrays.asList( - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key1, randomInt()); }), - pipeline2Processor - ), - Collections.emptyList() - ), + new CompoundProcessor(true, Arrays.asList(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key1, randomInt()); + }), pipeline2Processor), Collections.emptyList()), relativeTimeProvider ); relativeTimeProvider = mock(LongSupplier.class); when(relativeTimeProvider.getAsLong()).thenReturn(0L, TimeUnit.MILLISECONDS.toNanos(2)); - Pipeline pipeline3 = new Pipeline( - pipeline3Id, - null, - null, - null, - new CompoundProcessor(new TestProcessor(ingestDocument -> { throw new RuntimeException("error"); })), - relativeTimeProvider - ); + Pipeline pipeline3 = new Pipeline(pipeline3Id, null, null, null, new CompoundProcessor(new TestProcessor(ingestDocument -> { + throw new RuntimeException("error"); + })), relativeTimeProvider); when(ingestService.getPipeline(pipeline1Id)).thenReturn(pipeline1); when(ingestService.getPipeline(pipeline2Id)).thenReturn(pipeline2); when(ingestService.getPipeline(pipeline3Id)).thenReturn(pipeline3); diff --git a/server/src/test/java/org/elasticsearch/ingest/TrackingResultProcessorTests.java b/server/src/test/java/org/elasticsearch/ingest/TrackingResultProcessorTests.java index 4d0d3e216eb26..b38e2aa510561 100644 --- a/server/src/test/java/org/elasticsearch/ingest/TrackingResultProcessorTests.java +++ b/server/src/test/java/org/elasticsearch/ingest/TrackingResultProcessorTests.java @@ -257,14 +257,17 @@ public void testActualCompoundProcessorWithFalseConditional() throws Exception { new HashMap<>(ScriptModule.CORE_CONTEXTS) ); - CompoundProcessor compoundProcessor = new CompoundProcessor( - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key1, randomInt()); }), + CompoundProcessor compoundProcessor = new CompoundProcessor(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key1, randomInt()); + }), new ConditionalProcessor( randomAlphaOfLength(10), null, new Script(ScriptType.INLINE, Script.DEFAULT_SCRIPT_LANG, scriptName, Collections.emptyMap()), scriptService, - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key2, randomInt()); }) + new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key2, randomInt()); + }) ), new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key3, randomInt()); }) ); @@ -308,17 +311,11 @@ public void testActualPipelineProcessor() throws Exception { String key2 = randomAlphaOfLength(10); String key3 = randomAlphaOfLength(10); - Pipeline pipeline = new Pipeline( - pipelineId, - null, - null, - null, - new CompoundProcessor( - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key1, randomInt()); }), - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key2, randomInt()); }), - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key3, randomInt()); }) - ) - ); + Pipeline pipeline = new Pipeline(pipelineId, null, null, null, new CompoundProcessor(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key1, randomInt()); + }), new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key2, randomInt()); }), new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key3, randomInt()); + }))); when(ingestService.getPipeline(pipelineId)).thenReturn(pipeline); PipelineProcessor pipelineProcessor = factory.create(Collections.emptyMap(), null, null, pipelineConfig); @@ -384,31 +381,24 @@ public void testActualPipelineProcessorWithTrueConditional() throws Exception { new HashMap<>(ScriptModule.CORE_CONTEXTS) ); - Pipeline pipeline1 = new Pipeline( - pipelineId1, - null, - null, - null, - new CompoundProcessor( - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key1, randomInt()); }), - new ConditionalProcessor( - randomAlphaOfLength(10), - null, - new Script(ScriptType.INLINE, Script.DEFAULT_SCRIPT_LANG, scriptName, Collections.emptyMap()), - scriptService, - factory.create(Collections.emptyMap(), "pipeline1", null, pipelineConfig2) - ), - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key3, randomInt()); }) - ) - ); + Pipeline pipeline1 = new Pipeline(pipelineId1, null, null, null, new CompoundProcessor(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key1, randomInt()); + }), + new ConditionalProcessor( + randomAlphaOfLength(10), + null, + new Script(ScriptType.INLINE, Script.DEFAULT_SCRIPT_LANG, scriptName, Collections.emptyMap()), + scriptService, + factory.create(Collections.emptyMap(), "pipeline1", null, pipelineConfig2) + ), + new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key3, randomInt()); + }) + )); - Pipeline pipeline2 = new Pipeline( - pipelineId2, - null, - null, - null, - new CompoundProcessor(new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key2, randomInt()); })) - ); + Pipeline pipeline2 = new Pipeline(pipelineId2, null, null, null, new CompoundProcessor(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key2, randomInt()); + }))); when(ingestService.getPipeline(pipelineId1)).thenReturn(pipeline1); when(ingestService.getPipeline(pipelineId2)).thenReturn(pipeline2); @@ -483,31 +473,24 @@ public void testActualPipelineProcessorWithFalseConditional() throws Exception { new HashMap<>(ScriptModule.CORE_CONTEXTS) ); - Pipeline pipeline1 = new Pipeline( - pipelineId1, - null, - null, - null, - new CompoundProcessor( - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key1, randomInt()); }), - new ConditionalProcessor( - randomAlphaOfLength(10), - null, - new Script(ScriptType.INLINE, Script.DEFAULT_SCRIPT_LANG, scriptName, Collections.emptyMap()), - scriptService, - factory.create(Collections.emptyMap(), null, null, pipelineConfig2) - ), - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key3, randomInt()); }) - ) - ); + Pipeline pipeline1 = new Pipeline(pipelineId1, null, null, null, new CompoundProcessor(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key1, randomInt()); + }), + new ConditionalProcessor( + randomAlphaOfLength(10), + null, + new Script(ScriptType.INLINE, Script.DEFAULT_SCRIPT_LANG, scriptName, Collections.emptyMap()), + scriptService, + factory.create(Collections.emptyMap(), null, null, pipelineConfig2) + ), + new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key3, randomInt()); + }) + )); - Pipeline pipeline2 = new Pipeline( - pipelineId2, - null, - null, - null, - new CompoundProcessor(new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key2, randomInt()); })) - ); + Pipeline pipeline2 = new Pipeline(pipelineId2, null, null, null, new CompoundProcessor(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key2, randomInt()); + }))); when(ingestService.getPipeline(pipelineId1)).thenReturn(pipeline1); when(ingestService.getPipeline(pipelineId2)).thenReturn(pipeline2); @@ -561,21 +544,18 @@ public void testActualPipelineProcessorWithHandledFailure() throws Exception { String key2 = randomAlphaOfLength(10); String key3 = randomAlphaOfLength(10); - Pipeline pipeline = new Pipeline( - pipelineId, - null, - null, - null, + Pipeline pipeline = new Pipeline(pipelineId, null, null, null, new CompoundProcessor(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key1, randomInt()); + }), new CompoundProcessor( - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key1, randomInt()); }), - new CompoundProcessor( - false, - Collections.singletonList(new TestProcessor(ingestDocument -> { throw exception; })), - Collections.singletonList(new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key2, randomInt()); })) - ), - new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key3, randomInt()); }) - ) - ); + false, + Collections.singletonList(new TestProcessor(ingestDocument -> { throw exception; })), + Collections.singletonList(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key2, randomInt()); + })) + ), + new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key3, randomInt()); }) + )); when(ingestService.getPipeline(pipelineId)).thenReturn(pipeline); PipelineProcessor pipelineProcessor = factory.create(Collections.emptyMap(), null, null, pipelineConfig); @@ -634,7 +614,9 @@ public void testActualPipelineProcessorWithUnhandledFailure() throws Exception { null, new CompoundProcessor( new TestProcessor(ingestDocument -> ingestDocument.setFieldValue(key1, randomInt())), - new TestProcessor(ingestDocument -> { throw exception; }) + new TestProcessor(ingestDocument -> { + throw exception; + }) ) ); when(ingestService.getPipeline(pipelineId)).thenReturn(pipeline); @@ -821,13 +803,9 @@ public void testActualPipelineProcessorRepeatedInvocation() throws Exception { String key1 = randomAlphaOfLength(10); PipelineProcessor pipelineProcessor = factory.create(Collections.emptyMap(), null, null, pipelineConfig); - Pipeline pipeline = new Pipeline( - pipelineId, - null, - null, - null, - new CompoundProcessor(new TestProcessor(ingestDocument -> { ingestDocument.setFieldValue(key1, randomInt()); })) - ); + Pipeline pipeline = new Pipeline(pipelineId, null, null, null, new CompoundProcessor(new TestProcessor(ingestDocument -> { + ingestDocument.setFieldValue(key1, randomInt()); + }))); when(ingestService.getPipeline(pipelineId)).thenReturn(pipeline); // calls the same pipeline twice diff --git a/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java index 852ff3e88dad9..b7c2810e3ef36 100644 --- a/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java @@ -1223,10 +1223,9 @@ public void testNoExtensionConstructors() { class TestExtension implements TestExtensionPoint { private TestExtension() {} } - IllegalStateException e = expectThrows( - IllegalStateException.class, - () -> { PluginsService.createExtension(TestExtension.class, TestExtensionPoint.class, plugin); } - ); + IllegalStateException e = expectThrows(IllegalStateException.class, () -> { + PluginsService.createExtension(TestExtension.class, TestExtensionPoint.class, plugin); + }); assertThat( e, @@ -1251,10 +1250,9 @@ public TestExtension(TestPlugin plugin) { } } - IllegalStateException e = expectThrows( - IllegalStateException.class, - () -> { PluginsService.createExtension(TestExtension.class, TestExtensionPoint.class, plugin); } - ); + IllegalStateException e = expectThrows(IllegalStateException.class, () -> { + PluginsService.createExtension(TestExtension.class, TestExtensionPoint.class, plugin); + }); assertThat( e, @@ -1272,10 +1270,9 @@ public TestExtension(TestPlugin plugin) { public void testBadSingleParameterConstructor() { TestPlugin plugin = new TestPlugin(); - IllegalStateException e = expectThrows( - IllegalStateException.class, - () -> { PluginsService.createExtension(BadSingleParameterConstructorExtension.class, TestExtensionPoint.class, plugin); } - ); + IllegalStateException e = expectThrows(IllegalStateException.class, () -> { + PluginsService.createExtension(BadSingleParameterConstructorExtension.class, TestExtensionPoint.class, plugin); + }); assertThat( e, @@ -1297,10 +1294,9 @@ public void testBadSingleParameterConstructor() { public void testTooManyParametersExtensionConstructors() { TestPlugin plugin = new TestPlugin(); - IllegalStateException e = expectThrows( - IllegalStateException.class, - () -> { PluginsService.createExtension(TooManyParametersConstructorExtension.class, TestExtensionPoint.class, plugin); } - ); + IllegalStateException e = expectThrows(IllegalStateException.class, () -> { + PluginsService.createExtension(TooManyParametersConstructorExtension.class, TestExtensionPoint.class, plugin); + }); assertThat( e, @@ -1320,10 +1316,9 @@ public void testTooManyParametersExtensionConstructors() { public void testThrowingConstructor() { TestPlugin plugin = new TestPlugin(); - IllegalStateException e = expectThrows( - IllegalStateException.class, - () -> { PluginsService.createExtension(ThrowingConstructorExtension.class, TestExtensionPoint.class, plugin); } - ); + IllegalStateException e = expectThrows(IllegalStateException.class, () -> { + PluginsService.createExtension(ThrowingConstructorExtension.class, TestExtensionPoint.class, plugin); + }); assertThat( e, diff --git a/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java index e412b245b276a..46f987d9c8875 100644 --- a/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java +++ b/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java @@ -442,10 +442,9 @@ public void testDeleteScript() throws Exception { assertNull(scriptMetadata.getStoredScript("_id")); ScriptMetadata errorMetadata = scriptMetadata; - ResourceNotFoundException e = expectThrows( - ResourceNotFoundException.class, - () -> { ScriptMetadata.deleteStoredScript(errorMetadata, "_id"); } - ); + ResourceNotFoundException e = expectThrows(ResourceNotFoundException.class, () -> { + ScriptMetadata.deleteStoredScript(errorMetadata, "_id"); + }); assertEquals("stored script [_id] does not exist and cannot be deleted", e.getMessage()); } @@ -476,24 +475,17 @@ public void testGetStoredScript() throws Exception { public void testMaxSizeLimit() throws Exception { buildScriptService(Settings.builder().put(ScriptService.SCRIPT_MAX_SIZE_IN_BYTES.getKey(), 4).build()); scriptService.compile(new Script(ScriptType.INLINE, "test", "1+1", Collections.emptyMap()), randomFrom(contexts.values())); - IllegalArgumentException iae = expectThrows( - IllegalArgumentException.class, - () -> { - scriptService.compile( - new Script(ScriptType.INLINE, "test", "10+10", Collections.emptyMap()), - randomFrom(contexts.values()) - ); - } - ); + IllegalArgumentException iae = expectThrows(IllegalArgumentException.class, () -> { + scriptService.compile(new Script(ScriptType.INLINE, "test", "10+10", Collections.emptyMap()), randomFrom(contexts.values())); + }); assertEquals("exceeded max allowed inline script size in bytes [4] with size [5] for script [10+10]", iae.getMessage()); clusterSettings.applySettings(Settings.builder().put(ScriptService.SCRIPT_MAX_SIZE_IN_BYTES.getKey(), 6).build()); scriptService.compile(new Script(ScriptType.INLINE, "test", "10+10", Collections.emptyMap()), randomFrom(contexts.values())); clusterSettings.applySettings(Settings.builder().put(ScriptService.SCRIPT_MAX_SIZE_IN_BYTES.getKey(), 5).build()); scriptService.compile(new Script(ScriptType.INLINE, "test", "10+10", Collections.emptyMap()), randomFrom(contexts.values())); - iae = expectThrows( - IllegalArgumentException.class, - () -> { clusterSettings.applySettings(Settings.builder().put(ScriptService.SCRIPT_MAX_SIZE_IN_BYTES.getKey(), 2).build()); } - ); + iae = expectThrows(IllegalArgumentException.class, () -> { + clusterSettings.applySettings(Settings.builder().put(ScriptService.SCRIPT_MAX_SIZE_IN_BYTES.getKey(), 2).build()); + }); assertEquals( "script.max_size_in_bytes cannot be set to [2], stored script [test1] exceeds the new value with a size of [3]", iae.getMessage() @@ -604,10 +596,9 @@ public void testUseContextSettingValue() { assertEquals(ScriptService.SCRIPT_GENERAL_MAX_COMPILATIONS_RATE_SETTING.get(s), ScriptService.USE_CONTEXT_RATE_VALUE); - IllegalArgumentException illegal = expectThrows( - IllegalArgumentException.class, - () -> { ScriptService.SCRIPT_MAX_COMPILATIONS_RATE_SETTING.getAsMap(s); } - ); + IllegalArgumentException illegal = expectThrows(IllegalArgumentException.class, () -> { + ScriptService.SCRIPT_MAX_COMPILATIONS_RATE_SETTING.getAsMap(s); + }); assertEquals("parameter must contain a positive integer and a timevalue, i.e. 10/1m, but was [use-context]", illegal.getMessage()); assertSettingDeprecationsAndWarnings(new Setting[] { contextMaxCompilationRate }); diff --git a/server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java b/server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java index 76c32556c1b3f..0d43c6fd487e8 100644 --- a/server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java +++ b/server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java @@ -270,11 +270,9 @@ public void testParseEpochSecondsTimezone() { long millis = randomNonNegativeLong(); // Convert to seconds millis -= (millis % 1000); - assertEquals( - "failed formatting for tz " + zone, - millis, - formatter.parseLong(formatter.format(millis), false, () -> { throw new UnsupportedOperationException("don't use now"); }) - ); + assertEquals("failed formatting for tz " + zone, millis, formatter.parseLong(formatter.format(millis), false, () -> { + throw new UnsupportedOperationException("don't use now"); + })); } public void testParseEpochMillisTimezone() { @@ -285,11 +283,9 @@ public void testParseEpochMillisTimezone() { Resolution.MILLISECONDS ); long millis = randomNonNegativeLong(); - assertEquals( - "failed formatting for tz " + zone, - millis, - formatter.parseLong(formatter.format(millis), false, () -> { throw new UnsupportedOperationException("don't use now"); }) - ); + assertEquals("failed formatting for tz " + zone, millis, formatter.parseLong(formatter.format(millis), false, () -> { + throw new UnsupportedOperationException("don't use now"); + })); } public void testDateHMSTimezone() { @@ -306,16 +302,12 @@ public void testDateHMSTimezone() { long millis = 1622567918000L; assertEquals("2021-06-01T17:18:38", utc.format(millis)); assertEquals("2021-06-02T02:18:38", tokyo.format(millis)); - assertEquals( - "couldn't parse UTC", - millis, - utc.parseLong(utc.format(millis), false, () -> { throw new UnsupportedOperationException("don't use now"); }) - ); - assertEquals( - "couldn't parse Tokyo", - millis, - tokyo.parseLong(tokyo.format(millis), false, () -> { throw new UnsupportedOperationException("don't use now"); }) - ); + assertEquals("couldn't parse UTC", millis, utc.parseLong(utc.format(millis), false, () -> { + throw new UnsupportedOperationException("don't use now"); + })); + assertEquals("couldn't parse Tokyo", millis, tokyo.parseLong(tokyo.format(millis), false, () -> { + throw new UnsupportedOperationException("don't use now"); + })); } public void testDateTimeWithTimezone() { @@ -333,16 +325,12 @@ public void testDateTimeWithTimezone() { long millis = 1622567918000L; assertEquals("20210601T171838Z", utc.format(millis)); assertEquals("20210602T021838+09:00", tokyo.format(millis)); - assertEquals( - "couldn't parse UTC", - millis, - utc.parseLong(utc.format(millis), false, () -> { throw new UnsupportedOperationException("don't use now"); }) - ); - assertEquals( - "couldn't parse Tokyo", - millis, - tokyo.parseLong(tokyo.format(millis), false, () -> { throw new UnsupportedOperationException("don't use now"); }) - ); + assertEquals("couldn't parse UTC", millis, utc.parseLong(utc.format(millis), false, () -> { + throw new UnsupportedOperationException("don't use now"); + })); + assertEquals("couldn't parse Tokyo", millis, tokyo.parseLong(tokyo.format(millis), false, () -> { + throw new UnsupportedOperationException("don't use now"); + })); } /** @@ -357,11 +345,9 @@ public void testParseOffset() { long expected = 1628719200000L; ZonedDateTime sample = ZonedDateTime.of(2021, 8, 12, 0, 0, 0, 0, ZoneId.ofOffset("", ZoneOffset.ofHours(2))); assertEquals("GUARD: wrong initial millis", expected, sample.toEpochSecond() * 1000); - long actualMillis = parsesZone.parseLong( - "2021-08-12T00:00:00.000000000+02:00", - false, - () -> { throw new UnsupportedOperationException("don't use now"); } - ); + long actualMillis = parsesZone.parseLong("2021-08-12T00:00:00.000000000+02:00", false, () -> { + throw new UnsupportedOperationException("don't use now"); + }); assertEquals(expected, actualMillis); } @@ -378,11 +364,9 @@ public void testParseZone() { ZonedDateTime sample = ZonedDateTime.of(2021, 8, 12, 0, 0, 0, 0, ZoneId.ofOffset("", ZoneOffset.ofHours(2))); assertEquals("GUARD: wrong initial millis", expected, sample.toEpochSecond() * 1000); // assertEquals("GUARD: wrong initial string", "2021-08-12T00:00:00.000000000+02:00", parsesZone.format(expected)); - long actualMillis = parsesZone.parseLong( - "2021-08-12T00:00:00.000000000CET", - false, - () -> { throw new UnsupportedOperationException("don't use now"); } - ); + long actualMillis = parsesZone.parseLong("2021-08-12T00:00:00.000000000CET", false, () -> { + throw new UnsupportedOperationException("don't use now"); + }); assertEquals(expected, actualMillis); } } diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java index b7f08a74d3359..a9fd99bceb506 100644 --- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java @@ -803,13 +803,9 @@ public void testOpenScrollContextsConcurrently() throws Exception { public static class FailOnRewriteQueryPlugin extends Plugin implements SearchPlugin { @Override public List> getQueries() { - return singletonList( - new QuerySpec<>( - "fail_on_rewrite_query", - FailOnRewriteQueryBuilder::new, - parseContext -> { throw new UnsupportedOperationException("No query parser for this plugin"); } - ) - ); + return singletonList(new QuerySpec<>("fail_on_rewrite_query", FailOnRewriteQueryBuilder::new, parseContext -> { + throw new UnsupportedOperationException("No query parser for this plugin"); + })); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java index 504b793a5bb87..780b620e38887 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java @@ -157,7 +157,9 @@ public void testUnmappedFieldWithTerms() throws Exception { Arrays.asList(new MatchAllDocsQuery(), new DocValuesFieldExistsQuery("keyword")), dataset, () -> new CompositeAggregationBuilder("name", Arrays.asList(new TermsValuesSourceBuilder("unmapped").field("unmapped"))), - (result) -> { assertEquals(0, result.getBuckets().size()); } + (result) -> { + assertEquals(0, result.getBuckets().size()); + } ); // Only aggregate on unmapped field, missing bucket => one null bucket with all values @@ -184,7 +186,9 @@ public void testUnmappedFieldWithTerms() throws Exception { "name", Arrays.asList(new TermsValuesSourceBuilder("unmapped").field("unmapped").missingBucket(true)) ).aggregateAfter(Collections.singletonMap("unmapped", null)), - (result) -> { assertEquals(0, result.getBuckets().size()); } + (result) -> { + assertEquals(0, result.getBuckets().size()); + } ); // Mapped field first, then unmapped, no missing bucket => no results @@ -198,7 +202,9 @@ public void testUnmappedFieldWithTerms() throws Exception { new TermsValuesSourceBuilder("unmapped").field("unmapped") ) ), - (result) -> { assertEquals(0, result.getBuckets().size()); } + (result) -> { + assertEquals(0, result.getBuckets().size()); + } ); // Mapped + unmapped, include missing => 3 buckets @@ -252,7 +258,9 @@ public void testUnmappedFieldWithTerms() throws Exception { new TermsValuesSourceBuilder("unmapped").field("unmapped").missingBucket(true).missingOrder(MissingOrder.FIRST) ) ).aggregateAfter(Collections.singletonMap("unmapped", "cat")), - (InternalComposite result) -> { assertEquals(0, result.getBuckets().size()); } + (InternalComposite result) -> { + assertEquals(0, result.getBuckets().size()); + } ); // Unmapped field, number after key, unmapped sorts after, include unmapped => 1 bucket @@ -283,7 +291,9 @@ public void testUnmappedFieldWithTerms() throws Exception { new TermsValuesSourceBuilder("unmapped").field("unmapped").missingBucket(true).missingOrder(MissingOrder.FIRST) ) ).aggregateAfter(Collections.singletonMap("unmapped", 42)), - (InternalComposite result) -> { assertEquals(0, result.getBuckets().size()); } + (InternalComposite result) -> { + assertEquals(0, result.getBuckets().size()); + } ); } @@ -306,7 +316,9 @@ public void testUnmappedTermsLongAfter() throws Exception { dataset, () -> new CompositeAggregationBuilder("name", Arrays.asList(new TermsValuesSourceBuilder("unmapped").field("unmapped"))) .aggregateAfter(Collections.singletonMap("unmapped", 42)), - (InternalComposite result) -> { assertEquals(0, result.getBuckets().size()); } + (InternalComposite result) -> { + assertEquals(0, result.getBuckets().size()); + } ); } @@ -562,7 +574,9 @@ public void testUnmappedFieldWithLongs() throws Exception { Arrays.asList(new MatchAllDocsQuery(), new DocValuesFieldExistsQuery("long")), dataset, () -> new CompositeAggregationBuilder("name", Arrays.asList(new TermsValuesSourceBuilder("unmapped").field("unmapped"))), - (result) -> { assertEquals(0, result.getBuckets().size()); } + (result) -> { + assertEquals(0, result.getBuckets().size()); + } ); testSearchCase( @@ -587,7 +601,9 @@ public void testUnmappedFieldWithLongs() throws Exception { "name", Arrays.asList(new TermsValuesSourceBuilder("unmapped").field("unmapped").missingBucket(true)) ).aggregateAfter(Collections.singletonMap("unmapped", null)), - (result) -> { assertEquals(0, result.getBuckets().size()); } + (result) -> { + assertEquals(0, result.getBuckets().size()); + } ); testSearchCase( @@ -600,7 +616,9 @@ public void testUnmappedFieldWithLongs() throws Exception { new TermsValuesSourceBuilder("unmapped").field("unmapped") ) ), - (result) -> { assertEquals(0, result.getBuckets().size()); } + (result) -> { + assertEquals(0, result.getBuckets().size()); + } ); testSearchCase( @@ -1527,7 +1545,9 @@ public void testMissingTermBucketAfterKey() throws Exception { .order(SortOrder.ASC) ) ).aggregateAfter(createAfterKey("keyword", null)), - (result) -> { assertEquals(0, result.getBuckets().size()); } + (result) -> { + assertEquals(0, result.getBuckets().size()); + } ); testSearchCase( @@ -1611,7 +1631,9 @@ public void testMissingHistogramBucketAfterKey() throws Exception { .order(SortOrder.ASC) ) ).aggregateAfter(createAfterKey("hist", null)), - (result) -> { assertEquals(0, result.getBuckets().size()); } + (result) -> { + assertEquals(0, result.getBuckets().size()); + } ); testSearchCase( diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java index 122b11b84db8d..df506af4e4d96 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java @@ -149,19 +149,18 @@ public void testBuildEmpty() throws IOException { } public void testNoFilters() throws IOException { - testCase( - new FiltersAggregationBuilder("test", new KeyedFilter[0]), - new MatchAllDocsQuery(), - iw -> { iw.addDocument(org.elasticsearch.core.List.of()); }, - (InternalFilters result) -> { assertThat(result.getBuckets(), hasSize(0)); } - ); + testCase(new FiltersAggregationBuilder("test", new KeyedFilter[0]), new MatchAllDocsQuery(), iw -> { + iw.addDocument(org.elasticsearch.core.List.of()); + }, (InternalFilters result) -> { assertThat(result.getBuckets(), hasSize(0)); }); } public void testNoFiltersWithSubAggs() throws IOException { testCase( new FiltersAggregationBuilder("test", new KeyedFilter[0]).subAggregation(new MaxAggregationBuilder("m").field("i")), new MatchAllDocsQuery(), - iw -> { iw.addDocument(org.elasticsearch.core.List.of(new SortedNumericDocValuesField("i", 1))); }, + iw -> { + iw.addDocument(org.elasticsearch.core.List.of(new SortedNumericDocValuesField("i", 1))); + }, (InternalFilters result) -> { assertThat(result.getBuckets(), hasSize(0)); }, new NumberFieldMapper.NumberFieldType("m", NumberFieldMapper.NumberType.INTEGER) ); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java index e6621f08b1ed1..044b4829db50d 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java @@ -103,7 +103,9 @@ public void testUnmapped() throws IOException { randomPrecision(), null, geoGrid -> { assertEquals(0, geoGrid.getBuckets().size()); }, - iw -> { iw.addDocument(Collections.singleton(new LatLonDocValuesField(FIELD_NAME, 10D, 10D))); } + iw -> { + iw.addDocument(Collections.singleton(new LatLonDocValuesField(FIELD_NAME, 10D, 10D))); + } ); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java index f9a6e0a1b94fb..a6654d7ad7c86 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java @@ -277,10 +277,9 @@ public void testIncorrectFieldType() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - expectThrows( - IllegalArgumentException.class, - () -> { searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, keywordField("field")); } - ); + expectThrows(IllegalArgumentException.class, () -> { + searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, keywordField("field")); + }); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java index a6f70850143f3..68dd7dad1dc5a 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java @@ -529,7 +529,9 @@ public void testSmallShardSize() throws Exception { org.elasticsearch.core.List.of(), true, aggregation -> aggregation.field(NUMERIC_FIELD).setNumBuckets(2).setShardSize(2), - histogram -> { fail(); } + histogram -> { + fail(); + } ) ); assertThat(e.getMessage(), equalTo("3/4 of shard_size must be at least buckets but was [1<2] for [_name]")); @@ -557,7 +559,9 @@ public void testSmallInitialBuffer() throws Exception { org.elasticsearch.core.List.of(), true, aggregation -> aggregation.field(NUMERIC_FIELD).setInitialBuffer(1), - histogram -> { fail(); } + histogram -> { + fail(); + } ) ); assertThat(e.getMessage(), equalTo("initial_buffer must be at least buckets but was [1<10] for [_name]")); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java index d3bc5657d4f1c..0b5cd85db6ffc 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java @@ -290,13 +290,9 @@ public void testKeywordField() { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> testCase( - aggregationBuilder, - new MatchAllDocsQuery(), - iw -> { iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo")))); }, - range -> fail("Should have thrown exception"), - fieldType - ) + () -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> { + iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo")))); + }, range -> fail("Should have thrown exception"), fieldType) ); assertEquals("Field [not_a_number] of type [keyword] is not supported for aggregation [date_range]", e.getMessage()); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java index f55e42f85d531..d2106e3e9f7f4 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java @@ -210,7 +210,9 @@ public void testFloatRangesExclusiveEndpoint() throws IOException { testCase( new RangeAggregationBuilder("range").field(fieldName).addRange("r1", 0, 0.04D).addRange("r2", 0.04D, 1.0D), new MatchAllDocsQuery(), - iw -> { iw.addDocument(NumberType.FLOAT.createFields(fieldName, 0.04F, false, true, false)); }, + iw -> { + iw.addDocument(NumberType.FLOAT.createFields(fieldName, 0.04F, false, true, false)); + }, result -> { InternalRange range = (InternalRange) result; List ranges = range.getBuckets(); @@ -231,7 +233,9 @@ public void testHalfFloatRangesExclusiveEndpoint() throws IOException { testCase( new RangeAggregationBuilder("range").field(fieldName).addRange("r1", 0, 0.0152D).addRange("r2", 0.0152D, 1.0D), new MatchAllDocsQuery(), - iw -> { iw.addDocument(NumberType.HALF_FLOAT.createFields(fieldName, 0.0152F, false, true, false)); }, + iw -> { + iw.addDocument(NumberType.HALF_FLOAT.createFields(fieldName, 0.0152F, false, true, false)); + }, result -> { InternalRange range = (InternalRange) result; List ranges = range.getBuckets(); @@ -494,13 +498,9 @@ public void testUnsupportedType() { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> testCase( - aggregationBuilder, - new MatchAllDocsQuery(), - iw -> { iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo")))); }, - range -> fail("Should have thrown exception"), - fieldType - ) + () -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> { + iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo")))); + }, range -> fail("Should have thrown exception"), fieldType) ); assertEquals("Field [not_a_number] of type [keyword] is not supported for aggregation [range]", e.getMessage()); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java index fea5b1aacec3d..320d4445d5b4c 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java @@ -89,16 +89,9 @@ public void testRangeField() throws IOException { MappedFieldType fieldType = new RangeFieldMapper.RangeFieldType(fieldName, RangeType.DOUBLE); RangeFieldMapper.Range range = new RangeFieldMapper.Range(RangeType.DOUBLE, 1.0D, 5.0D, true, true); BytesRef encodedRange = RangeType.DOUBLE.encodeRanges(Collections.singleton(range)); - expectThrows( - IllegalArgumentException.class, - () -> testCase( - new DocValuesFieldExistsQuery(fieldName), - iw -> { iw.addDocument(singleton(new BinaryDocValuesField(fieldName, encodedRange))); }, - hdr -> {}, - fieldType, - fieldName - ) - ); + expectThrows(IllegalArgumentException.class, () -> testCase(new DocValuesFieldExistsQuery(fieldName), iw -> { + iw.addDocument(singleton(new BinaryDocValuesField(fieldName, encodedRange))); + }, hdr -> {}, fieldType, fieldName)); } public void testNoMatchingField() throws IOException { diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java index 236984456661d..c293941ddebee 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java @@ -261,13 +261,9 @@ public void testUnsupportedType() { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> testCase( - aggregationBuilder, - new MatchAllDocsQuery(), - iw -> { iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo")))); }, - (Consumer) min -> { fail("Should have thrown exception"); }, - fieldType - ) + () -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> { + iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo")))); + }, (Consumer) min -> { fail("Should have thrown exception"); }, fieldType) ); assertEquals("Field [not_a_number] of type [keyword] is not supported for aggregation [min]", e.getMessage()); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java index c92ce332dde7a..fdb90f89f5db0 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java @@ -557,12 +557,9 @@ public void testInitScriptMakesArray() throws IOException { .mapScript(MAP_SCRIPT) .combineScript(COMBINE_SCRIPT) .reduceScript(REDUCE_SCRIPT); - testCase( - aggregationBuilder, - new MatchAllDocsQuery(), - iw -> { iw.addDocument(new Document()); }, - (InternalScriptedMetric r) -> { assertEquals(1, r.aggregation()); } - ); + testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> { iw.addDocument(new Document()); }, (InternalScriptedMetric r) -> { + assertEquals(1, r.aggregation()); + }); } public void testAsSubAgg() throws IOException { diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java index 11b73470ec990..6cb8287ec12e3 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java @@ -193,13 +193,9 @@ public void testUnmappedBoolean() throws Exception { public void testTypeFieldDeprecation() throws IOException { MapperService mapperService = createMapperService(mapping(b -> {})); - withAggregationContext( - mapperService, - List.of(source(b -> {})), - context -> { - ValuesSourceConfig.resolve(context, null, TypeFieldMapper.NAME, null, null, null, null, CoreValuesSourceType.KEYWORD); - } - ); + withAggregationContext(mapperService, List.of(source(b -> {})), context -> { + ValuesSourceConfig.resolve(context, null, TypeFieldMapper.NAME, null, null, null, null, CoreValuesSourceType.KEYWORD); + }); assertWarnings(TypeFieldMapper.TYPES_DEPRECATION_MESSAGE); } diff --git a/server/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java index 3a756c2a50707..cfc4bb541f257 100644 --- a/server/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java @@ -78,11 +78,9 @@ public void testFromXContent() throws IOException { public void testEqualsAndHashcode() throws IOException { for (int runs = 0; runs < NUMBER_OF_RUNS; runs++) { // explicit about type parameters, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=481649 - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - randomSuggestBuilder(), - original -> { return copyWriteable(original, namedWriteableRegistry, SuggestBuilder::new); }, - this::createMutation - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(randomSuggestBuilder(), original -> { + return copyWriteable(original, namedWriteableRegistry, SuggestBuilder::new); + }, this::createMutation); } } diff --git a/server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java b/server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java index e264088903d04..7453024713b7b 100644 --- a/server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java +++ b/server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java @@ -288,7 +288,9 @@ public void testScalingThreadPoolRejectAfterShutdown() throws Exception { if (rejectAfterShutdown) { final EsRejectedExecutionException exception = expectThrows( EsRejectedExecutionException.class, - () -> scalingExecutor.execute(() -> { throw new AssertionError("should be rejected"); }) + () -> scalingExecutor.execute(() -> { + throw new AssertionError("should be rejected"); + }) ); assertThat(exception.getLocalizedMessage(), allOf(containsString("rejected execution of "), containsString("(shutdown)"))); assertThat(exception.isExecutorShutdown(), equalTo(true)); diff --git a/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java b/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java index 7dd77f99a0289..72af69fce316d 100644 --- a/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java +++ b/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java @@ -218,12 +218,9 @@ public void testException() throws InterruptedException { }); TransportActionProxy.registerProxyAction(serviceB, "internal:test", cancellable, SimpleTestResponse::new); serviceB.connectToNode(nodeC); - serviceC.registerRequestHandler( - "internal:test", - ThreadPool.Names.SAME, - SimpleTestRequest::new, - (request, channel, task) -> { throw new ElasticsearchException("greetings from TS_C"); } - ); + serviceC.registerRequestHandler("internal:test", ThreadPool.Names.SAME, SimpleTestRequest::new, (request, channel, task) -> { + throw new ElasticsearchException("greetings from TS_C"); + }); TransportActionProxy.registerProxyAction(serviceC, "internal:test", cancellable, SimpleTestResponse::new); CountDownLatch latch = new CountDownLatch(1); diff --git a/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java b/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java index 71732fd690f3d..087d184d14a25 100644 --- a/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java +++ b/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java @@ -196,10 +196,9 @@ public void testNodeConnectWithDifferentNodeId() { emptySet(), handleB.discoveryNode.getVersion() ); - ConnectTransportException ex = expectThrows( - ConnectTransportException.class, - () -> { handleA.transportService.connectToNode(discoveryNode, TestProfiles.LIGHT_PROFILE); } - ); + ConnectTransportException ex = expectThrows(ConnectTransportException.class, () -> { + handleA.transportService.connectToNode(discoveryNode, TestProfiles.LIGHT_PROFILE); + }); assertThat(ex.getMessage(), containsString("unexpected remote node")); assertFalse(handleA.transportService.nodeConnected(discoveryNode)); } @@ -235,10 +234,9 @@ public void testNodeConnectWithDifferentNodeIdFailsWhenSnifferTransportClient() emptySet(), handleB.discoveryNode.getVersion() ); - ConnectTransportException ex = expectThrows( - ConnectTransportException.class, - () -> { handleA.transportService.connectToNode(discoveryNode, TestProfiles.LIGHT_PROFILE); } - ); + ConnectTransportException ex = expectThrows(ConnectTransportException.class, () -> { + handleA.transportService.connectToNode(discoveryNode, TestProfiles.LIGHT_PROFILE); + }); assertThat(ex.getMessage(), containsString("unexpected remote node")); assertFalse(handleA.transportService.nodeConnected(discoveryNode)); } diff --git a/test/framework/src/main/java/org/elasticsearch/common/util/concurrent/DeterministicTaskQueue.java b/test/framework/src/main/java/org/elasticsearch/common/util/concurrent/DeterministicTaskQueue.java index e272dd0e3d198..eb399aca30275 100644 --- a/test/framework/src/main/java/org/elasticsearch/common/util/concurrent/DeterministicTaskQueue.java +++ b/test/framework/src/main/java/org/elasticsearch/common/util/concurrent/DeterministicTaskQueue.java @@ -214,17 +214,9 @@ public PrioritizedEsThreadPoolExecutor getPrioritizedEsThreadPoolExecutor() { } public PrioritizedEsThreadPoolExecutor getPrioritizedEsThreadPoolExecutor(Function runnableWrapper) { - return new PrioritizedEsThreadPoolExecutor( - "DeterministicTaskQueue", - 1, - 1, - 1, - TimeUnit.SECONDS, - r -> { throw new AssertionError("should not create new threads"); }, - null, - null, - PrioritizedEsThreadPoolExecutor.StarvationWatcher.NOOP_STARVATION_WATCHER - ) { + return new PrioritizedEsThreadPoolExecutor("DeterministicTaskQueue", 1, 1, 1, TimeUnit.SECONDS, r -> { + throw new AssertionError("should not create new threads"); + }, null, null, PrioritizedEsThreadPoolExecutor.StarvationWatcher.NOOP_STARVATION_WATCHER) { @Override public void execute(Runnable command, final TimeValue timeout, final Runnable timeoutCallback) { throw new AssertionError("not implemented"); diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java index e127bcea399a1..1a3d7652f67d4 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java @@ -200,7 +200,9 @@ protected final MapperService createMapperService(Version version, Settings sett xContentRegistry(), similarityService, mapperRegistry, - () -> { throw new UnsupportedOperationException(); }, + () -> { + throw new UnsupportedOperationException(); + }, idFieldDataEnabled, this::compileScript ); diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java index 4dd83690c2550..a5a374eaa199e 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java @@ -321,19 +321,17 @@ protected final List fetchFromDocValues(MapperService mapperService, MappedFi throws IOException { SetOnce> result = new SetOnce<>(); - withLuceneIndex( - mapperService, - iw -> { iw.addDocument(mapperService.documentMapper().parse(source(b -> b.field(ft.name(), sourceValue))).rootDoc()); }, - iw -> { - SearchLookup lookup = new SearchLookup(mapperService::fieldType, fieldDataLookup()); - ValueFetcher valueFetcher = new DocValueFetcher(format, lookup.getForField(ft)); - IndexSearcher searcher = newSearcher(iw); - LeafReaderContext context = searcher.getIndexReader().leaves().get(0); - lookup.source().setSegmentAndDocument(context, 0); - valueFetcher.setNextReader(context); - result.set(valueFetcher.fetchValues(lookup.source(), new ArrayList<>())); - } - ); + withLuceneIndex(mapperService, iw -> { + iw.addDocument(mapperService.documentMapper().parse(source(b -> b.field(ft.name(), sourceValue))).rootDoc()); + }, iw -> { + SearchLookup lookup = new SearchLookup(mapperService::fieldType, fieldDataLookup()); + ValueFetcher valueFetcher = new DocValueFetcher(format, lookup.getForField(ft)); + IndexSearcher searcher = newSearcher(iw); + LeafReaderContext context = searcher.getIndexReader().leaves().get(0); + lookup.source().setSegmentAndDocument(context, 0); + valueFetcher.setNextReader(context); + result.set(valueFetcher.fetchValues(lookup.source(), new ArrayList<>())); + }); return result.get(); } @@ -591,9 +589,9 @@ protected void assertFetch(MapperService mapperService, String field, Object val ); SearchExecutionContext searchExecutionContext = mock(SearchExecutionContext.class); when(searchExecutionContext.sourcePath(field)).thenReturn(Set.of(field)); - when(searchExecutionContext.getForField(ft)).thenAnswer( - inv -> { return fieldDataLookup().apply(ft, () -> { throw new UnsupportedOperationException(); }); } - ); + when(searchExecutionContext.getForField(ft)).thenAnswer(inv -> { + return fieldDataLookup().apply(ft, () -> { throw new UnsupportedOperationException(); }); + }); ValueFetcher nativeFetcher = ft.valueFetcher(searchExecutionContext, format); ParsedDocument doc = mapperService.documentMapper().parse(source); withLuceneIndex(mapperService, iw -> iw.addDocuments(doc.docs()), ir -> { diff --git a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java index cfb384e490fae..b7ca2c6ac9de0 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java @@ -198,7 +198,9 @@ protected class ReplicationGroup implements AutoCloseable, Iterable (_shardId, primaryAllocationId, primaryTerm, retentionLeases) -> syncRetentionLeases( _shardId, retentionLeases, - ActionListener.wrap(r -> {}, e -> { throw new AssertionError("failed to background sync retention lease", e); }) + ActionListener.wrap(r -> {}, e -> { + throw new AssertionError("failed to background sync retention lease", e); + }) ) ); diff --git a/test/framework/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseUtils.java b/test/framework/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseUtils.java index 77a4208522415..25de635f190a3 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseUtils.java @@ -29,13 +29,8 @@ public static Map toMapExcludingPeerRecoveryRetentionLea return retentionLeases.leases() .stream() .filter(l -> ReplicationTracker.PEER_RECOVERY_RETENTION_LEASE_SOURCE.equals(l.source()) == false) - .collect( - Collectors.toMap( - RetentionLease::id, - Function.identity(), - (o1, o2) -> { throw new AssertionError("unexpectedly merging " + o1 + " and " + o2); }, - LinkedHashMap::new - ) - ); + .collect(Collectors.toMap(RetentionLease::id, Function.identity(), (o1, o2) -> { + throw new AssertionError("unexpectedly merging " + o1 + " and " + o2); + }, LinkedHashMap::new)); } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java index 817b41165fc8a..474616b26d4d8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java @@ -359,12 +359,9 @@ private static class ServiceHolder implements Closeable { boolean registerType ) throws IOException { this.nowInMillis = nowInMillis; - Environment env = InternalSettingsPreparer.prepareEnvironment( - nodeSettings, - emptyMap(), - null, - () -> { throw new AssertionError("node.name must be set"); } - ); + Environment env = InternalSettingsPreparer.prepareEnvironment(nodeSettings, emptyMap(), null, () -> { + throw new AssertionError("node.name must be set"); + }); PluginsService pluginsService; pluginsService = new PluginsService(nodeSettings, null, env.modulesFile(), env.pluginsFile(), plugins); diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java index 8b16e81673db7..642eb5787e408 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java @@ -710,7 +710,8 @@ protected static String getRandomRewriteMethod() { .getPreferredName(); } else { rewrite = randomFrom(QueryParsers.TOP_TERMS, QueryParsers.TOP_TERMS_BOOST, QueryParsers.TOP_TERMS_BLENDED_FREQS) - .getPreferredName() + "1"; + .getPreferredName() + + "1"; } return rewrite; } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java index 917595ee7f4b8..548c5efe32a38 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java @@ -2242,7 +2242,9 @@ public void testRegisterHandlerTwice() { "internal:action1", randomFrom(ThreadPool.Names.SAME, ThreadPool.Names.GENERIC), TestRequest::new, - (request, message, task) -> { throw new AssertionError("boom"); } + (request, message, task) -> { + throw new AssertionError("boom"); + } ); expectThrows( IllegalArgumentException.class, @@ -2250,7 +2252,9 @@ public void testRegisterHandlerTwice() { "internal:action1", randomFrom(ThreadPool.Names.SAME, ThreadPool.Names.GENERIC), TestRequest::new, - (request, message, task) -> { throw new AssertionError("boom"); } + (request, message, task) -> { + throw new AssertionError("boom"); + } ) ); @@ -2258,7 +2262,9 @@ public void testRegisterHandlerTwice() { "internal:action1", randomFrom(ThreadPool.Names.SAME, ThreadPool.Names.GENERIC), TestRequest::new, - (request, message, task) -> { throw new AssertionError("boom"); } + (request, message, task) -> { + throw new AssertionError("boom"); + } ); } diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/util/IOUtils.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/util/IOUtils.java index 8b7f2c167cb11..1aef432d0dab4 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/util/IOUtils.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/util/IOUtils.java @@ -110,7 +110,7 @@ private static void sync(Path sourceRoot, Path destinationRoot, BiConsumer PARSER = - new ConstructingObjectParser<>( - NAME, - false, - (args, name) -> { return new CumulativeCardinalityPipelineAggregationBuilder(name, (String) args[0]); } - ); + new ConstructingObjectParser<>(NAME, false, (args, name) -> { + return new CumulativeCardinalityPipelineAggregationBuilder(name, (String) args[0]); + }); static { PARSER.declareString(constructorArg(), BUCKETS_PATH_FIELD); PARSER.declareString(CumulativeCardinalityPipelineAggregationBuilder::format, FORMAT); diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesPipelineAggregationBuilder.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesPipelineAggregationBuilder.java index bd86230ed4182..2985f699cd246 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesPipelineAggregationBuilder.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesPipelineAggregationBuilder.java @@ -27,11 +27,9 @@ public class MovingPercentilesPipelineAggregationBuilder extends AbstractPipelin private static final ParseField SHIFT = new ParseField("shift"); public static final ConstructingObjectParser PARSER = - new ConstructingObjectParser<>( - NAME, - false, - (args, name) -> { return new MovingPercentilesPipelineAggregationBuilder(name, (String) args[0], (int) args[1]); } - ); + new ConstructingObjectParser<>(NAME, false, (args, name) -> { + return new MovingPercentilesPipelineAggregationBuilder(name, (String) args[0], (int) args[1]); + }); static { PARSER.declareString(constructorArg(), BUCKETS_PATH_FIELD); PARSER.declareInt(constructorArg(), WINDOW); diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentilesAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentilesAggregatorTests.java index 491ecb5313f91..3bb3f638febf0 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentilesAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentilesAggregatorTests.java @@ -98,27 +98,23 @@ public void testNoMatchingField() throws IOException { } public void testEmptyField() throws IOException { - testCase( - new MatchAllDocsQuery(), - iw -> { iw.addDocument(singleton(getDocValue("number", new double[0]))); }, - hdr -> { assertFalse(AggregationInspectionHelper.hasValue(hdr)); } - ); + testCase(new MatchAllDocsQuery(), iw -> { iw.addDocument(singleton(getDocValue("number", new double[0]))); }, hdr -> { + assertFalse(AggregationInspectionHelper.hasValue(hdr)); + }); } public void testSomeMatchesBinaryDocValues() throws IOException { - testCase( - new DocValuesFieldExistsQuery("number"), - iw -> { iw.addDocument(singleton(getDocValue("number", new double[] { 60, 40, 20, 10 }))); }, - hdr -> { - // assertEquals(4L, hdr.state.getTotalCount()); - double approximation = 0.05d; - assertEquals(10.0d, hdr.percentile(25), approximation); - assertEquals(20.0d, hdr.percentile(50), approximation); - assertEquals(40.0d, hdr.percentile(75), approximation); - assertEquals(60.0d, hdr.percentile(99), approximation); - assertTrue(AggregationInspectionHelper.hasValue(hdr)); - } - ); + testCase(new DocValuesFieldExistsQuery("number"), iw -> { + iw.addDocument(singleton(getDocValue("number", new double[] { 60, 40, 20, 10 }))); + }, hdr -> { + // assertEquals(4L, hdr.state.getTotalCount()); + double approximation = 0.05d; + assertEquals(10.0d, hdr.percentile(25), approximation); + assertEquals(20.0d, hdr.percentile(50), approximation); + assertEquals(40.0d, hdr.percentile(75), approximation); + assertEquals(60.0d, hdr.percentile(99), approximation); + assertTrue(AggregationInspectionHelper.hasValue(hdr)); + }); } public void testSomeMatchesMultiBinaryDocValues() throws IOException { diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentilesAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentilesAggregatorTests.java index 1baac0c08d1cc..52c0f47b9ea4a 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentilesAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentilesAggregatorTests.java @@ -76,27 +76,23 @@ public void testNoMatchingField() throws IOException { } public void testEmptyField() throws IOException { - testCase( - new MatchAllDocsQuery(), - iw -> { iw.addDocument(singleton(histogramFieldDocValues("number", new double[0]))); }, - hdr -> { assertFalse(AggregationInspectionHelper.hasValue(hdr)); } - ); + testCase(new MatchAllDocsQuery(), iw -> { iw.addDocument(singleton(histogramFieldDocValues("number", new double[0]))); }, hdr -> { + assertFalse(AggregationInspectionHelper.hasValue(hdr)); + }); } public void testSomeMatchesBinaryDocValues() throws IOException { - testCase( - new DocValuesFieldExistsQuery("number"), - iw -> { iw.addDocument(singleton(histogramFieldDocValues("number", new double[] { 60, 40, 20, 10 }))); }, - hdr -> { - // assertEquals(4L, hdr.state.getTotalCount()); - double approximation = 0.05d; - assertEquals(15.0d, hdr.percentile(25), approximation); - assertEquals(30.0d, hdr.percentile(50), approximation); - assertEquals(50.0d, hdr.percentile(75), approximation); - assertEquals(60.0d, hdr.percentile(99), approximation); - assertTrue(AggregationInspectionHelper.hasValue(hdr)); - } - ); + testCase(new DocValuesFieldExistsQuery("number"), iw -> { + iw.addDocument(singleton(histogramFieldDocValues("number", new double[] { 60, 40, 20, 10 }))); + }, hdr -> { + // assertEquals(4L, hdr.state.getTotalCount()); + double approximation = 0.05d; + assertEquals(15.0d, hdr.percentile(25), approximation); + assertEquals(30.0d, hdr.percentile(50), approximation); + assertEquals(50.0d, hdr.percentile(75), approximation); + assertEquals(60.0d, hdr.percentile(99), approximation); + assertTrue(AggregationInspectionHelper.hasValue(hdr)); + }); } public void testSomeMatchesMultiBinaryDocValues() throws IOException { diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregatorTests.java index 5b39f961339f3..c33058a6428cd 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/boxplot/BoxplotAggregatorTests.java @@ -188,13 +188,9 @@ public void testUnsupportedType() { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> testCase( - aggregationBuilder, - new MatchAllDocsQuery(), - iw -> { iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo")))); }, - (Consumer) boxplot -> { fail("Should have thrown exception"); }, - fieldType - ) + () -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> { + iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo")))); + }, (Consumer) boxplot -> { fail("Should have thrown exception"); }, fieldType) ); assertEquals(e.getMessage(), "Field [not_a_number] of type [keyword] " + "is not supported for aggregation [boxplot]"); } diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregatorTests.java index 18a4537f9b025..b3609e1bb399b 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregatorTests.java @@ -632,13 +632,9 @@ public void testNoTerms() { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> testCase( - new MatchAllDocsQuery(), - terms, - null, - iw -> { iw.addDocument(docWithDate("2020-01-01", new NumericDocValuesField(INT_FIELD, 3))); }, - h -> fail("Should have thrown exception") - ) + () -> testCase(new MatchAllDocsQuery(), terms, null, iw -> { + iw.addDocument(docWithDate("2020-01-01", new NumericDocValuesField(INT_FIELD, 3))); + }, h -> fail("Should have thrown exception")) ); if (terms == null) { assertEquals("[terms] must not be null: [my_terms]", ex.getMessage()); diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/rate/RateAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/rate/RateAggregatorTests.java index 86cd93edbd89f..7f40c79f37595 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/rate/RateAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/rate/RateAggregatorTests.java @@ -848,14 +848,9 @@ public void testModeWithoutField() { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> testCase( - dateHistogramAggregationBuilder, - new MatchAllDocsQuery(), - iw -> { iw.addDocument(doc("2010-03-12T01:07:45", new SortedNumericDocValuesField("val", 1))); }, - h -> { fail("Shouldn't be here"); }, - dateType, - numType - ) + () -> testCase(dateHistogramAggregationBuilder, new MatchAllDocsQuery(), iw -> { + iw.addDocument(doc("2010-03-12T01:07:45", new SortedNumericDocValuesField("val", 1))); + }, h -> { fail("Shouldn't be here"); }, dateType, numType) ); assertEquals("The mode parameter is only supported with field or script", ex.getMessage()); } diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorTests.java index e162c6e3cc407..6eee5b882d0e8 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorTests.java @@ -94,12 +94,9 @@ public void testNoDocs() throws IOException { } public void testUnmappedMetric() throws IOException { - InternalTopMetrics result = collect( - simpleBuilder(), - new MatchAllDocsQuery(), - writer -> { writer.addDocument(singletonList(doubleField("s", 1.0))); }, - numberFieldType(NumberType.DOUBLE, "s") - ); + InternalTopMetrics result = collect(simpleBuilder(), new MatchAllDocsQuery(), writer -> { + writer.addDocument(singletonList(doubleField("s", 1.0))); + }, numberFieldType(NumberType.DOUBLE, "s")); assertThat(result.getSortOrder(), equalTo(SortOrder.ASC)); assertThat(result.getTopMetrics(), hasSize(1)); assertThat(result.getTopMetrics().get(0).getSortValue(), equalTo(SortValue.from(1.0))); @@ -107,12 +104,9 @@ public void testUnmappedMetric() throws IOException { } public void testMissingValueForDoubleMetric() throws IOException { - InternalTopMetrics result = collect( - simpleBuilder(), - new MatchAllDocsQuery(), - writer -> { writer.addDocument(singletonList(doubleField("s", 1.0))); }, - doubleFields() - ); + InternalTopMetrics result = collect(simpleBuilder(), new MatchAllDocsQuery(), writer -> { + writer.addDocument(singletonList(doubleField("s", 1.0))); + }, doubleFields()); assertThat(result.getSortOrder(), equalTo(SortOrder.ASC)); assertThat(result.getTopMetrics(), hasSize(1)); assertThat(result.getTopMetrics().get(0).getSortValue(), equalTo(SortValue.from(1.0))); @@ -120,12 +114,9 @@ public void testMissingValueForDoubleMetric() throws IOException { } public void testMissingValueForLongMetric() throws IOException { - InternalTopMetrics result = collect( - simpleBuilder(), - new MatchAllDocsQuery(), - writer -> { writer.addDocument(singletonList(longField("s", 1))); }, - longFields() - ); + InternalTopMetrics result = collect(simpleBuilder(), new MatchAllDocsQuery(), writer -> { + writer.addDocument(singletonList(longField("s", 1))); + }, longFields()); assertThat(result.getSortOrder(), equalTo(SortOrder.ASC)); assertThat(result.getTopMetrics(), hasSize(1)); assertThat(result.getTopMetrics().get(0).getSortValue(), equalTo(SortValue.from(1))); @@ -133,23 +124,17 @@ public void testMissingValueForLongMetric() throws IOException { } public void testActualValueForDoubleMetric() throws IOException { - InternalTopMetrics result = collect( - simpleBuilder(), - new MatchAllDocsQuery(), - writer -> { writer.addDocument(Arrays.asList(doubleField("s", 1.0), doubleField("m", 2.0))); }, - doubleFields() - ); + InternalTopMetrics result = collect(simpleBuilder(), new MatchAllDocsQuery(), writer -> { + writer.addDocument(Arrays.asList(doubleField("s", 1.0), doubleField("m", 2.0))); + }, doubleFields()); assertThat(result.getSortOrder(), equalTo(SortOrder.ASC)); assertThat(result.getTopMetrics(), equalTo(singletonList(top(1.0, 2.0)))); } public void testActualValueForLongMetric() throws IOException { - InternalTopMetrics result = collect( - simpleBuilder(), - new MatchAllDocsQuery(), - writer -> { writer.addDocument(Arrays.asList(longField("s", 1), longField("m", 2))); }, - longFields() - ); + InternalTopMetrics result = collect(simpleBuilder(), new MatchAllDocsQuery(), writer -> { + writer.addDocument(Arrays.asList(longField("s", 1), longField("m", 2))); + }, longFields()); assertThat(result.getSortOrder(), equalTo(SortOrder.ASC)); assertThat(result.getTopMetrics(), equalTo(singletonList(top(1, 2)))); } diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/ttest/TTestAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/ttest/TTestAggregatorTests.java index 342d8f4429c07..c0b673a843125 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/ttest/TTestAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/ttest/TTestAggregatorTests.java @@ -150,12 +150,9 @@ public void testNoMatchingField() throws IOException { } public void testNotEnoughRecords() throws IOException { - testCase( - new MatchAllDocsQuery(), - randomFrom(TTestType.values()), - iw -> { iw.addDocument(asList(new NumericDocValuesField("a", 102), new NumericDocValuesField("b", 89))); }, - tTest -> assertEquals(Double.NaN, tTest.getValue(), 0) - ); + testCase(new MatchAllDocsQuery(), randomFrom(TTestType.values()), iw -> { + iw.addDocument(asList(new NumericDocValuesField("a", 102), new NumericDocValuesField("b", 89))); + }, tTest -> assertEquals(Double.NaN, tTest.getValue(), 0)); } public void testSameValues() throws IOException { diff --git a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchIntegTestCase.java b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchIntegTestCase.java index 236e2abc1d410..fd201fa857f66 100644 --- a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchIntegTestCase.java +++ b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchIntegTestCase.java @@ -75,12 +75,9 @@ public SearchTestPlugin() {} @Override public List> getQueries() { - return Arrays.asList( - new QuerySpec<>( - BlockingQueryBuilder.NAME, - BlockingQueryBuilder::new, - p -> { throw new IllegalStateException("not implemented"); } - ), + return Arrays.asList(new QuerySpec<>(BlockingQueryBuilder.NAME, BlockingQueryBuilder::new, p -> { + throw new IllegalStateException("not implemented"); + }), new QuerySpec<>( ThrowingQueryBuilder.NAME, ThrowingQueryBuilder::new, @@ -95,7 +92,9 @@ public List getAggregations() { new AggregationSpec( CancellingAggregationBuilder.NAME, CancellingAggregationBuilder::new, - (ContextParser) (p, c) -> { throw new IllegalStateException("not implemented"); } + (ContextParser) (p, c) -> { + throw new IllegalStateException("not implemented"); + } ).addResultReader(InternalFilter::new) ); } diff --git a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCalculateCapacityService.java b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCalculateCapacityService.java index c7753221bdf56..ec0f64c6942e5 100644 --- a/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCalculateCapacityService.java +++ b/x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingCalculateCapacityService.java @@ -157,7 +157,9 @@ private AutoscalingDeciderResults calculateForPolicy( SortedMap results = deciders.entrySet() .stream() .map(entry -> Tuple.tuple(entry.getKey(), calculateForDecider(entry.getKey(), entry.getValue(), context, ensureNotCancelled))) - .collect(Collectors.toMap(Tuple::v1, Tuple::v2, (a, b) -> { throw new UnsupportedOperationException(); }, TreeMap::new)); + .collect(Collectors.toMap(Tuple::v1, Tuple::v2, (a, b) -> { + throw new UnsupportedOperationException(); + }, TreeMap::new)); return new AutoscalingDeciderResults(context.currentCapacity, context.currentNodes, results); } diff --git a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/AutoscalingTestCase.java b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/AutoscalingTestCase.java index 43e56abb22ea5..60b2079b5674b 100644 --- a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/AutoscalingTestCase.java +++ b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/AutoscalingTestCase.java @@ -51,7 +51,9 @@ protected static AutoscalingDeciderResult randomAutoscalingDeciderResultWithCapa public static AutoscalingDeciderResults randomAutoscalingDeciderResults() { final SortedMap results = IntStream.range(0, randomIntBetween(1, 10)) .mapToObj(i -> Tuple.tuple(Integer.toString(i), randomAutoscalingDeciderResult())) - .collect(Collectors.toMap(Tuple::v1, Tuple::v2, (a, b) -> { throw new IllegalStateException(); }, TreeMap::new)); + .collect(Collectors.toMap(Tuple::v1, Tuple::v2, (a, b) -> { + throw new IllegalStateException(); + }, TreeMap::new)); AutoscalingCapacity capacity = new AutoscalingCapacity(randomAutoscalingResources(), randomAutoscalingResources()); return new AutoscalingDeciderResults(capacity, randomNodes(), results); } diff --git a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionTests.java b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionTests.java index 21ddd6e1bdc35..cf104c1cebb08 100644 --- a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionTests.java +++ b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionTests.java @@ -227,12 +227,9 @@ public void testPolicyValidator() { final Logger mockLogger = mock(Logger.class); expectThrows( IllegalArgumentException.class, - () -> TransportPutAutoscalingPolicyAction.putAutoscalingPolicy( - ClusterState.EMPTY_STATE, - request, - p -> { throw new IllegalArgumentException(); }, - mockLogger - ) + () -> TransportPutAutoscalingPolicyAction.putAutoscalingPolicy(ClusterState.EMPTY_STATE, request, p -> { + throw new IllegalArgumentException(); + }, mockLogger) ); verifyNoMoreInteractions(mockLogger); diff --git a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingDeciderResultsTests.java b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingDeciderResultsTests.java index 080ca94610b2c..2c6d619e1c001 100644 --- a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingDeciderResultsTests.java +++ b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/capacity/AutoscalingDeciderResultsTests.java @@ -142,12 +142,9 @@ private void verifyRequiredCapacity(AutoscalingCapacity expected, AutoscalingCap SortedMap results = Arrays.stream(capacities) .map(AutoscalingDeciderResultsTests::randomAutoscalingDeciderResultWithCapacity) .collect( - Collectors.toMap( - k -> randomAlphaOfLength(10) + "-" + uniqueGenerator.incrementAndGet(), - Function.identity(), - (a, b) -> { throw new UnsupportedOperationException(); }, - TreeMap::new - ) + Collectors.toMap(k -> randomAlphaOfLength(10) + "-" + uniqueGenerator.incrementAndGet(), Function.identity(), (a, b) -> { + throw new UnsupportedOperationException(); + }, TreeMap::new) ); assertThat( new AutoscalingDeciderResults(randomAutoscalingCapacity(), randomNodes(), results).requiredCapacity(), diff --git a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/capacity/memory/AutoscalingMemoryInfoServiceTests.java b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/capacity/memory/AutoscalingMemoryInfoServiceTests.java index 9ad6adf7a7e18..c8f080f472e85 100644 --- a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/capacity/memory/AutoscalingMemoryInfoServiceTests.java +++ b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/capacity/memory/AutoscalingMemoryInfoServiceTests.java @@ -327,14 +327,9 @@ private Set randomIrrelevantRoles(Set> relevantRo } public void assertMatchesResponse(Set nodes, NodesStatsResponse response) { - nodes.forEach( - n -> { - assertThat( - service.snapshot().get(n), - equalTo(response.getNodesMap().get(n.getId()).getOs().getMem().getTotal().getBytes()) - ); - } - ); + nodes.forEach(n -> { + assertThat(service.snapshot().get(n), equalTo(response.getNodesMap().get(n.getId()).getOs().getMem().getTotal().getBytes())); + }); } private Thread startThread(Runnable runnable) { diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java index a28d9de560cfb..3a6037410f01f 100644 --- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java +++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java @@ -64,14 +64,12 @@ public void testFollowIndex() throws Exception { client().prepareIndex("leader", "doc").setSource("{}", XContentType.JSON).get(); } - assertBusy( - () -> { - assertThat( - client().prepareSearch("follower").get().getHits().getTotalHits().value, - equalTo(firstBatchNumDocs + secondBatchNumDocs) - ); - } - ); + assertBusy(() -> { + assertThat( + client().prepareSearch("follower").get().getHits().getTotalHits().value, + equalTo(firstBatchNumDocs + secondBatchNumDocs) + ); + }); PauseFollowAction.Request pauseRequest = new PauseFollowAction.Request("follower"); client().execute(PauseFollowAction.INSTANCE, pauseRequest); diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java index d48250d08b05c..41ba86db117b4 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java @@ -571,10 +571,9 @@ private void checkAutoFollowPattern( Consumer resultHandler ) { final GroupedActionListener> groupedListener = new GroupedActionListener<>( - ActionListener.wrap( - rs -> resultHandler.accept(new AutoFollowResult(autoFollowPattenName, new ArrayList<>(rs))), - e -> { throw new AssertionError("must never happen", e); } - ), + ActionListener.wrap(rs -> resultHandler.accept(new AutoFollowResult(autoFollowPattenName, new ArrayList<>(rs))), e -> { + throw new AssertionError("must never happen", e); + }), leaderIndicesToFollow.size() ); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/FollowInfoResponseTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/FollowInfoResponseTests.java index 66dfea290bdb4..8bc02608fc54b 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/FollowInfoResponseTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/FollowInfoResponseTests.java @@ -46,10 +46,9 @@ public class FollowInfoResponseTests extends AbstractSerializingTestCase PARSER = new ConstructingObjectParser<>( - "response", - args -> { return new FollowInfoAction.Response((List) args[0]); } - ); + static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>("response", args -> { + return new FollowInfoAction.Response((List) args[0]); + }); static { PARSER.declareObjectArray(ConstructingObjectParser.constructorArg(), INFO_PARSER, FOLLOWER_INDICES_FIELD); diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java index 625dd464d7b03..93ee85772f031 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java @@ -115,14 +115,9 @@ public void testSnapshotAndRestore() throws Exception { boolean sourceHadDeletions = deleted > 0; // we use indexRandom which might create holes ie. deleted docs assertHits(sourceIdx, builders.length, sourceHadDeletions); assertMappings(sourceIdx, requireRouting, useNested); - SearchPhaseExecutionException e = expectThrows( - SearchPhaseExecutionException.class, - () -> { - client().prepareSearch(sourceIdx) - .setQuery(QueryBuilders.idsQuery().addIds("" + randomIntBetween(0, builders.length))) - .get(); - } - ); + SearchPhaseExecutionException e = expectThrows(SearchPhaseExecutionException.class, () -> { + client().prepareSearch(sourceIdx).setQuery(QueryBuilders.idsQuery().addIds("" + randomIntBetween(0, builders.length))).get(); + }); assertTrue(e.toString().contains("_source only indices can't be searched or filtered")); // can-match phase pre-filters access to non-existing field diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/ReloadAnalyzersResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/ReloadAnalyzersResponse.java index f973ab20281a2..1b3c21932d3f9 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/ReloadAnalyzersResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/ReloadAnalyzersResponse.java @@ -103,7 +103,9 @@ protected void addCustomXContentFields(XContentBuilder builder, Params params) t private static final ConstructingObjectParser ENTRY_PARSER = new ConstructingObjectParser<>( "reload_analyzer.entry", true, - arg -> { return new ReloadDetails((String) arg[0], new HashSet<>((List) arg[1]), new HashSet<>((List) arg[2])); } + arg -> { + return new ReloadDetails((String) arg[0], new HashSet<>((List) arg[1]), new HashSet<>((List) arg[2])); + } ); static { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/TransportDeleteAsyncResultAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/TransportDeleteAsyncResultAction.java index aa9004459f1f0..5e1d6475eabf1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/TransportDeleteAsyncResultAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/TransportDeleteAsyncResultAction.java @@ -48,7 +48,9 @@ public TransportDeleteAsyncResultAction( threadPool.getThreadContext(), client, ASYNC_SEARCH_ORIGIN, - (in) -> { throw new UnsupportedOperationException("Reading is not supported during deletion"); }, + (in) -> { + throw new UnsupportedOperationException("Reading is not supported during deletion"); + }, registry, bigArrays ); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleMetadata.java index 078557f63ff8e..666206080fed2 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleMetadata.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleMetadata.java @@ -47,12 +47,9 @@ public class IndexLifecycleMetadata implements XPackMetadataCustom { ) ); static { - PARSER.declareNamedObjects( - ConstructingObjectParser.constructorArg(), - (p, c, n) -> LifecyclePolicyMetadata.parse(p, n), - v -> { throw new IllegalArgumentException("ordered " + POLICIES_FIELD.getPreferredName() + " are not supported"); }, - POLICIES_FIELD - ); + PARSER.declareNamedObjects(ConstructingObjectParser.constructorArg(), (p, c, n) -> LifecyclePolicyMetadata.parse(p, n), v -> { + throw new IllegalArgumentException("ordered " + POLICIES_FIELD.getPreferredName() + " are not supported"); + }, POLICIES_FIELD); PARSER.declareString(ConstructingObjectParser.constructorArg(), OPERATION_MODE_FIELD); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java index e85ddb2857f67..022228dc75652 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java @@ -58,12 +58,9 @@ public class LifecyclePolicy extends AbstractDiffable implement } ); static { - PARSER.declareNamedObjects( - ConstructingObjectParser.constructorArg(), - (p, c, n) -> Phase.parse(p, n), - v -> { throw new IllegalArgumentException("ordered " + PHASES_FIELD.getPreferredName() + " are not supported"); }, - PHASES_FIELD - ); + PARSER.declareNamedObjects(ConstructingObjectParser.constructorArg(), (p, c, n) -> Phase.parse(p, n), v -> { + throw new IllegalArgumentException("ordered " + PHASES_FIELD.getPreferredName() + " are not supported"); + }, PHASES_FIELD); PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(), (p, c) -> p.map(), METADATA); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/Phase.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/Phase.java index 315415acd059f..c3fafadb51e65 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/Phase.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/Phase.java @@ -67,7 +67,9 @@ public class Phase implements ToXContentObject, Writeable { PARSER.declareNamedObjects( ConstructingObjectParser.constructorArg(), (p, c, n) -> p.namedObject(LifecycleAction.class, n, null), - v -> { throw new IllegalArgumentException("ordered " + ACTIONS_FIELD.getPreferredName() + " are not supported"); }, + v -> { + throw new IllegalArgumentException("ordered " + ACTIONS_FIELD.getPreferredName() + " are not supported"); + }, ACTIONS_FIELD ); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/action/MonitoringBulkRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/action/MonitoringBulkRequest.java index b8f2eac2de3da..0fb4aa65b7f55 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/action/MonitoringBulkRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/action/MonitoringBulkRequest.java @@ -105,7 +105,9 @@ public MonitoringBulkRequest add( add(new MonitoringBulkDoc(system, indexRequest.type(), indexRequest.id(), timestamp, intervalMillis, source, xContentType)); }, updateRequest -> { throw new IllegalArgumentException("monitoring bulk requests should only contain index requests"); }, - deleteRequest -> { throw new IllegalArgumentException("monitoring bulk requests should only contain index requests"); } + deleteRequest -> { + throw new IllegalArgumentException("monitoring bulk requests should only contain index requests"); + } ); return this; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/GetApiKeyResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/GetApiKeyResponse.java index f96831f1a8c01..f34bf690cb127 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/GetApiKeyResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/GetApiKeyResponse.java @@ -63,10 +63,9 @@ public void writeTo(StreamOutput out) throws IOException { } @SuppressWarnings("unchecked") - static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( - "get_api_key_response", - args -> { return (args[0] == null) ? GetApiKeyResponse.emptyResponse() : new GetApiKeyResponse((List) args[0]); } - ); + static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>("get_api_key_response", args -> { + return (args[0] == null) ? GetApiKeyResponse.emptyResponse() : new GetApiKeyResponse((List) args[0]); + }); static { PARSER.declareObjectArray(optionalConstructorArg(), (p, c) -> ApiKey.fromXContent(p), new ParseField("api_keys")); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java index ac780a6142cb0..8a1aac8729afb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java @@ -66,7 +66,9 @@ public class SnapshotLifecycleMetadata implements XPackMetadataCustom { PARSER.declareNamedObjects( ConstructingObjectParser.constructorArg(), (p, c, n) -> SnapshotLifecyclePolicyMetadata.parse(p, n), - v -> { throw new IllegalArgumentException("ordered " + POLICIES_FIELD.getPreferredName() + " are not supported"); }, + v -> { + throw new IllegalArgumentException("ordered " + POLICIES_FIELD.getPreferredName() + " are not supported"); + }, POLICIES_FIELD ); PARSER.declareString(ConstructingObjectParser.constructorArg(), OPERATION_MODE_FIELD); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/TermCount.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/TermCount.java index a580f1d1aca6d..19b4591e3251a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/TermCount.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/termsenum/action/TermCount.java @@ -25,11 +25,9 @@ public class TermCount implements Writeable, ToXContentFragment { public static final String TERM_FIELD = "term"; public static final String DOC_COUNT_FIELD = "doc_count"; - static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( - "term_count", - true, - a -> { return new TermCount((String) a[0], (long) a[1]); } - ); + static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>("term_count", true, a -> { + return new TermCount((String) a[0], (long) a[1]); + }); static { PARSER.declareString(constructorArg(), new ParseField(TERM_FIELD)); PARSER.declareLong(constructorArg(), new ParseField(DOC_COUNT_FIELD)); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicenseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicenseTests.java index 6ba5d562a35eb..6b7adb6f563d4 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicenseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicenseTests.java @@ -228,10 +228,9 @@ public void testNotEnoughBytesFromXContent() throws Exception { + "\"issuer\":\"elasticsearch\"," + "\"signature\":\"AA\"}" + "}"; - ElasticsearchException exception = expectThrows( - ElasticsearchException.class, - () -> { License.fromSource(new BytesArray(licenseString.getBytes(StandardCharsets.UTF_8)), XContentType.JSON); } - ); + ElasticsearchException exception = expectThrows(ElasticsearchException.class, () -> { + License.fromSource(new BytesArray(licenseString.getBytes(StandardCharsets.UTF_8)), XContentType.JSON); + }); assertThat(exception.getMessage(), containsString("malformed signature for license [4056779d-b823-4c12-a9cb-efa4a8d8c422]")); assertThat(exception.getCause(), instanceOf(BufferUnderflowException.class)); } @@ -250,10 +249,9 @@ public void testMalformedSignatureFromXContent() throws Exception { + randomAlphaOfLength(10) + "\"}" + "}"; - ElasticsearchException exception = expectThrows( - ElasticsearchException.class, - () -> { License.fromSource(new BytesArray(licenseString.getBytes(StandardCharsets.UTF_8)), XContentType.JSON); } - ); + ElasticsearchException exception = expectThrows(ElasticsearchException.class, () -> { + License.fromSource(new BytesArray(licenseString.getBytes(StandardCharsets.UTF_8)), XContentType.JSON); + }); // When parsing a license, we read the signature bytes to verify the _version_. // Random alphabetic sig bytes will generate a bad version assertThat(exception, throwableWithMessage(containsString("Unknown license version found"))); @@ -277,10 +275,9 @@ public void testUnableToBase64DecodeFromXContent() throws Exception { + "EL7wA6Z0/UuRm/weECcsjW/50kBnPLO8yEs+9/bPa5LSU0bF6byEXOVeO0ebUQfztpjulbXh8TrBDSG+6VdxGtohPo2IYPBaXzGs3LOOor6An/lhptxBWdwYmf" + "+xHAQ8tyvRqP5G+PRU7tiluEwR/eyHGZV2exdJNzmoGzdPSWwueBM5HK2GexORICH+UFI4cuGz444/hL2MMM1RdpVWQkT0SJ6D9x/VuSmHuYPdtX59Pp41LXvl" + "bcp0m8mnXZh1vN9rmbTsZXnhBIoPTaRDwUBi3vJ3Ms3iLaEm4S8Slrfmtht2jUjgGZ2vAeZ9OHU2YsGtrSpz6fd\"}"; - ElasticsearchException exception = expectThrows( - ElasticsearchException.class, - () -> { License.fromSource(new BytesArray(licenseString.getBytes(StandardCharsets.UTF_8)), XContentType.JSON); } - ); + ElasticsearchException exception = expectThrows(ElasticsearchException.class, () -> { + License.fromSource(new BytesArray(licenseString.getBytes(StandardCharsets.UTF_8)), XContentType.JSON); + }); assertThat(exception.getMessage(), containsString("malformed signature for license [4056779d-b823-4c12-a9cb-efa4a8d8c422]")); assertThat(exception.getCause(), instanceOf(IllegalArgumentException.class)); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/IteratingActionListenerTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/IteratingActionListenerTests.java index 8bc85751589a5..8493fd1840921 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/IteratingActionListenerTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/IteratingActionListenerTests.java @@ -129,15 +129,12 @@ public void testFailure() { }; final AtomicBoolean onFailureCalled = new AtomicBoolean(false); - IteratingActionListener iteratingListener = new IteratingActionListener<>( - ActionListener.wrap((object) -> { fail("onResponse should not have been called, but was called with: " + object); }, (e) -> { - assertEquals("expected exception", e.getMessage()); - assertTrue(onFailureCalled.compareAndSet(false, true)); - }), - consumer, - items, - new ThreadContext(Settings.EMPTY) - ); + IteratingActionListener iteratingListener = new IteratingActionListener<>(ActionListener.wrap((object) -> { + fail("onResponse should not have been called, but was called with: " + object); + }, (e) -> { + assertEquals("expected exception", e.getMessage()); + assertTrue(onFailureCalled.compareAndSet(false, true)); + }), consumer, items, new ThreadContext(Settings.EMPTY)); iteratingListener.run(); // we never really went async, its all chained together so verify this for sanity diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ensemble/EnsembleTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ensemble/EnsembleTests.java index 395edee638f7a..423f36ea841f7 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ensemble/EnsembleTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ensemble/EnsembleTests.java @@ -132,17 +132,14 @@ public void testEnsembleWithAggregatedOutputDifferingFromTrainedModels() { for (int i = 0; i < numberOfModels; i++) { models.add(TreeTests.buildRandomTree(featureNames, 6)); } - ElasticsearchException ex = expectThrows( - ElasticsearchException.class, - () -> { - Ensemble.builder() - .setTrainedModels(models) - .setOutputAggregator(outputAggregator) - .setFeatureNames(featureNames) - .build() - .validate(); - } - ); + ElasticsearchException ex = expectThrows(ElasticsearchException.class, () -> { + Ensemble.builder() + .setTrainedModels(models) + .setOutputAggregator(outputAggregator) + .setFeatureNames(featureNames) + .build() + .validate(); + }); assertThat(ex.getMessage(), equalTo("[aggregate_output] expects value array of size [7] but number of models is [5]")); } @@ -209,10 +206,9 @@ public void testEnsembleWithTargetTypeAndLabelsMismatch() { public void testEnsembleWithEmptyModels() { List featureNames = Arrays.asList("foo", "bar"); - ElasticsearchException ex = expectThrows( - ElasticsearchException.class, - () -> { Ensemble.builder().setTrainedModels(Collections.emptyList()).setFeatureNames(featureNames).build().validate(); } - ); + ElasticsearchException ex = expectThrows(ElasticsearchException.class, () -> { + Ensemble.builder().setTrainedModels(Collections.emptyList()).setFeatureNames(featureNames).build().validate(); + }); assertThat(ex.getMessage(), equalTo("[trained_models] must not be empty")); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/CreateApiKeyResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/CreateApiKeyResponseTests.java index 2381256dfc13a..f8f3aac176e75 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/CreateApiKeyResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/CreateApiKeyResponseTests.java @@ -56,19 +56,12 @@ public void testSerialization() throws IOException { public void testEqualsHashCode() { CreateApiKeyResponse createApiKeyResponse = createTestInstance(); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - createApiKeyResponse, - (original) -> { - return new CreateApiKeyResponse(original.getName(), original.getId(), original.getKey(), original.getExpiration()); - } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - createApiKeyResponse, - (original) -> { - return new CreateApiKeyResponse(original.getName(), original.getId(), original.getKey(), original.getExpiration()); - }, - CreateApiKeyResponseTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(createApiKeyResponse, (original) -> { + return new CreateApiKeyResponse(original.getName(), original.getId(), original.getKey(), original.getExpiration()); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(createApiKeyResponse, (original) -> { + return new CreateApiKeyResponse(original.getName(), original.getId(), original.getKey(), original.getExpiration()); + }, CreateApiKeyResponseTests::mutateTestItem); } private static CreateApiKeyResponse mutateTestItem(CreateApiKeyResponse original) { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/ResourcePrivilegesMapTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/ResourcePrivilegesMapTests.java index a9edb87a90cad..4f17df584be10 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/ResourcePrivilegesMapTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/ResourcePrivilegesMapTests.java @@ -70,15 +70,12 @@ public void testEqualsHashCode() { .addResourcePrivilege("*", mapBuilder().put("read", true).put("write", true).map()) .build(); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - instance, - (original) -> { return ResourcePrivilegesMap.builder().addResourcePrivilegesMap(original).build(); } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - instance, - (original) -> { return ResourcePrivilegesMap.builder().addResourcePrivilegesMap(original).build(); }, - ResourcePrivilegesMapTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(instance, (original) -> { + return ResourcePrivilegesMap.builder().addResourcePrivilegesMap(original).build(); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(instance, (original) -> { + return ResourcePrivilegesMap.builder().addResourcePrivilegesMap(original).build(); + }, ResourcePrivilegesMapTests::mutateTestItem); } private static ResourcePrivilegesMap mutateTestItem(ResourcePrivilegesMap original) { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/ResourcePrivilegesTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/ResourcePrivilegesTests.java index db155e424a2bc..e4cc1390d132f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/ResourcePrivilegesTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/ResourcePrivilegesTests.java @@ -40,15 +40,12 @@ public void testWhenSamePrivilegeExists() { public void testEqualsHashCode() { ResourcePrivileges instance = createInstance(); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - instance, - (original) -> { return ResourcePrivileges.builder(original.getResource()).addPrivileges(original.getPrivileges()).build(); } - ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - instance, - (original) -> { return ResourcePrivileges.builder(original.getResource()).addPrivileges(original.getPrivileges()).build(); }, - ResourcePrivilegesTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(instance, (original) -> { + return ResourcePrivileges.builder(original.getResource()).addPrivileges(original.getPrivileges()).build(); + }); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(instance, (original) -> { + return ResourcePrivileges.builder(original.getResource()).addPrivileges(original.getPrivileges()).build(); + }, ResourcePrivilegesTests::mutateTestItem); } private ResourcePrivileges createInstance() { diff --git a/x-pack/plugin/data-streams/src/test/java/org/elasticsearch/xpack/datastreams/DataStreamsStatsTests.java b/x-pack/plugin/data-streams/src/test/java/org/elasticsearch/xpack/datastreams/DataStreamsStatsTests.java index 5df7bb7b17538..edf7e93f30e9e 100644 --- a/x-pack/plugin/data-streams/src/test/java/org/elasticsearch/xpack/datastreams/DataStreamsStatsTests.java +++ b/x-pack/plugin/data-streams/src/test/java/org/elasticsearch/xpack/datastreams/DataStreamsStatsTests.java @@ -133,14 +133,9 @@ public void testStatsClosedBackingIndexDataStream() throws Exception { client().admin().indices().close(new CloseIndexRequest(".ds-" + dataStreamName + "-*-000001")).actionGet().isAcknowledged() ); - assertBusy( - () -> { - assertNotEquals( - ClusterHealthStatus.RED, - client().admin().cluster().health(new ClusterHealthRequest()).actionGet().getStatus() - ); - } - ); + assertBusy(() -> { + assertNotEquals(ClusterHealthStatus.RED, client().admin().cluster().health(new ClusterHealthRequest()).actionGet().getStatus()); + }); DataStreamsStatsAction.Response stats = getDataStreamsStats(); assertEquals(2, stats.getSuccessfulShards()); diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TransformDeprecationChecker.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TransformDeprecationChecker.java index 9f3840d95a65a..30dab4cab99fc 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TransformDeprecationChecker.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/TransformDeprecationChecker.java @@ -33,15 +33,9 @@ public void check(Components components, ActionListener deprecation PageParams startPage = new PageParams(0, PageParams.DEFAULT_SIZE); List issues = new ArrayList<>(); - recursiveGetTransformsAndCollectDeprecations( - components, - issues, - startPage, - ActionListener.wrap( - allIssues -> { deprecationIssueListener.onResponse(new CheckResult(getName(), allIssues)); }, - deprecationIssueListener::onFailure - ) - ); + recursiveGetTransformsAndCollectDeprecations(components, issues, startPage, ActionListener.wrap(allIssues -> { + deprecationIssueListener.onResponse(new CheckResult(getName(), allIssues)); + }, deprecationIssueListener::onFailure)); } @Override diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java index 650c3fd7364b4..5bbd6a105db20 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichShardMultiSearchAction.java @@ -238,14 +238,9 @@ protected MultiSearchResponse shardOperation(Request request, ShardId shardId) t * any. */ Map runtimeFields = emptyMap(); - final SearchExecutionContext context = indexService.newSearchExecutionContext( - shardId.id(), - 0, - searcher, - () -> { throw new UnsupportedOperationException(); }, - null, - runtimeFields - ); + final SearchExecutionContext context = indexService.newSearchExecutionContext(shardId.id(), 0, searcher, () -> { + throw new UnsupportedOperationException(); + }, null, runtimeFields); final String type = context.getType(); final Text typeText = new Text(type); final MultiSearchResponse.Item[] items = new MultiSearchResponse.Item[request.multiSearchRequest.requests().size()]; diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/planner/QueryTranslator.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/planner/QueryTranslator.java index 2d529d8e9142e..e757245b02609 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/planner/QueryTranslator.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/planner/QueryTranslator.java @@ -79,9 +79,9 @@ public static Query toQuery(Expression e, TranslatorHandler handler) { if (translation instanceof ScriptQuery) { // check the operators and the expressions involved in these operations so that all can be used // in a doc-values multi-valued context - boolean multiValuedIncompatible = e.anyMatch( - exp -> { return false == (exp instanceof Literal || exp instanceof FieldAttribute || exp instanceof Function); } - ); + boolean multiValuedIncompatible = e.anyMatch(exp -> { + return false == (exp instanceof Literal || exp instanceof FieldAttribute || exp instanceof Function); + }); if (multiValuedIncompatible == false) { ScriptQuery query = (ScriptQuery) translation; return new MultiValueAwareScriptQuery(query.source(), Scripts.multiValueDocValuesRewrite(query.script())); diff --git a/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java b/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java index 04dce55f6f9dd..301f95fa5d53e 100644 --- a/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java +++ b/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java @@ -1176,7 +1176,7 @@ public void testDeleteActionDoesntDeleteSearchableSnapshot() throws Exception { Map snapshotInfoMap = (Map) snapshot; if (snapshotInfoMap.get("snapshot").equals(snapshotName[0]) && // wait for the snapshot to be completed (successfully or not) otherwise the teardown might fail - SnapshotState.valueOf((String) snapshotInfoMap.get("state")).completed()) { + SnapshotState.valueOf((String) snapshotInfoMap.get("state")).completed()) { return true; } } diff --git a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java index a89d013b6dbb2..3b61f1558a2d7 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java @@ -228,14 +228,9 @@ public AggregateDoubleMetricFieldMapper build(MapperBuilderContext context) { EnumMap metricFields = metricMappers.entrySet() .stream() - .collect( - Collectors.toMap( - Map.Entry::getKey, - e -> e.getValue().fieldType(), - (l, r) -> { throw new IllegalArgumentException("Duplicate keys " + l + "and " + r + "."); }, - () -> new EnumMap<>(Metric.class) - ) - ); + .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().fieldType(), (l, r) -> { + throw new IllegalArgumentException("Duplicate keys " + l + "and " + r + "."); + }, () -> new EnumMap<>(Metric.class))); AggregateDoubleMetricFieldType metricFieldType = new AggregateDoubleMetricFieldType( context.buildFullName(name), diff --git a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java index 08af074090b61..7f22ceb2df7c8 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java @@ -61,33 +61,19 @@ protected void registerParameters(ParameterChecker checker) throws IOException { m -> assertTrue(((AggregateDoubleMetricFieldMapper) m).ignoreMalformed()) ); - checker.registerConflictCheck( - DEFAULT_METRIC, - fieldMapping(this::minimalMapping), - fieldMapping( - b -> { b.field("type", CONTENT_TYPE).field(METRICS_FIELD, new String[] { "min", "max" }).field(DEFAULT_METRIC, "min"); } - ) - ); - - checker.registerConflictCheck( - METRICS_FIELD, - fieldMapping(this::minimalMapping), - fieldMapping( - b -> { b.field("type", CONTENT_TYPE).field(METRICS_FIELD, new String[] { "min", "max" }).field(DEFAULT_METRIC, "max"); } - ) - ); - - checker.registerConflictCheck( - METRICS_FIELD, - fieldMapping(this::minimalMapping), - fieldMapping( - b -> { - b.field("type", CONTENT_TYPE) - .field(METRICS_FIELD, new String[] { "min", "max", "value_count", "sum" }) - .field(DEFAULT_METRIC, "min"); - } - ) - ); + checker.registerConflictCheck(DEFAULT_METRIC, fieldMapping(this::minimalMapping), fieldMapping(b -> { + b.field("type", CONTENT_TYPE).field(METRICS_FIELD, new String[] { "min", "max" }).field(DEFAULT_METRIC, "min"); + })); + + checker.registerConflictCheck(METRICS_FIELD, fieldMapping(this::minimalMapping), fieldMapping(b -> { + b.field("type", CONTENT_TYPE).field(METRICS_FIELD, new String[] { "min", "max" }).field(DEFAULT_METRIC, "max"); + })); + + checker.registerConflictCheck(METRICS_FIELD, fieldMapping(this::minimalMapping), fieldMapping(b -> { + b.field("type", CONTENT_TYPE) + .field(METRICS_FIELD, new String[] { "min", "max", "value_count", "sum" }) + .field(DEFAULT_METRIC, "min"); + })); } @Override diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelPersisterIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelPersisterIT.java index 1d758d257396a..f465b4fa7a026 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelPersisterIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelPersisterIT.java @@ -81,7 +81,9 @@ public void testStoreModelViaChunkedPersister() throws IOException { trainedModelProvider, analyticsConfig, new DataFrameAnalyticsAuditor(client(), getInstanceFromNode(ClusterService.class)), - (ex) -> { throw new ElasticsearchException(ex); }, + (ex) -> { + throw new ElasticsearchException(ex); + }, new ExtractedFields(extractedFieldList, Collections.emptyList(), Collections.emptyMap()) ); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java index 76aa6bfac8373..85401d5e0bfaf 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java @@ -486,17 +486,16 @@ public void snapshotMlMeta(MlMetadata mlMetadata, ActionListener listen client.threadPool().getThreadContext(), ML_ORIGIN, indexRequest, - ActionListener.wrap( - indexResponse -> { listener.onResponse(indexResponse.getResult() == DocWriteResponse.Result.CREATED); }, - e -> { - if (ExceptionsHelper.unwrapCause(e) instanceof VersionConflictEngineException) { - // the snapshot already exists - listener.onResponse(Boolean.TRUE); - } else { - listener.onFailure(e); - } + ActionListener.wrap(indexResponse -> { + listener.onResponse(indexResponse.getResult() == DocWriteResponse.Result.CREATED); + }, e -> { + if (ExceptionsHelper.unwrapCause(e) instanceof VersionConflictEngineException) { + // the snapshot already exists + listener.onResponse(Boolean.TRUE); + } else { + listener.onFailure(e); } - ), + }), client::index ); }, listener::onFailure) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetCalendarEventsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetCalendarEventsAction.java index 116bde09cab6f..4c75c300fce94 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetCalendarEventsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetCalendarEventsAction.java @@ -58,10 +58,9 @@ protected void doExecute( .size(request.getPageParams().getSize()) .calendarIds(calendarId); - ActionListener> eventsListener = ActionListener.wrap( - events -> { listener.onResponse(new GetCalendarEventsAction.Response(events)); }, - listener::onFailure - ); + ActionListener> eventsListener = ActionListener.wrap(events -> { + listener.onResponse(new GetCalendarEventsAction.Response(events)); + }, listener::onFailure); if (request.getJobId() != null) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetJobsStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetJobsStatsAction.java index 30b2a09b23d4a..59bba9a196240 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetJobsStatsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetJobsStatsAction.java @@ -246,17 +246,13 @@ void gatherDataCountsModelSizeStatsAndTimingStats( Consumer errorHandler ) { jobResultsProvider.dataCounts(jobId, dataCounts -> { - jobResultsProvider.modelSizeStats( - jobId, - modelSizeStats -> { - jobResultsProvider.timingStats( - jobId, - timingStats -> { handler.apply(dataCounts, modelSizeStats, timingStats); }, - errorHandler - ); - }, - errorHandler - ); + jobResultsProvider.modelSizeStats(jobId, modelSizeStats -> { + jobResultsProvider.timingStats( + jobId, + timingStats -> { handler.apply(dataCounts, modelSizeStats, timingStats); }, + errorHandler + ); + }, errorHandler); }, errorHandler); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateFilterAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateFilterAction.java index 77b9a2c122f60..3ca4161e37822 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateFilterAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateFilterAction.java @@ -69,10 +69,9 @@ public TransportUpdateFilterAction( @Override protected void doExecute(Task task, UpdateFilterAction.Request request, ActionListener listener) { - ActionListener filterListener = ActionListener.wrap( - filterWithVersion -> { updateFilter(filterWithVersion, request, listener); }, - listener::onFailure - ); + ActionListener filterListener = ActionListener.wrap(filterWithVersion -> { + updateFilter(filterWithVersion, request, listener); + }, listener::onFailure); getFilterWithVersion(request.getFilterId(), filterListener); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DestinationIndex.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DestinationIndex.java index 793110e3e5cb3..4ce249ae3fa22 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DestinationIndex.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DestinationIndex.java @@ -128,14 +128,9 @@ private static void prepareCreateIndexRequest( AtomicReference settingsHolder = new AtomicReference<>(); AtomicReference> mappingsHolder = new AtomicReference<>(); - ActionListener fieldCapabilitiesListener = ActionListener.wrap( - fieldCapabilitiesResponse -> { - listener.onResponse( - createIndexRequest(clock, config, settingsHolder.get(), mappingsHolder.get(), fieldCapabilitiesResponse) - ); - }, - listener::onFailure - ); + ActionListener fieldCapabilitiesListener = ActionListener.wrap(fieldCapabilitiesResponse -> { + listener.onResponse(createIndexRequest(clock, config, settingsHolder.get(), mappingsHolder.get(), fieldCapabilitiesResponse)); + }, listener::onFailure); ActionListener> mappingsListener = ActionListener.wrap(mappings -> { mappingsHolder.set(mappings); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java index ff7851a0d1158..7c4aaa6de7c9e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java @@ -662,10 +662,9 @@ public void notifyFilterChanged( if (isJobOpen(clusterState, job.getId())) { updateJobProcessNotifier.submitJobUpdate( UpdateParams.filterUpdate(job.getId(), filter), - ActionListener.wrap( - isUpdated -> { auditFilterChanges(job.getId(), filter.getId(), addedItems, removedItems); }, - e -> {} - ) + ActionListener.wrap(isUpdated -> { + auditFilterChanges(job.getId(), filter.getId(), addedItems, removedItems); + }, e -> {}) ); } else { auditFilterChanges(job.getId(), filter.getId(), addedItems, removedItems); @@ -735,13 +734,9 @@ public void updateProcessOnCalendarChanged(List calendarJobIds, ActionLi private void submitJobEventUpdate(Collection jobIds, ActionListener updateListener) { for (String jobId : jobIds) { - updateJobProcessNotifier.submitJobUpdate( - UpdateParams.scheduledEventsUpdate(jobId), - ActionListener.wrap( - isUpdated -> { auditor.info(jobId, Messages.getMessage(Messages.JOB_AUDIT_CALENDARS_UPDATED_ON_PROCESS)); }, - e -> logger.error("[" + jobId + "] failed submitting process update on calendar change", e) - ) - ); + updateJobProcessNotifier.submitJobUpdate(UpdateParams.scheduledEventsUpdate(jobId), ActionListener.wrap(isUpdated -> { + auditor.info(jobId, Messages.getMessage(Messages.JOB_AUDIT_CALENDARS_UPDATED_ON_PROCESS)); + }, e -> logger.error("[" + jobId + "] failed submitting process update on calendar change", e))); } updateListener.onResponse(Boolean.TRUE); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java index 957f5e757d54c..0c13fecff8150 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java @@ -665,10 +665,9 @@ public void groupExists(String groupId, ActionListener listener) { client.threadPool().getThreadContext(), ML_ORIGIN, searchRequest, - ActionListener.wrap( - response -> { listener.onResponse(response.getHits().getTotalHits().value > 0); }, - listener::onFailure - ), + ActionListener.wrap(response -> { + listener.onResponse(response.getHits().getTotalHits().value > 0); + }, listener::onFailure), client::search ); } diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/DataExtractorFactoryTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/DataExtractorFactoryTests.java index 695b11d1dbeb1..03cdd8b1d898b 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/DataExtractorFactoryTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/DataExtractorFactoryTests.java @@ -315,10 +315,9 @@ public void testCreateDataExtractorFactoryGivenRollupAndValidAggregation() { .field("time") ) ); - ActionListener listener = ActionListener.wrap( - dataExtractorFactory -> { assertThat(dataExtractorFactory, instanceOf(RollupDataExtractorFactory.class)); }, - e -> fail() - ); + ActionListener listener = ActionListener.wrap(dataExtractorFactory -> { + assertThat(dataExtractorFactory, instanceOf(RollupDataExtractorFactory.class)); + }, e -> fail()); DataExtractorFactory.create( client, datafeedConfig.build(), @@ -353,10 +352,9 @@ public void testCreateDataExtractorFactoryGivenRollupAndRemoteIndex() { ); // Test with remote index, aggregation, and no chunking - ActionListener listener = ActionListener.wrap( - dataExtractorFactory -> { assertThat(dataExtractorFactory, instanceOf(AggregationDataExtractorFactory.class)); }, - e -> fail() - ); + ActionListener listener = ActionListener.wrap(dataExtractorFactory -> { + assertThat(dataExtractorFactory, instanceOf(AggregationDataExtractorFactory.class)); + }, e -> fail()); DataExtractorFactory.create( client, datafeedConfig.build(), @@ -437,10 +435,9 @@ public void testCreateDataExtractorFactoryGivenRollupAndValidAggregationAndAutoC .field("time") ) ); - ActionListener listener = ActionListener.wrap( - dataExtractorFactory -> { assertThat(dataExtractorFactory, instanceOf(ChunkedDataExtractorFactory.class)); }, - e -> fail() - ); + ActionListener listener = ActionListener.wrap(dataExtractorFactory -> { + assertThat(dataExtractorFactory, instanceOf(ChunkedDataExtractorFactory.class)); + }, e -> fail()); DataExtractorFactory.create( client, datafeedConfig.build(), diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProviderTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProviderTests.java index 50b979cdcadba..7c2de49706349 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProviderTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProviderTests.java @@ -707,7 +707,9 @@ public void testTimingStats_Ok() throws IOException { provider.timingStats( "foo", stats -> assertThat(stats, equalTo(new TimingStats("foo", 7, 1.0, 1000.0, 666.0, 777.0, context))), - e -> { throw new AssertionError("Failure getting timing stats", e); } + e -> { + throw new AssertionError("Failure getting timing stats", e); + } ); verify(client).prepareSearch(indexName); @@ -724,11 +726,9 @@ public void testTimingStats_NotFound() throws IOException { when(client.prepareSearch(indexName)).thenReturn(new SearchRequestBuilder(client, SearchAction.INSTANCE).setIndices(indexName)); JobResultsProvider provider = createProvider(client); - provider.timingStats( - "foo", - stats -> assertThat(stats, equalTo(new TimingStats("foo"))), - e -> { throw new AssertionError("Failure getting timing stats", e); } - ); + provider.timingStats("foo", stats -> assertThat(stats, equalTo(new TimingStats("foo"))), e -> { + throw new AssertionError("Failure getting timing stats", e); + }); verify(client).prepareSearch(indexName); verify(client).threadPool(); @@ -740,13 +740,9 @@ public void testDatafeedTimingStats_EmptyJobList() { Client client = getBasicMockedClient(); JobResultsProvider provider = createProvider(client); - provider.datafeedTimingStats( - Arrays.asList(), - ActionListener.wrap( - statsByJobId -> assertThat(statsByJobId, anEmptyMap()), - e -> { throw new AssertionError("Failure getting datafeed timing stats", e); } - ) - ); + provider.datafeedTimingStats(Arrays.asList(), ActionListener.wrap(statsByJobId -> assertThat(statsByJobId, anEmptyMap()), e -> { + throw new AssertionError("Failure getting datafeed timing stats", e); + })); verifyNoMoreInteractions(client); } @@ -859,7 +855,9 @@ public void testDatafeedTimingStats_Ok() throws IOException { provider.datafeedTimingStats( "foo", stats -> assertThat(stats, equalTo(new DatafeedTimingStats("foo", 6, 66, 666.0, contextFoo))), - e -> { throw new AssertionError("Failure getting datafeed timing stats", e); } + e -> { + throw new AssertionError("Failure getting datafeed timing stats", e); + } ); verify(client).prepareSearch(indexName); @@ -876,11 +874,9 @@ public void testDatafeedTimingStats_NotFound() throws IOException { when(client.prepareSearch(indexName)).thenReturn(new SearchRequestBuilder(client, SearchAction.INSTANCE).setIndices(indexName)); JobResultsProvider provider = createProvider(client); - provider.datafeedTimingStats( - "foo", - stats -> assertThat(stats, equalTo(new DatafeedTimingStats("foo"))), - e -> { throw new AssertionError("Failure getting datafeed timing stats", e); } - ); + provider.datafeedTimingStats("foo", stats -> assertThat(stats, equalTo(new DatafeedTimingStats("foo"))), e -> { + throw new AssertionError("Failure getting datafeed timing stats", e); + }); verify(client).prepareSearch(indexName); verify(client).threadPool(); diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java index 724d980e4942d..f6cec9f5a8334 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java @@ -596,21 +596,15 @@ public void resolveAsSeparateMappings( ) { FieldCapabilitiesRequest fieldRequest = createFieldCapsRequest(indexWildcard, includeFrozen, runtimeMappings); client.fieldCaps(fieldRequest, wrap(response -> { - client.admin() - .indices() - .getAliases( - createGetAliasesRequest(response, includeFrozen), - wrap( - aliases -> { listener.onResponse(separateMappings(typeRegistry, javaRegex, response, aliases.getAliases())); }, - ex -> { - if (ex instanceof IndexNotFoundException || ex instanceof ElasticsearchSecurityException) { - listener.onResponse(separateMappings(typeRegistry, javaRegex, response, null)); - } else { - listener.onFailure(ex); - } - } - ) - ); + client.admin().indices().getAliases(createGetAliasesRequest(response, includeFrozen), wrap(aliases -> { + listener.onResponse(separateMappings(typeRegistry, javaRegex, response, aliases.getAliases())); + }, ex -> { + if (ex instanceof IndexNotFoundException || ex instanceof ElasticsearchSecurityException) { + listener.onResponse(separateMappings(typeRegistry, javaRegex, response, null)); + } else { + listener.onFailure(ex); + } + })); }, listener::onFailure)); } diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java index 0ef4496ee3fa7..bc7f802fb8de0 100644 --- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java +++ b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java @@ -459,7 +459,7 @@ private Expression propagate(And and) { } } else if (bc instanceof GreaterThan || bc instanceof GreaterThanOrEqual) { // a = 2 AND a >/>= ? if ((compare == 0 && bc instanceof GreaterThan) || // a = 2 AND a > 2 - compare < 0) { // a = 2 AND a >/>= 3 + compare < 0) { // a = 2 AND a >/>= 3 return new Literal(and.source(), Boolean.FALSE, DataTypes.BOOLEAN); } } @@ -1048,15 +1048,15 @@ else if ((other instanceof LessThan || other instanceof LessThanOrEqual) // AND if ((conjunctive && // a < 2 AND a < 3 -> a < 2 - (compare < 0 || + (compare < 0 || // a < 2 AND a <= 2 -> a < 2 - (compare == 0 && main instanceof LessThan && other instanceof LessThanOrEqual))) || + (compare == 0 && main instanceof LessThan && other instanceof LessThanOrEqual))) || // OR - (conjunctive == false && + (conjunctive == false && // a < 2 OR a < 3 -> a < 3 - (compare > 0 || + (compare > 0 || // a <= 2 OR a < 2 -> a <= 2 - (compare == 0 && main instanceof LessThanOrEqual && other instanceof LessThan)))) { + (compare == 0 && main instanceof LessThanOrEqual && other instanceof LessThan)))) { bcs.remove(i); bcs.add(i, main); @@ -1252,15 +1252,13 @@ protected Expression rule(Or or) { if (found.isEmpty() == false) { // combine equals alongside the existing ors final ZoneId finalZoneId = zoneId; - found.forEach( - (k, v) -> { - ors.add( - v.size() == 1 - ? new Equals(k.source(), k, v.iterator().next(), finalZoneId) - : createIn(k, new ArrayList<>(v), finalZoneId) - ); - } - ); + found.forEach((k, v) -> { + ors.add( + v.size() == 1 + ? new Equals(k.source(), k, v.iterator().next(), finalZoneId) + : createIn(k, new ArrayList<>(v), finalZoneId) + ); + }); Expression combineOr = combineOr(ors); // check the result semantically since the result might different in order diff --git a/x-pack/plugin/repository-encrypted/src/test/java/org/elasticsearch/repositories/encrypted/SingleUseKeyTests.java b/x-pack/plugin/repository-encrypted/src/test/java/org/elasticsearch/repositories/encrypted/SingleUseKeyTests.java index ef3fac7839c0c..97518fd07ab9c 100644 --- a/x-pack/plugin/repository-encrypted/src/test/java/org/elasticsearch/repositories/encrypted/SingleUseKeyTests.java +++ b/x-pack/plugin/repository-encrypted/src/test/java/org/elasticsearch/repositories/encrypted/SingleUseKeyTests.java @@ -149,10 +149,9 @@ public void testGeneratorException() { int nonce = SingleUseKey.MAX_NONCE; SingleUseKey singleUseKey = new SingleUseKey(null, null, nonce); AtomicReference keyCurrentlyInUse = new AtomicReference<>(singleUseKey); - CheckedSupplier singleUseKeySupplier = SingleUseKey.internalSingleUseKeySupplier( - () -> { throw new IOException("expected exception"); }, - keyCurrentlyInUse - ); + CheckedSupplier singleUseKeySupplier = SingleUseKey.internalSingleUseKeySupplier(() -> { + throw new IOException("expected exception"); + }, keyCurrentlyInUse); expectThrows(IOException.class, () -> singleUseKeySupplier.get()); } } diff --git a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/action/PutJobStateMachineTests.java b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/action/PutJobStateMachineTests.java index 9f79dbbf80211..03d13433261e7 100644 --- a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/action/PutJobStateMachineTests.java +++ b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/action/PutJobStateMachineTests.java @@ -57,13 +57,12 @@ public class PutJobStateMachineTests extends ESTestCase { public void testCreateIndexException() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random(), "foo"), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { - assertThat(e.getMessage(), equalTo("Could not create index for rollup job [foo]")); - assertThat(e.getCause().getMessage(), equalTo("something bad")); - } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { + assertThat(e.getMessage(), equalTo("Could not create index for rollup job [foo]")); + assertThat(e.getCause().getMessage(), equalTo("something bad")); + }); Logger logger = mock(Logger.class); Client client = mock(Client.class); @@ -84,10 +83,9 @@ public void testCreateIndexException() { public void testIndexAlreadyExists() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random()), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { assertThat(e.getCause().getMessage(), equalTo("Ending")); } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { assertThat(e.getCause().getMessage(), equalTo("Ending")); }); Logger logger = mock(Logger.class); Client client = mock(Client.class); @@ -115,10 +113,9 @@ public void testIndexAlreadyExists() { public void testIndexMetadata() throws InterruptedException { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random()), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { assertThat(e.getCause().getMessage(), equalTo("Ending")); } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { assertThat(e.getCause().getMessage(), equalTo("Ending")); }); Logger logger = mock(Logger.class); Client client = mock(Client.class); @@ -157,13 +154,12 @@ public void testIndexMetadata() throws InterruptedException { public void testGetMappingFails() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random(), "foo"), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { - assertThat(e.getMessage(), equalTo("Could not update mappings for rollup job [foo]")); - assertThat(e.getCause().getMessage(), equalTo("something bad")); - } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { + assertThat(e.getMessage(), equalTo("Could not update mappings for rollup job [foo]")); + assertThat(e.getCause().getMessage(), equalTo("something bad")); + }); Logger logger = mock(Logger.class); Client client = mock(Client.class); @@ -182,20 +178,19 @@ public void testGetMappingFails() { public void testNoMetadataInMapping() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random()), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { - assertThat( - e.getMessage(), - equalTo( - "Rollup data cannot be added to existing indices that contain " - + "non-rollup data (expected to find _meta key in mapping of rollup index [" - + job.getConfig().getRollupIndex() - + "] but not found)." - ) - ); - } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { + assertThat( + e.getMessage(), + equalTo( + "Rollup data cannot be added to existing indices that contain " + + "non-rollup data (expected to find _meta key in mapping of rollup index [" + + job.getConfig().getRollupIndex() + + "] but not found)." + ) + ); + }); Logger logger = mock(Logger.class); Client client = mock(Client.class); @@ -223,20 +218,19 @@ public void testNoMetadataInMapping() { public void testMetadataButNotRollup() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random()), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { - assertThat( - e.getMessage(), - equalTo( - "Rollup data cannot be added to existing indices that contain " - + "non-rollup data (expected to find rollup meta key [_rollup] in mapping of rollup index [" - + job.getConfig().getRollupIndex() - + "] but not found)." - ) - ); - } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { + assertThat( + e.getMessage(), + equalTo( + "Rollup data cannot be added to existing indices that contain " + + "non-rollup data (expected to find rollup meta key [_rollup] in mapping of rollup index [" + + job.getConfig().getRollupIndex() + + "] but not found)." + ) + ); + }); Logger logger = mock(Logger.class); Client client = mock(Client.class); @@ -266,15 +260,14 @@ public void testMetadataButNotRollup() { public void testNoMappingVersion() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random()), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { - assertThat( - e.getMessage(), - equalTo("Could not determine version of existing rollup metadata for index [" + job.getConfig().getRollupIndex() + "]") - ); - } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { + assertThat( + e.getMessage(), + equalTo("Could not determine version of existing rollup metadata for index [" + job.getConfig().getRollupIndex() + "]") + ); + }); Logger logger = mock(Logger.class); Client client = mock(Client.class); @@ -304,8 +297,9 @@ public void testNoMappingVersion() { public void testJobAlreadyInMapping() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random(), "foo"), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { assertThat( e.getMessage(), @@ -355,10 +349,9 @@ public void testAddJobToMapping() { "rollup_index_foo" ); RollupJob job = new RollupJob(config, Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { assertThat(e.getMessage(), equalTo("Ending")); } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { assertThat(e.getMessage(), equalTo("Ending")); }); Logger logger = mock(Logger.class); Client client = mock(Client.class); @@ -397,10 +390,9 @@ public void testAddJobToMapping() { public void testTaskAlreadyExists() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random(), "foo"), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { assertThat(e.getMessage(), equalTo("Cannot create job [foo] because it has already been created (task exists)")); } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { assertThat(e.getMessage(), equalTo("Cannot create job [foo] because it has already been created (task exists)")); }); PersistentTasksService tasksService = mock(PersistentTasksService.class); @@ -418,10 +410,9 @@ public void testTaskAlreadyExists() { public void testStartTask() { RollupJob job = new RollupJob(ConfigTestHelpers.randomRollupJobConfig(random()), Collections.emptyMap()); - ActionListener testListener = ActionListener.wrap( - response -> { fail("Listener success should not have been triggered."); }, - e -> { assertThat(e.getMessage(), equalTo("Ending")); } - ); + ActionListener testListener = ActionListener.wrap(response -> { + fail("Listener success should not have been triggered."); + }, e -> { assertThat(e.getMessage(), equalTo("Ending")); }); PersistentTasksService tasksService = mock(PersistentTasksService.class); diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/DirectBlobContainerIndexInput.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/DirectBlobContainerIndexInput.java index acd49c8acd5fe..6f06e059c95fc 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/DirectBlobContainerIndexInput.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/DirectBlobContainerIndexInput.java @@ -129,12 +129,9 @@ private void readInternalBytes(final int part, long pos, final ByteBuffer b, int // we did not read everything in an optimized fashion, so read the remainder directly final long startTimeNanos = stats.currentTimeNanos(); try (InputStream inputStream = openBlobStream(part, pos + optimizedReadSize, length - optimizedReadSize)) { - final int directReadSize = readFully( - inputStream, - b, - length - optimizedReadSize, - () -> { throw new EOFException("Read past EOF at [" + position + "] with length [" + fileInfo.partBytes(part) + "]"); } - ); + final int directReadSize = readFully(inputStream, b, length - optimizedReadSize, () -> { + throw new EOFException("Read past EOF at [" + position + "] with length [" + fileInfo.partBytes(part) + "]"); + }); assert optimizedReadSize + directReadSize == length : optimizedReadSize + " and " + directReadSize + " vs " + length; position += directReadSize; final long endTimeNanos = stats.currentTimeNanos(); diff --git a/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocatorTests.java b/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocatorTests.java index d3c4383e9c32a..5558fd40cb2c5 100644 --- a/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocatorTests.java +++ b/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocatorTests.java @@ -162,11 +162,9 @@ public void doE } }; - final SearchableSnapshotAllocator allocator = new SearchableSnapshotAllocator( - client, - (reason, priority, listener) -> { throw new AssertionError("Expecting no reroutes"); }, - testFrozenCacheSizeService() - ); + final SearchableSnapshotAllocator allocator = new SearchableSnapshotAllocator(client, (reason, priority, listener) -> { + throw new AssertionError("Expecting no reroutes"); + }, testFrozenCacheSizeService()); allocateAllUnassigned(allocation, allocator); assertTrue(allocation.routingNodesChanged()); assertThat(allocation.routingNodes().assignedShards(shardId), empty()); @@ -202,11 +200,9 @@ public void doE } }; - final SearchableSnapshotAllocator allocator = new SearchableSnapshotAllocator( - client, - (reason, priority, listener) -> { throw new AssertionError("Expecting no reroutes"); }, - testFrozenCacheSizeService() - ); + final SearchableSnapshotAllocator allocator = new SearchableSnapshotAllocator(client, (reason, priority, listener) -> { + throw new AssertionError("Expecting no reroutes"); + }, testFrozenCacheSizeService()); allocateAllUnassigned(allocation, allocator); assertThat(allocation.routingNodes().assignedShards(shardId), empty()); assertTrue(allocation.routingTable().index(shardId.getIndex()).allPrimaryShardsUnassigned()); diff --git a/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/SparseFileTrackerTests.java b/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/SparseFileTrackerTests.java index c34628abc12e6..2bdf4bb8ae99b 100644 --- a/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/SparseFileTrackerTests.java +++ b/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/SparseFileTrackerTests.java @@ -172,7 +172,9 @@ public void testCallsListenerWhenWholeRangeIsAvailable() { final List gaps = sparseFileTracker.waitForRange( range, range, - ActionListener.wrap(ignored -> assertTrue(wasNotified.compareAndSet(false, true)), e -> { throw new AssertionError(e); }) + ActionListener.wrap(ignored -> assertTrue(wasNotified.compareAndSet(false, true)), e -> { + throw new AssertionError(e); + }) ); assertThat(gaps, empty()); assertTrue(wasNotified.get()); @@ -213,10 +215,9 @@ public void testCallsListenerWhenRangeIsAvailable() { if (pending == false) { final AtomicBoolean wasNotified = new AtomicBoolean(); - final ActionListener listener = ActionListener.wrap( - ignored -> assertTrue(wasNotified.compareAndSet(false, true)), - e -> { throw new AssertionError(e); } - ); + final ActionListener listener = ActionListener.wrap(ignored -> assertTrue(wasNotified.compareAndSet(false, true)), e -> { + throw new AssertionError(e); + }); final List gaps = sparseFileTracker.waitForRange(range, subRange, listener); assertTrue( @@ -244,7 +245,9 @@ public void testCallsListenerWhenRangeIsAvailable() { final AtomicBoolean waitIfPendingWasNotified = new AtomicBoolean(); final ActionListener waitIfPendingListener = ActionListener.wrap( ignored -> assertTrue(waitIfPendingWasNotified.compareAndSet(false, true)), - e -> { throw new AssertionError(e); } + e -> { + throw new AssertionError(e); + } ); assertFalse(sparseFileTracker.waitForRangeIfPending(subRange, waitIfPendingListener)); @@ -321,7 +324,9 @@ public void testCallsListenerWhenRangeIsAvailable() { final List gaps = sparseFileTracker.waitForRange( range, subRange, - ActionListener.wrap(ignored -> assertTrue(wasNotified.compareAndSet(false, true)), e -> { throw new AssertionError(e); }) + ActionListener.wrap(ignored -> assertTrue(wasNotified.compareAndSet(false, true)), e -> { + throw new AssertionError(e); + }) ); assertThat(gaps, empty()); assertTrue(wasNotified.get()); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthDelegationIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthDelegationIntegTests.java index be1bf6ae5ade7..9c2d8c7820352 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthDelegationIntegTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/pki/PkiAuthDelegationIntegTests.java @@ -273,10 +273,9 @@ public void testDelegateUnauthorized() throws Exception { "Authorization", basicAuthHeaderValue(delegateeUsername, SecuritySettingsSourceField.TEST_PASSWORD_SECURE_STRING) ); - ElasticsearchStatusException e = expectThrows( - ElasticsearchStatusException.class, - () -> { restClient.security().delegatePkiAuthentication(delegatePkiRequest, optionsBuilder.build()); } - ); + ElasticsearchStatusException e = expectThrows(ElasticsearchStatusException.class, () -> { + restClient.security().delegatePkiAuthentication(delegatePkiRequest, optionsBuilder.build()); + }); assertThat( e.getMessage(), startsWith( diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/netty4/IPHostnameVerificationTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/netty4/IPHostnameVerificationTests.java index fa783fc5e90d4..02401af58fb78 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/netty4/IPHostnameVerificationTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/netty4/IPHostnameVerificationTests.java @@ -57,10 +57,9 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) { throw new RuntimeException(e); } - SecuritySettingsSource.addSecureSettings( - settingsBuilder, - secureSettings -> { secureSettings.setString("xpack.security.transport.ssl.secure_key_passphrase", "testnode-ip-only"); } - ); + SecuritySettingsSource.addSecureSettings(settingsBuilder, secureSettings -> { + secureSettings.setString("xpack.security.transport.ssl.secure_key_passphrase", "testnode-ip-only"); + }); return settingsBuilder.put("xpack.security.transport.ssl.key", keyPath.toAbsolutePath()) .put("xpack.security.transport.ssl.certificate", certPath.toAbsolutePath()) .put("xpack.security.transport.ssl.certificate_authorities", certPath.toAbsolutePath()) diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/netty4/SslHostnameVerificationTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/netty4/SslHostnameVerificationTests.java index 8c04afe3368d2..50c07d729e86e 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/netty4/SslHostnameVerificationTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/netty4/SslHostnameVerificationTests.java @@ -58,10 +58,9 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) { throw new RuntimeException(e); } - SecuritySettingsSource.addSecureSettings( - settingsBuilder, - secureSettings -> { secureSettings.setString("xpack.security.transport.ssl.secure_key_passphrase", "testnode-no-subjaltname"); } - ); + SecuritySettingsSource.addSecureSettings(settingsBuilder, secureSettings -> { + secureSettings.setString("xpack.security.transport.ssl.secure_key_passphrase", "testnode-no-subjaltname"); + }); return settingsBuilder.put("xpack.security.transport.ssl.key", keyPath.toAbsolutePath()) .put("xpack.security.transport.ssl.certificate", certPath.toAbsolutePath()) .putList("xpack.security.transport.ssl.certificate_authorities", Arrays.asList(certPath.toString(), nodeCertPath.toString())) diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java index 43e2d406f9070..0b4abb35c91a7 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java @@ -114,11 +114,9 @@ public void app Version.CURRENT ); } else if (AuthorizationUtils.shouldSetUserBasedOnActionOrigin(threadContext)) { - AuthorizationUtils.switchUserBasedOnActionOriginAndExecute( - threadContext, - securityContext, - (original) -> { applyInternal(task, chain, action, request, contextPreservingListener); } - ); + AuthorizationUtils.switchUserBasedOnActionOriginAndExecute(threadContext, securityContext, (original) -> { + applyInternal(task, chain, action, request, contextPreservingListener); + }); } else { try (ThreadContext.StoredContext ignore = threadContext.newStoredContext(true)) { applyInternal(task, chain, action, request, contextPreservingListener); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java index df0b4c4c2f1ae..f729f52c32416 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java @@ -402,14 +402,9 @@ public LoggingAuditTrail(Settings settings, ClusterService clusterService, Threa MarkerFilter auditMarkerFilter = MarkerFilter.createFilter(AUDIT_MARKER.getName(), Result.ACCEPT, Result.NEUTRAL); ctx.addFilter(auditMarkerFilter); ctx.updateLoggers(); - clusterService.getClusterSettings() - .addSettingsUpdateConsumer( - ignored -> { - LogManager.getLogger(Security.class) - .warn("Changing log level for [" + LoggingAuditTrail.class.getName() + "] has no effect"); - }, - Collections.singletonList(Loggers.LOG_LEVEL_SETTING.getConcreteSettingForNamespace(LoggingAuditTrail.class.getName())) - ); + clusterService.getClusterSettings().addSettingsUpdateConsumer(ignored -> { + LogManager.getLogger(Security.class).warn("Changing log level for [" + LoggingAuditTrail.class.getName() + "] has no effect"); + }, Collections.singletonList(Loggers.LOG_LEVEL_SETTING.getConcreteSettingForNamespace(LoggingAuditTrail.class.getName()))); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java index 4d3087f0a9234..24fb441f87639 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/Realms.java @@ -135,9 +135,9 @@ protected void recomputeActiveRealms() { // Stop license-tracking for any previously-active realms that are no longer allowed if (activeRealms != null) { - activeRealms.stream() - .filter(r -> licensedRealms.contains(r) == false) - .forEach(realm -> { handleDisabledRealmDueToLicenseChange(realm, licenseStateSnapshot); }); + activeRealms.stream().filter(r -> licensedRealms.contains(r) == false).forEach(realm -> { + handleDisabledRealmDueToLicenseChange(realm, licenseStateSnapshot); + }); } activeRealms = licensedRealms; diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java index 301271a1408f3..26403ec5a2196 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticator.java @@ -285,12 +285,12 @@ private void getUserClaims( && JWSAlgorithm.Family.HMAC_SHA.contains(rpConfig.getSignatureAlgorithm()) == false && opConfig.getJwkSetPath().startsWith("https://")) { ((ReloadableJWKSource) ((JWSVerificationKeySelector) idTokenValidator.get().getJWSKeySelector()).getJWKSource()) - .triggerReload( - ActionListener.wrap(v -> { getUserClaims(accessToken, idToken, expectedNonce, false, claimsListener); }, ex -> { - LOGGER.trace("Attempted and failed to refresh JWK cache upon token validation failure", e); - claimsListener.onFailure(ex); - }) - ); + .triggerReload(ActionListener.wrap(v -> { + getUserClaims(accessToken, idToken, expectedNonce, false, claimsListener); + }, ex -> { + LOGGER.trace("Attempted and failed to refresh JWK cache upon token validation failure", e); + claimsListener.onFailure(ex); + })); } else { claimsListener.onFailure(new ElasticsearchSecurityException("Failed to parse or validate the ID Token", e)); } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStore.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStore.java index 6ff7efec3b15c..21d45f5a76b3b 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStore.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/IndexServiceAccountTokenStore.java @@ -239,19 +239,16 @@ void deleteToken(DeleteServiceAccountTokenRequest request, ActionListener { - listener.onResponse(deleteResponse.getResult() == DocWriteResponse.Result.DELETED); - }, - e -> { - final ParameterizedMessage message = new ParameterizedMessage( - "clearing the cache for service token [{}] failed. please clear the cache manually", - qualifiedTokenName - ); - logger.error(message, e); - listener.onFailure(new ElasticsearchException(message.getFormattedMessage(), e)); - } - ) + ActionListener.wrap(clearSecurityCacheResponse -> { + listener.onResponse(deleteResponse.getResult() == DocWriteResponse.Result.DELETED); + }, e -> { + final ParameterizedMessage message = new ParameterizedMessage( + "clearing the cache for service token [{}] failed. please clear the cache manually", + qualifiedTokenName + ); + logger.error(message, e); + listener.onFailure(new ElasticsearchException(message.getFormattedMessage(), e)); + }) ); }, listener::onFailure) ); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/ServiceAccountService.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/ServiceAccountService.java index f5496fca79e4b..3f18652f8d2aa 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/ServiceAccountService.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/service/ServiceAccountService.java @@ -212,10 +212,9 @@ private ElasticsearchSecurityException createAuthenticationException(ServiceAcco } private void findIndexTokens(ServiceAccountId accountId, ActionListener listener) { - indexServiceAccountTokenStore.findTokensFor( - accountId, - ActionListener.wrap(indexTokenInfos -> { findFileTokens(indexTokenInfos, accountId, listener); }, listener::onFailure) - ); + indexServiceAccountTokenStore.findTokensFor(accountId, ActionListener.wrap(indexTokenInfos -> { + findFileTokens(indexTokenInfos, accountId, listener); + }, listener::onFailure)); } private void findFileTokens( diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequestBuilderTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequestBuilderTests.java index c0a9d1c239dae..538d5405122f9 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequestBuilderTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/ChangePasswordRequestBuilderTests.java @@ -58,10 +58,9 @@ public void testWithHashedPasswordWithWrongAlgo() { final char[] hash = userHasher.hash(new SecureString("superlongpassword".toCharArray())); final String json = "{\n" + " \"password_hash\": \"" + new String(hash) + "\"" + "}"; ChangePasswordRequestBuilder builder = new ChangePasswordRequestBuilder(mock(Client.class)); - final IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { builder.source(new BytesArray(json.getBytes(StandardCharsets.UTF_8)), XContentType.JSON, systemHasher).request(); } - ); + final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + builder.source(new BytesArray(json.getBytes(StandardCharsets.UTF_8)), XContentType.JSON, systemHasher).request(); + }); assertThat(e.getMessage(), containsString(userHasher.name())); assertThat(e.getMessage(), containsString(systemHasher.name())); } @@ -71,10 +70,9 @@ public void testWithHashedPasswordNotHash() { final char[] hash = randomAlphaOfLength(20).toCharArray(); final String json = "{\n" + " \"password_hash\": \"" + new String(hash) + "\"" + "}"; ChangePasswordRequestBuilder builder = new ChangePasswordRequestBuilder(mock(Client.class)); - final IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { builder.source(new BytesArray(json.getBytes(StandardCharsets.UTF_8)), XContentType.JSON, systemHasher).request(); } - ); + final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + builder.source(new BytesArray(json.getBytes(StandardCharsets.UTF_8)), XContentType.JSON, systemHasher).request(); + }); assertThat(e.getMessage(), containsString(Hasher.NOOP.name())); assertThat(e.getMessage(), containsString(systemHasher.name())); } @@ -91,10 +89,9 @@ public void testWithPasswordAndHash() throws IOException { ); ChangePasswordRequestBuilder builder = new ChangePasswordRequestBuilder(mock(Client.class)); - final IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { builder.source(json, XContentType.JSON, hasher).request(); } - ); + final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + builder.source(json, XContentType.JSON, hasher).request(); + }); assertThat(e.getMessage(), containsString("password_hash has already been set")); } diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilderTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilderTests.java index a58c898d0c2fc..e39af0ac955d6 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilderTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/PutUserRequestBuilderTests.java @@ -174,13 +174,9 @@ public void testWithMismatchedPasswordHashingAlgorithm() throws IOException { final String json = "{\n" + " \"password_hash\": \"" + new String(hash) + "\"," + " \"roles\": []\n" + "}"; PutUserRequestBuilder builder = new PutUserRequestBuilder(mock(Client.class)); - final IllegalArgumentException ex = expectThrows( - IllegalArgumentException.class, - () -> { - builder.source("hash_user", new BytesArray(json.getBytes(StandardCharsets.UTF_8)), XContentType.JSON, systemHasher) - .request(); - } - ); + final IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> { + builder.source("hash_user", new BytesArray(json.getBytes(StandardCharsets.UTF_8)), XContentType.JSON, systemHasher).request(); + }); assertThat(ex.getMessage(), containsString(userHasher.name())); assertThat(ex.getMessage(), containsString(systemHasher.name())); } @@ -190,13 +186,9 @@ public void testWithPasswordHashThatsNotReallyAHash() throws IOException { final String json = "{\n" + " \"password_hash\": \"not-a-hash\"," + " \"roles\": []\n" + "}"; PutUserRequestBuilder builder = new PutUserRequestBuilder(mock(Client.class)); - final IllegalArgumentException ex = expectThrows( - IllegalArgumentException.class, - () -> { - builder.source("hash_user", new BytesArray(json.getBytes(StandardCharsets.UTF_8)), XContentType.JSON, systemHasher) - .request(); - } - ); + final IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> { + builder.source("hash_user", new BytesArray(json.getBytes(StandardCharsets.UTF_8)), XContentType.JSON, systemHasher).request(); + }); assertThat(ex.getMessage(), containsString(Hasher.NOOP.name())); assertThat(ex.getMessage(), containsString(systemHasher.name())); } @@ -214,10 +206,9 @@ public void testWithBothPasswordAndHash() throws IOException { ); PutUserRequestBuilder builder = new PutUserRequestBuilder(mock(Client.class)); - final IllegalArgumentException ex = expectThrows( - ValidationException.class, - () -> { builder.source("hash_user", json, XContentType.JSON, hasher).request(); } - ); + final IllegalArgumentException ex = expectThrows(ValidationException.class, () -> { + builder.source("hash_user", json, XContentType.JSON, hasher).request(); + }); assertThat(ex.getMessage(), containsString("password_hash has already been set")); } } diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmSettingsTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmSettingsTests.java index 0dcc46efe97b3..1597dcf4401a4 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmSettingsTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmSettingsTests.java @@ -210,10 +210,9 @@ private Settings.Builder pkiSettings(boolean useTrustStore) { if (useTrustStore) { builder.put("truststore.path", randomAlphaOfLengthBetween(8, 32)); - SecuritySettingsSource.addSecureSettings( - builder, - secureSettings -> { secureSettings.setString("truststore.secure_password", randomAlphaOfLength(8)); } - ); + SecuritySettingsSource.addSecureSettings(builder, secureSettings -> { + secureSettings.setString("truststore.secure_password", randomAlphaOfLength(8)); + }); builder.put("truststore.algorithm", randomAlphaOfLengthBetween(6, 10)); } else { builder.putList("certificate_authorities", generateRandomStringArray(5, 32, false, false)); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java index 6dd4dde58bd82..dc8499d43841b 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java @@ -291,10 +291,9 @@ public void testWithSettingsWithMultipleRealmsWithSameName() throws Exception { .put("path.home", createTempDir()) .build(); Environment env = TestEnvironment.newEnvironment(settings); - IllegalArgumentException e = expectThrows( - IllegalArgumentException.class, - () -> { new Realms(settings, env, factories, licenseState, threadContext, reservedRealm); } - ); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { + new Realms(settings, env, factories, licenseState, threadContext, reservedRealm); + }); assertThat(e.getMessage(), containsString("Found multiple realms configured with the same name")); } diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationTokenTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationTokenTests.java index 3b7dc5632a10c..ce7e523dcbd94 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationTokenTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationTokenTests.java @@ -87,19 +87,16 @@ public void testEqualsHashCode() { final KerberosAuthenticationToken kerberosAuthenticationToken = new KerberosAuthenticationToken( "base64EncodedToken".getBytes(StandardCharsets.UTF_8) ); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - kerberosAuthenticationToken, - (original) -> { return new KerberosAuthenticationToken((byte[]) original.credentials()); } - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(kerberosAuthenticationToken, (original) -> { + return new KerberosAuthenticationToken((byte[]) original.credentials()); + }); EqualsHashCodeTestUtils.checkEqualsAndHashCode(kerberosAuthenticationToken, (original) -> { byte[] originalCreds = (byte[]) original.credentials(); return new KerberosAuthenticationToken(Arrays.copyOf(originalCreds, originalCreds.length)); }); - EqualsHashCodeTestUtils.checkEqualsAndHashCode( - kerberosAuthenticationToken, - (original) -> { return new KerberosAuthenticationToken((byte[]) original.credentials()); }, - KerberosAuthenticationTokenTests::mutateTestItem - ); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(kerberosAuthenticationToken, (original) -> { + return new KerberosAuthenticationToken((byte[]) original.credentials()); + }, KerberosAuthenticationTokenTests::mutateTestItem); } private static KerberosAuthenticationToken mutateTestItem(KerberosAuthenticationToken original) { diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/CancellableLdapRunnableTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/CancellableLdapRunnableTests.java index 473404fcf8749..67cf1953a5836 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/CancellableLdapRunnableTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/CancellableLdapRunnableTests.java @@ -25,12 +25,9 @@ public class CancellableLdapRunnableTests extends ESTestCase { public void testTimingOutARunnable() { AtomicReference exceptionAtomicReference = new AtomicReference<>(); - final CancellableLdapRunnable runnable = new CancellableLdapRunnable<>( - ActionListener.wrap(user -> { throw new AssertionError("onResponse should not be called"); }, exceptionAtomicReference::set), - e -> null, - () -> { throw new AssertionError("runnable should not be executed"); }, - logger - ); + final CancellableLdapRunnable runnable = new CancellableLdapRunnable<>(ActionListener.wrap(user -> { + throw new AssertionError("onResponse should not be called"); + }, exceptionAtomicReference::set), e -> null, () -> { throw new AssertionError("runnable should not be executed"); }, logger); runnable.maybeTimeout(); runnable.run(); @@ -61,12 +58,9 @@ public void testCallTimeOutAfterRunning() { public void testRejectingExecution() { AtomicReference exceptionAtomicReference = new AtomicReference<>(); - final CancellableLdapRunnable runnable = new CancellableLdapRunnable<>( - ActionListener.wrap(user -> { throw new AssertionError("onResponse should not be called"); }, exceptionAtomicReference::set), - e -> null, - () -> { throw new AssertionError("runnable should not be executed"); }, - logger - ); + final CancellableLdapRunnable runnable = new CancellableLdapRunnable<>(ActionListener.wrap(user -> { + throw new AssertionError("onResponse should not be called"); + }, exceptionAtomicReference::set), e -> null, () -> { throw new AssertionError("runnable should not be executed"); }, logger); final Exception e = new RuntimeException("foo"); runnable.onRejection(e); @@ -79,10 +73,9 @@ public void testTimeoutDuringExecution() throws InterruptedException { final CountDownLatch listenerCalledLatch = new CountDownLatch(1); final CountDownLatch timeoutCalledLatch = new CountDownLatch(1); final CountDownLatch runningLatch = new CountDownLatch(1); - final ActionListener listener = ActionListener.wrap( - user -> { listenerCalledLatch.countDown(); }, - e -> { throw new AssertionError("onFailure should not be executed"); } - ); + final ActionListener listener = ActionListener.wrap(user -> { listenerCalledLatch.countDown(); }, e -> { + throw new AssertionError("onFailure should not be executed"); + }); final CancellableLdapRunnable runnable = new CancellableLdapRunnable<>(listener, e -> null, () -> { runningLatch.countDown(); try { @@ -104,17 +97,13 @@ public void testTimeoutDuringExecution() throws InterruptedException { public void testExceptionInRunnable() { AtomicReference resultRef = new AtomicReference<>(); - final ActionListener listener = ActionListener.wrap( - resultRef::set, - e -> { throw new AssertionError("onFailure should not be executed"); } - ); + final ActionListener listener = ActionListener.wrap(resultRef::set, e -> { + throw new AssertionError("onFailure should not be executed"); + }); String defaultValue = randomAlphaOfLengthBetween(2, 10); - final CancellableLdapRunnable runnable = new CancellableLdapRunnable<>( - listener, - e -> defaultValue, - () -> { throw new RuntimeException("runnable intentionally failed"); }, - logger - ); + final CancellableLdapRunnable runnable = new CancellableLdapRunnable<>(listener, e -> defaultValue, () -> { + throw new RuntimeException("runnable intentionally failed"); + }, logger); runnable.run(); assertThat(resultRef.get(), equalTo(defaultValue)); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticatorTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticatorTests.java index 195251eaf0f8d..613efec5446b6 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticatorTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectAuthenticatorTests.java @@ -819,10 +819,9 @@ public void testJsonObjectMerging() throws Exception { .build() .toJSONObject(); - final IllegalStateException e = expectThrows( - IllegalStateException.class, - () -> { OpenIdConnectAuthenticator.mergeObjects(idTokenObject, wrongTypeInfo); } - ); + final IllegalStateException e = expectThrows(IllegalStateException.class, () -> { + OpenIdConnectAuthenticator.mergeObjects(idTokenObject, wrongTypeInfo); + }); // Userinfo Claims overwrite ID Token claims Map overwriteUserInfo = new JWTClaimsSet.Builder().claim("given_name", "Jane Doe") diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealmSettingsTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealmSettingsTests.java index 7d36db2737b61..80ab9a04e81d3 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealmSettingsTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealmSettingsTests.java @@ -87,10 +87,9 @@ public void testIncorrectResponseTypeThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "hybrid"); settingsBuilder.setSecureSettings(getSecureSettings()); - IllegalArgumentException exception = expectThrows( - IllegalArgumentException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE)) @@ -107,10 +106,9 @@ public void testMissingAuthorizationEndpointThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.OP_AUTHORIZATION_ENDPOINT)) @@ -128,10 +126,9 @@ public void testInvalidAuthorizationEndpointThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - IllegalArgumentException exception = expectThrows( - IllegalArgumentException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.OP_AUTHORIZATION_ENDPOINT)) @@ -148,10 +145,9 @@ public void testMissingTokenEndpointThrowsErrorInCodeFlow() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.OP_TOKEN_ENDPOINT)) @@ -183,10 +179,9 @@ public void testInvalidTokenEndpointThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - IllegalArgumentException exception = expectThrows( - IllegalArgumentException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.OP_TOKEN_ENDPOINT)) @@ -202,10 +197,9 @@ public void testMissingJwksUrlThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.OP_JWKSET_PATH)) @@ -222,10 +216,9 @@ public void testMissingIssuerThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat(exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.OP_ISSUER))); } @@ -239,10 +232,9 @@ public void testMissingRedirectUriThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_REDIRECT_URI)) @@ -259,10 +251,9 @@ public void testMissingClientIdThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_REDIRECT_URI), "https://rp.my.com") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat(exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID))); } @@ -280,10 +271,9 @@ public void testMissingPrincipalClaimThrowsError() { Arrays.asList("openid", "scope1", "scope2") ); settingsBuilder.setSecureSettings(getSecureSettings()); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.PRINCIPAL_CLAIM.getClaim())) @@ -306,10 +296,9 @@ public void testPatternWithoutSettingThrowsError() { Arrays.asList("openid", "scope1", "scope2") ); settingsBuilder.setSecureSettings(getSecureSettings()); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.NAME_CLAIM.getClaim())) @@ -330,10 +319,9 @@ public void testMissingClientSecretThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_REDIRECT_URI), "https://rp.my.com") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_ID), "rp-my") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); - SettingsException exception = expectThrows( - SettingsException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + SettingsException exception = expectThrows(SettingsException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_SECRET)) @@ -353,10 +341,9 @@ public void testInvalidProxySchemeThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.HTTP_PROXY_HOST), "proxyhostname.org") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.HTTP_PROXY_SCHEME), "invalid"); settingsBuilder.setSecureSettings(getSecureSettings()); - IllegalArgumentException exception = expectThrows( - IllegalArgumentException.class, - () -> { buildConfig(settingsBuilder.build()).getSetting(OpenIdConnectRealmSettings.HTTP_PROXY_SCHEME); } - ); + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> { + buildConfig(settingsBuilder.build()).getSetting(OpenIdConnectRealmSettings.HTTP_PROXY_SCHEME); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.HTTP_PROXY_SCHEME)) @@ -376,10 +363,9 @@ public void testInvalidProxyPortThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.HTTP_PROXY_HOST), "proxyhostname.org") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.HTTP_PROXY_PORT), 123456); settingsBuilder.setSecureSettings(getSecureSettings()); - IllegalArgumentException exception = expectThrows( - IllegalArgumentException.class, - () -> { buildConfig(settingsBuilder.build()).getSetting(OpenIdConnectRealmSettings.HTTP_PROXY_PORT); } - ); + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> { + buildConfig(settingsBuilder.build()).getSetting(OpenIdConnectRealmSettings.HTTP_PROXY_PORT); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.HTTP_PROXY_PORT)) @@ -399,10 +385,9 @@ public void testInvalidProxyHostThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.HTTP_PROXY_HOST), "proxy hostname.org") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.HTTP_PROXY_PORT), 8080); settingsBuilder.setSecureSettings(getSecureSettings()); - IllegalArgumentException exception = expectThrows( - IllegalArgumentException.class, - () -> { buildConfig(settingsBuilder.build()).getSetting(OpenIdConnectRealmSettings.HTTP_PROXY_HOST); } - ); + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> { + buildConfig(settingsBuilder.build()).getSetting(OpenIdConnectRealmSettings.HTTP_PROXY_HOST); + }); assertThat( exception.getMessage(), Matchers.allOf( @@ -425,10 +410,9 @@ public void testInvalidClientAuthenticationMethodThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_AUTH_METHOD), "none") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_RESPONSE_TYPE), "code"); settingsBuilder.setSecureSettings(getSecureSettings()); - IllegalArgumentException exception = expectThrows( - IllegalArgumentException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_AUTH_METHOD)) @@ -448,10 +432,9 @@ public void testInvalidClientAuthenticationJwtAlgorithmThrowsError() { .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_AUTH_METHOD), "client_secret_jwt") .put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_AUTH_JWT_SIGNATURE_ALGORITHM), "AB234"); settingsBuilder.setSecureSettings(getSecureSettings()); - IllegalArgumentException exception = expectThrows( - IllegalArgumentException.class, - () -> { new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); } - ); + IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> { + new OpenIdConnectRealm(buildConfig(settingsBuilder.build()), null, null); + }); assertThat( exception.getMessage(), Matchers.containsString(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.RP_CLIENT_AUTH_JWT_SIGNATURE_ALGORITHM)) diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java index 8d5c77f5df745..d7f96e76edae4 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/DnRoleMapperTests.java @@ -249,10 +249,9 @@ public void testParseFile_WhenFileDoesNotExist() throws Exception { assertThat(mappings, notNullValue()); assertThat(mappings.isEmpty(), is(true)); - final ElasticsearchException exception = expectThrows( - ElasticsearchException.class, - () -> { DnRoleMapper.parseFile(file, logger, "_type", "_name", true); } - ); + final ElasticsearchException exception = expectThrows(ElasticsearchException.class, () -> { + DnRoleMapper.parseFile(file, logger, "_type", "_name", true); + }); assertThat(exception.getMessage(), containsString(file.toString())); assertThat(exception.getMessage(), containsString("does not exist")); assertThat(exception.getMessage(), containsString("_name")); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractorTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractorTests.java index 7fff331ddd813..4b855de684a51 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractorTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldExtractorTests.java @@ -136,10 +136,9 @@ public void testMatchNoDocs() { public void testUnsupported() { Set fields = new HashSet<>(); - expectThrows( - UnsupportedOperationException.class, - () -> { FieldExtractor.extractFields(new AssertingQuery(random(), new MatchAllDocsQuery()), fields); } - ); + expectThrows(UnsupportedOperationException.class, () -> { + FieldExtractor.extractFields(new AssertingQuery(random(), new MatchAllDocsQuery()), fields); + }); } public void testIndexOrDocValuesQuery() { diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java index db6c6ef597a8e..1d06a3bbe3bf5 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java @@ -443,9 +443,9 @@ public void testHttpHeaderAuthnBypassHeaderValidator() throws Exception { HttpMessage authenticableMessage = HttpHeadersAuthenticatorUtils.wrapAsMessageWithAuthenticationContext( new DefaultHttpRequest(HTTP_1_1, HttpMethod.GET, "/unauthenticated_request") ); - ((HttpHeadersWithAuthenticationContext) authenticableMessage.headers()).setAuthenticationContext( - () -> { throw new ElasticsearchException("Boom"); } - ); + ((HttpHeadersWithAuthenticationContext) authenticableMessage.headers()).setAuthenticationContext(() -> { + throw new ElasticsearchException("Boom"); + }); ch.writeInbound(authenticableMessage); ch.writeInbound(new DefaultLastHttpContent()); ch.flushInbound(); @@ -488,7 +488,9 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th sslService, new SharedGroupFactory(settings), randomClusterSettings(), - (httpPreRequest, channel, listener) -> { throw new AssertionError("should not be invoked for OPTIONS requests"); }, + (httpPreRequest, channel, listener) -> { + throw new AssertionError("should not be invoked for OPTIONS requests"); + }, (httpPreRequest, channel, listener) -> { throw new AssertionError("should not be invoked for OPTIONS requests with a body"); } diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/bucket/geogrid/GeoShapeGeoGridTestCase.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/bucket/geogrid/GeoShapeGeoGridTestCase.java index 6890d1affd185..d5512bcc4ef78 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/bucket/geogrid/GeoShapeGeoGridTestCase.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/bucket/geogrid/GeoShapeGeoGridTestCase.java @@ -115,39 +115,24 @@ public void testNoDocs() throws IOException { } public void testUnmapped() throws IOException { - testCase( - new MatchAllDocsQuery(), - "wrong_field", - randomPrecision(), - null, - iw -> { iw.addDocument(Collections.singleton(GeoTestUtils.binaryGeoShapeDocValuesField(FIELD_NAME, new Point(10D, 10D)))); }, - geoGrid -> { assertEquals(0, geoGrid.getBuckets().size()); } - ); + testCase(new MatchAllDocsQuery(), "wrong_field", randomPrecision(), null, iw -> { + iw.addDocument(Collections.singleton(GeoTestUtils.binaryGeoShapeDocValuesField(FIELD_NAME, new Point(10D, 10D)))); + }, geoGrid -> { assertEquals(0, geoGrid.getBuckets().size()); }); } public void testUnmappedMissingGeoShape() throws IOException { // default value type for agg is GEOPOINT, so missing value is parsed as a GEOPOINT GeoGridAggregationBuilder builder = createBuilder("_name").field("wrong_field").missing("-34.0,53.4"); - testCase( - new MatchAllDocsQuery(), - 1, - null, - iw -> { iw.addDocument(Collections.singleton(GeoTestUtils.binaryGeoShapeDocValuesField(FIELD_NAME, new Point(10D, 10D)))); }, - geoGrid -> assertEquals(1, geoGrid.getBuckets().size()), - builder - ); + testCase(new MatchAllDocsQuery(), 1, null, iw -> { + iw.addDocument(Collections.singleton(GeoTestUtils.binaryGeoShapeDocValuesField(FIELD_NAME, new Point(10D, 10D)))); + }, geoGrid -> assertEquals(1, geoGrid.getBuckets().size()), builder); } public void testMappedMissingGeoShape() throws IOException { GeoGridAggregationBuilder builder = createBuilder("_name").field(FIELD_NAME).missing("LINESTRING (30 10, 10 30, 40 40)"); - testCase( - new MatchAllDocsQuery(), - 1, - null, - iw -> { iw.addDocument(Collections.singleton(new SortedSetDocValuesField("string", new BytesRef("a")))); }, - geoGrid -> assertEquals(1, geoGrid.getBuckets().size()), - builder - ); + testCase(new MatchAllDocsQuery(), 1, null, iw -> { + iw.addDocument(Collections.singleton(new SortedSetDocValuesField("string", new BytesRef("a")))); + }, geoGrid -> assertEquals(1, geoGrid.getBuckets().size()), builder); } public void testGeoShapeBounds() throws IOException { diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java index 635db2287f402..c05269e13d728 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Verifier.java @@ -270,11 +270,9 @@ Collection verify(LogicalPlan plan) { private void checkNestedAggregation(LogicalPlan p, Set localFailures, AttributeMap attributeRefs) { if (p instanceof Aggregate) { - ((Aggregate) p).child() - .forEachDown( - Aggregate.class, - a -> { localFailures.add(fail(a, "Nested aggregations in sub-selects are not supported.")); } - ); + ((Aggregate) p).child().forEachDown(Aggregate.class, a -> { + localFailures.add(fail(a, "Nested aggregations in sub-selects are not supported.")); + }); } } diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeParseProcessor.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeParseProcessor.java index 0497261c47fdd..2b9801e513881 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeParseProcessor.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeParseProcessor.java @@ -37,7 +37,9 @@ public class DateTimeParseProcessor extends BinaryDateTimeProcessor { public enum Parser { DATE_TIME(DataTypes.DATETIME, ZonedDateTime::from, LocalDateTime::from), TIME(SqlDataTypes.TIME, OffsetTime::from, LocalTime::from), - DATE(SqlDataTypes.DATE, LocalDate::from, (TemporalAccessor ta) -> { throw new DateTimeException("InvalidDate"); }); + DATE(SqlDataTypes.DATE, LocalDate::from, (TemporalAccessor ta) -> { + throw new DateTimeException("InvalidDate"); + }); private final BiFunction parser; diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTrunc.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTrunc.java index 38305f2627af0..d278fafe9c62d 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTrunc.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTrunc.java @@ -84,20 +84,13 @@ public enum Part implements DateTimeField { int firstYearOfDecade = year - (year % 10); return new IntervalYearMonth(Period.ZERO.plusYears(firstYearOfDecade), iym.dataType()); }, "decades"), - YEAR( - dt -> { - return dt.with(ChronoField.MONTH_OF_YEAR, 1).with(ChronoField.DAY_OF_MONTH, 1).toLocalDate().atStartOfDay(dt.getZone()); - }, - idt -> new IntervalDayTime(Duration.ZERO, idt.dataType()), - iym -> { - Period period = iym.interval(); - int year = period.getYears(); - return new IntervalYearMonth(Period.ZERO.plusYears(year), iym.dataType()); - }, - "years", - "yy", - "yyyy" - ), + YEAR(dt -> { + return dt.with(ChronoField.MONTH_OF_YEAR, 1).with(ChronoField.DAY_OF_MONTH, 1).toLocalDate().atStartOfDay(dt.getZone()); + }, idt -> new IntervalDayTime(Duration.ZERO, idt.dataType()), iym -> { + Period period = iym.interval(); + int year = period.getYears(); + return new IntervalYearMonth(Period.ZERO.plusYears(year), iym.dataType()); + }, "years", "yy", "yyyy"), QUARTER(dt -> { int month = dt.getMonthValue(); int firstMonthOfQuarter = (((month - 1) / 3) * 3) + 1; @@ -120,14 +113,9 @@ public enum Part implements DateTimeField { "mm", "m" ), - WEEK( - dt -> { return dt.with(ChronoField.DAY_OF_WEEK, 1).toLocalDate().atStartOfDay(dt.getZone()); }, - idt -> new IntervalDayTime(Duration.ZERO, idt.dataType()), - iym -> iym, - "weeks", - "wk", - "ww" - ), + WEEK(dt -> { + return dt.with(ChronoField.DAY_OF_WEEK, 1).toLocalDate().atStartOfDay(dt.getZone()); + }, idt -> new IntervalDayTime(Duration.ZERO, idt.dataType()), iym -> iym, "weeks", "wk", "ww"), DAY( dt -> dt.toLocalDate().atStartOfDay(dt.getZone()), idt -> truncateIntervalSmallerThanWeek(idt, ChronoUnit.DAYS), diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/planner/QueryTranslatorTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/planner/QueryTranslatorTests.java index 1678f55db40eb..77d4a7d9de1a7 100644 --- a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/planner/QueryTranslatorTests.java +++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/planner/QueryTranslatorTests.java @@ -1200,14 +1200,14 @@ public void testPercentileMethodParametersSameAsDefault() { final int fieldCount = 5; final String sql = ("SELECT " + // 0-3: these all should fold into the same aggregation - " PERCENTILE(int, 50, 'tdigest', 79.8 + 20.2), " + " PERCENTILE(int, 50, 'tdigest', 79.8 + 20.2), " + " PERCENTILE(int, 40 + 10, 'tdigest', null), " + " PERCENTILE(int, 50, 'tdigest'), " + " PERCENTILE(int, 50), " + // 4: this has a different method parameter // just to make sure we don't fold everything to default - " PERCENTILE(int, 50, 'tdigest', 22) " + " PERCENTILE(int, 50, 'tdigest', 22) " + "FROM test").replaceAll("PERCENTILE", fnName); List aggs = percentilesAggsByField(optimizeAndPlan(sql), fieldCount); @@ -1234,13 +1234,13 @@ public void testPercentileOptimization() { final int fieldCount = 5; final String sql = ("SELECT " + // 0-1: fold into the same aggregation - " PERCENTILE(int, 50, 'tdigest'), " + " PERCENTILE(int, 60, 'tdigest'), " + + " PERCENTILE(int, 50, 'tdigest'), " + " PERCENTILE(int, 60, 'tdigest'), " + // 2-3: fold into one aggregation - " PERCENTILE(int, 50, 'hdr'), " + " PERCENTILE(int, 60, 'hdr', 3), " + + " PERCENTILE(int, 50, 'hdr'), " + " PERCENTILE(int, 60, 'hdr', 3), " + // 4: folds into a separate aggregation - " PERCENTILE(int, 60, 'hdr', 4)" + "FROM test").replaceAll("PERCENTILE", fnName); + " PERCENTILE(int, 60, 'hdr', 4)" + "FROM test").replaceAll("PERCENTILE", fnName); List aggs = percentilesAggsByField(optimizeAndPlan(sql), fieldCount); diff --git a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsingSearchRuntimeFieldsIT.java b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsingSearchRuntimeFieldsIT.java index d943c28eac592..7e9ead3cd4958 100644 --- a/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsingSearchRuntimeFieldsIT.java +++ b/x-pack/plugin/transform/qa/multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsingSearchRuntimeFieldsIT.java @@ -286,14 +286,12 @@ public void testLatestTransform() throws Exception { waitUntilCheckpoint(configWithRuntimeFields.getId(), 1L); stopTransform(configWithRuntimeFields.getId()); - assertBusy( - () -> { - assertEquals( - TransformStats.State.STOPPED, - getTransformStats(configWithRuntimeFields.getId()).getTransformsStats().get(0).getState() - ); - } - ); + assertBusy(() -> { + assertEquals( + TransformStats.State.STOPPED, + getTransformStats(configWithRuntimeFields.getId()).getTransformsStats().get(0).getState() + ); + }); try (RestHighLevelClient restClient = new TestRestHighLevelClient()) { restClient.indices().refresh(new RefreshRequest(destIndexName), RequestOptions.DEFAULT); diff --git a/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformAuditorIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformAuditorIT.java index 729e7825f5e9b..4932638a0754b 100644 --- a/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformAuditorIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformAuditorIT.java @@ -113,15 +113,10 @@ public void testAliasCreatedforBWCIndexes() throws Exception { request.setOptions(options); client().performRequest(request); - assertBusy( - () -> { - assertTrue( - aliasExists( - TransformInternalIndexConstants.AUDIT_INDEX_DEPRECATED, - TransformInternalIndexConstants.AUDIT_INDEX_READ_ALIAS - ) - ); - } - ); + assertBusy(() -> { + assertTrue( + aliasExists(TransformInternalIndexConstants.AUDIT_INDEX_DEPRECATED, TransformInternalIndexConstants.AUDIT_INDEX_READ_ALIAS) + ); + }); } } diff --git a/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformProgressIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformProgressIT.java index 854d45d5e2517..4e0292d8175f2 100644 --- a/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformProgressIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformProgressIT.java @@ -232,10 +232,9 @@ private TransformProgress getProgress(Function function, SearchRequest searchReq try (RestHighLevelClient restClient = new TestRestHighLevelClient()) { SearchResponse response = restClient.search(searchRequest, RequestOptions.DEFAULT); - function.getInitialProgressFromResponse( - response, - new LatchedActionListener<>(ActionListener.wrap(progressHolder::set, e -> { exceptionHolder.set(e); }), latch) - ); + function.getInitialProgressFromResponse(response, new LatchedActionListener<>(ActionListener.wrap(progressHolder::set, e -> { + exceptionHolder.set(e); + }), latch)); } assertTrue("timed out after 20s", latch.await(20, TimeUnit.SECONDS)); diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformCheckpointServiceNodeTests.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformCheckpointServiceNodeTests.java index 7c4746989c888..675159691b823 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformCheckpointServiceNodeTests.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformCheckpointServiceNodeTests.java @@ -376,10 +376,9 @@ private static void getCheckpoint( TransformProgress nextCheckpointProgress, ActionListener listener ) { - ActionListener checkPointInfoListener = ActionListener.wrap( - infoBuilder -> { listener.onResponse(infoBuilder.build()); }, - listener::onFailure - ); + ActionListener checkPointInfoListener = ActionListener.wrap(infoBuilder -> { + listener.onResponse(infoBuilder.build()); + }, listener::onFailure); transformCheckpointService.getCheckpointingInfo( mockClientForCheckpointing, transformId, diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java index cbc046a88c14e..dbee52b30fc02 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java @@ -198,7 +198,7 @@ public Setting legacySetting() { public boolean isEnabledByDefault(final Settings settings) { return super.isEnabledByDefault(settings) && // Don't use DiscoveryNode#isDataNode(Settings) here, as it is called before all plugins are initialized - (DiscoveryNode.hasRole(settings, DiscoveryNodeRole.DATA_ROLE) || DataTier.isExplicitDataTier(settings)); + (DiscoveryNode.hasRole(settings, DiscoveryNodeRole.DATA_ROLE) || DataTier.isExplicitDataTier(settings)); } }; diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransformUpdater.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransformUpdater.java index 655810f6654bf..9706b88b07bf0 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransformUpdater.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransformUpdater.java @@ -175,10 +175,9 @@ public static void updateTransform( }, listener::onFailure); // <2> Validate source and destination indices - ActionListener checkPrivilegesListener = ActionListener.wrap( - aVoid -> { validateTransform(updatedConfig, client, deferValidation, timeout, validateTransformListener); }, - listener::onFailure - ); + ActionListener checkPrivilegesListener = ActionListener.wrap(aVoid -> { + validateTransform(updatedConfig, client, deferValidation, timeout, validateTransformListener); + }, listener::onFailure); // <1> Early check to verify that the user can create the destination index and can read from the source if (checkAccess && licenseState.isSecurityEnabled() && deferValidation == false) { diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPreviewTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPreviewTransformAction.java index 9521ff45d95e8..63c0dabe484bb 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPreviewTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPreviewTransformAction.java @@ -186,10 +186,9 @@ protected void doExecute(Task task, Request request, ActionListener li }, listener::onFailure); // <3> Validate transform function config - ActionListener validateSourceDestListener = ActionListener.wrap( - validateSourceDestResponse -> { function.validateConfig(validateConfigListener); }, - listener::onFailure - ); + ActionListener validateSourceDestListener = ActionListener.wrap(validateSourceDestResponse -> { + function.validateConfig(validateConfigListener); + }, listener::onFailure); // <2> Validate source and destination indices ActionListener checkPrivilegesListener = ActionListener.wrap(aVoid -> { diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPutTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPutTransformAction.java index 29f6b7fbf7597..fbe978c583d12 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPutTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPutTransformAction.java @@ -138,10 +138,9 @@ protected void masterOperation(Request request, ClusterState clusterState, Actio } // <3> Create the transform - ActionListener validateTransformListener = ActionListener.wrap( - validationResponse -> { putTransform(request, listener); }, - listener::onFailure - ); + ActionListener validateTransformListener = ActionListener.wrap(validationResponse -> { + putTransform(request, listener); + }, listener::onFailure); // <2> Validate source and destination indices ActionListener checkPrivilegesListener = ActionListener.wrap(aVoid -> { diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStopTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStopTransformAction.java index e5df1ee979424..53364bf7ef3ff 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStopTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportStopTransformAction.java @@ -484,20 +484,18 @@ private ActionListener cancelTransformTasksWithNoAssignment( final TransformNodeAssignments transformNodeAssignments ) { final ActionListener doExecuteListener = ActionListener.wrap(response -> { - GroupedActionListener> groupedListener = new GroupedActionListener<>( - ActionListener.wrap(r -> { finalListener.onResponse(response); }, finalListener::onFailure), - transformNodeAssignments.getWaitingForAssignment().size() - ); + GroupedActionListener> groupedListener = new GroupedActionListener<>(ActionListener.wrap(r -> { + finalListener.onResponse(response); + }, finalListener::onFailure), transformNodeAssignments.getWaitingForAssignment().size()); for (String unassignedTaskId : transformNodeAssignments.getWaitingForAssignment()) { persistentTasksService.sendRemoveRequest(unassignedTaskId, groupedListener); } }, e -> { - GroupedActionListener> groupedListener = new GroupedActionListener<>( - ActionListener.wrap(r -> { finalListener.onFailure(e); }, finalListener::onFailure), - transformNodeAssignments.getWaitingForAssignment().size() - ); + GroupedActionListener> groupedListener = new GroupedActionListener<>(ActionListener.wrap(r -> { + finalListener.onFailure(e); + }, finalListener::onFailure), transformNodeAssignments.getWaitingForAssignment().size()); for (String unassignedTaskId : transformNodeAssignments.getWaitingForAssignment()) { persistentTasksService.sendRemoveRequest(unassignedTaskId, groupedListener); diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportValidateTransformAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportValidateTransformAction.java index f0e508e54b477..ed85a8449af54 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportValidateTransformAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportValidateTransformAction.java @@ -119,8 +119,9 @@ protected void doExecute(Task task, Request request, ActionListener li final Function function = FunctionFactory.create(config); // <5> Final listener - ActionListener> deduceMappingsListener = ActionListener.wrap( - deducedMappings -> { listener.onResponse(new Response(deducedMappings)); }, + ActionListener> deduceMappingsListener = ActionListener.wrap(deducedMappings -> { + listener.onResponse(new Response(deducedMappings)); + }, deduceTargetMappingsException -> listener.onFailure( new RuntimeException(TransformMessages.REST_PUT_TRANSFORM_FAILED_TO_DEDUCE_DEST_MAPPINGS, deduceTargetMappingsException) ) @@ -145,10 +146,9 @@ protected void doExecute(Task task, Request request, ActionListener li }, listener::onFailure); // <2> Validate transform function config - ActionListener validateSourceDestListener = ActionListener.wrap( - validateSourceDestResponse -> { function.validateConfig(validateConfigListener); }, - listener::onFailure - ); + ActionListener validateSourceDestListener = ActionListener.wrap(validateSourceDestResponse -> { + function.validateConfig(validateConfigListener); + }, listener::onFailure); // <1> Validate source and destination indices sourceDestValidator.validate( diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProvider.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProvider.java index 341b8e9a363b5..d7e3033870526 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProvider.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProvider.java @@ -241,11 +241,9 @@ static Map extractIndexCheckPoints(ShardStats[] shards, Set checkpointsByIndexReduced = new TreeMap<>(); - checkpointsByIndex.forEach( - (indexName, checkpoints) -> { - checkpointsByIndexReduced.put(indexName, checkpoints.values().stream().mapToLong(l -> l).toArray()); - } - ); + checkpointsByIndex.forEach((indexName, checkpoints) -> { + checkpointsByIndexReduced.put(indexName, checkpoints.values().stream().mapToLong(l -> l).toArray()); + }); return checkpointsByIndexReduced; } diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java index 9f9eb400bba3e..2021d827909f7 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/checkpoint/TimeBasedCheckpointProvider.java @@ -95,16 +95,11 @@ public void createNextCheckpoint(final TransformCheckpoint lastCheckpoint, final // for time based synchronization final long timeUpperBound = alignTimestamp.apply(timestamp - timeSyncConfig.getDelay().millis()); - getIndexCheckpoints( - ActionListener.wrap( - checkpointsByIndex -> { - listener.onResponse( - new TransformCheckpoint(transformConfig.getId(), timestamp, checkpoint, checkpointsByIndex, timeUpperBound) - ); - }, - listener::onFailure - ) - ); + getIndexCheckpoints(ActionListener.wrap(checkpointsByIndex -> { + listener.onResponse( + new TransformCheckpoint(transformConfig.getId(), timestamp, checkpoint, checkpointsByIndex, timeUpperBound) + ); + }, listener::onFailure)); } /** diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexer.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexer.java index c5db5c79a0b48..76d143692d05c 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexer.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexer.java @@ -397,7 +397,9 @@ private void closePointInTime(String name) { client, ClosePointInTimeAction.INSTANCE, closePitRequest, - ActionListener.wrap(response -> { logger.trace("[{}] closed pit search context [{}]", getJobId(), oldPit); }, e -> { + ActionListener.wrap(response -> { + logger.trace("[{}] closed pit search context [{}]", getJobId(), oldPit); + }, e -> { // note: closing the pit should never throw, even if the pit is invalid logger.error(new ParameterizedMessage("[{}] Failed to close point in time reader", getJobId()), e); }) diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformIndexer.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformIndexer.java index cbaabfd77e9a4..e02c8f55bb2f7 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformIndexer.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformIndexer.java @@ -326,10 +326,9 @@ protected void onStart(long now, ActionListener listener) { configurationReadyListener.onResponse(null); }, listener::onFailure); - ActionListener reLoadFieldMappingsListener = ActionListener.wrap( - updateConfigResponse -> { doGetFieldMappings(fieldMappingsListener); }, - listener::onFailure - ); + ActionListener reLoadFieldMappingsListener = ActionListener.wrap(updateConfigResponse -> { + doGetFieldMappings(fieldMappingsListener); + }, listener::onFailure); // If we are continuous, we will want to verify we have the latest stored configuration ActionListener changedSourceListener = ActionListener.wrap(r -> { diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/TransformAggregations.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/TransformAggregations.java index d0b2574837629..c6d4ec6779e09 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/TransformAggregations.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/TransformAggregations.java @@ -211,9 +211,9 @@ public static Tuple, Map> getAggregationInpu Collections.emptyMap(), Arrays.stream(percentilesAgg.percentiles()) .mapToObj(OutputFieldNameConverter::fromDouble) - .collect( - Collectors.toMap(p -> percentilesAgg.getName() + "." + p, p -> { return percentilesAgg.getType(); }, (p1, p2) -> p1) - ) + .collect(Collectors.toMap(p -> percentilesAgg.getName() + "." + p, p -> { + return percentilesAgg.getType(); + }, (p1, p2) -> p1)) ); } diff --git a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProviderTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProviderTests.java index fb2b3f7e67d09..c7735a45bd202 100644 --- a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProviderTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProviderTests.java @@ -95,7 +95,9 @@ public void testReportSourceIndexChangesRunsEmpty() throws Exception { transformId, "Source did not resolve to any open indexes" ), - () -> { provider.reportSourceIndexChanges(Collections.singleton("index"), Collections.emptySet()); } + () -> { + provider.reportSourceIndexChanges(Collections.singleton("index"), Collections.emptySet()); + } ); assertExpectation( @@ -111,7 +113,9 @@ public void testReportSourceIndexChangesRunsEmpty() throws Exception { transformId, "Source did not resolve to any concrete indexes" ), - () -> { provider.reportSourceIndexChanges(Collections.emptySet(), Collections.emptySet()); } + () -> { + provider.reportSourceIndexChanges(Collections.emptySet(), Collections.emptySet()); + } ); } @@ -133,7 +137,9 @@ public void testReportSourceIndexChangesAddDelete() throws Exception { transformId, "Source index resolve found changes, removedIndexes: [index], new indexes: [other_index]" ), - () -> { provider.reportSourceIndexChanges(Collections.singleton("index"), Collections.singleton("other_index")); } + () -> { + provider.reportSourceIndexChanges(Collections.singleton("index"), Collections.singleton("other_index")); + } ); assertExpectation( @@ -149,7 +155,9 @@ public void testReportSourceIndexChangesAddDelete() throws Exception { transformId, "Source index resolve found changes, removedIndexes: [index], new indexes: []" ), - () -> { provider.reportSourceIndexChanges(Sets.newHashSet("index", "other_index"), Collections.singleton("other_index")); } + () -> { + provider.reportSourceIndexChanges(Sets.newHashSet("index", "other_index"), Collections.singleton("other_index")); + } ); assertExpectation( new MockLogAppender.SeenEventExpectation( @@ -164,7 +172,9 @@ public void testReportSourceIndexChangesAddDelete() throws Exception { transformId, "Source index resolve found changes, removedIndexes: [], new indexes: [other_index]" ), - () -> { provider.reportSourceIndexChanges(Collections.singleton("index"), Sets.newHashSet("index", "other_index")); } + () -> { + provider.reportSourceIndexChanges(Collections.singleton("index"), Sets.newHashSet("index", "other_index")); + } ); } @@ -195,7 +205,9 @@ public void testReportSourceIndexChangesAddDeleteMany() throws Exception { transformId, "Source index resolve found more than 10 changes, [50] removed indexes, [50] new indexes" ), - () -> { provider.reportSourceIndexChanges(oldSet, newSet); } + () -> { + provider.reportSourceIndexChanges(oldSet, newSet); + } ); } diff --git a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexerTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexerTests.java index 5772e45cfa853..3dd944a14d9ee 100644 --- a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexerTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/ClientTransformIndexerTests.java @@ -160,10 +160,9 @@ public void testPitInjection() throws InterruptedException { false ); - this.assertAsync( - listener -> indexer.doNextSearch(0, listener), - response -> { assertEquals("the_pit_id+", response.pointInTimeId()); } - ); + this.assertAsync(listener -> indexer.doNextSearch(0, listener), response -> { + assertEquals("the_pit_id+", response.pointInTimeId()); + }); assertEquals(1L, client.getPitContextCounter()); @@ -174,40 +173,34 @@ public void testPitInjection() throws InterruptedException { indexer.onStop(); assertEquals(0L, client.getPitContextCounter()); - this.assertAsync( - listener -> indexer.doNextSearch(0, listener), - response -> { assertEquals("the_pit_id+", response.pointInTimeId()); } - ); + this.assertAsync(listener -> indexer.doNextSearch(0, listener), response -> { + assertEquals("the_pit_id+", response.pointInTimeId()); + }); - this.assertAsync( - listener -> indexer.doNextSearch(0, listener), - response -> { assertEquals("the_pit_id++", response.pointInTimeId()); } - ); + this.assertAsync(listener -> indexer.doNextSearch(0, listener), response -> { + assertEquals("the_pit_id++", response.pointInTimeId()); + }); - this.assertAsync( - listener -> indexer.doNextSearch(0, listener), - response -> { assertEquals("the_pit_id+++", response.pointInTimeId()); } - ); + this.assertAsync(listener -> indexer.doNextSearch(0, listener), response -> { + assertEquals("the_pit_id+++", response.pointInTimeId()); + }); assertEquals(1L, client.getPitContextCounter()); indexer.onStop(); assertEquals(0L, client.getPitContextCounter()); - this.assertAsync( - listener -> indexer.doNextSearch(0, listener), - response -> { assertEquals("the_pit_id+", response.pointInTimeId()); } - ); + this.assertAsync(listener -> indexer.doNextSearch(0, listener), response -> { + assertEquals("the_pit_id+", response.pointInTimeId()); + }); - this.assertAsync( - listener -> indexer.doNextSearch(0, listener), - response -> { assertEquals("the_pit_id++", response.pointInTimeId()); } - ); + this.assertAsync(listener -> indexer.doNextSearch(0, listener), response -> { + assertEquals("the_pit_id++", response.pointInTimeId()); + }); - this.assertAsync( - listener -> indexer.doNextSearch(0, listener), - response -> { assertEquals("the_pit_id+++", response.pointInTimeId()); } - ); + this.assertAsync(listener -> indexer.doNextSearch(0, listener), response -> { + assertEquals("the_pit_id+++", response.pointInTimeId()); + }); assertEquals(1L, client.getPitContextCounter()); diff --git a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformIndexerStateTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformIndexerStateTests.java index a546ea1548c6a..d417a5afa67d8 100644 --- a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformIndexerStateTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformIndexerStateTests.java @@ -604,13 +604,9 @@ private void assertResponse(Consumer> function) throws Inte } private void countResponse(Consumer> function, CountDownLatch latch) throws InterruptedException { - LatchedActionListener listener = new LatchedActionListener<>( - ActionListener.wrap( - r -> { assertEquals("listener called more than once", 1, latch.getCount()); }, - e -> { fail("got unexpected exception: " + e.getMessage()); } - ), - latch - ); + LatchedActionListener listener = new LatchedActionListener<>(ActionListener.wrap(r -> { + assertEquals("listener called more than once", 1, latch.getCount()); + }, e -> { fail("got unexpected exception: " + e.getMessage()); }), latch); function.accept(listener); } diff --git a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformTaskTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformTaskTests.java index 845fd964b2992..68916338655b2 100644 --- a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformTaskTests.java +++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformTaskTests.java @@ -197,13 +197,9 @@ public void testStopOnFailedTaskWithoutIndexer() { transformTask.init(mock(PersistentTasksService.class), taskManager, "task-id", 42); AtomicBoolean listenerCalled = new AtomicBoolean(false); - transformTask.fail( - "because", - ActionListener.wrap( - r -> { listenerCalled.compareAndSet(false, true); }, - e -> { fail("setting transform task to failed failed with: " + e); } - ) - ); + transformTask.fail("because", ActionListener.wrap(r -> { listenerCalled.compareAndSet(false, true); }, e -> { + fail("setting transform task to failed failed with: " + e); + })); TransformState state = transformTask.getState(); assertEquals(TransformTaskState.FAILED, state.getTaskState()); diff --git a/x-pack/plugin/vector-tile/src/test/java/org/elasticsearch/xpack/vectortile/rest/VectorTileRequestTests.java b/x-pack/plugin/vector-tile/src/test/java/org/elasticsearch/xpack/vectortile/rest/VectorTileRequestTests.java index cc4a486a580fe..f59feea08d9c6 100644 --- a/x-pack/plugin/vector-tile/src/test/java/org/elasticsearch/xpack/vectortile/rest/VectorTileRequestTests.java +++ b/x-pack/plugin/vector-tile/src/test/java/org/elasticsearch/xpack/vectortile/rest/VectorTileRequestTests.java @@ -62,10 +62,9 @@ public void testDefaults() throws IOException { public void testFieldSize() throws IOException { final int size = randomIntBetween(0, 10000); - assertRestRequest( - (builder) -> { builder.field(SearchSourceBuilder.SIZE_FIELD.getPreferredName(), size); }, - (vectorTileRequest) -> { assertThat(vectorTileRequest.getSize(), Matchers.equalTo(size)); } - ); + assertRestRequest((builder) -> { builder.field(SearchSourceBuilder.SIZE_FIELD.getPreferredName(), size); }, (vectorTileRequest) -> { + assertThat(vectorTileRequest.getSize(), Matchers.equalTo(size)); + }); } public void testFieldTrackTotalHitsAsBoolean() throws IOException { @@ -87,7 +86,9 @@ public void testFieldTrackTotalHitsAsInt() throws IOException { final int trackTotalHits = randomIntBetween(1, 10000); assertRestRequest( (builder) -> { builder.field(SearchSourceBuilder.TRACK_TOTAL_HITS_FIELD.getPreferredName(), trackTotalHits); }, - (vectorTileRequest) -> { assertThat(vectorTileRequest.getTrackTotalHitsUpTo(), Matchers.equalTo(trackTotalHits)); } + (vectorTileRequest) -> { + assertThat(vectorTileRequest.getTrackTotalHitsUpTo(), Matchers.equalTo(trackTotalHits)); + } ); } @@ -95,7 +96,9 @@ public void testFieldExtent() throws IOException { final int extent = randomIntBetween(256, 8192); assertRestRequest( (builder) -> { builder.field(VectorTileRequest.EXTENT_FIELD.getPreferredName(), extent); }, - (vectorTileRequest) -> { assertThat(vectorTileRequest.getExtent(), Matchers.equalTo(extent)); } + (vectorTileRequest) -> { + assertThat(vectorTileRequest.getExtent(), Matchers.equalTo(extent)); + } ); } @@ -114,7 +117,9 @@ public void testFieldGridType() throws IOException { final VectorTileRequest.GRID_TYPE grid_type = RandomPicks.randomFrom(random(), VectorTileRequest.GRID_TYPE.values()); assertRestRequest( (builder) -> { builder.field(VectorTileRequest.GRID_TYPE_FIELD.getPreferredName(), grid_type.name()); }, - (vectorTileRequest) -> { assertThat(vectorTileRequest.getGridType(), Matchers.equalTo(grid_type)); } + (vectorTileRequest) -> { + assertThat(vectorTileRequest.getGridType(), Matchers.equalTo(grid_type)); + } ); } @@ -122,7 +127,9 @@ public void testFieldGridPrecision() throws IOException { final int grid_precision = randomIntBetween(1, 8); assertRestRequest( (builder) -> { builder.field(VectorTileRequest.GRID_PRECISION_FIELD.getPreferredName(), grid_precision); }, - (vectorTileRequest) -> { assertThat(vectorTileRequest.getGridPrecision(), Matchers.equalTo(grid_precision)); } + (vectorTileRequest) -> { + assertThat(vectorTileRequest.getGridPrecision(), Matchers.equalTo(grid_precision)); + } ); } @@ -130,7 +137,9 @@ public void testFieldExactBounds() throws IOException { final boolean exactBounds = randomBoolean(); assertRestRequest( (builder) -> { builder.field(VectorTileRequest.EXACT_BOUNDS_FIELD.getPreferredName(), exactBounds); }, - (vectorTileRequest) -> { assertThat(vectorTileRequest.getExactBounds(), Matchers.equalTo(exactBounds)); } + (vectorTileRequest) -> { + assertThat(vectorTileRequest.getExactBounds(), Matchers.equalTo(exactBounds)); + } ); } @@ -179,20 +188,17 @@ public void testDefaultFieldSort() throws IOException { public void testFieldSort() throws IOException { final String sortName = randomAlphaOfLength(10); - assertRestRequest( - (builder) -> { - builder.startArray(SearchSourceBuilder.SORT_FIELD.getPreferredName()) - .startObject() - .field(sortName, "desc") - .endObject() - .endArray(); - }, - (vectorTileRequest) -> { - assertThat(vectorTileRequest.getSortBuilders(), Matchers.iterableWithSize(1)); - FieldSortBuilder sortBuilder = (FieldSortBuilder) vectorTileRequest.getSortBuilders().get(0); - assertThat(sortBuilder.getFieldName(), Matchers.equalTo(sortName)); - } - ); + assertRestRequest((builder) -> { + builder.startArray(SearchSourceBuilder.SORT_FIELD.getPreferredName()) + .startObject() + .field(sortName, "desc") + .endObject() + .endArray(); + }, (vectorTileRequest) -> { + assertThat(vectorTileRequest.getSortBuilders(), Matchers.iterableWithSize(1)); + FieldSortBuilder sortBuilder = (FieldSortBuilder) vectorTileRequest.getSortBuilders().get(0); + assertThat(sortBuilder.getFieldName(), Matchers.equalTo(sortName)); + }); } public void testWrongTile() { diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java index 4656f5f225e11..333ca3957325a 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java @@ -801,14 +801,9 @@ public void prepareForIndicesMigration(ClusterService clusterService, Client cli if (manuallyStopped == false) { WatcherServiceRequest serviceRequest = new WatcherServiceRequest(); serviceRequest.stop(); - originClient.execute( - WatcherServiceAction.INSTANCE, - serviceRequest, - ActionListener.wrap( - (response) -> { listener.onResponse(Collections.singletonMap("manually_stopped", manuallyStopped)); }, - listener::onFailure - ) - ); + originClient.execute(WatcherServiceAction.INSTANCE, serviceRequest, ActionListener.wrap((response) -> { + listener.onResponse(Collections.singletonMap("manually_stopped", manuallyStopped)); + }, listener::onFailure)); } else { // If Watcher is manually stopped, we don't want to stop it AGAIN, so just call the listener. listener.onResponse(Collections.singletonMap("manually_stopped", manuallyStopped)); @@ -827,11 +822,9 @@ public void indicesMigrationComplete( if (manuallyStopped == false) { WatcherServiceRequest serviceRequest = new WatcherServiceRequest(); serviceRequest.start(); - originClient.execute( - WatcherServiceAction.INSTANCE, - serviceRequest, - ActionListener.wrap((response) -> { listener.onResponse(response.isAcknowledged()); }, listener::onFailure) - ); + originClient.execute(WatcherServiceAction.INSTANCE, serviceRequest, ActionListener.wrap((response) -> { + listener.onResponse(response.isAcknowledged()); + }, listener::onFailure)); } else { // Watcher was manually stopped before we got there, don't start it. listener.onResponse(true); diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/NotificationServiceTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/NotificationServiceTests.java index b8bfdb7e17385..160e82337584d 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/NotificationServiceTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/NotificationServiceTests.java @@ -123,10 +123,9 @@ public void testAccountCreationCached() { Settings settings = Settings.builder().put("xpack.notification.test.account." + accountName, "bar").build(); final AtomicInteger validationInvocationCount = new AtomicInteger(0); - TestNotificationService service = new TestNotificationService( - settings, - (String name, Settings accountSettings) -> { validationInvocationCount.incrementAndGet(); } - ); + TestNotificationService service = new TestNotificationService(settings, (String name, Settings accountSettings) -> { + validationInvocationCount.incrementAndGet(); + }); assertThat(validationInvocationCount.get(), is(0)); assertThat(service.getAccount(accountName), is(accountName)); assertThat(validationInvocationCount.get(), is(1)); diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java index dd3a41032cb2d..5d14d426a5328 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java @@ -104,7 +104,9 @@ public static void main(String[] args) throws Exception { Settings.builder().put(SETTINGS).put("node.data", false).build(), emptyMap(), null, - () -> { throw new IllegalArgumentException("settings must have [node.name]"); } + () -> { + throw new IllegalArgumentException("settings must have [node.name]"); + } ) ).start() ) { diff --git a/x-pack/qa/kerberos-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationIT.java b/x-pack/qa/kerberos-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationIT.java index 0ecf121bf7a32..79eb9d7ca6793 100644 --- a/x-pack/qa/kerberos-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationIT.java +++ b/x-pack/qa/kerberos-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationIT.java @@ -197,7 +197,9 @@ private void executeRequestAndVerifyResponse( final LoginContext lc = callbackHandler.login(); Response response = SpnegoHttpClientConfigCallbackHandler.doAsPrivilegedWrapper( lc.getSubject(), - (PrivilegedExceptionAction) () -> { return restClient.performRequest(request); }, + (PrivilegedExceptionAction) () -> { + return restClient.performRequest(request); + }, accessControlContext ); diff --git a/x-pack/qa/security-tools-tests/src/test/java/org/elasticsearch/xpack/security/authc/file/tool/UsersToolTests.java b/x-pack/qa/security-tools-tests/src/test/java/org/elasticsearch/xpack/security/authc/file/tool/UsersToolTests.java index ccce1f97292cb..386c1f6bd091e 100644 --- a/x-pack/qa/security-tools-tests/src/test/java/org/elasticsearch/xpack/security/authc/file/tool/UsersToolTests.java +++ b/x-pack/qa/security-tools-tests/src/test/java/org/elasticsearch/xpack/security/authc/file/tool/UsersToolTests.java @@ -237,10 +237,9 @@ void assertRole(String role, String... users) throws IOException { } public void testParseInvalidUsername() throws Exception { - UserException e = expectThrows( - UserException.class, - () -> { UsersTool.parseUsername(Collections.singletonList("áccented"), Settings.EMPTY); } - ); + UserException e = expectThrows(UserException.class, () -> { + UsersTool.parseUsername(Collections.singletonList("áccented"), Settings.EMPTY); + }); assertEquals(ExitCodes.DATA_ERROR, e.exitCode); assertTrue(e.getMessage(), e.getMessage().contains("Invalid username")); } @@ -309,10 +308,9 @@ public void testParseReservedRole() throws Exception { } public void testParseInvalidRole() throws Exception { - UserException e = expectThrows( - UserException.class, - () -> { UsersTool.parseRoles(terminal, TestEnvironment.newEnvironment(settings), "fóóbár"); } - ); + UserException e = expectThrows(UserException.class, () -> { + UsersTool.parseRoles(terminal, TestEnvironment.newEnvironment(settings), "fóóbár"); + }); assertEquals(ExitCodes.DATA_ERROR, e.exitCode); assertTrue(e.getMessage(), e.getMessage().contains("Invalid role [fóóbár]")); } @@ -337,22 +335,18 @@ public void testUseraddPasswordOption() throws Exception { } public void testUseraddUserExists() throws Exception { - UserException e = expectThrows( - UserException.class, - () -> { - execute("useradd", pathHomeParameter, fileOrderParameter, "existing_user", "-p", SecuritySettingsSourceField.TEST_PASSWORD); - } - ); + UserException e = expectThrows(UserException.class, () -> { + execute("useradd", pathHomeParameter, fileOrderParameter, "existing_user", "-p", SecuritySettingsSourceField.TEST_PASSWORD); + }); assertEquals(ExitCodes.CODE_ERROR, e.exitCode); assertEquals("User [existing_user] already exists", e.getMessage()); } public void testUseraddReservedUser() throws Exception { final String name = randomFrom(ElasticUser.NAME, KibanaUser.NAME); - UserException e = expectThrows( - UserException.class, - () -> { execute("useradd", pathHomeParameter, fileOrderParameter, name, "-p", SecuritySettingsSourceField.TEST_PASSWORD); } - ); + UserException e = expectThrows(UserException.class, () -> { + execute("useradd", pathHomeParameter, fileOrderParameter, name, "-p", SecuritySettingsSourceField.TEST_PASSWORD); + }); assertEquals(ExitCodes.DATA_ERROR, e.exitCode); assertEquals("Invalid username [" + name + "]... Username [" + name + "] is reserved and may not be used.", e.getMessage()); } @@ -372,19 +366,16 @@ public void testAddUserWithInvalidHashingAlgorithmInFips() throws Exception { .put("xpack.security.fips_mode.enabled", true) .build(); - UserException e = expectThrows( - UserException.class, - () -> { - execute( - "useradd", - pathHomeParameter, - fileOrderParameter, - randomAlphaOfLength(12), - "-p", - SecuritySettingsSourceField.TEST_PASSWORD - ); - } - ); + UserException e = expectThrows(UserException.class, () -> { + execute( + "useradd", + pathHomeParameter, + fileOrderParameter, + randomAlphaOfLength(12), + "-p", + SecuritySettingsSourceField.TEST_PASSWORD + ); + }); assertEquals(ExitCodes.CONFIG, e.exitCode); assertEquals( "Only PBKDF2 is allowed for password hashing in a FIPS 140 JVM. " @@ -408,10 +399,9 @@ public void testUserdel() throws Exception { } public void testPasswdUnknownUser() throws Exception { - UserException e = expectThrows( - UserException.class, - () -> { execute("passwd", pathHomeParameter, fileOrderParameter, "unknown", "-p", SecuritySettingsSourceField.TEST_PASSWORD); } - ); + UserException e = expectThrows(UserException.class, () -> { + execute("passwd", pathHomeParameter, fileOrderParameter, "unknown", "-p", SecuritySettingsSourceField.TEST_PASSWORD); + }); assertEquals(ExitCodes.NO_USER, e.exitCode); assertTrue(e.getMessage(), e.getMessage().contains("User [unknown] doesn't exist")); } @@ -436,10 +426,9 @@ public void testPasswdWithInvalidHashingAlgorithmInFips() throws Exception { .put("xpack.security.authc.password_hashing.algorithm", "bcrypt") .put("xpack.security.fips_mode.enabled", true) .build(); - UserException e = expectThrows( - UserException.class, - () -> { execute("passwd", pathHomeParameter, fileOrderParameter, "existing_user", "-p", "new-test-user-password"); } - ); + UserException e = expectThrows(UserException.class, () -> { + execute("passwd", pathHomeParameter, fileOrderParameter, "existing_user", "-p", "new-test-user-password"); + }); assertEquals(ExitCodes.CONFIG, e.exitCode); assertEquals( "Only PBKDF2 is allowed for password hashing in a FIPS 140 JVM. " @@ -560,12 +549,9 @@ public void testUserAddNoConfig() throws Exception { IOUtils.rm(confDir.resolve("users")); pathHomeParameter = "-Epath.home=" + homeDir; fileOrderParameter = "-Expack.security.authc.realms.file.file.order=0"; - UserException e = expectThrows( - UserException.class, - () -> { - execute("useradd", pathHomeParameter, fileOrderParameter, "username", "-p", SecuritySettingsSourceField.TEST_PASSWORD); - } - ); + UserException e = expectThrows(UserException.class, () -> { + execute("useradd", pathHomeParameter, fileOrderParameter, "username", "-p", SecuritySettingsSourceField.TEST_PASSWORD); + }); assertEquals(ExitCodes.CONFIG, e.exitCode); assertThat(e.getMessage(), containsString("Configuration file [/work/eshome/config/users] is missing")); }