Extract recuring questions mechanism into a function

Author: dnestoro

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

@@ -49,10 +49,9 @@ public abstract class ContributionTask extends DefaultTask {
     @Inject
     protected abstract FileSystemOperations getFileSystemOperations();
 
-    private Path gradlew;
-
     private final ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
+    private Path gradlew;
     private Path testsDirectory;
     private Path metadataDirectory;
 
@@ -166,7 +165,7 @@ private void checkPackages(Path testsPath) throws ContributingException {
         try {
             FilesUtils.findJavaFiles(testsPath, javaFiles);
         } catch (IOException e) {
-            throw new ContributingException("Cannot find java files. Reason: " + e);
+            throw new ContributingException("Cannot find Java files. Reason: " + e);
         }
 
         for (Path file : javaFiles) {
@@ -211,71 +210,29 @@ private Path getResourcesLocation(){
 
     private List<String> getDockerImages() {
         ContributingQuestion question = questions.get("docker");
-
-        List<String> images = new ArrayList<>();
-        while (true) {
-            String nextImage = InteractiveTaskUtils.askQuestion(question.question(), question.help(), answer -> {
-                if (!answer.equalsIgnoreCase("-") && answer.split(":").length != 2) {
-                    throw new ContributingException("Docker image name not provided in the correct format. Type help for explanation.");
-                }
-
-                return answer;
-            });
-
-            if (nextImage.trim().equalsIgnoreCase("-")) {
-                break;
+        return InteractiveTaskUtils.askRecurringQuestions(question.question(), question.help(), 0, answer -> {
+            if (answer.split(":").length != 2) {
+                throw new ContributingException("Docker image name not provided in the correct format. Type help for explanation.");
             }
 
-            images.add(nextImage);
-        }
-
-        return images;
+            return answer;
+        });
     }
 
     private List<String> getAllowedPackages() {
         ContributingQuestion question = questions.get("allowedPackages");
-        List<String> packages = new ArrayList<>();
-        while (true) {
-            String nextPackage = InteractiveTaskUtils.askQuestion(question.question(), question.help(), answer -> answer);
-            if (nextPackage.trim().equalsIgnoreCase("-")) {
-                if (packages.isEmpty()) {
-                    InteractiveTaskUtils.printErrorMessage("At least one package must be provided. Type help for explanation.");
-                    continue;
-                }
-
-                break;
-            }
-
-            packages.add(nextPackage);
-        }
-
-        return packages;
+        return InteractiveTaskUtils.askRecurringQuestions(question.question(), question.help(), 1, answer -> answer);
     }
 
     private List<Coordinates> getAdditionalDependencies() {
         ContributingQuestion question = questions.get("additionalDependencies");
-        List<Coordinates> dependencies = new ArrayList<>();
-        while (true) {
-            Coordinates dependency = InteractiveTaskUtils.askQuestion(question.question(), question.help(), answer -> {
-                if (answer.equalsIgnoreCase("-")) {
-                    return null;
-                }
-
-                try {
-                    return CoordinateUtils.fromString(answer);
-                } catch (IllegalArgumentException ex) {
-                    throw new ContributingException(ex.getMessage());
-                }
-            });
-
-            if (dependency == null) {
-                break;
+        return InteractiveTaskUtils.askRecurringQuestions(question.question(), question.help(), 0, answer -> {
+            try {
+                return CoordinateUtils.fromString(answer);
+            } catch (IllegalArgumentException ex) {
+                throw new ContributingException(ex.getMessage());
             }
-
-            dependencies.add(dependency);
-        }
-
-        return dependencies;
+        });
     }
 
     private void createStubs(boolean shouldUpdate){

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

@@ -2,6 +2,8 @@
 
 import org.graalvm.internal.tck.exceptions.ContributingException;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Scanner;
 
 public class InteractiveTaskUtils {
@@ -31,6 +33,30 @@ public static <R> R askQuestion(String question, String helpMessage, Contributin
         }
     }
 
+    public static <R> List<R> askRecurringQuestions(String question, String help, int minimalNumberOfAnswers, ContributingHandler<String, R> handleAnswer) {
+        List<R> answers = new ArrayList<>();
+        while (true) {
+            String answer = InteractiveTaskUtils.askQuestion(question, help, a -> a);
+            if (answer.equalsIgnoreCase("-")) {
+                if (answers.size() < minimalNumberOfAnswers) {
+                    printErrorMessage("At least " + minimalNumberOfAnswers + " should be provided. Currently provided: " + answers.size());
+                    continue;
+                }
+
+                break;
+            }
+
+            try {
+                R item = handleAnswer.apply(answer);
+                answers.add(item);
+            } catch (ContributingException e) {
+                printErrorMessage(e.getMessage());
+            }
+        }
+
+        return answers;
+    }
+
     public static boolean askYesNoQuestion(String question, String helpMessage, boolean defaultAnswer) {
         Scanner scanner = new Scanner(System.in);