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:49 UTC
[camel-karaf] branch master updated (9fec3f4 -> 6502a80)
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-karaf.git.
from 9fec3f4 [create-pull-request] automated change
new 7ab5a4f CAMEL-15784: camel-core - Optimize to remove not needed factory finder in type converter
new 61c9112 CAMEL-15784: camel-core - Optimize with bootstrap factory finder.
new 6502a80 CAMEL-15784: camel-core - Optimize with bootstrap factory finder.
The 3 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:
.../org/apache/camel/blueprint/BlueprintCamelContext.java | 5 +----
.../org/apache/camel/core/osgi/OsgiDefaultCamelContext.java | 4 +---
.../org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java | 5 +++++
.../java/org/apache/camel/core/osgi/OsgiTypeConverter.java | 11 ++++-------
4 files changed, 11 insertions(+), 14 deletions(-)
[camel-karaf] 01/03: 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-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
[camel-karaf] 02/03: 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-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");
[camel-karaf] 03/03: 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-karaf.git
commit 6502a808b15e12dd7bee3423d6752e177082980c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Nov 2 19:53:07 2020 +0100
CAMEL-15784: camel-core - Optimize with bootstrap factory finder.
---
.../main/java/org/apache/camel/core/osgi/OsgiCamelContextHelper.java | 3 ---
.../java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java | 5 +++++
2 files changed, 5 insertions(+), 3 deletions(-)
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 9f4cb23..aeda372 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,7 +17,6 @@
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;
@@ -41,8 +40,6 @@ 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");
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java
index 631c190..a6fc1af 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinderResolver.java
@@ -34,4 +34,9 @@ public class OsgiFactoryFinderResolver implements FactoryFinderResolver {
return new OsgiFactoryFinder(bundleContext, classResolver, resourcePath);
}
+ @Override
+ public FactoryFinder resolveBootstrapFactoryFinder(ClassResolver classResolver, String resourcePath) {
+ return new OsgiFactoryFinder(bundleContext, classResolver, resourcePath);
+ }
+
}