spotless

Author: JVerwolf

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

@@ -19,10 +19,9 @@ public void apply(Project project) {
         project.getTasks().register("generateTransportVersionData", GenerateTransportVersionDataTask.class, t -> {
             t.setDescription("Generate transport version data"); // todo update this to be more descriptive
             t.setGroup("Transport Versions"); // todo
-            t.getDataFileDirectory().set(
-                project.getLayout().getProjectDirectory().file("src/main/resources/org/elasticsearch/transport/"));
-            t.getTVSetName().set("test"); //todo
+            t.getDataFileDirectory().set(project.getLayout().getProjectDirectory().file("src/main/resources/org/elasticsearch/transport/"));
+            t.getTVSetName().set("test"); // todo
             t.getReleaseVersionForTV().set("9.1"); // todo
-    });
+        });
     }
 }

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

@@ -10,6 +10,7 @@
 package org.elasticsearch.gradle.internal.transport;
 
 import com.google.common.collect.Streams;
+
 import org.elasticsearch.gradle.Version;
 import org.elasticsearch.gradle.VersionProperties;
 import org.elasticsearch.gradle.internal.transport.TransportVersionUtils.TransportVersionSetData;
@@ -70,14 +71,12 @@ public abstract class GenerateTransportVersionDataTask extends DefaultTask {
     @Input
     public abstract Property<String> getReleaseVersionForTV();
 
-
     @TaskAction
     public void generateTransportVersionData() {
         final var tvDataDir = Objects.requireNonNull(getDataFileDirectory().getAsFile().get());
         final var tvSetName = Objects.requireNonNull(getTVSetName().get());
         final var tvReleaseVersion = ReleaseVersion.fromString(Objects.requireNonNull(getReleaseVersionForTV().get()));
 
-
         // Get the latest transport version data for the local version.
         final var latestTVSetData = TransportVersionUtils.getLatestTVSetData(tvDataDir, tvReleaseVersion.toString());
 
@@ -87,7 +86,8 @@ public void generateTransportVersionData() {
         if (priorLatestTVSetData == null) {
             throw new GradleException(
                 "The latest Transport Version ID for the prior release was not found at: "
-                    + tvDataDir.getAbsolutePath() + formatLatestTVSetFilename(priorReleaseVersion)
+                    + tvDataDir.getAbsolutePath()
+                    + formatLatestTVSetFilename(priorReleaseVersion)
                     + " This is required."
             );
         }
@@ -108,7 +108,7 @@ public void generateTransportVersionData() {
 
         // Create/update the data file
         if (tvSetFileExists) {
-            // This is not a new TVSet.  We are creating a backport version for an existing TVSet.
+            // This is not a new TVSet. We are creating a backport version for an existing TVSet.
             // Check to ensure that there isn't already a TV id for this release version (e.g., if this task has been run twice).
             var existingIDsForReleaseVersion = tvSetDataFromFile.ids().stream().filter(id -> {
                 var priorLatestID = priorLatestTVSetData.ids().getFirst();
@@ -117,9 +117,12 @@ public void generateTransportVersionData() {
             if (existingIDsForReleaseVersion.isEmpty() == false) {
                 throw new GradleException(
                     "A transport version could not be created because one already exists for this release:"
-                        + " Release version: " + tvReleaseVersion
-                        + " TransportVersion Id: " + existingIDsForReleaseVersion.getFirst()
-                        + " File: " + getTVSetDataFilePath(tvDataDir, tvSetName)
+                        + " Release version: "
+                        + tvReleaseVersion
+                        + " TransportVersion Id: "
+                        + existingIDsForReleaseVersion.getFirst()
+                        + " File: "
+                        + getTVSetDataFilePath(tvDataDir, tvSetName)
                 );
             }
 
@@ -130,10 +133,7 @@ public void generateTransportVersionData() {
             ).writeToDataDir(tvDataDir);
         } else {
             // Create a new data file for the case where this is a new TV
-            new TransportVersionSetData(
-                tvSetName,
-                List.of(newVersion)
-            ).writeToDataDir(tvDataDir);
+            new TransportVersionSetData(tvSetName, List.of(newVersion)).writeToDataDir(tvDataDir);
         }
 
         // Update the LATEST file.
@@ -144,7 +144,6 @@ public void generateTransportVersionData() {
         );
     }
 
-
     private static int bumpVersionNumber(
         int tvIDToBump,
         ReleaseVersion releaseVersion,
@@ -196,11 +195,13 @@ private static ReleaseVersion getPriorReleaseVersion(File tvDataDir, ReleaseVers
                 var fileMajor = Integer.parseInt(matcher.group(1));
                 var fileMinor = Integer.parseInt(matcher.group(2));
                 return fileMajor == releaseVersion.major - 1 ? Stream.of(fileMinor) : Stream.empty();
-            }).sorted().toList().getLast();
+            })
+            .sorted()
+            .toList()
+            .getLast();
         return new ReleaseVersion(releaseVersion.major - 1, highestMinorOfPrevMajor);
     }
 
-
     private static String formatLatestTVSetFilename(ReleaseVersion releaseVersion) {
         return releaseVersion.toString() + LATEST_SUFFIX;
     }
@@ -209,25 +210,18 @@ private record ReleaseVersion(int major, int minor) {
         public static ReleaseVersion fromString(String string) {
             String[] versionParts = string.split("\\.");
             assert versionParts.length == 2;
-            return new ReleaseVersion(
-                Integer.parseInt(versionParts[0]),
-                Integer.parseInt(versionParts[1])
-            );
+            return new ReleaseVersion(Integer.parseInt(versionParts[0]), Integer.parseInt(versionParts[1]));
         }
 
         public static ReleaseVersion of(Version version) {
-            return new ReleaseVersion(
-                version.getMajor(),
-                version.getMinor()
-            );
+            return new ReleaseVersion(version.getMajor(), version.getMinor());
         }
 
         @Override
         public @NotNull String toString() {
             return major + "." + minor;
         }
 
-
         @Override
         public boolean equals(Object obj) {
             if (this == obj) return true;

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

@@ -21,12 +21,8 @@ public class TransportVersionUtils {
     public static final String LATEST_SUFFIX = "-LATEST.json";
     public static final String JSON_SUFFIX = ".json";
 
-
     public record TransportVersionSetData(String name, List<Integer> ids) implements Serializable {
-        public TransportVersionSetData(
-            @JsonProperty("name") String name,
-            @JsonProperty("ids") List<Integer> ids
-        ) {
+        public TransportVersionSetData(@JsonProperty("name") String name, @JsonProperty("ids") List<Integer> ids) {
             this.name = name;
             this.ids = ids;
         }
@@ -46,13 +42,11 @@ public static void writeTVSetData(File tvDataDir, String filename, TransportVers
         }
     }
 
-
     public static TransportVersionSetData getLatestTVSetData(File tvDataDir, String majorMinor) {
         return getTVSetData(tvDataDir.toPath().resolve(majorMinor + LATEST_SUFFIX));
 
     }
 
-
     public static Path getTVSetDataFilePath(File tvDataDir, String tvSetNameField) {
         return tvDataDir.toPath().resolve(tvSetNameField + JSON_SUFFIX);
     }

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

@@ -62,8 +62,12 @@ public void validateTransportVersions() throws IOException {
         try (var reader = new BufferedReader(new FileReader(tvSetDeclaredNamesFile))) {
             reader.lines().forEach(declaredName -> {
                 if (tvSetNamesInDataFiles.contains(declaredName) == false) {
-                    throw new RuntimeException("TransportVersionSetData.get(\"" + declaredName + "\") was used, but lacks a" +
-                        " data file with a corresponding transport version. This can be generated with the <TODO> task"); //TODO
+                    throw new RuntimeException(
+                        "TransportVersionSetData.get(\""
+                            + declaredName
+                            + "\") was used, but lacks a"
+                            + " data file with a corresponding transport version. This can be generated with the <TODO> task"
+                    ); // TODO
                 }
             });
         }