feedback

Author: rjernst

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

@@ -22,17 +22,18 @@
 
 public abstract class GenerateTransportVersionManifestTask extends DefaultTask {
     @InputDirectory
-    public abstract DirectoryProperty getDefinitionsDirectory();
+    public abstract DirectoryProperty getResourcesDirectory();
 
     @OutputFile
     public abstract RegularFileProperty getManifestFile();
 
     @TaskAction
     public void generateTransportVersionManifest() throws IOException {
-        Path constantsDir = getDefinitionsDirectory().get().getAsFile().toPath();
+        Path resourcesDir = getResourcesDirectory().get().getAsFile().toPath();
+        Path definitionsDir = TransportVersionUtils.getDefinitionsDirectory(resourcesDir);
         Path manifestFile = getManifestFile().get().getAsFile().toPath();
         try (var writer = Files.newBufferedWriter(manifestFile)) {
-            try (var stream = Files.list(constantsDir)) {
+            try (var stream = Files.list(definitionsDir)) {
                 for (String filename : stream.map(p -> p.getFileName().toString()).toList()) {
                     if (filename.equals(manifestFile.getFileName().toString())) {
                         // don't list self

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

@@ -55,7 +55,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.getDefinitionsDirectory().set(TransportVersionUtils.getDefinitionsDirectory(project));
+                t.getResourcesDirectory().set(TransportVersionUtils.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

@@ -43,9 +43,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 definitionsDir = TransportVersionUtils.getDefinitionsDirectory(project);
-                if (definitionsDir.getAsFile().exists()) {
-                    t.getDefinitionsDirectory().set(definitionsDir);
+                Directory resourcesDir = TransportVersionUtils.getResourcesDirectory(project);
+                if (resourcesDir.getAsFile().exists()) {
+                    t.getResourcesDirectory().set(resourcesDir);
                 }
                 t.getReferencesFile().set(collectTask.get().getOutputFile());
             });

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

@@ -84,12 +84,12 @@ public int base() {
         }
     }
 
-    static Path definitionFilePath(Project project, String name) {
-        return getDefinitionsDirectory(project).getAsFile().toPath().resolve(name + ".csv");
+    static Path definitionFilePath(Path resourcesDir, String name) {
+        return getDefinitionsDirectory(resourcesDir).resolve(name + ".csv");
     }
 
-    static Path latestFilePath(Project project, String name) {
-        return getLatestDirectory(project).getAsFile().toPath().resolve(name + ".csv");
+    static Path latestFilePath(Path resourcesDir, String name) {
+        return getLatestDirectory(resourcesDir).resolve(name + ".csv");
     }
 
     static TransportVersionDefinition readDefinitionFile(Path file) throws IOException {
@@ -124,12 +124,12 @@ private static TransportVersionId parseId(String rawId) {
         return new TransportVersionId(complete, major, server, subsidiary, patch);
     }
 
-    static Directory getDefinitionsDirectory(Project project) {
-        return getResourcesDirectory(project).dir("defined");
+    static Path getDefinitionsDirectory(Path resourcesDir) {
+        return resourcesDir.resolve("defined");
     }
 
-    static Directory getLatestDirectory(Project project) {
-        return getResourcesDirectory(project).dir("latest");
+    static Path getLatestDirectory(Path resourcesDir) {
+        return resourcesDir.resolve("latest");
     }
 
     static Directory getResourcesDirectory(Project project) {

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

@@ -308,6 +308,7 @@ private void cleanupAndValidateBase(int base, List<IdAndDefinition> ids) {
                     "Transport version base id " + base + " is missing patch ids between " + next.id() + " and " + previous.id()
                 );
             }
+            previous = next;
         }
     }
 
@@ -319,12 +320,16 @@ 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(project, name));
+        return relativePath(definitionFilePath(resourcesDirPath(), name));
     }
 
     private String latestRelativePath(String branch) {
-        return relativePath(latestFilePath(project, branch));
+        return relativePath(latestFilePath(resourcesDirPath(), 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 getDefinitionsDirectory();
+    public abstract DirectoryProperty getResourcesDirectory();
 
     @InputFile
     @PathSensitive(PathSensitivity.RELATIVE)
@@ -43,8 +43,9 @@ public abstract class ValidateTransportVersionReferencesTask extends DefaultTask
     @TaskAction
     public void validateTransportVersions() throws IOException {
         final Predicate<String> referenceChecker;
-        if (getDefinitionsDirectory().isPresent()) {
-            Path definitionsDir = getDefinitionsDirectory().getAsFile().get().toPath();
+        if (getResourcesDirectory().isPresent()) {
+            Path resourcesDir = getResourcesDirectory().getAsFile().get().toPath();
+            Path definitionsDir = TransportVersionUtils.getDefinitionsDirectory(resourcesDir);
             referenceChecker = (name) -> Files.exists(definitionsDir.resolve(name + ".csv"));
         } else {
             referenceChecker = (name) -> false;