Apply code review feedback

Author: jozala

branches.json

@@ -1,33 +1,33 @@
 {
-  "notice": "This file is not maintained outside of the main branch and should only be used for tooling.",
-  "branches": [
+  "notice" : "This file is not maintained outside of the main branch and should only be used for tooling.",
+  "branches" : [
     {
-      "branch": "main",
-      "version": "9.2.0"
+      "branch" : "main",
+      "version" : "9.2.0"
     },
     {
-      "branch": "9.1",
-      "version": "9.1.0"
+      "branch" : "9.1",
+      "version" : "9.1.0"
     },
     {
-      "branch": "9.0",
-      "version": "9.0.4"
+      "branch" : "9.0",
+      "version" : "9.0.4"
     },
     {
-      "branch": "8.19",
-      "version": "8.19.0"
+      "branch" : "8.19",
+      "version" : "8.19.0"
     },
     {
-      "branch": "8.18",
-      "version": "8.18.4"
+      "branch" : "8.18",
+      "version" : "8.18.4"
     },
     {
-      "branch": "8.17",
-      "version": "8.17.9"
+      "branch" : "8.17",
+      "version" : "8.17.9"
     },
     {
-      "branch": "7.17",
-      "version": "7.17.30"
+      "branch" : "7.17",
+      "version" : "7.17.30"
     }
   ]
 }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DevelopmentBranch.java

@@ -11,6 +11,7 @@
 
 import org.elasticsearch.gradle.Version;
 
+import java.io.Serializable;
 import java.util.Objects;
 
 /**
@@ -19,7 +20,7 @@
  * @param name Name of the development branch
  * @param version Elasticsearch version on the development branch
  */
-public record DevelopmentBranch(String name, Version version) {
+public record DevelopmentBranch(String name, Version version) implements Serializable {
     public DevelopmentBranch {
         Objects.requireNonNull(name);
         Objects.requireNonNull(version);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/UpdateBranchesJsonTask.java

@@ -17,14 +17,16 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import org.elasticsearch.gradle.Version;
-import org.elasticsearch.gradle.internal.conventions.util.Util;
 import org.elasticsearch.gradle.internal.info.BranchesFileParser;
 import org.elasticsearch.gradle.internal.info.DevelopmentBranch;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.InvalidUserDataException;
-import org.gradle.api.Project;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.Optional;
+import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.options.Option;
 
@@ -36,7 +38,6 @@
 import java.util.Comparator;
 import java.util.List;
 
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 /**
@@ -46,22 +47,47 @@ public class UpdateBranchesJsonTask extends DefaultTask {
 
     private static final Logger LOGGER = Logging.getLogger(UpdateBranchesJsonTask.class);
 
-    private final Project project;
     private final ObjectMapper objectMapper;
     private final BranchesFileParser branchesFileParser;
 
-    @Nullable
+    @OutputFile
+    private File branchesFile;
+
+    @Input
+    @Optional
     private DevelopmentBranch addBranch;
-    @Nullable
+    @Input
+    @Optional
     private String removeBranch;
-    @Nullable
+    @Input
+    @Optional
     private DevelopmentBranch updateBranch;
 
     @Inject
-    public UpdateBranchesJsonTask(Project project) {
-        this.project = project;
+    public UpdateBranchesJsonTask(ProjectLayout projectLayout) {
         this.objectMapper = new ObjectMapper();
         this.branchesFileParser = new BranchesFileParser(objectMapper);
+        this.branchesFile = projectLayout.getSettingsDirectory().file("branches.json").getAsFile();
+    }
+
+    public File getBranchesFile() {
+        return branchesFile;
+    }
+
+    public void setBranchesFile(File branchesFile) {
+        this.branchesFile = branchesFile;
+    }
+
+    public DevelopmentBranch getAddBranch() {
+        return addBranch;
+    }
+
+    public String getRemoveBranch() {
+        return removeBranch;
+    }
+
+    public DevelopmentBranch getUpdateBranch() {
+        return updateBranch;
     }
 
     @Option(option = "add-branch", description = "Specifies the branch and corresponding version to add in format <branch>:<version>")
@@ -89,7 +115,6 @@ private DevelopmentBranch toDevelopmentBranch(String branchAndVersion) {
 
     @TaskAction
     public void executeTask() throws IOException {
-        File branchesFile = new File(Util.locateElasticsearchWorkspace(project.getGradle()), "branches.json");
         List<DevelopmentBranch> developmentBranches = readBranches(branchesFile);
 
         if (addBranch == null && removeBranch == null && updateBranch == null) {
@@ -133,7 +158,6 @@ public void executeTask() throws IOException {
 
         DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
         prettyPrinter.indentArraysWith(new DefaultIndenter("  ", DefaultIndenter.SYS_LF));
-        prettyPrinter.withoutSpacesInObjectEntries();
         objectMapper.writer(prettyPrinter).writeValue(branchesFile, jsonNode);
     }
 

build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/release/UpdateBranchesJsonTaskSpec.groovy

@@ -33,6 +33,7 @@ class UpdateBranchesJsonTaskSpec extends Specification {
     def setup() {
         Project project = ProjectBuilder.builder().withProjectDir(projectRoot).build()
         task = project.tasks.register("updateBranchesJson", UpdateBranchesJsonTask).get()
+        task.branchesFile = new File(projectRoot, "branches.json")
     }
 
     def "add new branch to branches.json (sorted by version) when --add-branch is specified"() {