Skip to content

Commit 21df4f5

Browse files
authored
Update spotless (#115349)
1 parent 57030d2 commit 21df4f5

File tree

274 files changed

+1972
-2461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

274 files changed

+1972
-2461
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,9 @@ public void apply(Project project) {
5858
Provider<BwcTaskThrottle> bwcTaskThrottleProvider = project.getGradle()
5959
.getSharedServices()
6060
.registerIfAbsent(BWC_TASK_THROTTLE_SERVICE, BwcTaskThrottle.class, spec -> spec.getMaxParallelUsages().set(1));
61-
BuildParams.getBwcVersions()
62-
.forPreviousUnreleased(
63-
(BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> {
64-
configureBwcProject(project.project(unreleasedVersion.gradleProjectPath), unreleasedVersion, bwcTaskThrottleProvider);
65-
}
66-
);
61+
BuildParams.getBwcVersions().forPreviousUnreleased((BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> {
62+
configureBwcProject(project.project(unreleasedVersion.gradleProjectPath), unreleasedVersion, bwcTaskThrottleProvider);
63+
});
6764
}
6865

6966
private void configureBwcProject(

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ public void apply(Project project) {
3232

3333
Provider<DockerSupportService> dockerSupportServiceProvider = project.getGradle()
3434
.getSharedServices()
35-
.registerIfAbsent(
36-
DOCKER_SUPPORT_SERVICE_NAME,
37-
DockerSupportService.class,
38-
spec -> spec.parameters(
39-
params -> { params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE)); }
40-
)
41-
);
35+
.registerIfAbsent(DOCKER_SUPPORT_SERVICE_NAME, DockerSupportService.class, spec -> spec.parameters(params -> {
36+
params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE));
37+
}));
4238

4339
// Ensure that if we are trying to run any DockerBuildTask tasks, we assert an available Docker installation exists
4440
project.getGradle().getTaskGraph().whenReady(graph -> {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public class LicenseAnalyzer {
143143
+ "NONINFRINGEMENT\\. IN NO EVENT SHALL THE AUTHORS OR "
144144
+ "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR "
145145
+ "OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n")
146-
.replaceAll("\\s+", "\\\\s*"),
146+
.replaceAll("\\s+", "\\\\s*"),
147147
Pattern.DOTALL
148148
)
149149
),

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/UpdateVersionsTask.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,9 @@ static Optional<CompilationUnit> addVersionConstant(CompilationUnit versionJava,
227227
.stream()
228228
.map(f -> Map.entry(f, parseVersionField(f.getVariable(0).getNameAsString())))
229229
.filter(e -> e.getValue().isPresent())
230-
.collect(
231-
Collectors.toMap(
232-
e -> e.getValue().get(),
233-
Map.Entry::getKey,
234-
(v1, v2) -> { throw new IllegalArgumentException("Duplicate version constants " + v1); },
235-
TreeMap::new
236-
)
237-
);
230+
.collect(Collectors.toMap(e -> e.getValue().get(), Map.Entry::getKey, (v1, v2) -> {
231+
throw new IllegalArgumentException("Duplicate version constants " + v1);
232+
}, TreeMap::new));
238233

239234
// find the version this should be inserted after
240235
var previousVersion = versions.lowerEntry(version);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,9 @@ public void apply(Project project) {
188188

189189
// windows boxes get windows distributions, and linux boxes get linux distributions
190190
if (isWindows(vmProject)) {
191-
configureVMWrapperTasks(
192-
vmProject,
193-
windowsTestTasks,
194-
depsTasks,
195-
wrapperTask -> { vmLifecyleTasks.get(ARCHIVE).configure(t -> t.dependsOn(wrapperTask)); },
196-
vmDependencies
197-
);
191+
configureVMWrapperTasks(vmProject, windowsTestTasks, depsTasks, wrapperTask -> {
192+
vmLifecyleTasks.get(ARCHIVE).configure(t -> t.dependsOn(wrapperTask));
193+
}, vmDependencies);
198194
} else {
199195
for (var entry : linuxTestTasks.entrySet()) {
200196
ElasticsearchDistributionType type = entry.getKey();

client/rest-high-level/src/main/java/org/elasticsearch/client/core/MainResponse.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ public class MainResponse {
1919
private static final ConstructingObjectParser<MainResponse, Void> PARSER = new ConstructingObjectParser<>(
2020
MainResponse.class.getName(),
2121
true,
22-
args -> { return new MainResponse((String) args[0], (Version) args[1], (String) args[2], (String) args[3], (String) args[4]); }
22+
args -> {
23+
return new MainResponse((String) args[0], (Version) args[1], (String) args[2], (String) args[3], (String) args[4]);
24+
}
2325
);
2426

2527
static {

client/rest-high-level/src/main/java/org/elasticsearch/client/core/TermVectorsResponse.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,9 @@ public static final class FieldStatistics {
240240
private static final ConstructingObjectParser<FieldStatistics, Void> PARSER = new ConstructingObjectParser<>(
241241
"field_statistics",
242242
true,
243-
args -> { return new FieldStatistics((long) args[0], (int) args[1], (long) args[2]); }
243+
args -> {
244+
return new FieldStatistics((long) args[0], (int) args[1], (long) args[2]);
245+
}
244246
);
245247

246248
static {
@@ -411,11 +413,9 @@ public int hashCode() {
411413

412414
public static final class Token {
413415

414-
private static final ConstructingObjectParser<Token, Void> PARSER = new ConstructingObjectParser<>(
415-
"token",
416-
true,
417-
args -> { return new Token((Integer) args[0], (Integer) args[1], (Integer) args[2], (String) args[3]); }
418-
);
416+
private static final ConstructingObjectParser<Token, Void> PARSER = new ConstructingObjectParser<>("token", true, args -> {
417+
return new Token((Integer) args[0], (Integer) args[1], (Integer) args[2], (String) args[3]);
418+
});
419419
static {
420420
PARSER.declareInt(optionalConstructorArg(), new ParseField("start_offset"));
421421
PARSER.declareInt(optionalConstructorArg(), new ParseField("end_offset"));

client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/LifecyclePolicy.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@ public class LifecyclePolicy implements ToXContentObject {
4545
private static Map<String, Set<String>> ALLOWED_ACTIONS = new HashMap<>();
4646

4747
static {
48-
PARSER.declareNamedObjects(
49-
ConstructingObjectParser.constructorArg(),
50-
(p, c, n) -> Phase.parse(p, n),
51-
v -> { throw new IllegalArgumentException("ordered " + PHASES_FIELD.getPreferredName() + " are not supported"); },
52-
PHASES_FIELD
53-
);
48+
PARSER.declareNamedObjects(ConstructingObjectParser.constructorArg(), (p, c, n) -> Phase.parse(p, n), v -> {
49+
throw new IllegalArgumentException("ordered " + PHASES_FIELD.getPreferredName() + " are not supported");
50+
}, PHASES_FIELD);
5451

5552
ALLOWED_ACTIONS.put(
5653
"hot",

client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/Phase.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ public class Phase implements ToXContentObject {
5252
PARSER.declareNamedObjects(
5353
ConstructingObjectParser.constructorArg(),
5454
(p, c, n) -> p.namedObject(LifecycleAction.class, n, null),
55-
v -> { throw new IllegalArgumentException("ordered " + ACTIONS_FIELD.getPreferredName() + " are not supported"); },
55+
v -> {
56+
throw new IllegalArgumentException("ordered " + ACTIONS_FIELD.getPreferredName() + " are not supported");
57+
},
5658
ACTIONS_FIELD
5759
);
5860
}

client/rest-high-level/src/main/java/org/elasticsearch/client/security/GetApiKeyResponse.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ public boolean equals(Object obj) {
6262
}
6363

6464
@SuppressWarnings("unchecked")
65-
static final ConstructingObjectParser<GetApiKeyResponse, Void> PARSER = new ConstructingObjectParser<>(
66-
"get_api_key_response",
67-
args -> { return (args[0] == null) ? GetApiKeyResponse.emptyResponse() : new GetApiKeyResponse((List<ApiKey>) args[0]); }
68-
);
65+
static final ConstructingObjectParser<GetApiKeyResponse, Void> PARSER = new ConstructingObjectParser<>("get_api_key_response", args -> {
66+
return (args[0] == null) ? GetApiKeyResponse.emptyResponse() : new GetApiKeyResponse((List<ApiKey>) args[0]);
67+
});
6968
static {
7069
PARSER.declareObjectArray(optionalConstructorArg(), (p, c) -> ApiKey.fromXContent(p), new ParseField("api_keys"));
7170
}

0 commit comments

Comments
 (0)