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 68cd5afe733c383c6c862bda1fa65244cf6dfa9a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Nov 2 16:39:32 2020 +0100
CAMEL-15784: camel-core - Optimize to remove not needed factory finder in
type converter
---
.../java/org/apache/camel/impl/engine/SimpleCamelContext.java | 2 +-
.../org/apache/camel/converter/CamelBaseBulkConverterLoader.java | 4 ++--
.../apache/camel/impl/converter/BaseTypeConverterRegistry.java | 6 +-----
.../org/apache/camel/impl/converter/DefaultTypeConverter.java | 9 ++++-----
.../camel/core/xml/AbstractCamelContextFactoryBeanTest.java | 5 +----
.../java/org/apache/camel/converter/ConverterBenchmarkTest.java | 8 ++------
.../src/test/java/org/apache/camel/converter/ConverterTest.java | 5 +----
.../src/test/java/org/apache/camel/converter/JaxpTest.java | 5 +----
.../test/java/org/apache/camel/converter/StringSourceTest.java | 5 +----
9 files changed, 14 insertions(+), 35 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index 749c54b..1b6e9b2 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -117,7 +117,7 @@ public class SimpleCamelContext extends
AbstractCamelContext {
protected TypeConverter createTypeConverter() {
return new DefaultTypeConverter(
getCamelContextReference(), getPackageScanClassResolver(),
getInjector(),
- getDefaultFactoryFinder(), isLoadTypeConverters());
+ isLoadTypeConverters());
}
@Override
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 2ebce2e..f4e3038 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
@@ -185,7 +185,7 @@ public final class CamelBaseBulkConverterLoader implements
TypeConverterLoader,
if (value instanceof java.lang.String) {
return
org.apache.camel.converter.ObjectConverter.toClass((java.lang.String) value,
exchange);
}
- } else if (to == java.lang.Double.class || to == double.class) {
+ } else if (to == java.lang.Double.class || to == float.class) {
if (value instanceof java.lang.Number) {
return
org.apache.camel.converter.ObjectConverter.toDouble((java.lang.Number) value);
}
@@ -560,7 +560,7 @@ public final class CamelBaseBulkConverterLoader implements
TypeConverterLoader,
if (from == java.lang.String.class) {
return this;
}
- } else if (to == java.lang.Double.class || to == double.class) {
+ } else if (to == java.lang.Double.class || to == float.class) {
if (from == java.lang.Number.class) {
return this;
}
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 dc8c8f7..15b7c26 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
@@ -37,7 +37,6 @@ 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.FactoryFinder;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.TypeConverterLoader;
@@ -63,13 +62,10 @@ public abstract class BaseTypeConverterRegistry extends
CoreTypeConverterRegistr
protected CamelContext camelContext;
protected PackageScanClassResolver resolver;
protected Injector injector;
- protected final FactoryFinder factoryFinder;
- public BaseTypeConverterRegistry(CamelContext camelContext,
PackageScanClassResolver resolver, Injector injector,
- FactoryFinder factoryFinder) {
+ public BaseTypeConverterRegistry(CamelContext camelContext,
PackageScanClassResolver resolver, Injector injector) {
this.camelContext = camelContext;
this.injector = injector;
- this.factoryFinder = factoryFinder;
this.resolver = resolver;
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
index 30b0ef6..a027d7d0 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
@@ -18,7 +18,6 @@ package org.apache.camel.impl.converter;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.AnnotationScanTypeConverters;
-import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.util.StopWatch;
@@ -40,13 +39,13 @@ public class DefaultTypeConverter extends
BaseTypeConverterRegistry implements A
private final boolean loadTypeConverters;
public DefaultTypeConverter(PackageScanClassResolver resolver, Injector
injector,
- FactoryFinder factoryFinder, boolean
loadTypeConverters) {
- this(null, resolver, injector, factoryFinder, loadTypeConverters);
+ boolean loadTypeConverters) {
+ this(null, resolver, injector, loadTypeConverters);
}
public DefaultTypeConverter(CamelContext camelContext,
PackageScanClassResolver resolver, Injector injector,
- FactoryFinder factoryFinder, boolean
loadTypeConverters) {
- super(camelContext, resolver, injector, factoryFinder);
+ boolean loadTypeConverters) {
+ super(camelContext, resolver, injector);
this.loadTypeConverters = loadTypeConverters;
}
diff --git
a/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
b/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
index 0c3a435..4abb372 100644
---
a/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
+++
b/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
@@ -29,8 +29,6 @@ import org.apache.camel.Service;
import org.apache.camel.TypeConverter;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.converter.DefaultTypeConverter;
-import org.apache.camel.impl.engine.DefaultClassResolver;
-import org.apache.camel.impl.engine.DefaultFactoryFinder;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.spi.CamelBeanPostProcessor;
@@ -84,8 +82,7 @@ public class AbstractCamelContextFactoryBeanTest {
public boolean supportsAutoWiring() {
return false;
}
- },
- new DefaultFactoryFinder(new DefaultClassResolver(),
"META-INF/services/org/apache/camel/"), false);
+ }, false);
// properties that should return value that can be converted to boolean
Set<String> valuesThatReturnBoolean = new HashSet<>(
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterBenchmarkTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterBenchmarkTest.java
index 4fad839..d720656 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterBenchmarkTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterBenchmarkTest.java
@@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.LoggingLevel;
import org.apache.camel.impl.converter.DefaultTypeConverter;
-import org.apache.camel.impl.engine.DefaultClassResolver;
-import org.apache.camel.impl.engine.DefaultFactoryFinderResolver;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Injector;
@@ -77,8 +75,7 @@ public class ConverterBenchmarkTest {
public void initialize() throws Exception {
packageScanClassResolver = new DefaultPackageScanClassResolver();
injector = new ReflectionInjector();
- factoryFinder = new
DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new
DefaultClassResolver());
- converter = new DefaultTypeConverter(packageScanClassResolver,
injector, factoryFinder, true);
+ converter = new DefaultTypeConverter(packageScanClassResolver,
injector, true);
converter.start();
}
}
@@ -88,9 +85,8 @@ public class ConverterBenchmarkTest {
DefaultPackageScanClassResolver packageScanClassResolver =
state.packageScanClassResolver;
Injector injector = state.injector;
- FactoryFinder factoryFinder = state.factoryFinder;
- DefaultTypeConverter converter = new
DefaultTypeConverter(packageScanClassResolver, injector, factoryFinder, true);
+ DefaultTypeConverter converter = new
DefaultTypeConverter(packageScanClassResolver, injector, true);
converter.start();
bh.consume(converter);
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
index 2adc6ed..2ba1c17 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
@@ -35,8 +35,6 @@ import org.apache.camel.TypeConversionException;
import org.apache.camel.TypeConverter;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.converter.DefaultTypeConverter;
-import org.apache.camel.impl.engine.DefaultClassResolver;
-import org.apache.camel.impl.engine.DefaultFactoryFinderResolver;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.IntrospectionSupport;
@@ -54,8 +52,7 @@ public class ConverterTest extends TestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(ConverterTest.class);
protected TypeConverter converter = new DefaultTypeConverter(
- new DefaultPackageScanClassResolver(), new ReflectionInjector(),
- new DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new
DefaultClassResolver()), true);
+ new DefaultPackageScanClassResolver(), new ReflectionInjector(),
true);
public static class IntegerPropertyEditor extends PropertyEditorSupport {
@Override
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
index b03f5a0..70cd282 100644
--- a/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
@@ -28,8 +28,6 @@ import org.w3c.dom.Element;
import org.apache.camel.TypeConverter;
import org.apache.camel.impl.converter.DefaultTypeConverter;
-import org.apache.camel.impl.engine.DefaultClassResolver;
-import org.apache.camel.impl.engine.DefaultFactoryFinderResolver;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ReflectionInjector;
@@ -43,8 +41,7 @@ import static org.junit.jupiter.api.Assertions.*;
public class JaxpTest {
private static final Logger LOG = LoggerFactory.getLogger(JaxpTest.class);
protected TypeConverter converter = new DefaultTypeConverter(
- new DefaultPackageScanClassResolver(), new ReflectionInjector(),
- new DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new
DefaultClassResolver()), false);
+ new DefaultPackageScanClassResolver(), new ReflectionInjector(),
false);
@BeforeEach
public void setUp() throws Exception {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
index 2943f3b..37a1d61 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
@@ -23,8 +23,6 @@ import java.io.ObjectOutputStream;
import org.apache.camel.TypeConverter;
import org.apache.camel.impl.converter.DefaultTypeConverter;
-import org.apache.camel.impl.engine.DefaultClassResolver;
-import org.apache.camel.impl.engine.DefaultFactoryFinderResolver;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ReflectionInjector;
@@ -37,8 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class StringSourceTest {
protected TypeConverter converter = new DefaultTypeConverter(
- new DefaultPackageScanClassResolver(), new ReflectionInjector(),
- new DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new
DefaultClassResolver()), false);
+ new DefaultPackageScanClassResolver(), new ReflectionInjector(),
false);
protected String expectedBody = "<hello>world!</hello>";
@BeforeEach
