[camel-karaf] 02/03: CAMEL-15784: camel-core - Optimize with bootstrap factory finder.

[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-karaf.git

commit 61c91122a9c7ecd3eeee2632248da769dc67977d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 2 19:27:35 2020 +0100

    CAMEL-15784: camel-core - Optimize with bootstrap factory finder.
---
 .../main/java/org/apache/camel/blueprint/BlueprintCamelContext.java  | 5 +----
 .../main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
index 3778f1e..2aa1fd5 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
@@ -23,14 +23,12 @@ import org.apache.camel.blueprint.handler.CamelNamespaceHandler;
 import org.apache.camel.core.osgi.OsgiBeanRepository;
 import org.apache.camel.core.osgi.OsgiCamelContextHelper;
 import org.apache.camel.core.osgi.OsgiCamelContextPublisher;
-import org.apache.camel.core.osgi.OsgiFactoryFinderResolver;
 import org.apache.camel.core.osgi.OsgiTypeConverter;
 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.BeanRepository;
 import org.apache.camel.spi.EventNotifier;
-import org.apache.camel.spi.FactoryFinder;
 import org.apache.camel.spi.ModelJAXBContextFactory;
 import org.apache.camel.support.DefaultRegistry;
 import org.osgi.framework.BundleContext;
@@ -227,8 +225,7 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
         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());
     }
 
     @Override
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java
index aeda372..9f4cb23 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java
@@ -17,6 +17,7 @@
 package org.apache.camel.core.osgi;
 
 import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.engine.BootstrapFactoryFinder;
 import org.apache.camel.util.ObjectHelper;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
@@ -40,6 +41,8 @@ public final class OsgiCamelContextHelper {
         camelContext.setClassResolver(new OsgiClassResolver(camelContext, bundleContext));
         LOG.debug("Using OsgiFactoryFinderResolver");
         camelContext.setFactoryFinderResolver(new OsgiFactoryFinderResolver(bundleContext));
+        LOG.debug("Using OsgiFactoryFinder");
+        camelContext.setBootstrapFactoryFinder(new OsgiFactoryFinder(bundleContext, camelContext.getClassResolver(), BootstrapFactoryFinder.DEFAULT_PATH));
         LOG.debug("Using OsgiPackageScanClassResolver");
         camelContext.setPackageScanClassResolver(new OsgiPackageScanClassResolver(bundleContext));
         LOG.debug("Using OsgiComponentResolver");