This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 90445062bf9b04260a8e6bf2f94777d186cd5afc Author: Claus Ibsen <[email protected]> AuthorDate: Fri May 15 18:01:59 2020 +0200 Remove java.lang. from classnames in types from generated code in endpoint-dsl --- .../org/apache/camel/maven/packaging/EndpointDslMojo.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java index a1b5d8d..a0b79d9 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java @@ -64,6 +64,8 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; import org.jboss.forge.roaster.Roaster; import org.jboss.forge.roaster._shade.org.eclipse.jdt.core.dom.ASTNode; +import org.jboss.forge.roaster.model.JavaType; +import org.jboss.forge.roaster.model.Type; import org.jboss.forge.roaster.model.source.JavaClassSource; import org.jboss.forge.roaster.model.source.MethodSource; import org.jboss.forge.roaster.model.source.ParameterSource; @@ -694,11 +696,11 @@ public class EndpointDslMojo extends AbstractGeneratorMojo { } method.setName(ms.getName()); method.setBody(ms.getBody()); - method.setReturnType(ms.getReturnType().getQualifiedName()); + method.setReturnType(getQualifiedType(ms.getReturnType())); for (Object o : ms.getParameters()) { if (o instanceof ParameterSource) { ParameterSource ps = (ParameterSource) o; - method.addParameter(ps.getType().getQualifiedName(), ps.getName()); + method.addParameter(getQualifiedType(ps.getType()), ps.getName()); } } String doc = extractJavaDoc(sourceCode, ms); @@ -734,6 +736,14 @@ public class EndpointDslMojo extends AbstractGeneratorMojo { return writeSourceIfChanged("//CHECKSTYLE:OFF\n" + printClass + "\n//CHECKSTYLE:ON", endpointFactoriesPackageName.replace(".", "/"), "StaticEndpointBuilders.java"); } + private static String getQualifiedType(Type type) { + String val = type.getQualifiedName(); + if (val.startsWith("java.lang.")) { + val = val.substring(10); + } + return val; + } + protected static String extractJavaDoc(String sourceCode, MethodSource ms) throws IOException { // the javadoc is mangled by roaster (sadly it does not preserve newlines and original formatting) // so we need to load it from the original source file
