Move off plexus

plexus-interactivity-api/pom.xml

@@ -18,18 +18,48 @@
       <artifactId>plexus-utils</artifactId>
       <version>4.0.0</version>
     </dependency>
+
+    <!-- JLine is optional -->
+    <dependency>
+      <groupId>org.jline</groupId>
+      <artifactId>jline</artifactId>
+      <version>3.23.0</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Test -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.inject</artifactId>
+      <version>0.9.0.M2</version>
       <scope>test</scope>
     </dependency>
-    <!--
-     | @PostConstruct and @PreDestroy help with Plexus->JSR330 migration
-    -->
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>1.3.2</version>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>6.0.0</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>

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

@@ -35,10 +35,11 @@
  * @version $Id$
  */
 public abstract class AbstractInputHandler implements InputHandler {
+    @Override
     public List<String> readMultipleLines() throws IOException {
         List<String> lines = new ArrayList<>();
         String line = readLine();
-        while (line != null && line.length() > 0) {
+        while (line != null && !line.isEmpty()) {
             lines.add(line);
             line = readLine();
         }

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

@@ -24,7 +24,7 @@
  * SOFTWARE.
  */
 
-import javax.annotation.PostConstruct;
+import javax.inject.Named;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -36,19 +36,17 @@
  * @author Brett Porter
  * @version $Id$
  */
+@Named
 public class DefaultInputHandler extends AbstractInputHandler {
-    private BufferedReader consoleReader;
+    private final BufferedReader consoleReader = new BufferedReader(new InputStreamReader(System.in));
 
+    @Override
     public String readLine() throws IOException {
         return consoleReader.readLine();
     }
 
+    @Override
     public String readPassword() throws IOException {
         return consoleReader.readLine();
     }
-
-    @PostConstruct
-    public void initialize() {
-        consoleReader = new BufferedReader(new InputStreamReader(System.in));
-    }
 }

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

@@ -24,9 +24,8 @@
  * SOFTWARE.
  */
 
-import javax.annotation.PostConstruct;
+import javax.inject.Named;
 
-import java.io.IOException;
 import java.io.PrintWriter;
 
 /**
@@ -35,20 +34,18 @@
  * @author Brett Porter
  * @version $Id$
  */
+@Named
 public class DefaultOutputHandler implements OutputHandler {
-    private PrintWriter consoleWriter;
+    private final PrintWriter consoleWriter = new PrintWriter(System.out);
 
-    @PostConstruct
-    public void initialize() {
-        consoleWriter = new PrintWriter(System.out);
-    }
-
-    public void write(String line) throws IOException {
+    @Override
+    public void write(String line) {
         consoleWriter.print(line);
         consoleWriter.flush();
     }
 
-    public void writeLine(String line) throws IOException {
+    @Override
+    public void writeLine(String line) {
         consoleWriter.println();
     }
 }

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

@@ -24,6 +24,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
@@ -36,26 +39,19 @@
  * @author Brett Porter
  * @version $Id$
  */
+@Named
 public class DefaultPrompter implements Prompter {
-    /**
-     * @requirement
-     */
-    private OutputHandler outputHandler;
-
-    /**
-     * @requirement
-     */
-    private InputHandler inputHandler;
-
-    public DefaultPrompter() {
-        super();
-    }
+    private final OutputHandler outputHandler;
+
+    private final InputHandler inputHandler;
 
+    @Inject
     public DefaultPrompter(OutputHandler outputHandler, InputHandler inputHandler) {
         this.outputHandler = outputHandler;
         this.inputHandler = inputHandler;
     }
 
+    @Override
     public String prompt(String message) throws PrompterException {
         try {
             writePrompt(message);
@@ -70,6 +66,7 @@ public String prompt(String message) throws PrompterException {
         }
     }
 
+    @Override
     public String prompt(String message, String defaultReply) throws PrompterException {
         try {
             writePrompt(formatMessage(message, null, defaultReply));
@@ -90,6 +87,7 @@ public String prompt(String message, String defaultReply) throws PrompterExcepti
         }
     }
 
+    @Override
     public String prompt(String message, List<String> possibleValues, String defaultReply) throws PrompterException {
         String formattedMessage = formatMessage(message, possibleValues, defaultReply);
 
@@ -127,10 +125,12 @@ public String prompt(String message, List<String> possibleValues, String default
         return line;
     }
 
+    @Override
     public String prompt(String message, List<String> possibleValues) throws PrompterException {
         return prompt(message, possibleValues, null);
     }
 
+    @Override
     public String promptForPassword(String message) throws PrompterException {
         try {
             writePrompt(message);
@@ -177,6 +177,7 @@ private void writePrompt(String message) throws IOException {
         outputHandler.write(message + ": ");
     }
 
+    @Override
     public void showMessage(String message) throws PrompterException {
         try {
             writePrompt(message);

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

@@ -37,8 +37,6 @@
  * @version $Id$
  */
 public interface InputHandler {
-    String ROLE = InputHandler.class.getName();
-
     /**
      * Read a single line of input, swalling the newline at the end.
      * If the input can be echoed, it will be.

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

@@ -33,8 +33,6 @@
  * @version $Id$
  */
 public interface OutputHandler {
-    String ROLE = OutputHandler.class.getName();
-
     /**
      * Write  a single line of input, excluding the newline at the end.
      * @param line the line

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

@@ -33,8 +33,6 @@
  * @version $Id$
  */
 public interface Prompter {
-    String ROLE = Prompter.class.getName();
-
     String prompt(String message) throws PrompterException;
 
     String prompt(String message, String defaultReply) throws PrompterException;

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

@@ -24,21 +24,23 @@
  * SOFTWARE.
  */
 
-import javax.annotation.PostConstruct;
+import javax.inject.Named;
 
 import java.io.IOException;
 
-import jline.ConsoleReader;
 import org.codehaus.plexus.components.interactivity.AbstractInputHandler;
+import org.jline.reader.LineReader;
+import org.jline.reader.LineReaderBuilder;
 
 /**
  * Default input handler, that uses the console.
  *
  * @author Brett Porter
  * @version $Id$
  */
+@Named("jline")
 public class JLineInputHandler extends AbstractInputHandler {
-    private ConsoleReader consoleReader;
+    private LineReader consoleReader = LineReaderBuilder.builder().build();
 
     public String readLine() throws IOException {
         return consoleReader.readLine();
@@ -47,13 +49,4 @@ public String readLine() throws IOException {
     public String readPassword() throws IOException {
         return consoleReader.readLine(new Character('*'));
     }
-
-    @PostConstruct
-    public void initialize() {
-        try {
-            consoleReader = new ConsoleReader();
-        } catch (IOException e) {
-            throw new IllegalStateException("Cannot create console reader: ", e);
-        }
-    }
 }

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

@@ -0,0 +1,43 @@
+package org.codehaus.plexus.components.interactivity;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2005, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import javax.inject.Inject;
+
+import org.eclipse.sisu.launch.InjectedTest;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class DefaultPrompterComponentTest extends InjectedTest {
+
+    @Inject
+    private Prompter prompter;
+
+    @Test
+    void smoke() throws PrompterException {
+        assertNotNull(prompter);
+    }
+}