Escape package pattern with dots

openrewrite · Jun 15, 2020 · 9dfc098 · 9dfc098
1 parent c508353
commit 9dfc098
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -29,7 +29,6 @@ commands:
       - save_cache:
           key: gradle-dependencies-{{ checksum "build.gradle.kts" }}
           paths:
-            - ~/rewrite/rewrite-java-8/.tools/
             - ~/.gradle
       - run:
           name: run gradle command

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/OrderImports.java b/rewrite-java/src/main/java/org/openrewrite/java/OrderImports.java
@@ -206,6 +206,7 @@ public ImportPackage(boolean statik, String packageWildcard, boolean withSubpack
                     this.classCountToUseStarImport = classCountToUseStarImport;
                     this.nameCountToUseStarImport = nameCountToUseStarImport;
                     this.packageWildcard = Pattern.compile(packageWildcard
+                            .replace(".", "\\.")
                             .replace("*", withSubpackages ? ".+" : "[^.]+"));
                 }
 

diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/OrderImportTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/OrderImportTest.kt
@@ -229,4 +229,23 @@ interface OrderImportTest {
             }
         """.trimIndent())
     }
+
+    @Test
+    fun packagePatternEscapesDots(jp: JavaParser) {
+        val a = jp.parse("""
+            import javax.annotation.Nonnull;
+            
+            public class A {}
+        """.trimIndent())
+
+        val fixed = a.refactor().visit(OrderImports.intellij().apply {
+            setRemoveUnused(false)
+        }).fix().fixed
+
+        assertRefactored(fixed, """
+            import javax.annotation.Nonnull;
+            
+            public class A {}
+        """.trimIndent())
+    }
 }