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/11/02 19:38:22 UTC
[camel] branch master updated (36e7f01 -> 51f5d41)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 36e7f01 Migrates the Couchbase test infrastructure (#4551)
new 68cd5af CAMEL-15784: camel-core - Optimize to remove not needed factory finder in type converter
new 83ebba3 CAMEL-15784: camel-core - Optimize to remove not needed factory finder in type converter
new 3178677 Polished
new 51f5d41 CAMEL-15784: camel-core - Optimize with bootstrap factory finder.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/jcr/JcrConverterTest.java | 4 +---
.../org/apache/camel/openapi/RestOpenApiSupport.java | 2 +-
.../org/apache/camel/spi/FactoryFinderResolver.java | 19 +++++++++++++++++++
.../camel/impl/engine/AbstractCamelContext.java | 5 +++--
.../impl/engine/DefaultFactoryFinderResolver.java | 4 ++++
.../engine/DefaultServiceBootstrapCloseable.java | 20 ++++++++++----------
.../apache/camel/impl/engine/SimpleCamelContext.java | 2 +-
.../converter/CamelBaseBulkConverterLoader.java | 4 ++--
.../impl/converter/BaseTypeConverterRegistry.java | 6 +-----
.../camel/impl/converter/DefaultTypeConverter.java | 9 ++++-----
.../camel/processor/DefaultProcessorFactory.java | 8 +++++---
.../xml/AbstractCamelContextFactoryBeanTest.java | 5 +----
.../camel/converter/ConverterBenchmarkTest.java | 8 ++------
.../org/apache/camel/converter/ConverterTest.java | 5 +----
.../java/org/apache/camel/converter/JaxpTest.java | 5 +----
.../org/apache/camel/converter/StringSourceTest.java | 5 +----
16 files changed, 57 insertions(+), 54 deletions(-)
[camel] 03/04: Polished
Posted by da...@apache.org.
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 3178677b5d7dca164204336e7d4f60856d15fdeb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 2 16:49:40 2020 +0100
Polished
---
.../src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java
index 99c7568..ed779ce 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiSupport.java
@@ -199,7 +199,7 @@ public class RestOpenApiSupport {
camelContext.adapt(ExtendedCamelContext.class).getBootstrapFactoryFinder())
.resolve(camelContext)
.orElseThrow(
- () -> new IllegalArgumentException("Cannot find JMX_REST_DEFINITION_RESOLVER on classpath."));
+ () -> new IllegalArgumentException("Cannot find camel-openapi-java on classpath."));
}
public void renderResourceListing(
[camel] 04/04: CAMEL-15784: camel-core - Optimize with bootstrap
factory finder.
Posted by da...@apache.org.
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 51f5d412579d2b4ab1737e01cdc65a037ac7cda0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 2 20:19:18 2020 +0100
CAMEL-15784: camel-core - Optimize with bootstrap factory finder.
---
.../org/apache/camel/spi/FactoryFinderResolver.java | 19 +++++++++++++++++++
.../camel/impl/engine/AbstractCamelContext.java | 5 +++--
.../impl/engine/DefaultFactoryFinderResolver.java | 4 ++++
.../engine/DefaultServiceBootstrapCloseable.java | 20 ++++++++++----------
.../camel/processor/DefaultProcessorFactory.java | 8 +++++---
5 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/FactoryFinderResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/FactoryFinderResolver.java
index 695be6c5..c75ad6c 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/FactoryFinderResolver.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/FactoryFinderResolver.java
@@ -32,6 +32,16 @@ public interface FactoryFinderResolver {
}
/**
+ * Creates a new bootstrap factory finder using a default resource path.
+ *
+ * @param classResolver the class resolver to use
+ * @return a factory finder.
+ */
+ default FactoryFinder resolveBootstrapFactoryFinder(ClassResolver classResolver) {
+ return resolveBootstrapFactoryFinder(classResolver, FactoryFinder.DEFAULT_PATH);
+ }
+
+ /**
* Creates a new factory finder.
*
* @param classResolver the class resolver to use
@@ -40,4 +50,13 @@ public interface FactoryFinderResolver {
*/
FactoryFinder resolveFactoryFinder(ClassResolver classResolver, String resourcePath);
+ /**
+ * Creates a new factory finder.
+ *
+ * @param classResolver the class resolver to use
+ * @param resourcePath the resource path as base to lookup files within
+ * @return a factory finder.
+ */
+ FactoryFinder resolveBootstrapFactoryFinder(ClassResolver classResolver, String resourcePath);
+
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 9b9ff49..cf50377 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -3385,7 +3385,8 @@ public abstract class AbstractCamelContext extends BaseService
synchronized (lock) {
if (bootstrapConfigurerResolver == null) {
bootstrapConfigurerResolver = new BootstrapConfigurerResolver(
- new BootstrapFactoryFinder(getClassResolver(), ConfigurerResolver.RESOURCE_PATH));
+ getFactoryFinderResolver().resolveBootstrapFactoryFinder(getClassResolver(),
+ ConfigurerResolver.RESOURCE_PATH));
}
}
}
@@ -3402,7 +3403,7 @@ public abstract class AbstractCamelContext extends BaseService
if (bootstrapFactoryFinder == null) {
synchronized (lock) {
if (bootstrapFactoryFinder == null) {
- bootstrapFactoryFinder = new BootstrapFactoryFinder(getClassResolver(), FactoryFinder.DEFAULT_PATH);
+ bootstrapFactoryFinder = getFactoryFinderResolver().resolveBootstrapFactoryFinder(getClassResolver());
}
}
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java
index 027dead..e44cad2 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinderResolver.java
@@ -30,4 +30,8 @@ public class DefaultFactoryFinderResolver implements FactoryFinderResolver {
return new DefaultFactoryFinder(classResolver, resourcePath);
}
+ @Override
+ public FactoryFinder resolveBootstrapFactoryFinder(ClassResolver classResolver, String resourcePath) {
+ return new BootstrapFactoryFinder(classResolver, resourcePath);
+ }
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
index 6d37eca..7394d33 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
@@ -75,27 +75,27 @@ public class DefaultServiceBootstrapCloseable implements BootstrapCloseable {
}
camelContext.setBootstrapConfigurerResolver(null);
- // clear bootstrap factory finder
- FactoryFinder ff = camelContext.getBootstrapFactoryFinder();
- if (ff instanceof BootstrapCloseable) {
+ // clear processor factory
+ ProcessorFactory pf = camelContext.getProcessorFactory();
+ if (pf instanceof BootstrapCloseable) {
try {
- ((BootstrapCloseable) ff).close();
+ ((BootstrapCloseable) pf).close();
} catch (Exception e) {
LOG.warn("Error during closing bootstrap service. This exception is ignored", e);
}
}
- camelContext.setBootstrapFactoryFinder(null);
+ camelContext.setProcessorFactory(null);
- // clear processor factory
- ProcessorFactory pf = camelContext.getProcessorFactory();
- if (pf instanceof BootstrapCloseable) {
+ // clear bootstrap factory finder
+ FactoryFinder ff = camelContext.getBootstrapFactoryFinder();
+ if (ff instanceof BootstrapCloseable) {
try {
- ((BootstrapCloseable) pf).close();
+ ((BootstrapCloseable) ff).close();
} catch (Exception e) {
LOG.warn("Error during closing bootstrap service. This exception is ignored", e);
}
}
- camelContext.setProcessorFactory(null);
+ camelContext.setBootstrapFactoryFinder(null);
}
}
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultProcessorFactory.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultProcessorFactory.java
index 68db7de..8ffab7a 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultProcessorFactory.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/DefaultProcessorFactory.java
@@ -23,11 +23,11 @@ import java.util.concurrent.ExecutorService;
import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Expression;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NamedNode;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.impl.engine.BootstrapFactoryFinder;
import org.apache.camel.spi.BootstrapCloseable;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.ProcessorFactory;
@@ -64,7 +64,8 @@ public class DefaultProcessorFactory implements ProcessorFactory, BootstrapClose
public Processor createChildProcessor(Route route, NamedNode definition, boolean mandatory) throws Exception {
String name = definition.getClass().getSimpleName();
if (finder == null) {
- finder = new BootstrapFactoryFinder(route.getCamelContext().getClassResolver(), RESOURCE_PATH);
+ finder = route.getCamelContext().adapt(ExtendedCamelContext.class).getFactoryFinderResolver()
+ .resolveBootstrapFactoryFinder(route.getCamelContext().getClassResolver(), RESOURCE_PATH);
}
try {
Object object = finder.newInstance(name).orElse(null);
@@ -83,7 +84,8 @@ public class DefaultProcessorFactory implements ProcessorFactory, BootstrapClose
public Processor createProcessor(Route route, NamedNode definition) throws Exception {
String name = definition.getClass().getSimpleName();
if (finder == null) {
- finder = new BootstrapFactoryFinder(route.getCamelContext().getClassResolver(), RESOURCE_PATH);
+ finder = route.getCamelContext().adapt(ExtendedCamelContext.class).getFactoryFinderResolver()
+ .resolveBootstrapFactoryFinder(route.getCamelContext().getClassResolver(), RESOURCE_PATH);
}
ProcessorFactory pc = finder.newInstance(name, ProcessorFactory.class).orElse(null);
if (pc != null) {
[camel] 01/04: CAMEL-15784: camel-core - Optimize to remove not
needed factory finder in type converter
Posted by da...@apache.org.
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 <cl...@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
[camel] 02/04: CAMEL-15784: camel-core - Optimize to remove not
needed factory finder in type converter
Posted by da...@apache.org.
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 83ebba30f76d837d3cdd7acb619672ecb2d86b26
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 2 16:43:49 2020 +0100
CAMEL-15784: camel-core - Optimize to remove not needed factory finder in type converter
---
.../test/java/org/apache/camel/component/jcr/JcrConverterTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
index 055e05d..ae98ddb 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
@@ -23,8 +23,6 @@ import javax.jcr.Value;
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.spi.Injector;
import org.apache.camel.support.ObjectHelper;
@@ -70,7 +68,7 @@ public class JcrConverterTest {
public boolean supportsAutoWiring() {
return false;
}
- }, new DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new DefaultClassResolver()), true);
+ }, true);
ServiceHelper.startService(converter);
}