Code cleanup to remove dependency to plexus-utils

Closes #52

Author: slachiewicz

plexus-interactivity-api/pom.xml

@@ -13,12 +13,6 @@
   <name>Plexus Default Interactivity Handler</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-
     <!-- JLine is optional -->
     <dependency>
       <groupId>org.jline</groupId>

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java

@@ -32,7 +32,6 @@
  * Base input handler, implements a default <code>readMultipleLines</code>.
  *
  * @author Brett Porter
- * @version $Id$
  */
 public abstract class AbstractInputHandler implements InputHandler {
     @Override

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultInputHandler.java

@@ -34,7 +34,6 @@
  * Default input handler, that uses the console.
  *
  * @author Brett Porter
- * @version $Id$
  */
 @Named
 public class DefaultInputHandler extends AbstractInputHandler {

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java

@@ -32,7 +32,6 @@
  * Default output handler, that uses the console.
  *
  * @author Brett Porter
- * @version $Id$
  */
 @Named
 public class DefaultOutputHandler implements OutputHandler {

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java

@@ -31,13 +31,10 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.codehaus.plexus.util.StringUtils;
-
 /**
  * Default prompter.
  *
  * @author Brett Porter
- * @version $Id$
  */
 @Named
 public class DefaultPrompter implements Prompter {
@@ -76,11 +73,9 @@ public String prompt(String message, String defaultReply) throws PrompterExcepti
 
         try {
             String line = inputHandler.readLine();
-
-            if (StringUtils.isEmpty(line)) {
+            if (line == null || line.isEmpty()) {
                 line = defaultReply;
             }
-
             return line;
         } catch (IOException e) {
             throw new PrompterException("Failed to read user response", e);
@@ -109,7 +104,7 @@ public String prompt(String message, List<String> possibleValues, String default
                 throw new PrompterException("Failed to read user response", e);
             }
 
-            if (StringUtils.isEmpty(line)) {
+            if (line == null || line.isEmpty()) {
                 line = defaultReply;
             }
 

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java

@@ -29,12 +29,10 @@
 
 /**
  * Manage user input from different sources.
- *
  * TODO should this also echo any prompts before the input?
  * TODO should this validate the input, reprompt if required?
  * TODO readBoolean, readInt, readSingleChar - readLine's that parse the input
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
  */
 public interface InputHandler {
     /**

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/OutputHandler.java

@@ -30,7 +30,6 @@
  * Manage user output to different sources.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
  */
 public interface OutputHandler {
     /**

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java

@@ -30,7 +30,6 @@
  * Prompt the user for input.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
  */
 public interface Prompter {
     String prompt(String message) throws PrompterException;

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/PrompterException.java

@@ -28,7 +28,6 @@
  * Error while prompting.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
  */
 public class PrompterException extends Exception {
     public PrompterException(String message) {

plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java

@@ -36,17 +36,16 @@
  * Default input handler, that uses the console.
  *
  * @author Brett Porter
- * @version $Id$
  */
 @Named("jline")
 public class JLineInputHandler extends AbstractInputHandler {
-    private LineReader consoleReader = LineReaderBuilder.builder().build();
+    private final LineReader consoleReader = LineReaderBuilder.builder().build();
 
     public String readLine() throws IOException {
         return consoleReader.readLine();
     }
 
     public String readPassword() throws IOException {
-        return consoleReader.readLine(new Character('*'));
+        return consoleReader.readLine('*');
     }
 }

plexus-interactivity-api/src/test/java/org/codehaus/plexus/components/interactivity/DefaultPrompterComponentTest.java

@@ -37,7 +37,7 @@ public class DefaultPrompterComponentTest extends InjectedTest {
     private Prompter prompter;
 
     @Test
-    void smoke() throws PrompterException {
+    void smoke() {
         assertNotNull(prompter);
     }
 }