diff --git a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java
index ea9009172c7e2..3ee55b38ec26d 100644
--- a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java
+++ b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java
@@ -52,6 +52,23 @@ public void apply(Project project) {
// Spotless resolves required dependencies from project repositories, so we need maven central
project.getRepositories().mavenCentral();
+ // we cannot update to a newer spotless plugin version yet but we want to use the latest eclipse formatter to be compatible
+ // with latest java versions
+ project.getConfigurations().matching(it -> it.getName().startsWith("spotless")).configureEach(conf -> {
+ project.getDependencies().constraints(constraints -> {
+ constraints.add(conf.getName(), "org.eclipse.jdt:org.eclipse.jdt.core:3.42.0", dependencyConstraint -> {
+ dependencyConstraint.because(
+ "We want to use a recent version of the Eclipse formatter libraries to support latest Java"
+ );
+ });
+ constraints.add(conf.getName(), "org.eclipse.jdt:ecj:3.42.0", dependencyConstraint -> {
+ dependencyConstraint.because(
+ "We want to use a recent version of the Eclipse formatter libraries to support latest Java"
+ );
+ });
+ });
+ });
+
project.getExtensions().getByType(SpotlessExtension.class).java(java -> {
File elasticsearchWorkspace = Util.locateElasticsearchWorkspace(project.getGradle());
String importOrderPath = "build-conventions/elastic.importorder";
@@ -74,7 +91,7 @@ public void apply(Project project) {
// When running build benchmarks we alter the source in some scenarios.
// The gradle-profiler unfortunately does not generate compliant formatted
// sources so we ignore that altered file when running build benchmarks
- if(Boolean.getBoolean("BUILD_PERFORMANCE_TEST") && project.getPath().equals(":server")) {
+ if (Boolean.getBoolean("BUILD_PERFORMANCE_TEST") && project.getPath().equals(":server")) {
java.targetExclude("src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java");
}
});
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 6cbf907d86853..bff8e70d4e9f5 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3873,9 +3873,9 @@
-
-
-
+
+
+
@@ -3883,6 +3883,11 @@
+
+
+
+
+
@@ -4388,11 +4393,6 @@
-
-
-
-
-
@@ -4403,11 +4403,6 @@
-
-
-
-
-
@@ -4918,6 +4913,11 @@
+
+
+
+
+
@@ -4983,11 +4983,6 @@
-
-
-
-
-
diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestService.java b/server/src/main/java/org/elasticsearch/ingest/IngestService.java
index 2265a0343576c..06ae43183b368 100644
--- a/server/src/main/java/org/elasticsearch/ingest/IngestService.java
+++ b/server/src/main/java/org/elasticsearch/ingest/IngestService.java
@@ -916,6 +916,7 @@ private record IngestPipelinesExecutionResult(
null,
IndexDocFailureStoreStatus.NOT_APPLICABLE_OR_UNKNOWN
);
+
private static IngestPipelinesExecutionResult failAndStoreFor(String index, Exception e) {
return new IngestPipelinesExecutionResult(false, true, e, index, IndexDocFailureStoreStatus.USED);
}
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/response/AzureAiStudioRerankResponseEntity.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/response/AzureAiStudioRerankResponseEntity.java
index c3bd369c8fb42..3497cf3118366 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/response/AzureAiStudioRerankResponseEntity.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/response/AzureAiStudioRerankResponseEntity.java
@@ -111,6 +111,7 @@ record RerankResultEntry(Float relevanceScore, Integer index, @Nullable ObjectPa
PARSER.declareInt(constructorArg(), new ParseField("index"));
PARSER.declareObject(optionalConstructorArg(), ObjectParser.PARSER::apply, new ParseField("document"));
}
+
public RankedDocsResults.RankedDoc toRankedDoc() {
return new RankedDocsResults.RankedDoc(index, relevanceScore, document == null ? null : document.text);
}
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/process/autodetect/AutodetectProcessManagerTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManagerTests.java
index d6d4ef84387d8..e17825fb69133 100644
--- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManagerTests.java
+++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManagerTests.java
@@ -907,19 +907,18 @@ public void testSetJobState_withHandler_onResponse_triggersHandlerNull() throws
public void testSetJobState_withHandler_onFailure_triggersHandlerException() throws IOException {
// Verifies that when updatePersistentTaskState reports a failure, the handler receives that exception
- when(threadPool.schedule(any(Runnable.class), any(TimeValue.class), any(Executor.class)))
- .thenAnswer(invocation -> {
- Runnable r = invocation.getArgument(0);
- r.run();
- return mock(ThreadPool.Cancellable.class);
- });
+ when(threadPool.schedule(any(Runnable.class), any(TimeValue.class), any(Executor.class))).thenAnswer(invocation -> {
+ Runnable r = invocation.getArgument(0);
+ r.run();
+ return mock(ThreadPool.Cancellable.class);
+ });
AutodetectProcessManager manager = createSpyManager();
JobTask jobTask = mock(JobTask.class);
ResourceNotFoundException boom = new ResourceNotFoundException("boom");
doAnswer(invocation -> {
@SuppressWarnings("unchecked")
- ActionListener> listener =
- (ActionListener>) invocation.getArguments()[1];
+ ActionListener> listener = (ActionListener<
+ PersistentTasksCustomMetadata.PersistentTask>) invocation.getArguments()[1];
listener.onFailure(boom);
return null;
}).when(jobTask).updatePersistentTaskState(any(), any());
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/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/BinaryStringNumericProcessor.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/BinaryStringNumericProcessor.java
index 6cab7c5d3f0b0..3082f43630802 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/BinaryStringNumericProcessor.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/BinaryStringNumericProcessor.java
@@ -44,7 +44,7 @@ public enum BinaryStringNumericOperation implements BiFunction