This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13947 in repository https://gitbox.apache.org/repos/asf/camel.git
commit c2269c5931f80ebdaa754362718e47275b2b2043 Author: Claus Ibsen <[email protected]> AuthorDate: Wed Sep 25 22:23:53 2019 +0200 CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features. --- .../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java | 5 ----- .../org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java | 1 - 2 files changed, 6 deletions(-) diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java index c241ffd..38ed198 100644 --- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java +++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java @@ -258,10 +258,6 @@ public class CamelNamespaceHandler implements NamespaceHandler { CamelContextFactoryBean ccfb = (CamelContextFactoryBean) value; ccfb.setImplicitId(implicitId); - // The properties component is always used / created by the CamelContextFactoryBean - // so we need to ensure that the resolver is ready to use - ComponentMetadata propertiesComponentResolver = getComponentResolverReference(context, "properties"); - MutablePassThroughMetadata factory = context.createMetadata(MutablePassThroughMetadata.class); factory.setId(".camelBlueprint.passThrough." + contextId); factory.setObject(new PassThroughCallable<>(value)); @@ -274,7 +270,6 @@ public class CamelNamespaceHandler implements NamespaceHandler { factory2.setDestroyMethod("destroy"); factory2.addProperty("blueprintContainer", createRef(context, "blueprintContainer")); factory2.addProperty("bundleContext", createRef(context, "blueprintBundleContext")); - factory2.addDependsOn(propertiesComponentResolver.getId()); // We need to add other components which the camel context dependsOn if (org.apache.camel.util.ObjectHelper.isNotEmpty(ccfb.getDependsOn())) { factory2.setDependsOn(Arrays.asList(ccfb.getDependsOn().split(" |,"))); diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java index a00aabb..b55536b 100644 --- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java +++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java @@ -340,7 +340,6 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport { return new KeyValueHolder<>(name, new KeyValueHolder<>(service, dict)); } - /** * Creates a holder for the given service, which make it easier to use {@link #addServicesOnStartup(java.util.Map)} */
