This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch 13557 in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/13557 by this push: new d008968 CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot. d008968 is described below commit d008968ad2c320b7fd11575d990ea6ad73838fd7 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu May 23 21:36:56 2019 +0200 CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot. --- .../org/apache/camel/model/ProcessorDefinitionHelper.java | 4 ++-- .../camel/management/JmxManagementStrategyFactory.java | 1 - .../verifier/DefaultComponentVerifierExtension.java | 2 -- .../org/apache/camel/support/PropertyBindingSupport.java | 15 +-------------- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java index 8852307..b0f55c5 100644 --- a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java +++ b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java @@ -647,8 +647,8 @@ public final class ProcessorDefinitionHelper { try { // do not use property placeholders as we want to preserve the text as-is when we restore PropertyBindingSupport.build() - .withPlaceholder(false).withNesting(false).withReference(false).withTarget(target).withProperties(properties) - .bind(context); + .withPlaceholder(false).withNesting(false).withReference(false) + .bind(context, target, properties); } catch (Exception e) { LOG.warn("Cannot restore definition properties. This exception is ignored.", e); } diff --git a/core/camel-management-impl/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java b/core/camel-management-impl/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java index b0dfde0..1a8052a 100644 --- a/core/camel-management-impl/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java +++ b/core/camel-management-impl/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java @@ -22,7 +22,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.spi.LifecycleStrategy; import org.apache.camel.spi.ManagementStrategy; import org.apache.camel.spi.ManagementStrategyFactory; -import org.apache.camel.support.IntrospectionSupport; import org.apache.camel.support.PropertyBindingSupport; /** diff --git a/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/DefaultComponentVerifierExtension.java b/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/DefaultComponentVerifierExtension.java index 9e751de..c473b77 100644 --- a/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/DefaultComponentVerifierExtension.java +++ b/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/DefaultComponentVerifierExtension.java @@ -25,12 +25,10 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.Component; import org.apache.camel.ComponentAware; -import org.apache.camel.TypeConverter; import org.apache.camel.component.extension.ComponentVerifierExtension; import org.apache.camel.runtimecatalog.EndpointValidationResult; import org.apache.camel.runtimecatalog.RuntimeCamelCatalog; import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.support.EndpointHelper; import org.apache.camel.support.IntrospectionSupport; import org.apache.camel.support.PropertyBindingSupport; diff --git a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java index cd03b63..14e6a37 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java @@ -57,9 +57,6 @@ public final class PropertyBindingSupport { private boolean placeholder = true; private boolean fluentBuilder = true; - private Object target; - private Map<String, Object> properties; - public Builder withNesting(boolean nesting) { this.nesting = nesting; return this; @@ -80,17 +77,7 @@ public final class PropertyBindingSupport { return this; } - public Builder withTarget(Object target) { - this.target = target; - return this; - } - - public Builder withProperties(Map<String, Object> properties) { - this.properties = properties; - return this; - } - - public boolean bind(CamelContext camelContext) { + public boolean bind(CamelContext camelContext, Object target, Map<String, Object> properties) { org.apache.camel.util.ObjectHelper.notNull(camelContext, "camelContext"); org.apache.camel.util.ObjectHelper.notNull(target, "target"); org.apache.camel.util.ObjectHelper.notNull(properties, "properties");