iter

Author: JVerwolf

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

@@ -26,6 +26,7 @@
 import org.gradle.process.ExecOperations;
 import org.gradle.process.ExecResult;
 
+import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -42,8 +43,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-
 import static org.elasticsearch.gradle.internal.transport.TransportVersionReference.listFromFile;
 import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.latestFilePath;
 import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.writeDefinitionFile;
@@ -240,7 +239,7 @@ private List<TransportVersionLatest> getMainLatestFiles() throws IOException {
         List<TransportVersionLatest> latestFiles = new ArrayList<>();
         String latestBasePath = TransportVersionUtils.getResourcePath(getResourcesProjectDir().get(), "latest/");
         for (String latestPath : getMainResources(latestBasePath)) {
-            TransportVersionLatest latest = readExistingFile(latestPath, this::latestRelativePath, TransportVersionLatest::fromString);
+            TransportVersionLatest latest = readExistingFile(latestPath, Function.identity(), TransportVersionLatest::fromString);
             latestFiles.add(latest);
         }
         return latestFiles;
@@ -268,42 +267,25 @@ private String findAddedTransportVersionName(Set<String> referencedNames, List<S
 
     // TODO duplicated
     private Set<String> getMainResources(String subPath) {
-        String output = gitCommand("ls-tree", "--name-only", "-r", "main", getResourcesProjectDir().get() + "/" + subPath);
+        String output = gitCommand("ls-tree", "--name-only", "-r", "main", subPath);
         return Set.of(output.split(System.lineSeparator()));
     }
 
     private Set<String> getChangedResources(String subPath) {
-        String output = gitCommand("diff", "--name-only", "main", getResourcesProjectDir().get() + "/" + subPath);
+        String output = gitCommand("diff", "--name-only", "main", subPath).strip();
+        if (output.isEmpty()) {
+            return Set.of();
+        }
         return Set.of(output.split(System.lineSeparator()));
     }
 
-    // TODO duplicated
-    private TransportVersionLatest readLatestFromMain(String releaseBranch) {
-        return readExistingFile(releaseBranch, this::latestRelativePath, TransportVersionLatest::fromString);
-    }
-
     // TODO duplicated
     private <T> T readExistingFile(String name, Function<String, String> pathFunction, BiFunction<String, String, T> parser) {
         String relativePath = pathFunction.apply(name);
         String content = gitCommand("show", "main:" + relativePath).strip();
         return parser.apply(relativePath, content);
     }
 
-    // TODO duplicated
-    private String latestRelativePath(String branch) {
-        return relativePath(latestFilePath(getResourcesDirectory().get(), branch));
-    }
-
-    // TODO duplicated
-    private Path resourcesDirPath() {
-        return getResourcesDirectory().get().getAsFile().toPath();
-    }
-
-    // TODO duplicated
-    private String relativePath(Path file) {
-        return rootPath.relativize(file).toString();
-    }
-
     // TODO duplicated
     public String gitCommand(String... args) {
         final ByteArrayOutputStream stdout = new ByteArrayOutputStream();

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

@@ -13,7 +13,8 @@ record TransportVersionLatest(String releaseBranch, String name, TransportVersio
 
     public static TransportVersionLatest fromString(String filename, String contents) {
         assert filename.endsWith(".csv");
-        String branch = filename.substring(0, filename.length() - 4);
+        int slashIndex = filename.lastIndexOf('/');
+        String branch = filename.substring(slashIndex == -1 ? 0 : (slashIndex + 1), filename.length() - 4);
 
         String[] parts = contents.split(",");
         if (parts.length != 2) {

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

@@ -75,7 +75,8 @@ public void apply(Project project) {
                 t.getReferencesFiles().setFrom(tvReferencesConfig);
                 Version esVersion = VersionProperties.getElasticsearchVersion();
                 t.getMainReleaseBranch().set(esVersion.getMajor() + "." + esVersion.getMinor());
-                t.getResourcesProjectDir().set(project.getRootProject().getProjectDir().toPath().relativize(project.getProjectDir().toPath()).toString());
+                t.getResourcesProjectDir()
+                    .set(project.getRootProject().getProjectDir().toPath().relativize(project.getProjectDir().toPath()).toString());
             });
     }
 }