Use object mapper instead of ConfigurationStringBuilder

Author: dnestoro

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/ContributionTask.java

@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.core.util.DefaultIndenter;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.graalvm.internal.tck.model.MetadataIndexEntry;
@@ -328,12 +330,12 @@ private void addTests(Path originalTestsLocation){
         Path allTests = originalTestsLocation.resolve(".");
 
         ensureFileBelongsToProject(destination);
+        InteractiveTaskUtils.printUserInfo("Removing dummy test stubs");
         boolean shouldDelete = InteractiveTaskUtils.askForDeletePermission(destination);
         if (!shouldDelete) {
             throw new RuntimeException("The task didn't get permission to delete dummy stubs. Cannot proceed with the task execution");
         }
 
-        InteractiveTaskUtils.printUserInfo("Removing dummy test stubs");
         getFileSystemOperations().delete(deleteSpec -> deleteSpec.delete(destination));
 
         InteractiveTaskUtils.printUserInfo("Copying tests from: " + originalTestsLocation + " to " + destination);
@@ -374,29 +376,18 @@ private void addDockerImages(List<String> images) throws IOException {
 
     private void addUserCodeFilterFile(List<String> packages) throws IOException {
         InteractiveTaskUtils.printUserInfo("Generating " + USER_CODE_FILTER_FILE);
+        List<Map<String, String>> filterFileRules = new ArrayList<>();
 
-        ConfigurationStringBuilder sb = new ConfigurationStringBuilder();
-        sb.openObject().newLine();
-        sb.indent();
-        sb.quote("rules").separateWithSemicolon().openArray().newLine();
-        sb.indent();
-        sb.openObject().appendStringProperty("excludeClasses", "**").closeObject().concat().newLine();
-        for (int i = 0; i < packages.size(); i++) {
-            String nextPackage = packages.get(i) + ".**";
-            sb.openObject().appendStringProperty("includeClasses", nextPackage).closeObject();
-            if (i < packages.size() - 1) {
-                sb.concat();
-            }
+        // add exclude classes
+        filterFileRules.add(Map.of("excludeClasses", "**"));
 
-            sb.newLine();
-        }
+        // add include classes
+        packages.forEach(p -> filterFileRules.add(Map.of("includeClasses", p + ".**")));
 
-        sb.unindent();
-        sb.closeArray().newLine();
-        sb.unindent();
-        sb.closeObject();
+        DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
+        prettyPrinter.indentArraysWith(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE);
 
-        writeToFile(testsDirectory.resolve(USER_CODE_FILTER_FILE), sb.toString(), StandardOpenOption.CREATE);
+        objectMapper.writer(prettyPrinter).writeValue(testsDirectory.resolve(USER_CODE_FILTER_FILE).toFile(), Map.of("rules", filterFileRules));
     }
 
     private void addAdditionalDependencies(List<Coordinates> dependencies) {
@@ -526,9 +517,9 @@ private void removeEmptyConfigFiles() throws IOException {
             if (extractedPredefinedClasses == null || extractedPredefinedClasses.length == 0) {
                 ensureFileBelongsToProject(agentExtractedPredefinedClasses);
 
+                InteractiveTaskUtils.printUserInfo("Removing empty: agent-extracted-predefined-classes");
                 boolean canDelete = InteractiveTaskUtils.askForDeletePermission(agentExtractedPredefinedClasses);
                 if (canDelete) {
-                    InteractiveTaskUtils.printUserInfo("Removing empty: agent-extracted-predefined-classes");
                     getFileSystemOperations().delete(deleteSpec -> deleteSpec.delete(agentExtractedPredefinedClasses));
                 }
             }
@@ -539,33 +530,21 @@ private void removeEmptyConfigFiles() throws IOException {
 
     private void removeConfigFile(Path path, CONFIG_FILES file, List<CONFIG_FILES> remainingFiles) {
         ensureFileBelongsToProject(path);
+
+        InteractiveTaskUtils.printUserInfo("Removing empty: " + file.get());
         boolean canDelete = InteractiveTaskUtils.askForDeletePermission(path);
         if (canDelete) {
-            InteractiveTaskUtils.printUserInfo("Removing empty: " + file.get());
             getFileSystemOperations().delete(deleteSpec -> deleteSpec.delete(path));
             remainingFiles.remove(file);
         }
     }
 
     private void trimIndexFile(Path index, List<CONFIG_FILES> remainingFiles) throws IOException {
         InteractiveTaskUtils.printUserInfo("Removing sufficient entries from: " + index);
-        ConfigurationStringBuilder sb = new ConfigurationStringBuilder();
-        sb.openArray().newLine();
-        sb.indent();
-        for (int i = 0; i < remainingFiles.size(); i++) {
-            sb.quote(remainingFiles.get(i).get());
-
-            if (i != remainingFiles.size() - 1) {
-                sb.concat();
-            }
-
-            sb.newLine();
-        }
-
-        sb.unindent();
-        sb.closeArray();
+        DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
+        prettyPrinter.indentArraysWith(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE);
 
-        writeToFile(index, sb.toString(), StandardOpenOption.TRUNCATE_EXISTING);
+        objectMapper.writer(prettyPrinter).writeValue(index.toFile(), remainingFiles.stream().map(CONFIG_FILES::get).toList());
     }
 
     private boolean shouldCreatePullRequest() {

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/utils/InteractiveTaskUtils.java

@@ -54,9 +54,9 @@ public static boolean askYesNoQuestion(String question, String helpMessage, bool
     }
 
     public static boolean askForDeletePermission(Path file) {
-        String question = "Please double check that the task can remove the following file: " + file +
+        String question = "The contributing task would like to delete following file: " + file +
                 ". If this file is not generated by the task, please report the error on the metadata repository. " +
-                "Can the task delete this file? [y/N]";
+                "Do you confirm that contributing task can delete this file? [y/N]";
         String help = "The task should only remove dummy files generated in the previous step. Please verify that the following file can be removed: " + file;
 
         return askYesNoQuestion(question, help, false);

tests/tck-build-logic/src/main/resources/contributing/questions.json

@@ -26,8 +26,8 @@
   },
   {
     "question-key": "additionalDependencies",
-    "question": "What additional testImplementation dependencies you want to include? Enter the next dependency (to stop type \"-\")",
-    "help": "Enter the testImplementation dependencies (press enter after each dependency) you want to include use in tests. Provide dependencies in form of Maven coordinates. Maven coordinates consist of three parts in the following format \"groupId:artifactId:version\". For more information visit: https://maven.apache.org/repositories/artifacts.html When you finish adding dependencies, type \"-\" to terminate the inclusion process"
+    "question": "What are the additional dependencies you want to include? Enter the next dependency (to stop type \"-\")",
+    "help": "Enter the additional dependencies (press enter after each dependency) you want to include use in tests. Provide dependencies in form of Maven coordinates. Maven coordinates consist of three parts in the following format \"groupId:artifactId:version\". For more information visit: https://maven.apache.org/repositories/artifacts.html When you finish adding dependencies, type \"-\" to terminate the inclusion process"
   },
   {
     "question-key": "shouldCreatePullRequest",