Skip to content

Commit 77da155

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent faab728 commit 77da155

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,13 @@
2525
import java.io.IOException;
2626
import java.nio.file.Path;
2727
import java.util.ArrayList;
28-
import java.util.Collections;
29-
import java.util.Comparator;
3028
import java.util.HashSet;
3129
import java.util.List;
3230
import java.util.Objects;
3331
import java.util.Set;
3432

3533
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.IdIncrement.PATCH;
3634
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.IdIncrement.SERVER;
37-
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getDefinedFile;
38-
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getLatestId;
39-
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getPriorLatestId;
40-
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.updateLatestFile;
41-
import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.writeDefinitionFile;
4235

4336
/**
4437
* This task generates transport version definition files. These files
@@ -56,8 +49,8 @@ public abstract class GenerateTransportVersionDefinitionTask extends DefaultTask
5649
@InputDirectory
5750
public abstract DirectoryProperty getTransportResourcesDirectory(); // The plugin should always set this, not optional
5851

59-
60-
// assumption: this task is always run on main, so we can determine the name by diffing with main and looking for new files added in the definition directory
52+
// assumption: this task is always run on main, so we can determine the name by diffing with main and looking for new files added in the
53+
// definition directory
6154
/**
6255
* Used to set the name of the TransportVersionSet for which a data file will be generated.
6356
*/
@@ -75,17 +68,19 @@ public abstract class GenerateTransportVersionDefinitionTask extends DefaultTask
7568
@Option(option = "versions", description = "The minor version(s) for which to generate IDs, e.g. --versions=\"9.2,9.1\"")
7669
public abstract ListProperty<String> getMinorVersions();
7770

78-
// @Optional
79-
// @Input
80-
// public abstract Property<Function<String, IdIncrement>> getIdIncrementSupplier();
71+
// @Optional
72+
// @Input
73+
// public abstract Property<Function<String, IdIncrement>> getIdIncrementSupplier();
8174

8275
@TaskAction
8376
public void generateTransportVersionData() throws IOException {
8477
getLogger().lifecycle("Name: " + getTransportVersionName().get());
8578
getLogger().lifecycle("Versions: " + getMinorVersions().get());
8679
Path resourcesDir = Objects.requireNonNull(getTransportResourcesDirectory().getAsFile().get()).toPath();
8780
String name = getTransportVersionName().isPresent() ? getTransportVersionName().get() : findLocalTransportVersionName();
88-
Set<String> targetMinorVersions = new HashSet<>(getMinorVersions().isPresent() ? getMinorVersions().get() : findTargetMinorVersions());
81+
Set<String> targetMinorVersions = new HashSet<>(
82+
getMinorVersions().isPresent() ? getMinorVersions().get() : findTargetMinorVersions()
83+
);
8984

9085
List<Integer> ids = new ArrayList<>();
9186
for (String minorVersion : getKnownMinorVersions(resourcesDir)) {
@@ -108,10 +103,10 @@ public void generateTransportVersionData() throws IOException {
108103
}
109104
}
110105

111-
/*
106+
/*
112107
final String tvName = Objects.requireNonNull(getTransportVersionName().get());
113108
List<String> minorVersions = getMinorVersions().get();
114-
// final var idIncrementSupplier = Objects.requireNonNull(getIdIncrementSupplier().get());
109+
// final var idIncrementSupplier = Objects.requireNonNull(getIdIncrementSupplier().get());
115110
116111
// TODO
117112
// - [x] do we need to also validate that the minorVersions don't contain duplicates here? How do we enforce idempotency if we don't?

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.gradle.internal.transport;
1111

1212
import com.google.common.collect.Comparators;
13+
1314
import org.elasticsearch.gradle.Version;
1415
import org.gradle.api.GradleException;
1516
import org.gradle.api.Project;

0 commit comments

Comments
 (0)