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 2021/05/14 11:31:49 UTC

[camel] 01/02: CAMEL-16614: camel-core - Generated type converter should support CamelContext as method parameter

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a19bd1349a0dffabaf4ea16763e31eda63412d20
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri May 14 13:21:52 2021 +0200

    CAMEL-16614: camel-core - Generated type converter should support CamelContext as method parameter
---
 .../maven/packaging/TypeConverterLoaderGeneratorMojo.java  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
index 24a2129..f5def2d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
@@ -515,9 +515,21 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
             converterClasses.add(converter.declaringClass().toString());
             pfx = "get" + converter.declaringClass().simpleName() + "()." + converter.name();
         }
+
+        // the 2nd parameter is optional and can either be Exchange or CamelContext
+        String param = "";
+        String paramType
+                = converter.parameters().size() == 2 ? converter.parameters().get(1).asClassType().name().toString() : null;
+        if (paramType != null) {
+            if ("org.apache.camel.Exchange".equals(paramType)) {
+                param = ", exchange";
+            } else if ("org.apache.camel.CamelContext".equals(paramType)) {
+                param = ", camelContext";
+            }
+        }
         String type = toString(converter.parameters().get(0));
         String cast = type.equals("java.lang.Object") ? "" : "(" + type + ") ";
-        return pfx + "(" + cast + "value" + (converter.parameters().size() == 2 ? ", exchange" : "") + ")";
+        return pfx + "(" + cast + "value" + param + ")";
     }
 
     private String toJavaFallback(MethodInfo converter, Set<String> converterClasses) {