Skip to content

Commit 303ba81

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 18c548d commit 303ba81

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
public class TransportVersionReferencesPlugin implements Plugin<Project> {
2020

21-
2221
@Override
2322
public void apply(Project project) {
2423
project.getPluginManager().apply(LifecycleBasePlugin.class);

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ public class TransportVersionResourcesPlugin implements Plugin<Project> {
2626
public void apply(Project project) {
2727
project.getPluginManager().apply(LifecycleBasePlugin.class);
2828

29-
project.getGradle().getSharedServices().registerIfAbsent("transportVersionResources", TransportVersionResourcesService.class, spec -> {
30-
Directory transportResources = project.getLayout().getProjectDirectory().dir("src/main/resources/transport");
31-
spec.getParameters().getResourcesDirectory().set(transportResources);
32-
spec.getParameters().getRootDirectory().set(project.getRootProject().getRootDir());
33-
});
29+
project.getGradle()
30+
.getSharedServices()
31+
.registerIfAbsent("transportVersionResources", TransportVersionResourcesService.class, spec -> {
32+
Directory transportResources = project.getLayout().getProjectDirectory().dir("src/main/resources/transport");
33+
spec.getParameters().getResourcesDirectory().set(transportResources);
34+
spec.getParameters().getRootDirectory().set(project.getRootProject().getRootDir());
35+
});
3436

3537
DependencyHandler depsHandler = project.getDependencies();
3638
Configuration tvReferencesConfig = project.getConfigurations().create("globalTvReferences");

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import org.gradle.process.ExecOperations;
1616
import org.gradle.process.ExecResult;
1717

18-
import javax.inject.Inject;
19-
2018
import java.io.ByteArrayOutputStream;
2119
import java.io.IOException;
2220
import java.nio.charset.StandardCharsets;
@@ -32,10 +30,13 @@
3230
import java.util.concurrent.atomic.AtomicReference;
3331
import java.util.function.BiFunction;
3432

33+
import javax.inject.Inject;
34+
3535
public abstract class TransportVersionResourcesService implements BuildService<TransportVersionResourcesService.Parameters> {
3636

3737
public interface Parameters extends BuildServiceParameters {
3838
DirectoryProperty getResourcesDirectory();
39+
3940
DirectoryProperty getRootDirectory();
4041
}
4142

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public void validateTransportVersions() throws IOException {
6565
Map<Integer, List<IdAndDefinition>> idsByBase = collectIdsByBase(definitions.values());
6666
Map<String, TransportVersionLatest> latestByReleaseBranch = getResources().get().getLatestByReleaseBranch();
6767

68-
6968
// now load all definitions, do some validation and record them by various keys for later quick lookup
7069
// NOTE: this must run after loading referenced names and existing definitions
7170
// NOTE: this is sorted so that the order of cross validation is deterministic
@@ -157,17 +156,18 @@ private void validateDefinition(TransportVersionDefinition definition, Set<Strin
157156
}
158157
}
159158

160-
private void validateLatest(TransportVersionLatest latest, Map<String, TransportVersionDefinition> definitions, Map<Integer, List<IdAndDefinition>> idsByBase) {
159+
private void validateLatest(
160+
TransportVersionLatest latest,
161+
Map<String, TransportVersionDefinition> definitions,
162+
Map<Integer, List<IdAndDefinition>> idsByBase
163+
) {
161164
TransportVersionDefinition latestDefinition = definitions.get(latest.name());
162165
if (latestDefinition == null) {
163166
throwLatestFailure(latest, "contains transport version name [" + latest.name() + "] which is not defined");
164167
}
165168
if (latestDefinition.ids().contains(latest.id()) == false) {
166169
Path relativePath = getResources().get().getRepositoryPath(latestDefinition);
167-
throwLatestFailure(
168-
latest,
169-
"has id " + latest.id() + " which is not in definition [" + relativePath + "]"
170-
);
170+
throwLatestFailure(latest, "has id " + latest.id() + " which is not in definition [" + relativePath + "]");
171171
}
172172

173173
List<IdAndDefinition> baseIds = idsByBase.get(latest.id().base());

0 commit comments

Comments
 (0)