cleanup

Author: rjernst

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

@@ -22,15 +22,14 @@
 
 public abstract class GenerateTransportVersionManifestTask extends DefaultTask {
     @InputDirectory
-    public abstract DirectoryProperty getResourcesDirectory();
+    public abstract DirectoryProperty getDefinitionsDirectory();
 
     @OutputFile
     public abstract RegularFileProperty getManifestFile();
 
     @TaskAction
     public void generateTransportVersionManifest() throws IOException {
-        Path resourcesDir = getResourcesDirectory().get().getAsFile().toPath();
-        Path definitionsDir = TransportVersionUtils.getDefinitionsDirectory(resourcesDir);
+        Path definitionsDir = getDefinitionsDirectory().get().getAsFile().toPath();
         Path manifestFile = getManifestFile().get().getAsFile().toPath();
         try (var writer = Files.newBufferedWriter(manifestFile)) {
             try (var stream = Files.list(definitionsDir)) {

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

@@ -20,6 +20,9 @@
 
 import java.util.Map;
 
+import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getDefinitionsDirectory;
+import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getResourcesDirectory;
+
 public class GlobalTransportVersionManagementPlugin implements Plugin<Project> {
 
     @Override
@@ -43,7 +46,7 @@ public void apply(Project project) {
             .register("validateTransportVersionDefinitions", ValidateTransportVersionDefinitionsTask.class, t -> {
                 t.setGroup("Transport Versions");
                 t.setDescription("Validates that all defined TransportVersion constants are used in at least one project");
-                Directory resourcesDir = TransportVersionUtils.getResourcesDirectory(project);
+                Directory resourcesDir = getResourcesDirectory(project);
                 if (resourcesDir.getAsFile().exists()) {
                     t.getResourcesDirectory().set(resourcesDir);
                 }
@@ -55,7 +58,7 @@ public void apply(Project project) {
             .register("generateTransportVersionManifest", GenerateTransportVersionManifestTask.class, t -> {
                 t.setGroup("Transport Versions");
                 t.setDescription("Generate a manifest resource for all the known transport version definitions");
-                t.getResourcesDirectory().set(TransportVersionUtils.getResourcesDirectory(project));
+                t.getDefinitionsDirectory().set(getDefinitionsDirectory(getResourcesDirectory(project)));
                 t.getManifestFile().set(project.getLayout().getBuildDirectory().file("generated-resources/manifest.txt"));
             });
         project.getTasks().named(JavaPlugin.PROCESS_RESOURCES_TASK_NAME, Copy.class).configure(t -> {

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

@@ -17,6 +17,9 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
+import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getDefinitionsDirectory;
+import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getResourcesDirectory;
+
 public class TransportVersionManagementPlugin implements Plugin<Project> {
 
     @Override
@@ -43,9 +46,9 @@ public void apply(Project project) {
             .register("validateTransportVersionReferences", ValidateTransportVersionReferencesTask.class, t -> {
                 t.setGroup("Transport Versions");
                 t.setDescription("Validates that all TransportVersion references used in the project have an associated definition file");
-                Directory resourcesDir = TransportVersionUtils.getResourcesDirectory(project);
-                if (resourcesDir.getAsFile().exists()) {
-                    t.getResourcesDirectory().set(resourcesDir);
+                Directory definitionsDir = getDefinitionsDirectory(getResourcesDirectory(project));
+                if (definitionsDir.getAsFile().exists()) {
+                    t.getDefinitionsDirectory().set(definitionsDir);
                 }
                 t.getReferencesFile().set(collectTask.get().getOutputFile());
             });

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

@@ -69,6 +69,16 @@ public static TransportVersionLatest fromString(String filename, String contents
     }
 
     record TransportVersionId(int complete, int major, int server, int subsidiary, int patch) implements Comparable<TransportVersionId> {
+
+        static TransportVersionId fromString(String s) {
+            int complete = Integer.parseInt(s);
+            int patch = complete % 100;
+            int subsidiary = (complete / 100) % 10;
+            int server = (complete / 1000) % 1000;
+            int major = complete / 1000000;
+            return new TransportVersionId(complete, major, server, subsidiary, patch);
+        }
+
         @Override
         public int compareTo(TransportVersionId o) {
             return Integer.compare(complete, o.complete);
@@ -84,12 +94,12 @@ public int base() {
         }
     }
 
-    static Path definitionFilePath(Path resourcesDir, String name) {
-        return getDefinitionsDirectory(resourcesDir).resolve(name + ".csv");
+    static Path definitionFilePath(Directory resourcesDirectory, String name) {
+        return getDefinitionsDirectory(resourcesDirectory).getAsFile().toPath().resolve(name + ".csv");
     }
 
-    static Path latestFilePath(Path resourcesDir, String name) {
-        return getLatestDirectory(resourcesDir).resolve(name + ".csv");
+    static Path latestFilePath(Directory resourcesDirectory, String name) {
+        return getLatestDirectory(resourcesDirectory).getAsFile().toPath().resolve(name + ".csv");
     }
 
     static TransportVersionDefinition readDefinitionFile(Path file) throws IOException {
@@ -124,12 +134,12 @@ private static TransportVersionId parseId(String rawId) {
         return new TransportVersionId(complete, major, server, subsidiary, patch);
     }
 
-    static Path getDefinitionsDirectory(Path resourcesDir) {
-        return resourcesDir.resolve("defined");
+    static Directory getDefinitionsDirectory(Directory resourcesDirectory) {
+        return resourcesDirectory.dir("defined");
     }
 
-    static Path getLatestDirectory(Path resourcesDir) {
-        return resourcesDir.resolve("latest");
+    static Directory getLatestDirectory(Directory resourcesDirectory) {
+        return resourcesDirectory.dir("latest");
     }
 
     static Directory getResourcesDirectory(Project project) {

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

@@ -317,16 +317,12 @@ private void throwLatestFailure(String branch, String message) {
         throw new IllegalStateException("Latest transport version file [" + latestRelativePath(branch) + "] " + message);
     }
 
-    private Path resourcesDirPath() {
-        return getResourcesDirectory().get().getAsFile().toPath();
-    }
-
     private String definitionRelativePath(String name) {
-        return relativePath(definitionFilePath(resourcesDirPath(), name));
+        return relativePath(definitionFilePath(getResourcesDirectory().get(), name));
     }
 
     private String latestRelativePath(String branch) {
-        return relativePath(latestFilePath(resourcesDirPath(), branch));
+        return relativePath(latestFilePath(getResourcesDirectory().get(), branch));
     }
 
     private String relativePath(Path file) {

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

@@ -34,7 +34,7 @@ public abstract class ValidateTransportVersionReferencesTask extends DefaultTask
     @InputDirectory
     @Optional
     @PathSensitive(PathSensitivity.RELATIVE)
-    public abstract DirectoryProperty getResourcesDirectory();
+    public abstract DirectoryProperty getDefinitionsDirectory();
 
     @InputFile
     @PathSensitive(PathSensitivity.RELATIVE)
@@ -43,9 +43,8 @@ public abstract class ValidateTransportVersionReferencesTask extends DefaultTask
     @TaskAction
     public void validateTransportVersions() throws IOException {
         final Predicate<String> referenceChecker;
-        if (getResourcesDirectory().isPresent()) {
-            Path resourcesDir = getResourcesDirectory().getAsFile().get().toPath();
-            Path definitionsDir = TransportVersionUtils.getDefinitionsDirectory(resourcesDir);
+        if (getDefinitionsDirectory().isPresent()) {
+            Path definitionsDir = getDefinitionsDirectory().getAsFile().get().toPath();
             referenceChecker = (name) -> Files.exists(definitionsDir.resolve(name + ".csv"));
         } else {
             referenceChecker = (name) -> false;