Skip to content

[MPLUGIN-521] Nested types not properly extracted cause exception whi… #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
May 3, 2024
Merged

[MPLUGIN-521] Nested types not properly extracted cause exception whi… #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ...src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ protected void writeParameterType(
}
}

static URI getJavadocUrlForType(JavadocLinkGenerator javadocLinkGenerator, String type) {
private static String extractBinaryNameForJavadoc(String type) {
final String binaryName;
int startOfParameterType = type.indexOf("<");
if (startOfParameterType != -1) {
Expand All @@ -637,10 +637,10 @@ static URI getJavadocUrlForType(JavadocLinkGenerator javadocLinkGenerator, Strin
.split(",\\s*");
switch (parameterTypes.length) {
case 1: // if only one parameter type, assume collection, first parameter type is most interesting
binaryName = parameterTypes[0];
binaryName = extractBinaryNameForJavadoc(parameterTypes[0]);
break;
case 2: // if two parameter types assume map, second parameter type is most interesting
binaryName = parameterTypes[1];
binaryName = extractBinaryNameForJavadoc(parameterTypes[1]);
break;
default:
// all other cases link to main type
Expand All @@ -649,7 +649,11 @@ static URI getJavadocUrlForType(JavadocLinkGenerator javadocLinkGenerator, Strin
} else {
binaryName = type;
}
return javadocLinkGenerator.createLink(binaryName);
return binaryName;
}

static URI getJavadocUrlForType(JavadocLinkGenerator javadocLinkGenerator, String type) {
return javadocLinkGenerator.createLink(extractBinaryNameForJavadoc(type));
}

/**
Expand Down
4 changes: 4 additions & 0 deletions ...test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ void testGetJavadocUrlForType() throws URISyntaxException {
javadocBaseUri.resolve("java/lang/Integer.html"),
PluginDescriptorFilesGenerator.getJavadocUrlForType(
linkGenerator, "java.lang.Map<java.lang.String,java.lang.Integer>"));
assertEquals(
javadocBaseUri.resolve("java/lang/Integer.html"),
PluginDescriptorFilesGenerator.getJavadocUrlForType(
linkGenerator, "java.lang.Map<java.lang.String,java.util.List<java.lang.Integer>>"));
assertEquals(
javadocBaseUri.resolve("java/util/function/BiFunction.html"),
PluginDescriptorFilesGenerator.getJavadocUrlForType(
Expand Down