Fix issue parsing string with Java8ReloadableParser (#4914)

* Fix parser * restore build files * Restore build file * Put arguments on new line for readability * Add test case (even though not reproducible) --------- Co-authored-by: Tim te Beek <[email protected]> Co-authored-by: Knut Wannheden <[email protected]>
openrewrite · Jan 17, 2025 · c1b258e · c1b258e
1 parent a6afce0
commit c1b258e
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 2 deletions.
diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java
@@ -113,7 +113,7 @@ class ReloadableJava8Parser implements JavaParser {
 
         LOMBOK:
         if (System.getenv().getOrDefault("REWRITE_LOMBOK", System.getProperty("rewrite.lombok")) != null &&
-            classpath != null && classpath.stream().anyMatch(it -> it.toString().contains("lombok"))) {
+                classpath != null && classpath.stream().anyMatch(it -> it.toString().contains("lombok"))) {
             Processor lombokProcessor = null;
             try {
                 // https://projectlombok.org/contributing/lombok-execution-path
@@ -255,7 +255,10 @@ LinkedHashMap<Input, JCTree.JCCompilationUnit> parseInputsToCompilerAst(Iterable
         }
         try {
             //noinspection unchecked
-            com.sun.tools.javac.util.List<JCTree.JCCompilationUnit> jcCompilationUnits = compiler.parseFiles((List<JavaFileObject>) (List<?>) inputFileObjects);
+            com.sun.tools.javac.util.List<JCTree.JCCompilationUnit> jcCompilationUnits = com.sun.tools.javac.util.List.from(
+                    inputFileObjects.stream()
+                            .map(input -> compiler.parse(input))
+                            .toArray(JCTree.JCCompilationUnit[]::new));
             for (int i = 0; i < inputFileObjects.size(); i++) {
                 cus.put(inputFileObjects.get(i).getInput(), jcCompilationUnits.get(i));
             }

diff --git a/rewrite-java-tck/src/main/java/org/openrewrite/java/tree/ParserTest.java b/rewrite-java-tck/src/main/java/org/openrewrite/java/tree/ParserTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2025 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.tree;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.Issue;
+import org.openrewrite.SourceFile;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RewriteTest;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.stream.Collectors;
+
+class ParserTest implements RewriteTest {
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/pull/4914")
+    void parseString() throws IOException {
+        // path needs to be resolvable from `rewrite-java-8` etc.
+        Path targetFile = Paths.get("../rewrite-java-tck/src/main/java/org/openrewrite/java/tree/ParserTest.java");
+        @SuppressWarnings("SimplifyStreamApiCallChains") List<SourceFile> ignore = JavaParser.fromJavaVersion()
+          .build()
+          .parse(new String(Files.readAllBytes(targetFile)))
+          .collect(Collectors.toList());
+    }
+}