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

[da...@apache.org]

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 0c413935c9f182cfa86da4a470a290d69e536190
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri May 14 13:30:06 2021 +0200

    CAMEL-16614: camel-core - Generated type converter should support CamelContext as method parameter
---
 .../org/apache/camel/converter/CamelBaseBulkConverterLoader.java  | 2 +-
 .../src/main/java/org/apache/camel/converter/ObjectConverter.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
index f57b57a..678d1fe 100644
--- a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
+++ b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
@@ -197,7 +197,7 @@ public final class CamelBaseBulkConverterLoader implements TypeConverterLoader,
             }
         } else if (to == java.lang.Class.class) {
             if (value instanceof java.lang.String) {
-                return org.apache.camel.converter.ObjectConverter.toClass((java.lang.String) value, exchange);
+                return org.apache.camel.converter.ObjectConverter.toClass((java.lang.String) value, camelContext);
             }
         } else if (to == java.lang.Double.class || to == double.class) {
             if (value instanceof java.lang.Number) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
index 5cbb113..8b6873b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
@@ -19,8 +19,8 @@ package org.apache.camel.converter;
 import java.math.BigInteger;
 import java.util.Iterator;
 
+import org.apache.camel.CamelContext;
 import org.apache.camel.Converter;
-import org.apache.camel.Exchange;
 import org.apache.camel.support.ObjectHelper;
 
 /**
@@ -117,10 +117,10 @@ public final class ObjectConverter {
      * Returns the converted value, or null if the value is null
      */
     @Converter(order = 11)
-    public static Class<?> toClass(String value, Exchange exchange) {
+    public static Class<?> toClass(String value, CamelContext camelContext) {
         // prefer to use class resolver API
-        if (exchange != null) {
-            return exchange.getContext().getClassResolver().resolveClass(value);
+        if (camelContext != null) {
+            return camelContext.getClassResolver().resolveClass(value);
         } else {
             return org.apache.camel.util.ObjectHelper.loadClass(value);
         }