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.git
The following commit(s) were added to refs/heads/master by this push: new 393bb26 CAMEL-13557: Fixed test to use property binding support as the old has removed the legacy JDK PropertyEditor in CAMEL-13566 393bb26 is described below commit 393bb26800e48f1a7fab60b11feb36386bf32f4e Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sat May 25 09:33:21 2019 +0200 CAMEL-13557: Fixed test to use property binding support as the old has removed the legacy JDK PropertyEditor in CAMEL-13566 --- .../org/apache/camel/component/http4/HttpComponent.java | 5 +++-- .../camel/component/hystrix/processor/HystrixReifier.java | 3 ++- .../apache/camel/component/jetty/JettyHttpEndpoint.java | 4 ++-- .../apache/camel/component/jetty9/JettyHttpComponent9.java | 4 ++-- .../component/linkedin/AbstractLinkedInTestSupport.java | 4 ++-- .../camel/component/netty4/http/NettyHttpComponent.java | 3 ++- .../org/apache/camel/component/netty4/NettyComponent.java | 3 ++- .../component/olingo2/AbstractOlingo2TestSupport.java | 4 ++-- .../component/olingo4/AbstractOlingo4TestSupport.java | 4 ++-- .../org/apache/camel/component/rest/RestComponent.java | 3 ++- .../camel/component/salesforce/SalesforceComponent.java | 14 ++++++-------- .../component/servicenow/ServiceNowMetaDataExtension.java | 4 ++-- .../camel/component/twilio/AbstractTwilioTestSupport.java | 4 ++-- .../camel/component/wordpress/WordpressComponent.java | 3 ++- .../camel/component/wordpress/WordpressEndpoint.java | 3 ++- .../component/zendesk/AbstractZendeskTestSupport.java | 4 ++-- 16 files changed, 37 insertions(+), 32 deletions(-) diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java index 14ddc5a..46c37ef 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java @@ -43,6 +43,7 @@ import org.apache.camel.spi.RestConfiguration; import org.apache.camel.spi.RestProducerFactory; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.RestProducerFactoryHelper; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.service.ServiceHelper; @@ -354,10 +355,10 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa HttpClientBuilder clientBuilder = HttpClientBuilder.create(); // allow the builder pattern httpClientOptions.putAll(IntrospectionSupport.extractProperties(parameters, "httpClient.")); - IntrospectionSupport.setProperties(clientBuilder, httpClientOptions); + PropertyBindingSupport.bindProperties(getCamelContext(), clientBuilder, httpClientOptions); // set the Request configure this way and allow the builder pattern RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); - IntrospectionSupport.setProperties(requestConfigBuilder, httpClientOptions); + PropertyBindingSupport.bindProperties(getCamelContext(), requestConfigBuilder, httpClientOptions); clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build()); // validate that we could resolve all httpClient. parameters as this component is lenient diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java index a3c24e3..8566dba 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java @@ -34,6 +34,7 @@ import org.apache.camel.model.Model; import org.apache.camel.reifier.ProcessorReifier; import org.apache.camel.spi.RouteContext; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.util.function.Suppliers; import static org.apache.camel.support.CamelContextHelper.lookup; @@ -239,7 +240,7 @@ public class HystrixReifier extends ProcessorReifier<HystrixDefinition> { HystrixConfigurationDefinition config = new HystrixConfigurationDefinition(); // Apply properties to a new configuration - IntrospectionSupport.setProperties(camelContext, camelContext.getTypeConverter(), config, properties); + PropertyBindingSupport.bindProperties(camelContext, config, properties); return config; } diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java index 3de1c6d..5cba345 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java @@ -30,7 +30,7 @@ import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.http.common.HttpCommonEndpoint; import org.apache.camel.http.common.cookie.CookieHandler; import org.apache.camel.spi.UriParam; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.SynchronousDelegateProducer; import org.apache.camel.support.jsse.SSLContextParameters; import org.eclipse.jetty.client.HttpClient; @@ -168,7 +168,7 @@ public abstract class JettyHttpEndpoint extends HttpCommonEndpoint { Map<String, Object> params = new HashMap<>(httpClientParameters); // Can not be set on httpClient for jetty 9 params.remove("timeout"); - IntrospectionSupport.setProperties(httpClient, params); + PropertyBindingSupport.bindProperties(getCamelContext(), httpClient, params); // validate we could set all parameters if (params.size() > 0) { throw new ResolveEndpointFailedException(getEndpointUri(), "There are " + params.size() diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java index 3f155ab..95183cb 100644 --- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java +++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java @@ -27,7 +27,7 @@ import org.apache.camel.component.jetty.CamelHttpClient; import org.apache.camel.component.jetty.JettyHttpComponent; import org.apache.camel.component.jetty.JettyHttpEndpoint; import org.apache.camel.spi.annotations.Component; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.eclipse.jetty.client.HttpClientTransport; import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.ConnectionFactory; @@ -102,7 +102,7 @@ public class JettyHttpComponent9 extends JettyHttpComponent { if (getSslSocketConnectorProperties() != null && "https".equals(endpoint.getProtocol())) { // must copy the map otherwise it will be deleted Map<String, Object> properties = new HashMap<>(getSslSocketConnectorProperties()); - IntrospectionSupport.setProperties(sslcf, properties); + PropertyBindingSupport.bindProperties(getCamelContext(), sslcf, properties); if (properties.size() > 0) { throw new IllegalArgumentException("There are " + properties.size() + " parameters that couldn't be set on the SocketConnector." diff --git a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java index bc95442..5574577 100644 --- a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java +++ b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java @@ -24,7 +24,7 @@ import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.component.linkedin.api.OAuthScope; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.test.junit4.CamelTestSupport; /** @@ -60,7 +60,7 @@ public class AbstractLinkedInTestSupport extends CamelTestSupport { // TODO save and load token from TEST_OPTIONS_PROPERTIES final LinkedInConfiguration configuration = new LinkedInConfiguration(); - IntrospectionSupport.setProperties(configuration, options); + PropertyBindingSupport.bindProperties(context, configuration, options); // add LinkedInComponent to Camel context final LinkedInComponent component = new LinkedInComponent(context); diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java index 4063478..d3ac545 100644 --- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java +++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java @@ -40,6 +40,7 @@ import org.apache.camel.spi.RestConsumerFactory; import org.apache.camel.spi.RestProducerFactory; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.RestProducerFactoryHelper; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.FileUtil; @@ -91,7 +92,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt if (bootstrapConfiguration != null) { Map<String, Object> options = new HashMap<>(); if (IntrospectionSupport.getProperties(bootstrapConfiguration, options, null, false)) { - IntrospectionSupport.setProperties(getCamelContext().getTypeConverter(), config, options); + PropertyBindingSupport.bindProperties(getCamelContext(), config, options); } } diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java index d6bf90f..cd7fa96 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java @@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.util.concurrent.CamelThreadFactory; @@ -84,7 +85,7 @@ public class NettyComponent extends DefaultComponent implements SSLContextParame if (bootstrapConfiguration != null) { Map<String, Object> options = new HashMap<>(); if (IntrospectionSupport.getProperties(bootstrapConfiguration, options, null, false)) { - IntrospectionSupport.setProperties(getCamelContext().getTypeConverter(), config, options); + PropertyBindingSupport.bindProperties(getCamelContext(), config, options); } } diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java index c2ccd93..8bb4343 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java +++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java @@ -23,7 +23,7 @@ import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.test.junit4.CamelTestSupport; /** @@ -57,7 +57,7 @@ public class AbstractOlingo2TestSupport extends CamelTestSupport { } final Olingo2Configuration configuration = new Olingo2Configuration(); - IntrospectionSupport.setProperties(configuration, options); + PropertyBindingSupport.bindProperties(context, configuration, options); // add OlingoComponent to Camel context final Olingo2Component component = new Olingo2Component(context); diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java index 1b007f5..6d6d813 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java +++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/AbstractOlingo4TestSupport.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.http.HttpHost; import org.apache.http.client.ClientProtocolException; @@ -56,7 +56,7 @@ public class AbstractOlingo4TestSupport extends CamelTestSupport { options.put("contentType", "application/json;charset=utf-8"); final Olingo4Configuration configuration = new Olingo4Configuration(); - IntrospectionSupport.setProperties(configuration, options); + PropertyBindingSupport.bindProperties(context, configuration, options); // add OlingoComponent to Camel context final Olingo4Component component = new Olingo4Component(context); diff --git a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java index 3e091da..915bea8 100644 --- a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java +++ b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestComponent.java @@ -31,6 +31,7 @@ import org.apache.camel.spi.RestConfiguration; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.util.FileUtil; import org.apache.camel.util.StringHelper; import org.apache.camel.util.URISupport; @@ -209,7 +210,7 @@ public class RestComponent extends DefaultComponent { } // Copy common options, will override those in conf - IntrospectionSupport.setProperties(getCamelContext(), getCamelContext().getTypeConverter(), conf, map); + PropertyBindingSupport.bindProperties(getCamelContext(), conf, map); // Merge properties mergeProperties(conf::getComponentProperties, from::getComponentProperties, conf::setComponentProperties); diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java index cd0d9f0..75e603b 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java @@ -41,7 +41,7 @@ import org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelp import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.service.ServiceHelper; @@ -668,29 +668,27 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP final SalesforceEndpointConfig modifiedConfig = Optional.ofNullable(config).map(SalesforceEndpointConfig::copy) .orElseGet(() -> new SalesforceEndpointConfig()); final CamelContext camelContext = getCamelContext(); - final TypeConverter typeConverter = camelContext.getTypeConverter(); - IntrospectionSupport.setProperties(typeConverter, modifiedConfig, properties); + PropertyBindingSupport.bindProperties(camelContext, modifiedConfig, properties); return createRestClientFor(modifiedConfig); } static RestClient createRestClient(final CamelContext camelContext, final Map<String, Object> properties) throws Exception { - final TypeConverter typeConverter = camelContext.getTypeConverter(); final SalesforceEndpointConfig config = new SalesforceEndpointConfig(); // let's work with a copy for IntrospectionSupport so original properties are intact - IntrospectionSupport.setProperties(typeConverter, config, new HashMap<>(properties)); + PropertyBindingSupport.bindProperties(camelContext, config, new HashMap<>(properties)); final SalesforceLoginConfig loginConfig = new SalesforceLoginConfig(); // let's work with a copy for IntrospectionSupport so original properties are intact - IntrospectionSupport.setProperties(typeConverter, loginConfig, new HashMap<>(properties)); + PropertyBindingSupport.bindProperties(camelContext, loginConfig, new HashMap<>(properties)); final SSLContextParameters sslContextParameters = Optional.ofNullable(camelContext.getSSLContextParameters()) .orElseGet(() -> new SSLContextParameters()); // let's work with a copy for IntrospectionSupport so original properties are intact - IntrospectionSupport.setProperties(typeConverter, sslContextParameters, new HashMap<>(properties)); + PropertyBindingSupport.bindProperties(camelContext, sslContextParameters, new HashMap<>(properties)); final SslContextFactory sslContextFactory = new SslContextFactory(); sslContextFactory.setSslContext(sslContextParameters.createSSLContext(camelContext)); @@ -724,7 +722,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP // set HTTP client parameters final TypeConverter typeConverter = camelContext.getTypeConverter(); - IntrospectionSupport.setProperties(typeConverter, httpClient, + PropertyBindingSupport.bindProperties(camelContext, httpClient, new HashMap<>(httpClientProperties)); final String httpProxyHost = typeConverter.convertTo(String.class, httpClientProperties.get(HTTP_PROXY_HOST)); diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java index c0d81d7..11d0233 100644 --- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java +++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowMetaDataExtension.java @@ -45,7 +45,7 @@ import org.apache.camel.component.extension.MetaDataExtension; import org.apache.camel.component.extension.metadata.AbstractMetaDataExtension; import org.apache.camel.component.extension.metadata.MetaDataBuilder; import org.apache.camel.component.servicenow.model.DictionaryEntry; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; import org.slf4j.Logger; @@ -564,7 +564,7 @@ final class ServiceNowMetaDataExtension extends AbstractMetaDataExtension { this.stack = new ArrayDeque<>(); try { - IntrospectionSupport.setProperties(configuration, new HashMap<>(parameters)); + PropertyBindingSupport.bindProperties(getCamelContext(), configuration, new HashMap<>(parameters)); } catch (Exception e) { throw new IllegalStateException(e); } diff --git a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java index a33c3a6..70cb0d1 100644 --- a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java +++ b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AbstractTwilioTestSupport.java @@ -23,7 +23,7 @@ import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.test.junit4.CamelTestSupport; /** @@ -54,7 +54,7 @@ public class AbstractTwilioTestSupport extends CamelTestSupport { // add TwilioComponent to Camel context final TwilioComponent component = new TwilioComponent(context); - IntrospectionSupport.setProperties(component, options); + PropertyBindingSupport.bindProperties(context, component, options); context.addComponent("twilio", component); return context; diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponent.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponent.java index 0b43451..086bd32 100644 --- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponent.java +++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponent.java @@ -25,6 +25,7 @@ import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; /** * Represents the component that manages {@link WordpressEndpoint}. @@ -84,7 +85,7 @@ public class WordpressComponent extends DefaultComponent { // create endpoint configuration with component properties WordpressComponentConfiguration config = new WordpressComponentConfiguration(); - IntrospectionSupport.setProperties(config, componentProperties); + PropertyBindingSupport.bindProperties(getCamelContext(), config, componentProperties); return config; } } diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java index aa61d5f..ad039ff 100644 --- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java +++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java @@ -39,6 +39,7 @@ import org.apache.camel.spi.UriPath; import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.support.EndpointHelper; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.util.ObjectHelper; /** @@ -130,7 +131,7 @@ public class WordpressEndpoint extends DefaultEndpoint { } return e.getValue(); })); - IntrospectionSupport.setProperties(searchCriteria, criteriaOptions); + PropertyBindingSupport.bindProperties(getCamelContext(), searchCriteria, criteriaOptions); config.setSearchCriteria(searchCriteria); } } catch (Exception e) { diff --git a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java index e3e0fb8..c628847 100644 --- a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java +++ b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Properties; import org.apache.camel.CamelContext; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.test.junit4.CamelTestSupport; /** @@ -58,7 +58,7 @@ public class AbstractZendeskTestSupport extends CamelTestSupport { options.put(entry.getKey().toString(), entry.getValue()); } - IntrospectionSupport.setProperties(configuration, options); + PropertyBindingSupport.bindProperties(context, configuration, options); } catch (Exception e) { // ignore - system property or ENV may be supplied }