Merge branch 'main' into greg-fix-before-recipe-idem

Author: greg-at-moderne

rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeMapping.java

@@ -46,7 +46,7 @@ class ReloadableJava21TypeMapping implements JavaTypeMapping<Tree> {
     private final JavaTypeCache typeCache;
 
     public JavaType type(@Nullable Type type) {
-        if (type == null || type instanceof Type.ErrorType || type instanceof Type.PackageType || type instanceof Type.UnknownType ||
+        if (type == null || type instanceof Type.ErrorType || type instanceof Type.PackageType || isUnknownType(type) ||
                 type instanceof NullType) {
             return JavaType.Class.Unknown.getInstance();
         }
@@ -465,7 +465,7 @@ public JavaType.Primitive primitive(TypeTag tag) {
         }
 
         if (selectType == null || selectType instanceof Type.ErrorType || symbol == null || symbol.kind == Kinds.Kind.ERR ||
-            symbol.type instanceof Type.UnknownType) {
+            isUnknownType(symbol.type)) {
             return null;
         }
 
@@ -530,7 +530,7 @@ public JavaType.Primitive primitive(TypeTag tag) {
                     exceptionTypes.add(javaType);
                 }
             }
-        } else if (selectType instanceof Type.UnknownType) {
+        } else if (isUnknownType(selectType)) {
             returnType = JavaType.Unknown.getInstance();
         }
 
@@ -751,4 +751,12 @@ private Object annotationElementValue(Object value) {
         }
         return JavaType.Unknown.getInstance();
     }
+
+    /**
+     * Check for the `UnknownType` which existed up until JDK 22; starting with JDK 23 only the `ErrorType` is used.
+     * Uses reflection to avoid compile-time dependency on the class, which was removed in JDK 24.
+     */
+    public static boolean isUnknownType(@Nullable Type type) {
+        return type != null && type.getClass().getName().equals("com.sun.tools.javac.code.Type$UnknownType");
+    }
 }

rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeSignatureBuilder.java

@@ -30,6 +30,7 @@
 import java.util.Set;
 import java.util.StringJoiner;
 
