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 2022/02/01 17:39:02 UTC
[camel] 02/13: CAMEL-17578: camel-core - Adding @Converter class should be easier programmatically
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 3f67bdceac51f3ae4da49fd81c0b47e68f1c61f2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Feb 1 09:41:30 2022 +0100
CAMEL-17578: camel-core - Adding @Converter class should be easier programmatically
---
core/camel-api/src/main/java/org/apache/camel/TypeConverters.java | 2 +-
.../src/main/java/org/apache/camel/spi/TypeConverterRegistry.java | 7 +++----
.../org/apache/camel/impl/converter/BaseTypeConverterRegistry.java | 3 +--
.../org/apache/camel/impl/converter/CoreTypeConverterRegistry.java | 3 +--
.../java/org/apache/camel/impl/converter/TypeConvertersLoader.java | 4 ++--
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/TypeConverters.java b/core/camel-api/src/main/java/org/apache/camel/TypeConverters.java
index 4660134..54f83be 100644
--- a/core/camel-api/src/main/java/org/apache/camel/TypeConverters.java
+++ b/core/camel-api/src/main/java/org/apache/camel/TypeConverters.java
@@ -20,7 +20,7 @@ package org.apache.camel;
* A tagging interface to mark this class implements type converters using the {@link Converter} annotations.
* <p/>
* This can be used to provide custom type converters that can be manually added to the {@link CamelContext} using
- * {@link org.apache.camel.spi.TypeConverterRegistry#addTypeConverters(TypeConverters)}.
+ * {@link org.apache.camel.spi.TypeConverterRegistry#addTypeConverters(Object)}.
*/
public interface TypeConverters {
}
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
index bd715cd..6037531 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
@@ -21,7 +21,6 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.StaticService;
import org.apache.camel.TypeConverter;
import org.apache.camel.TypeConverterExists;
-import org.apache.camel.TypeConverters;
/**
* Registry for type converters.
@@ -106,12 +105,12 @@ public interface TypeConverterRegistry extends StaticService, CamelContextAware
boolean removeTypeConverter(Class<?> toType, Class<?> fromType);
/**
- * Registers all the type converters from the class, each converter must be implemented as a method and annotated
+ * Registers all the type converters from the instance, each converter must be implemented as a method and annotated
* with {@link org.apache.camel.Converter}.
*
- * @param typeConverters class which implements the type converters
+ * @param typeConverters instance which implements the type converters
*/
- void addTypeConverters(TypeConverters typeConverters);
+ void addTypeConverters(Object typeConverters);
/**
* Registers a new fallback type converter
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index af9c8c2..ee4af77 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -36,7 +36,6 @@ import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.TypeConverter;
import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.TypeConverters;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.TypeConverterLoader;
@@ -86,7 +85,7 @@ public abstract class BaseTypeConverterRegistry extends CoreTypeConverterRegistr
}
@Override
- public void addTypeConverters(TypeConverters typeConverters) {
+ public void addTypeConverters(Object typeConverters) {
LOG.trace("Adding type converters: {}", typeConverters);
try {
// scan the class for @Converter and load them into this registry
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
index 2828e69..14f301c 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
@@ -33,7 +33,6 @@ import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverter;
import org.apache.camel.TypeConverterExists;
import org.apache.camel.TypeConverterExistsException;
-import org.apache.camel.TypeConverters;
import org.apache.camel.converter.ObjectConverter;
import org.apache.camel.spi.BulkTypeConverters;
import org.apache.camel.spi.CamelLogger;
@@ -619,7 +618,7 @@ public class CoreTypeConverterRegistry extends ServiceSupport implements TypeCon
}
@Override
- public void addTypeConverters(TypeConverters typeConverters) {
+ public void addTypeConverters(Object typeConverters) {
throw new UnsupportedOperationException();
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java
index 12c7dd3..85060a6 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java
@@ -26,14 +26,14 @@ import org.apache.camel.TypeConverters;
*/
public class TypeConvertersLoader extends AnnotationTypeConverterLoader {
- private final TypeConverters typeConverters;
+ private final Object typeConverters;
/**
* Creates the loader
*
* @param typeConverters The implementation that has the type converters
*/
- public TypeConvertersLoader(TypeConverters typeConverters) {
+ public TypeConvertersLoader(Object typeConverters) {
super(new TypeConvertersPackageScanClassResolver(typeConverters.getClass()));
this.typeConverters = typeConverters;
}