You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/05 06:20:39 UTC
[camel] branch master updated: CAMEL-15478: Upgrade Roaster with
speedy fix by George Gastaldi.
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
The following commit(s) were added to refs/heads/master by this push:
new b009367 CAMEL-15478: Upgrade Roaster with speedy fix by George Gastaldi.
b009367 is described below
commit b009367577d6d91ab1c2c2957ca0f7d2786bf259
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Sep 5 08:20:05 2020 +0200
CAMEL-15478: Upgrade Roaster with speedy fix by George Gastaldi.
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../org/apache/camel/maven/JavaSourceParser.java | 25 +---------------------
3 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 5fb2004..2d7489e 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -500,7 +500,7 @@
<rhino-js-version>1.7R2</rhino-js-version>
<rhino-version>1.7.7.1</rhino-version>
<ribbon-version>2.3.0</ribbon-version>
- <roaster-version>2.21.3.Final</roaster-version>
+ <roaster-version>2.22.0.Final</roaster-version>
<robotframework-version>3.2.1</robotframework-version>
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index a69f579..fce5d22 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -488,7 +488,7 @@
<rhino-version>1.7.7.1</rhino-version>
<rhino-js-version>1.7R2</rhino-js-version>
<ribbon-version>2.3.0</ribbon-version>
- <roaster-version>2.21.3.Final</roaster-version>
+ <roaster-version>2.22.0.Final</roaster-version>
<robotframework-version>3.2.1</robotframework-version>
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
index 0d42a0b..cde1174 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
@@ -25,7 +25,6 @@ import java.util.Map;
import org.jboss.forge.roaster.Roaster;
import org.jboss.forge.roaster.model.JavaDocTag;
-import org.jboss.forge.roaster.model.Visibility;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
import org.jboss.forge.roaster.model.source.ParameterSource;
@@ -50,7 +49,7 @@ public class JavaSourceParser {
if (!ms.isPublic() || ms.isConstructor()) {
continue;
}
- String signature = toSignatureRoasterFix(ms);
+ String signature = ms.toSignature();
// roaster signatures has return values at end
// public create(String, AddressRequest) : Result
@@ -178,26 +177,4 @@ public class JavaSourceParser {
return parameters;
}
- private static String toSignatureRoasterFix(MethodSource ms) {
- StringBuilder signature = new StringBuilder();
- signature.append(Visibility.PACKAGE_PRIVATE.equals(ms.getVisibility().scope())
- ? ""
- : ms.getVisibility()
- .scope());
- signature.append(" ");
- signature.append(ms.getName()).append("(");
- List<ParameterSource<?>> parameters = ms.getParameters();
- for (ParameterSource<?> p : parameters) {
- signature.append(p.getType().getName());
- if (p.isVarArgs()) {
- signature.append("...");
- }
- if (parameters.indexOf(p) < (parameters.size() - 1)) {
- signature.append(", ");
- }
- }
-
- signature.append(") : ").append((ms.getReturnType() == null ? "void" : ms.getReturnType().getName()));
- return signature.toString();
- }
}