Fix JavaSourceSet#gavFromPath for TypeTable jar layout (#7543)

Author: steve-aom-elliott

rewrite-java/src/main/java/org/openrewrite/java/marker/JavaSourceSet.java

@@ -471,10 +471,15 @@ public static JavaSourceSet build(String sourceSetName, Collection<Path> classpa
                 version = pathParts.get(pathParts.size() - 3);
             } else if (pathParts.contains(".tt")) {
                 int ttIndex = pathParts.indexOf(".tt");
-                if (pathParts.size() - ttIndex > 3) {
-                    groupId = String.join(".", pathParts.subList(ttIndex + 1, pathParts.size() - 2));
-                    artifactId = pathParts.get(pathParts.size() - 2);
-                    version = pathParts.get(pathParts.size() - 1);
+                int last = pathParts.size() - 1;
+                // Legacy layout ends at the version directory; post-#7528 layout adds
+                // a trailing <artifact>-<version>.jar file inside the version directory.
+                int versionIndex = pathParts.get(last).endsWith(".jar") ? last - 1 : last;
+                int artifactIndex = versionIndex - 1;
+                if (artifactIndex - (ttIndex + 1) >= 1) {
+                    groupId = String.join(".", pathParts.subList(ttIndex + 1, artifactIndex));
+                    artifactId = pathParts.get(artifactIndex);
+                    version = pathParts.get(versionIndex);
                 }
             } else if (pathParts.size() >= 4) {
                 version = pathParts.get(pathParts.size() - 2);

rewrite-java/src/test/java/org/openrewrite/java/marker/JavaSourceSetTest.java

@@ -21,6 +21,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
@@ -71,4 +72,28 @@ private static void writeEntry(JarOutputStream jos, String name, byte[] content)
         jos.write(content);
         jos.closeEntry();
     }
+
+    @Test
+    void gavFromTypeTableClassesDirPath() {
+        Path p = Paths.get(System.getProperty("user.home"),
+          ".rewrite/classpath/.tt/org/junit/jupiter/junit-jupiter-api/6.0.2");
+        assertThat(JavaSourceSet.gavFromPath(p))
+          .isEqualTo("org.junit.jupiter:junit-jupiter-api:6.0.2");
+    }
+
+    @Test
+    void gavFromTypeTableJarPath() {
+        Path p = Paths.get(System.getProperty("user.home"),
+          ".rewrite/classpath/.tt/org/junit/jupiter/junit-jupiter-api/6.0.2/junit-jupiter-api-6.0.2.jar");
+        assertThat(JavaSourceSet.gavFromPath(p))
+          .isEqualTo("org.junit.jupiter:junit-jupiter-api:6.0.2");
+    }
+
+    @Test
+    void gavFromGradleCachePath() {
+        Path p = Paths.get(System.getProperty("user.home"),
+          ".gradle/caches/modules-2/files-2.1/org.openrewrite/rewrite-core/8.32.0/64ddcc371f1bf29593b4b27e907757d5554d1a83/rewrite-core-8.32.0.jar");
+        assertThat(JavaSourceSet.gavFromPath(p))
+          .isEqualTo("org.openrewrite:rewrite-core:8.32.0");
+    }
 }