Fix IllegalArgumentException in Input.getRelativePath for relative paths

[timtebeek]

What's Changed

When a Parser$Input has a relative path (e.g. synthetic dependsOn stubs created by KotlinParser.determinePath() via Paths.get(pkg, prefix + className + ".kt")), calling getRelativePath(relativeTo) with an absolute relativeTo path causes Path.relativize() to throw IllegalArgumentException: 'other' is different type of Path on JDK 21+.

This happens because JDK 21+ strictly enforces that both paths must be of the same type (both absolute or both relative) in Path.relativize().

The fix returns relative paths as-is since they're already relative and don't need relativization.

• Fixes java.lang.IllegalArgumentException: 'other' is different type of Path rewrite-gradle-plugin#424

[shanman190]

It seems like the KotlinParser doesn't follow the convention of prefixing dependsOn snippets like every other parser that I've checked.

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

Line 267 in ae70bc3

.map(input -> Input.fromString(resolveSourcePathFromSourceText(Paths.get(""), input), input))

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

Lines 369 to 390 in ae70bc3

	static Path resolveSourcePathFromSourceText(Path prefix, String sourceCode) {
	Pattern packagePattern = Pattern.compile("^package\\s+([^;]+);");
	Pattern classPattern = Pattern.compile("(class|interface|enum|record)\\s*(<[^>]*>)?\\s+(\\w+)");
	Pattern publicClassPattern = Pattern.compile("public\\s+" + classPattern.pattern());
	Function<String, @Nullable String> simpleName = sourceStr -> {
	Matcher classMatcher = publicClassPattern.matcher(sourceStr);
	if (classMatcher.find()) {
	return classMatcher.group(3);
	}
	classMatcher = classPattern.matcher(sourceStr);
	return classMatcher.find() ? classMatcher.group(3) : null;
	};
	Matcher packageMatcher = packagePattern.matcher(sourceCode);
	String pkg = packageMatcher.find() ? packageMatcher.group(1).replace('.', '/') + "/" : "";
	String className = Optional.ofNullable(simpleName.apply(sourceCode))
	.orElse(Long.toString(System.nanoTime())) + ".java";
	return prefix.resolve(Paths.get(pkg + className));
	}

[shanman190]

I think normally the absolute path just gets pretended here?

[timtebeek]

I went by what I'd seen in the JavaParser:

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

Line 267 in ae70bc3

.map(input -> Input.fromString(resolveSourcePathFromSourceText(Paths.get(""), input), input))

[shanman190]

That is doing a Paths.get("") which isn't represented here. That's the same thing that I was meaning.

[timtebeek]

Hmm; with how that Paths.get("") is being used I couldn't mentally compute any difference, but I'll replicate it here.

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

Lines 369 to 389 in ae70bc3

	static Path resolveSourcePathFromSourceText(Path prefix, String sourceCode) {
	Pattern packagePattern = Pattern.compile("^package\\s+([^;]+);");
	Pattern classPattern = Pattern.compile("(class|interface|enum|record)\\s*(<[^>]*>)?\\s+(\\w+)");
	Pattern publicClassPattern = Pattern.compile("public\\s+" + classPattern.pattern());
	Function<String, @Nullable String> simpleName = sourceStr -> {
	Matcher classMatcher = publicClassPattern.matcher(sourceStr);
	if (classMatcher.find()) {
	return classMatcher.group(3);
	}
	classMatcher = classPattern.matcher(sourceStr);
	return classMatcher.find() ? classMatcher.group(3) : null;
	};
	Matcher packageMatcher = packagePattern.matcher(sourceCode);
	String pkg = packageMatcher.find() ? packageMatcher.group(1).replace('.', '/') + "/" : "";
	String className = Optional.ofNullable(simpleName.apply(sourceCode))
	.orElse(Long.toString(System.nanoTime())) + ".java";
	return prefix.resolve(Paths.get(pkg + className));

[timtebeek]

We could even remove the now always empty prefix for no real effect that I can see; am I missing anything?