Repository: camel Updated Branches: refs/heads/master f5296eb88 -> bade73dd4
Optimise - Allow to turn off loading type converters from classpath scanning. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bade73dd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bade73dd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bade73dd Branch: refs/heads/master Commit: bade73dd4b370d02fa176fd06dd82f8844f1d320 Parents: e516bf4 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jun 22 10:15:49 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jun 22 10:27:34 2017 +0200 ---------------------------------------------------------------------- .../src/main/docs/atomix-map-component.adoc | 3 --- .../src/main/docs/atomix-messaging-component.adoc | 3 --- .../src/main/docs/atomix-multimap-component.adoc | 3 --- .../src/main/docs/atomix-queue-component.adoc | 3 --- .../src/main/docs/atomix-set-component.adoc | 3 --- .../src/main/docs/atomix-value-component.adoc | 5 ----- .../apache/camel/cdi/xml/CamelContextFactoryBean.java | 12 ++++++++++++ .../org/apache/camel/core/osgi/OsgiTypeConverter.java | 2 +- .../apache/camel/component/jcr/JcrConverterTest.java | 2 +- .../org/apache/camel/rx/support/ReactiveInjector.java | 5 +++++ 10 files changed, 19 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-atomix/src/main/docs/atomix-map-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-atomix/src/main/docs/atomix-map-component.adoc b/components/camel-atomix/src/main/docs/atomix-map-component.adoc index b558857..0740f0e 100644 --- a/components/camel-atomix/src/main/docs/atomix-map-component.adoc +++ b/components/camel-atomix/src/main/docs/atomix-map-component.adoc @@ -44,10 +44,7 @@ The Atomix Map component supports 5 options which are listed below. // endpoint options: START The Atomix Map endpoint is configured using URI syntax: -[source,java] ----- atomix-map:mapName ----- with the following path and query parameters: http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc b/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc index dfaac7c..8670b45 100644 --- a/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc +++ b/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc @@ -42,10 +42,7 @@ The Atomix Messaging component supports 5 options which are listed below. // endpoint options: START The Atomix Messaging endpoint is configured using URI syntax: -[source,java] ----- atomix-messaging:group ----- with the following path and query parameters: http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc b/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc index 684029a..fb12cbb 100644 --- a/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc +++ b/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc @@ -42,10 +42,7 @@ The Atomix MultiMap component supports 5 options which are listed below. // endpoint options: START The Atomix MultiMap endpoint is configured using URI syntax: -[source,java] ----- atomix-multimap:multiMapName ----- with the following path and query parameters: http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-atomix/src/main/docs/atomix-queue-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-atomix/src/main/docs/atomix-queue-component.adoc b/components/camel-atomix/src/main/docs/atomix-queue-component.adoc index cff0b9b..129f76d 100644 --- a/components/camel-atomix/src/main/docs/atomix-queue-component.adoc +++ b/components/camel-atomix/src/main/docs/atomix-queue-component.adoc @@ -42,10 +42,7 @@ The Atomix Queue component supports 5 options which are listed below. // endpoint options: START The Atomix Queue endpoint is configured using URI syntax: -[source,java] ----- atomix-queue:queueName ---- with the following path and query parameters: http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-atomix/src/main/docs/atomix-set-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-atomix/src/main/docs/atomix-set-component.adoc b/components/camel-atomix/src/main/docs/atomix-set-component.adoc index 2299fe2..4066ded 100644 --- a/components/camel-atomix/src/main/docs/atomix-set-component.adoc +++ b/components/camel-atomix/src/main/docs/atomix-set-component.adoc @@ -42,10 +42,7 @@ The Atomix Set component supports 5 options which are listed below. // endpoint options: START The Atomix Set endpoint is configured using URI syntax: -[source,java] ----- atomix-set:setName ----- with the following path and query parameters: http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-atomix/src/main/docs/atomix-value-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-atomix/src/main/docs/atomix-value-component.adoc b/components/camel-atomix/src/main/docs/atomix-value-component.adoc index 8cc36d4..6db60ba 100644 --- a/components/camel-atomix/src/main/docs/atomix-value-component.adoc +++ b/components/camel-atomix/src/main/docs/atomix-value-component.adoc @@ -42,12 +42,7 @@ The Atomix Value component supports 5 options which are listed below. // endpoint options: START The Atomix Value endpoint is configured using URI syntax: -### URI format - -[source,java] ----- atomix-value:valueName ----- with the following path and query parameters: http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java index edff3ef..c94d6dd 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java @@ -136,6 +136,9 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def private Boolean lazyLoadTypeConverters; @XmlAttribute + private Boolean loadTypeConverters; + + @XmlAttribute private Boolean typeConverterStatisticsEnabled; @XmlAttribute @@ -672,6 +675,15 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def this.lazyLoadTypeConverters = lazyLoadTypeConverters; } + @Override + public Boolean getLoadTypeConverters() { + return loadTypeConverters; + } + + public void setLoadTypeConverters(Boolean loadTypeConverters) { + this.loadTypeConverters = loadTypeConverters; + } + public Boolean getTypeConverterStatisticsEnabled() { return typeConverterStatisticsEnabled; } http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java index 787ee8a..85bd1f1 100644 --- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java +++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java @@ -207,7 +207,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter, // we don't need any classloaders as we use OSGi service tracker instead return Collections.emptySet(); } - }, injector, factoryFinder); + }, injector, factoryFinder, false); // inject CamelContext answer.setCamelContext(camelContext); http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java ---------------------------------------------------------------------- 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 1298e3c..2db18bd 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 @@ -45,7 +45,7 @@ public class JcrConverterTest extends Assert { @Before public void init() throws Exception { converter = new DefaultTypeConverter(new DefaultPackageScanClassResolver(), - new ReflectionInjector(), new DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new DefaultClassResolver())); + new ReflectionInjector(), new DefaultFactoryFinderResolver().resolveDefaultFactoryFinder(new DefaultClassResolver()), true); ServiceHelper.startService(converter); } http://git-wip-us.apache.org/repos/asf/camel/blob/bade73dd/components/camel-rx/src/main/java/org/apache/camel/rx/support/ReactiveInjector.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ReactiveInjector.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ReactiveInjector.java index 5011a65..1247c48 100644 --- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ReactiveInjector.java +++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ReactiveInjector.java @@ -58,4 +58,9 @@ public class ReactiveInjector implements Injector { } return answer; } + + @Override + public boolean supportsAutoWiring() { + return delegate.supportsAutoWiring(); + } }