+import static org.openrewrite.java.isolated.ReloadableJava21TypeMapping.isUnknownType;
 
 class ReloadableJava21TypeSignatureBuilder implements JavaTypeSignatureBuilder {
     @Nullable
@@ -41,7 +42,7 @@ public String signature(@Nullable Object t) {
     }
 
     private String signature(@Nullable Type type) {
-        if (type == null || type instanceof Type.UnknownType || type instanceof NullType) {
+        if (type == null || isUnknownType(type) || type instanceof NullType) {
             return "{undefined}";
         } else if (type instanceof Type.IntersectionClassType) {
             return intersectionSignature(type);
@@ -299,7 +300,7 @@ private String methodArgumentSignature(Type selectType) {
             return resolvedArgumentTypes.toString();
         } else if (selectType instanceof Type.ForAll) {
             return methodArgumentSignature(((Type.ForAll) selectType).qtype);
-        } else if (selectType instanceof Type.JCNoType || selectType instanceof Type.UnknownType) {
+        } else if (selectType instanceof Type.JCNoType || isUnknownType(selectType)) {
             return "{undefined}";
         }
 

rewrite-java/src/main/java/org/openrewrite/java/JavaUnrestrictedClassLoader.java

@@ -105,7 +105,18 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
                         Path classFile = path.resolve(internalName);
                         if (Files.exists(classFile)) {
                             byte[] bytes = Files.readAllBytes(classFile);
-                            return defineClass(name, bytes, 0, bytes.length);
+                            try {
+                                return defineClass(name, bytes, 0, bytes.length);
+                            } catch (LinkageError e) {
+                                // On JDK 25+, cross-module type references in DocCommentTable can cause the
+                                // app classloader to load jdk.compiler classes before this classloader does.
+                                // Fall back to parent delegation for the already-loaded class.
+                                try {
+                                    return super.loadClass(name);
+                                } catch (ClassNotFoundException cnfe) {
+                                    throw e;
+                                }
+                            }
                         }
                     }
                 } catch (IOException e) {

rewrite-javascript/build.gradle.kts

@@ -124,7 +124,6 @@ val npmBuild = tasks.register<NpmTask>("npmBuild") {
     inputs.files(fileTree("rewrite/src"))
         .withPathSensitivity(PathSensitivity.RELATIVE)
     outputs.dir(file("rewrite/dist/"))
-    outputs.cacheIf { true }
 
     val versionTxt = file("src/main/resources/META-INF/version.txt")
     outputs.file(versionTxt)
@@ -174,7 +173,6 @@ val npmFixturesBuild = tasks.register<NpmTask>("npmFixturesBuild") {
     inputs.files(fileTree("rewrite/fixtures"))
         .withPathSensitivity(PathSensitivity.RELATIVE)
     outputs.dir(file("rewrite/dist-fixtures/"))
-    outputs.cacheIf { true }
 
     args = listOf("run", "build:fixtures")
 }
@@ -227,11 +225,6 @@ val npmPublish = tasks.register<NpmTask>("npmPublish") {
     args = provider { listOf("publish", npmPack.get().archiveFile.get().asFile.absolutePath) }
     if (!project.hasProperty("releasing")) {
         args.addAll("--tag", "next")
-        // Skip publishing when nothing changed in the JavaScript implementation.
-        // When npmBuild is restored from the build cache, version.txt retains the
-        // timestamp from the original build, causing a conflict with the previously
-        // published version on npmjs.
-        onlyIf { npmBuild.get().state.didWork }
     }
 
     workingDir.set(file("rewrite"))

rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java

@@ -411,7 +411,7 @@ public MavenMetadata downloadMetadata(GroupArtifactVersion gav, @Nullable Resolv
         int start = responseBody.indexOf("<a href=\"");
         while (start > 0) {
             start += 9;
-            int end = responseBody.indexOf("\">", start);
+            int end = responseBody.indexOf("\"", start);
             if (end < 0) {
                 break;
             }

rewrite-maven/src/test/java/org/openrewrite/maven/internal/MavenPomDownloaderTest.java

@@ -626,6 +626,42 @@ void deriveMetaDataFromHtmlBasedRepository() {
               new MavenPomDownloader(emptyMap(), ctx).downloadMetadata(new GroupArtifact("does.definitely.not", "exist"), null, List.of(repository)));
         }
 
+        @Issue("https://github.com/openrewrite/rewrite/issues/6739")
+        @Test
+        void deriveMetaDataFromHtmlWithTitleAttributes() throws Exception {
+            try (MockWebServer server = new MockWebServer()) {
+                server.setDispatcher(new Dispatcher() {
+                    @Override
+                    public MockResponse dispatch(RecordedRequest request) {
+                        if (request.getPath() != null && request.getPath().endsWith("maven-metadata.xml")) {
+                            return new MockResponse().setResponseCode(404);
+                        }
+                        return new MockResponse().setResponseCode(200).setBody(
+                          """
+                            <html><body>
+                            <a href="../" title="../">../</a>
+                            <a href="1.0.0/" title="1.0.0/">1.0.0/</a>
+                            <a href="1.1.0/" title="1.1.0/">1.1.0/</a>
+                            <a href="2.0.0/" title="2.0.0/">2.0.0/</a>
+                            </body></html>
+                            """
+                        );
+                    }
+                });
+                server.start();
+
+                MavenRepository repository = MavenRepository.builder()
+                  .id("html-with-title")
+                  .uri("http://%s:%d/".formatted(server.getHostName(), server.getPort()))
+                  .knownToExist(true)
+                  .deriveMetadataIfMissing(true)
+                  .build();
+                MavenMetadata metaData = new MavenPomDownloader(emptyMap(), ctx)
+                  .downloadMetadata(new GroupArtifact("fred", "fred"), null, List.of(repository));
+                assertThat(metaData.getVersioning().getVersions()).containsExactlyInAnyOrder("1.0.0", "1.1.0", "2.0.0");
+            }
+        }
+
         @SuppressWarnings("ConstantConditions")
         @Test
         void mergeMetadata() throws Exception {

rewrite-python/rewrite/pyproject.toml

@@ -36,7 +36,7 @@ dev = [
     "ruff>=0.1.0",
 ]
 typing = [
-    "ty>=0.0.15",  # Required for type attribution with Java recipes
+    "ty>=0.0.17",  # Required for type attribution with Java recipes
 ]
 publish = [
     "build>=1.0.0",

rewrite-python/rewrite/src/rewrite/__init__.py

@@ -2,7 +2,7 @@
 
 # helps pytest to rewrite the assert statements in test.py
 try:
-    import pytest
+    import pytest  # ty: ignore[unresolved-import]
     pytest.register_assert_rewrite("rewrite.test")
 except ImportError:
     pass  # pytest not available, skip assert rewriting

rewrite-python/rewrite/src/rewrite/parser.py

@@ -141,7 +141,7 @@ def with_erroneous(self, erroneous: Optional[SourceFile]) -> 'ParseError':
         return self if erroneous is self._erroneous else replace(self, _erroneous=erroneous)
 
     def printer(self, cursor: Cursor) -> TreeVisitor[Tree, PrintOutputCapture[P]]:
-        return PrinterFactory.current().create_printer(cursor)  # ty: ignore[possibly-missing-attribute]  # PrinterFactory.current() is always set
+        return PrinterFactory.current().create_printer(cursor)  # ty: ignore[unresolved-attribute]  # PrinterFactory.current() is always set
 
     def is_acceptable(self, v: TreeVisitor[Any, P], p: P) -> bool:
         return v.is_adaptable_to(ParseErrorVisitor)

rewrite-python/rewrite/src/rewrite/python/__init__.py

@@ -67,7 +67,7 @@
     VariableScope,
     YieldFrom,
 )
-from rewrite.python.support_types import PyComment
+from rewrite.python.support_types import PyComment  # ty: ignore[unresolved-import]
 from rewrite.python.visitor import PythonVisitor
 from rewrite.python.style import (
     SpacesStyle,