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:37:50 UTC
[camel-karaf] 01/03: CAMEL-15784: camel-core - Optimize to remove
not needed factory finder in type converter
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-karaf.git
commit 7ab5a4f877b8d757987862474b16b955c877ba68
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 2 16:47:00 2020 +0100
CAMEL-15784: camel-core - Optimize to remove not needed factory finder in type converter
---
.../org/apache/camel/core/osgi/OsgiDefaultCamelContext.java | 4 +---
.../java/org/apache/camel/core/osgi/OsgiTypeConverter.java | 11 ++++-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
index 9f85f73..20f2e73 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
@@ -20,7 +20,6 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.core.osgi.utils.BundleContextUtils;
import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.support.DefaultRegistry;
import org.osgi.framework.BundleContext;
@@ -53,8 +52,7 @@ public class OsgiDefaultCamelContext extends DefaultCamelContext {
if (ctx == null) {
ctx = bundleContext;
}
- FactoryFinder finder = new OsgiFactoryFinderResolver(bundleContext).resolveDefaultFactoryFinder(getClassResolver());
- return new OsgiTypeConverter(ctx, this, getInjector(), finder);
+ return new OsgiTypeConverter(ctx, this, getInjector());
}
}
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index c0ebbf1..56534e2 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -34,7 +34,6 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.spi.BulkTypeConverters;
-import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.TypeConverterLoader;
@@ -56,15 +55,13 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
private final BundleContext bundleContext;
private CamelContext camelContext;
private final Injector injector;
- private final FactoryFinder factoryFinder;
private final ServiceTracker<TypeConverterLoader, Object> tracker;
private volatile DefaultTypeConverter delegate;
- public OsgiTypeConverter(BundleContext bundleContext, CamelContext camelContext, Injector injector, FactoryFinder factoryFinder) {
+ public OsgiTypeConverter(BundleContext bundleContext, CamelContext camelContext, Injector injector) {
this.bundleContext = bundleContext;
this.camelContext = camelContext;
this.injector = injector;
- this.factoryFinder = factoryFinder;
this.tracker = new ServiceTracker<>(bundleContext, TypeConverterLoader.class.getName(), this);
}
@@ -249,7 +246,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
DefaultTypeConverter.class.getClassLoader(),
DefaultCamelContext.class.getClassLoader()));
}
- }, injector, factoryFinder, false);
+ }, injector, false);
// inject CamelContext
answer.setCamelContext(camelContext);
@@ -289,8 +286,8 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
private class OsgiDefaultTypeConverter extends DefaultTypeConverter {
- public OsgiDefaultTypeConverter(PackageScanClassResolver resolver, Injector injector, FactoryFinder factoryFinder, boolean loadTypeConverters) {
- super(resolver, injector, factoryFinder, loadTypeConverters);
+ public OsgiDefaultTypeConverter(PackageScanClassResolver resolver, Injector injector, boolean loadTypeConverters) {
+ super(resolver, injector, loadTypeConverters);
}
@Override