From fd2b2795efd4bffefce06cd8daae99e6ed970305 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Mon, 28 Oct 2024 12:01:07 +0100 Subject: [PATCH 1/3] [Gradle] Spotless plugin update provides better configuration cache support requires some rework due to changed defaults --- build-tools-internal/build.gradle | 1 - gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 18 +++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build-tools-internal/build.gradle b/build-tools-internal/build.gradle index c04ba9b90d5e7..11f035e225db1 100644 --- a/build-tools-internal/build.gradle +++ b/build-tools-internal/build.gradle @@ -381,7 +381,6 @@ tasks.named("jar") { spotless { java { - // workaround for https://github.com/diffplug/spotless/issues/2317 //toggleOffOn() target project.fileTree("src/main/java") { diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index bf0e6873f9073..c861e075fbedb 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -45,7 +45,7 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2. 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.25.0" +spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA4" 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 cf520c208cfd8..d59c3acf5b93d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -216,9 +216,9 @@ - - - + + + @@ -226,9 +226,9 @@ - - - + + + @@ -236,9 +236,9 @@ - - - + + + From 5c4414874e33b9d022caf01a68820d24b34fcca1 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 29 Jan 2025 16:29:34 +0100 Subject: [PATCH 2/3] Update spotless to 7.0.2 --- gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 128 +++++++++++++++++++++++++------ 2 files changed, 105 insertions(+), 25 deletions(-) diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index c861e075fbedb..96df27d73862c 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -45,7 +45,7 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2. 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:7.0.0.BETA4" +spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.2" 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 d59c3acf5b93d..5d81448bf47d9 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -201,6 +201,11 @@ + + + + + @@ -211,34 +216,19 @@ - - - - - - - - - - - - - + + + - - - + + + - - - - - - - - + + + @@ -1423,6 +1413,11 @@ + + + + + @@ -1781,6 +1776,11 @@ + + + + + @@ -2385,6 +2385,11 @@ + + + + + @@ -3626,6 +3631,11 @@ + + + + + @@ -3636,6 +3646,11 @@ + + + + + @@ -3766,6 +3781,11 @@ + + + + + @@ -3776,6 +3796,11 @@ + + + + + @@ -3796,6 +3821,11 @@ + + + + + @@ -3806,6 +3836,11 @@ + + + + + @@ -3816,6 +3851,11 @@ + + + + + @@ -3826,6 +3866,11 @@ + + + + + @@ -3836,6 +3881,11 @@ + + + + + @@ -3846,6 +3896,11 @@ + + + + + @@ -3866,6 +3921,11 @@ + + + + + @@ -3876,6 +3936,11 @@ + + + + + @@ -3886,6 +3951,11 @@ + + + + + @@ -3901,6 +3971,11 @@ + + + + + @@ -3911,6 +3986,11 @@ + + + + + From 7732fa235b0a0ff1b15734bc4f0a76da3505b551 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 11 Jun 2025 18:46:29 +0200 Subject: [PATCH 3/3] Update to spotless 7.0.4 --- gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 95 +++++++++++++++++++ .../HuggingFaceRerankResponseEntityTests.java | 4 +- .../retention/MockWritableIndexExpander.java | 6 +- .../authc/AuthenticationServiceTests.java | 30 +++--- 5 files changed, 115 insertions(+), 22 deletions(-) diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 96df27d73862c..07db2bb0116c8 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -45,7 +45,7 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2. 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:7.0.2" +spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.4" 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 5d81448bf47d9..1ca6ceea3cc5a 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -221,16 +221,31 @@ + + + + + + + + + + + + + + + @@ -1781,6 +1796,11 @@ + + + + + @@ -3636,6 +3656,11 @@ + + + + + @@ -3651,6 +3676,11 @@ + + + + + @@ -3761,6 +3791,11 @@ + + + + + @@ -3786,6 +3821,11 @@ + + + + + @@ -3841,6 +3881,11 @@ + + + + + @@ -3856,6 +3901,11 @@ + + + + + @@ -3871,6 +3921,11 @@ + + + + + @@ -3886,6 +3941,11 @@ + + + + + @@ -3901,6 +3961,11 @@ + + + + + @@ -3911,6 +3976,11 @@ + + + + + @@ -3926,6 +3996,11 @@ + + + + + @@ -3941,6 +4016,11 @@ + + + + + @@ -3956,6 +4036,11 @@ + + + + + @@ -3976,6 +4061,11 @@ + + + + + @@ -3991,6 +4081,11 @@ + + + + + diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/response/HuggingFaceRerankResponseEntityTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/response/HuggingFaceRerankResponseEntityTests.java index 5d1b14c46f099..ccea9663d4cfa 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/response/HuggingFaceRerankResponseEntityTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/response/HuggingFaceRerankResponseEntityTests.java @@ -134,8 +134,8 @@ private void assertMissingFieldThrowsIllegalArgumentException(String responseJso assertThat(thrownException.getMessage(), is("Required [" + missingField + "]")); } - private void assertTopNLimit( - Integer topN, String responseJson, List expectation) throws IOException { + private void assertTopNLimit(Integer topN, String responseJson, List expectation) + throws IOException { when(REQUEST_MOCK.getTopN()).thenReturn(topN); RankedDocsResults parsedResults = HuggingFaceRerankResponseEntity.fromResponse( diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/MockWritableIndexExpander.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/MockWritableIndexExpander.java index a2cf4479db0da..d32f84e2ded5c 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/MockWritableIndexExpander.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/MockWritableIndexExpander.java @@ -30,10 +30,8 @@ public static WritableIndexExpander create(boolean stateIndexWritable) { } private static void mockWhenIndicesAreNotWritable(WritableIndexExpander writableIndexExpander) { - when(writableIndexExpander.getWritableIndices(anyString())) - .thenReturn(new ArrayList<>()); - when(writableIndexExpander.getWritableIndices(ArgumentMatchers.>any())) - .thenReturn(new ArrayList<>()); + when(writableIndexExpander.getWritableIndices(anyString())).thenReturn(new ArrayList<>()); + when(writableIndexExpander.getWritableIndices(ArgumentMatchers.>any())).thenReturn(new ArrayList<>()); } private static void mockWhenIndicesAreWritable(WritableIndexExpander writableIndexExpander) { diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java index 1b5bbd4de9a44..345bc3dbef362 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java @@ -791,7 +791,7 @@ public void testAuthenticateCached() throws Exception { public void testAuthenticateNonExistentRestRequestUserThrowsAuthenticationException() throws Exception { when(firstRealm.token(threadContext)).thenReturn( - new UsernamePasswordToken("idonotexist", new SecureString("passwd".toCharArray())) + new UsernamePasswordToken("idonotexist", new SecureString("passwd".toCharArray())) ); try { authenticateBlocking(restRequest, null); @@ -2069,23 +2069,23 @@ public void testExpiredToken() throws Exception { when(projectIndex.indexExists()).thenReturn(true); User user = new User("_username", "r1"); final Authentication expected = AuthenticationTestHelper.builder() - .user(user) - .realmRef(new RealmRef("realm", "custom", "node")) - .build(false); + .user(user) + .realmRef(new RealmRef("realm", "custom", "node")) + .build(false); PlainActionFuture tokenFuture = new PlainActionFuture<>(); Tuple newTokenBytes = tokenService.getRandomTokenBytes(randomBoolean()); try (ThreadContext.StoredContext ctx = threadContext.stashContext()) { Authentication originatingAuth = AuthenticationTestHelper.builder() - .user(new User("creator")) - .realmRef(new RealmRef("test", "test", "test")) - .build(false); + .user(new User("creator")) + .realmRef(new RealmRef("test", "test", "test")) + .build(false); tokenService.createOAuth2Tokens( - newTokenBytes.v1(), - newTokenBytes.v2(), - expected, - originatingAuth, - Collections.emptyMap(), - tokenFuture + newTokenBytes.v1(), + newTokenBytes.v2(), + expected, + originatingAuth, + Collections.emptyMap(), + tokenFuture ); } String token = tokenFuture.get().getAccessToken(); @@ -2104,8 +2104,8 @@ public void testExpiredToken() throws Exception { } threadContext.putHeader("Authorization", "Bearer " + token); ElasticsearchSecurityException e = expectThrows( - ElasticsearchSecurityException.class, - () -> authenticateBlocking("_action", transportRequest, null, null) + ElasticsearchSecurityException.class, + () -> authenticateBlocking("_action", transportRequest, null, null) ); if (requestIdAlreadyPresent) { assertThat(expectAuditRequestId(threadContext), is(reqId.get()));