Fix HasImportTest

openrewrite · Aug 22, 2020 · 37b7447 · 37b7447
1 parent 97b141e
commit 37b7447
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/Java11Parser.java b/rewrite-java-11/src/main/java/org/openrewrite/java/Java11Parser.java
@@ -147,7 +147,17 @@ public List<J.CompilationUnit> parseInputs(Iterable<Input> sourceFiles, @Nullabl
                                 .tag("file.type", "Java")
                                 .tag("step", "JDK parsing")
                                 .register(meterRegistry)
-                                .record(() -> compiler.parse(new ParserInputFileObject(input))),
+                                .record(() -> {
+                                    try {
+                                        return compiler.parse(new ParserInputFileObject(input));
+                                    } catch (IllegalStateException e) {
+                                        if (e.getMessage().equals("endPosTable already set")) {
+                                            throw new IllegalStateException("Call reset() on JavaParser before parsing another" +
+                                                    "set of source files that have some of the same fully qualified names", e);
+                                        }
+                                        throw e;
+                                    }
+                                }),
                         (e2, e1) -> e1, LinkedHashMap::new));
 
         try {

diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/search/HasImportTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/search/HasImportTest.kt
@@ -21,14 +21,14 @@ import org.junit.jupiter.api.Test
 import org.openrewrite.java.JavaParser
 
 interface HasImportTest {
-    
+
     @Test
     fun hasImport(jp: JavaParser) {
         val a = jp.parse("""
             import java.util.List;
             class A {}
         """)[0]
-        
+
         assertTrue(a.hasImport("java.util.List"))
         assertFalse(a.hasImport("java.util.Set"))
     }
@@ -51,7 +51,7 @@ interface HasImportTest {
                public static class B { }
             }
         """
-        
+
         val c = """
             import a.*;
             public class C {
@@ -60,6 +60,6 @@ interface HasImportTest {
         """
 
         assertTrue(jp.parse(c, a)[0].hasImport("a.A.B"))
-        assertTrue(jp.parse(c, a)[0].hasImport("a.A"))
+        assertTrue(jp.reset().parse(c, a)[0].hasImport("a.A"))
     }
 }