From 647653dd5207ba4c9a0dd13d5dc29e34a111b642 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Mon, 22 May 2023 13:51:02 +0200
Subject: [PATCH] JSR330 Replace plexus-container-default with javax.annotation

---
 plexus-interactivity-api/pom.xml                          | 8 ++++++--
 .../components/interactivity/AbstractInputHandler.java    | 3 ---
 .../components/interactivity/DefaultInputHandler.java     | 7 ++-----
 .../components/interactivity/DefaultOutputHandler.java    | 8 +++-----
 plexus-interactivity-jline/pom.xml                        | 8 ++++++--
 .../components/interactivity/jline/JLineInputHandler.java | 8 +++-----
 6 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/plexus-interactivity-api/pom.xml b/plexus-interactivity-api/pom.xml
index ba05bac..fc4ad4b 100644
--- a/plexus-interactivity-api/pom.xml
+++ b/plexus-interactivity-api/pom.xml
@@ -22,9 +22,13 @@
       <version>5.9.3</version>
       <scope>test</scope>
     </dependency>
+    <!--
+     | @PostConstruct and @PreDestroy help with Plexus->JSR330 migration
+    -->
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.2</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
index ce4f87a..e956669 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
@@ -24,8 +24,6 @@
  * SOFTWARE.
  */
 
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
 import java.util.List;
 import java.util.ArrayList;
 import java.io.IOException;
@@ -37,7 +35,6 @@
  * @version $Id$
  */
 public abstract class AbstractInputHandler
-    extends AbstractLogEnabled
     implements InputHandler
 {
     public List<String> readMultipleLines()
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultInputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultInputHandler.java
index 79f65f6..4028ede 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultInputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultInputHandler.java
@@ -24,9 +24,7 @@
  * SOFTWARE.
  */
 
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-
+import javax.annotation.PostConstruct;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -39,7 +37,6 @@
  */
 public class DefaultInputHandler
     extends AbstractInputHandler
-    implements Initializable
 {
     private BufferedReader consoleReader;
 
@@ -55,8 +52,8 @@ public String readPassword()
         return consoleReader.readLine();
     }
 
+    @PostConstruct
     public void initialize()
-        throws InitializationException
     {
         consoleReader = new BufferedReader( new InputStreamReader( System.in ) );
     }
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
index 75855f1..c380807 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
@@ -24,9 +24,7 @@
  * SOFTWARE.
  */
 
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.io.PrintWriter;
 
@@ -37,12 +35,12 @@
  * @version $Id$
  */
 public class DefaultOutputHandler
-    implements Initializable, OutputHandler
+    implements OutputHandler
 {
     private PrintWriter consoleWriter;
 
+    @PostConstruct
     public void initialize()
-        throws InitializationException
     {
         consoleWriter = new PrintWriter( System.out );
     }
diff --git a/plexus-interactivity-jline/pom.xml b/plexus-interactivity-jline/pom.xml
index c50420e..51b8b68 100644
--- a/plexus-interactivity-jline/pom.xml
+++ b/plexus-interactivity-jline/pom.xml
@@ -22,9 +22,13 @@
       <artifactId>plexus-interactivity-api</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!--
+     | @PostConstruct and @PreDestroy help with Plexus->JSR330 migration
+    -->
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.2</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java b/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
index fd624d9..e5d3234 100644
--- a/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
+++ b/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
@@ -26,9 +26,8 @@
 
 import jline.ConsoleReader;
 import org.codehaus.plexus.components.interactivity.AbstractInputHandler;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 
 /**
@@ -39,7 +38,6 @@
  */
 public class JLineInputHandler
     extends AbstractInputHandler
-    implements Initializable
 {
     private ConsoleReader consoleReader;
 
@@ -55,8 +53,8 @@ public String readPassword()
         return consoleReader.readLine( new Character( '*' ) );
     }
 
+    @PostConstruct
     public void initialize()
-        throws InitializationException
     {
         try
         {
@@ -64,7 +62,7 @@ public void initialize()
         }
         catch ( IOException e )
         {
-            throw new InitializationException( "Cannot create console reader: ", e );
+            throw new IllegalStateException( "Cannot create console reader: ", e );
         }
     }
 }