Skip to content

Commit 7ff4be4

Browse files
authored
[Build] update eclipse formatter used by spotless (#135382)
We cannot directly declare the ecl and jdt core dependency but we can tweak the used dependency by spotless in our precommit plugin.
1 parent 9a67ed9 commit 7ff4be4

File tree

8 files changed

+40
-19
lines changed

8 files changed

+40
-19
lines changed

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ public void apply(Project project) {
5252
// Spotless resolves required dependencies from project repositories, so we need maven central
5353
project.getRepositories().mavenCentral();
5454

55+
// we cannot update to a newer spotless plugin version yet but we want to use the latest eclipse formatter to be compatible
56+
// with latest java versions
57+
project.getConfigurations().matching(it -> it.getName().startsWith("spotless")).configureEach(conf -> {
58+
project.getDependencies().constraints(constraints -> {
59+
constraints.add(conf.getName(), "org.eclipse.jdt:org.eclipse.jdt.core:3.42.0", dependencyConstraint -> {
60+
dependencyConstraint.because(
61+
"We want to use a recent version of the Eclipse formatter libraries to support latest Java"
62+
);
63+
});
64+
constraints.add(conf.getName(), "org.eclipse.jdt:ecj:3.42.0", dependencyConstraint -> {
65+
dependencyConstraint.because(
66+
"We want to use a recent version of the Eclipse formatter libraries to support latest Java"
67+
);
68+
});
69+
});
70+
});
71+
5572
project.getExtensions().getByType(SpotlessExtension.class).java(java -> {
5673
File elasticsearchWorkspace = Util.locateElasticsearchWorkspace(project.getGradle());
5774
String importOrderPath = "build-conventions/elastic.importorder";
@@ -74,7 +91,7 @@ public void apply(Project project) {
7491
// When running build benchmarks we alter the source in some scenarios.
7592
// The gradle-profiler unfortunately does not generate compliant formatted
7693
// sources so we ignore that altered file when running build benchmarks
77-
if(Boolean.getBoolean("BUILD_PERFORMANCE_TEST") && project.getPath().equals(":server")) {
94+
if (Boolean.getBoolean("BUILD_PERFORMANCE_TEST") && project.getPath().equals(":server")) {
7895
java.targetExclude("src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java");
7996
}
8097
});

gradle/verification-metadata.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3913,16 +3913,21 @@
39133913
<sha256 value="97c566b120009c203a2fc8b291f4a9adbc171cf1ccb70f06f6b4e1828c00ce8e" origin="Generated by Gradle"/>
39143914
</artifact>
39153915
</component>
3916-
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.35.0">
3917-
<artifact name="org.eclipse.jdt.core-3.35.0.jar">
3918-
<sha256 value="8f5bcb00355b271638b9d82a8cccd0e733225cb74c4a3f0f55a7b75d43ee442a" origin="Generated by Gradle"/>
3916+
<component group="org.eclipse.jdt" name="ecj" version="3.42.0">
3917+
<artifact name="ecj-3.42.0.jar">
3918+
<sha256 value="29f6d3918ee02db4400c103bc25dd90a22491c3a395867d9393070cb96a7dd29" origin="Generated by Gradle"/>
39193919
</artifact>
39203920
</component>
39213921
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.38.0">
39223922
<artifact name="org.eclipse.jdt.core-3.38.0.jar">
39233923
<sha256 value="f0387e80ed4327d39f1f63da8773ee460af4edd78f7c2efecb4ba9bc0628bf60" origin="Generated by Gradle"/>
39243924
</artifact>
39253925
</component>
3926+
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.42.0">
3927+
<artifact name="org.eclipse.jdt.core-3.42.0.jar">
3928+
<sha256 value="cac5d217e6df38900c1654f937d6af27ef9b433f59e8a9254b8c693e811517e3" origin="Generated by Gradle"/>
3929+
</artifact>
3930+
</component>
39263931
<component group="org.eclipse.jetty" name="jetty-annotations" version="9.4.40.v20210413">
39273932
<artifact name="jetty-annotations-9.4.40.v20210413.jar">
39283933
<sha256 value="faccdc2113daf5ace9157cacd98751a41280fec94f584fd571b7fc26ff84742d" origin="Generated by Gradle"/>

server/src/main/java/org/elasticsearch/ingest/IngestService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ private record IngestPipelinesExecutionResult(
916916
null,
917917
IndexDocFailureStoreStatus.NOT_APPLICABLE_OR_UNKNOWN
918918
);
919+
919920
private static IngestPipelinesExecutionResult failAndStoreFor(String index, Exception e) {
920921
return new IngestPipelinesExecutionResult(false, true, e, index, IndexDocFailureStoreStatus.USED);
921922
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/response/AzureAiStudioRerankResponseEntity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ record RerankResultEntry(Float relevanceScore, Integer index, @Nullable ObjectPa
111111
PARSER.declareInt(constructorArg(), new ParseField("index"));
112112
PARSER.declareObject(optionalConstructorArg(), ObjectParser.PARSER::apply, new ParseField("document"));
113113
}
114+
114115
public RankedDocsResults.RankedDoc toRankedDoc() {
115116
return new RankedDocsResults.RankedDoc(index, relevanceScore, document == null ? null : document.text);
116117
}

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/response/HuggingFaceRerankResponseEntityTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ private void assertMissingFieldThrowsIllegalArgumentException(String responseJso
134134
assertThat(thrownException.getMessage(), is("Required [" + missingField + "]"));
135135
}
136136

137-
private void assertTopNLimit(
138-
Integer topN, String responseJson, List<RankedDocsResultsTests.RerankExpectation> expectation) throws IOException {
137+
private void assertTopNLimit(Integer topN, String responseJson, List<RankedDocsResultsTests.RerankExpectation> expectation)
138+
throws IOException {
139139
when(REQUEST_MOCK.getTopN()).thenReturn(topN);
140140

141141
RankedDocsResults parsedResults = HuggingFaceRerankResponseEntity.fromResponse(

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManagerTests.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -907,19 +907,18 @@ public void testSetJobState_withHandler_onResponse_triggersHandlerNull() throws
907907

908908
public void testSetJobState_withHandler_onFailure_triggersHandlerException() throws IOException {
909909
// Verifies that when updatePersistentTaskState reports a failure, the handler receives that exception
910-
when(threadPool.schedule(any(Runnable.class), any(TimeValue.class), any(Executor.class)))
911-
.thenAnswer(invocation -> {
912-
Runnable r = invocation.getArgument(0);
913-
r.run();
914-
return mock(ThreadPool.Cancellable.class);
915-
});
910+
when(threadPool.schedule(any(Runnable.class), any(TimeValue.class), any(Executor.class))).thenAnswer(invocation -> {
911+
Runnable r = invocation.getArgument(0);
912+
r.run();
913+
return mock(ThreadPool.Cancellable.class);
914+
});
916915
AutodetectProcessManager manager = createSpyManager();
917916
JobTask jobTask = mock(JobTask.class);
918917
ResourceNotFoundException boom = new ResourceNotFoundException("boom");
919918
doAnswer(invocation -> {
920919
@SuppressWarnings("unchecked")
921-
ActionListener<PersistentTasksCustomMetadata.PersistentTask<?>> listener =
922-
(ActionListener<PersistentTasksCustomMetadata.PersistentTask<?>>) invocation.getArguments()[1];
920+
ActionListener<PersistentTasksCustomMetadata.PersistentTask<?>> listener = (ActionListener<
921+
PersistentTasksCustomMetadata.PersistentTask<?>>) invocation.getArguments()[1];
923922
listener.onFailure(boom);
924923
return null;
925924
}).when(jobTask).updatePersistentTaskState(any(), any());

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/MockWritableIndexExpander.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ public static WritableIndexExpander create(boolean stateIndexWritable) {
3030
}
3131

3232
private static void mockWhenIndicesAreNotWritable(WritableIndexExpander writableIndexExpander) {
33-
when(writableIndexExpander.getWritableIndices(anyString()))
34-
.thenReturn(new ArrayList<>());
35-
when(writableIndexExpander.getWritableIndices(ArgumentMatchers.<Collection<String>>any()))
36-
.thenReturn(new ArrayList<>());
33+
when(writableIndexExpander.getWritableIndices(anyString())).thenReturn(new ArrayList<>());
34+
when(writableIndexExpander.getWritableIndices(ArgumentMatchers.<Collection<String>>any())).thenReturn(new ArrayList<>());
3735
}
3836

3937
private static void mockWhenIndicesAreWritable(WritableIndexExpander writableIndexExpander) {

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/BinaryStringNumericProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public enum BinaryStringNumericOperation implements BiFunction<String, Number, S
4444
if (i <= 0) {
4545
return null;
4646
}
47-
checkResultLength(s.length() * c.longValue()); // mul is safe: c's checked by doProcess() to be within Integer's range
47+
checkResultLength(s.length() * c.longValue());// mul is safe: c's checked by doProcess() to be within Integer's range
4848
return s.repeat(i);
4949
});
5050

0 commit comments

Comments
 (0)