Add handling for default value in lists

Author: adrienlauer

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 2.6.2 (2017-10-19)
+
+* [new] Add basic prompt mode (-DbasicPrompt) on generate goal, for the case where ConsoleUI doesn't work properly.
+* [chg] If an archetype named "web" exists, set it as the default project type.
+
 # Version 2.6.2 (2017-08-10)
 
 * [chg] Add a fallback to hard-coded archetype list for project generation.

src/license/THIRD-PARTY.properties

@@ -13,7 +13,7 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Thu Oct 19 14:13:45 CEST 2017
+#Thu Oct 19 15:02:05 CEST 2017
 classworlds--classworlds--1.1-alpha-2=
 commons-collections--commons-collections--3.1=
 dom4j--dom4j--1.6.1=

src/main/java/org/seedstack/maven/GenerateMojo.java

@@ -123,11 +123,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                     getLog().info("Resolved version " + archetypeVersion);
                 }
                 try {
-                    // We have a list of possible types, let the user choose
+                    // We have a list of possible types, let the user choose (if a "web" choice exists, set it as default)
                     List<Value> list = new ArrayList<>(findProjectTypes(archetypeGroupId, archetypeVersion, remoteCatalog));
                     Collections.sort(list);
                     list.add(new Value("custom archetype", "custom"));
-                    type = getPrompter().promptList("Choose the project type", list);
+                    type = getPrompter().promptList("Choose the project type", list, "web");
 
                     // If the user wants to input a custom archetype
                     if ("custom".equals(type)) {
@@ -271,21 +271,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
     }
 
-    private Thread setupBasicPromptHintHook() {
-        Thread basicPromptHook = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                if (!basicMode) {
-                    getLog().info("Hint: if you experience prompting issues, try the basic prompt instead by adding \"-DbasicPrompt\" to your command line");
-                }
-            }
-        }, "basic-prompt-hook");
-        Runtime.getRuntime().addShutdownHook(basicPromptHook);
-        return basicPromptHook;
-    }
-
-
-
     private Thread setupInquiryCancelHook(final File projectDir, final File questionFile, final HashMap<String, Object> vars) {
         Thread shutdownRender = new Thread(new Runnable() {
             @Override

src/main/java/org/seedstack/maven/components/inquirer/impl/AbstractInquirer.java

@@ -85,7 +85,7 @@ public Object ask(Question question) throws InquirerException {
                     case CHECKBOX:
                         return coerce(getPrompter().promptCheckbox(message, question.getValues()), type);
                     case LIST:
-                        return coerce(getPrompter().promptList(message, question.getValues()), type);
+                        return coerce(getPrompter().promptList(message, question.getValues(), defaultValue), type);
                     case CHOICE:
                         return coerce(getPrompter().promptChoice(message, question.getValues()), type);
                     default:

src/main/java/org/seedstack/maven/components/prompter/Prompter.java

@@ -14,7 +14,7 @@
 public interface Prompter {
     String promptChoice(String message, List<Value> values) throws PromptException;
 
-    String promptList(String message, List<Value> values) throws PromptException;
+    String promptList(String message, List<Value> values, String defaultValue) throws PromptException;
 
     Set<String> promptCheckbox(String message, List<Value> values) throws PromptException;
 

src/main/java/org/seedstack/maven/components/prompter/Value.java

@@ -96,12 +96,24 @@ public static List<String> convertValues(List<Value> values) {
         return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Value value = (Value) o;
+
+        return name.equals(value.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+
     @Override
     public int compareTo(Value o) {
-        if (o == null) {
-            throw new NullPointerException("Attempt to compare to null value");
-        }
-        return this.label.compareTo(o.label);
+        return this.name.compareTo(o.name);
     }
 }
 

src/main/java/org/seedstack/maven/components/prompter/impl/BasicPrompter.java

@@ -33,19 +33,14 @@ public String promptChoice(String message, List<Value> groups) throws PromptExce
         throw new UnsupportedOperationException("Basic prompter cannot handle complex choices");
     }
 
-    @Override
-    public String promptList(String message, List<Value> values) throws PromptException {
-        return promptList(message, values, null);
-    }
-
-    private String promptList(String message, List<Value> values, String defaultValue) throws PromptException {
+    public String promptList(String message, List<Value> values, String defaultValue) throws PromptException {
         List<String> strings = Value.convertValues(values);
-        String formattedMessage = formatMessage(message, strings, null);
+        String formattedMessage = formatMessage(message, strings, defaultValue);
         String line;
         do {
             writePrompt(formattedMessage);
             line = readLine();
-            if (line == null && defaultValue != null) {
+            if ((line == null || line.isEmpty()) && defaultValue != null) {
                 line = defaultValue;
             }
         } while (line == null || !strings.contains(line));

src/main/java/org/seedstack/maven/components/prompter/impl/ConsoleUIPrompter.java

@@ -57,18 +57,38 @@ public String promptChoice(String message, List<Value> values) throws PromptExce
     }
 
     @Override
-    public String promptList(String message, List<Value> values) throws PromptException {
+    public String promptList(String message, List<Value> values, String defaultValue) throws PromptException {
         ConsolePrompt consolePrompt = new ConsolePrompt();
         PromptBuilder promptBuilder = consolePrompt.getPromptBuilder();
         ListPromptBuilder listPromptBuilder = promptBuilder.createListPrompt()
                 .name("dummy")
                 .message(message);
+
+        // Put default value first
+        Value defaultValueObject = null;
+        if (defaultValue != null && !defaultValue.isEmpty()) {
+            for (Value value : values) {
+                if (value.getName().equals(defaultValue)) {
+                    defaultValueObject = value;
+                    listPromptBuilder.newItem()
+                            .name(value.getName())
+                            .text(value.getLabel())
+                            .add();
+                    break;
+                }
+            }
+        }
+
+        // Put other values
         for (Value value : values) {
-            listPromptBuilder.newItem()
-                    .name(value.getName())
-                    .text(value.getLabel())
-                    .add();
+            if (!value.equals(defaultValueObject)) {
+                listPromptBuilder.newItem()
+                        .name(value.getName())
+                        .text(value.getLabel())
+                        .add();
+            }
         }
+
         listPromptBuilder.addPrompt();
         return ((ListResult) extractAnswer(consolePrompt, promptBuilder)).getSelectedId();
     }