Remove Random import during SecureRandom recipe (#132)

Fixes #131
openrewrite · May 7, 2024 · b7aed0e · b7aed0e
1 parent 24cca64
commit b7aed0e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/main/java/org/openrewrite/java/security/SecureRandom.java b/src/main/java/org/openrewrite/java/security/SecureRandom.java
@@ -55,6 +55,7 @@ public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
                 J.NewClass n = super.visitNewClass(newClass, ctx);
                 if (TypeUtils.isOfClassType(newClass.getType(), "java.util.Random")) {
                     maybeAddImport("java.security.SecureRandom");
+                    maybeRemoveImport("java.util.Random");
                     return JavaTemplate.builder("new SecureRandom()")
                             .imports("java.security.SecureRandom")
                             .build()

diff --git a/src/test/java/org/openrewrite/java/security/SecureRandomTest.java b/src/test/java/org/openrewrite/java/security/SecureRandomTest.java
@@ -17,6 +17,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
+import org.openrewrite.Issue;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
@@ -30,6 +31,7 @@ public void defaults(RecipeSpec spec) {
     }
 
     @DocumentExample
+    @Issue("https://github.com/openrewrite/rewrite-java-security/issues/131")
     @Test
     void secureContext() {
         rewriteRun(
@@ -59,4 +61,31 @@ String generateSecretToken() {
           )
         );
     }
+
+    @Test
+    void removeImport() {
+        rewriteRun(
+          //language=java
+          java(
+            """
+              import java.util.Random;
+
+              public class A {
+                  void generateSecretToken() {
+                      int num = new Random().nextInt();
+                  }
+              }
+              """,
+            """
+              import java.security.SecureRandom;
+
+              public class A {
+                  void generateSecretToken() {
+                      int num = new SecureRandom().nextInt();
+                  }
+              }
+              """
+          )
+        );
+    }
 }