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 2019/08/31 08:08:39 UTC
[camel] branch master updated: CAMEL-13913: camel3 - components -
Use BeanIntrospection instead of IntrospectionSupport
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 a2fd6ad CAMEL-13913: camel3 - components - Use BeanIntrospection instead of IntrospectionSupport
a2fd6ad is described below
commit a2fd6ad6ef25cff793e4f69a0fcc5e0d7bf79f06
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Aug 31 09:52:20 2019 +0200
CAMEL-13913: camel3 - components - Use BeanIntrospection instead of IntrospectionSupport
---
.../apache/camel/component/activemq/ActiveMQComponent.java | 6 +++---
.../java/org/apache/camel/component/ahc/AhcComponent.java | 10 +++++-----
.../atomix/client/AbstractAtomixClientComponent.java | 6 +++---
.../org/apache/camel/component/aws/swf/SWFComponent.java | 8 ++++----
.../java/org/apache/camel/component/bean/BeanComponent.java | 4 ++--
.../apache/camel/component/beanclass/ClassComponent.java | 4 ++--
.../java/org/apache/camel/component/cxf/CxfComponent.java | 11 +++++------
.../org/apache/camel/component/elsql/ElsqlComponent.java | 4 ++--
.../java/org/apache/camel/component/fop/FopProducer.java | 13 ++++++-------
9 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
index 25f8980..7f6df6e 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
@@ -30,8 +30,8 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.jms.JmsConfiguration;
import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.PropertiesHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +45,7 @@ import org.springframework.jms.core.JmsTemplate;
@Component("activemq")
public class ActiveMQComponent extends JmsComponent {
private static final transient Logger LOG = LoggerFactory.getLogger(ActiveMQComponent.class);
- DestinationSource source;
+ private DestinationSource source;
private boolean exposeAllQueues;
private CamelEndpointLoader endpointLoader;
private EnhancedConnection connection;
@@ -169,7 +169,7 @@ public class ActiveMQComponent extends JmsComponent {
protected String convertPathToActualDestination(String path, Map<String, Object> parameters) {
// support ActiveMQ destination options using the destination. prefix
// http://activemq.apache.org/destination-options.html
- Map options = IntrospectionSupport.extractProperties(parameters, "destination.");
+ Map options = PropertiesHelper.extractProperties(parameters, "destination.");
String query;
try {
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
index 137856b..5cfd740 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
@@ -25,9 +25,9 @@ import org.apache.camel.SSLContextParametersAware;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.HeaderFilterStrategyComponent;
-import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.PropertiesHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.asynchttpclient.AsyncHttpClient;
@@ -83,7 +83,7 @@ public class AhcComponent extends HeaderFilterStrategyComponent implements SSLCo
setProperties(endpoint, parameters);
- if (IntrospectionSupport.hasProperties(parameters, CLIENT_CONFIG_PREFIX)) {
+ if (PropertiesHelper.hasProperties(parameters, CLIENT_CONFIG_PREFIX)) {
DefaultAsyncHttpClientConfig.Builder builder = endpoint.getClientConfig() == null
? new DefaultAsyncHttpClientConfig.Builder() : AhcComponent.cloneConfig(endpoint.getClientConfig());
@@ -103,10 +103,10 @@ public class AhcComponent extends HeaderFilterStrategyComponent implements SSLCo
// special for realm builder
Builder realmBuilder = null;
- if (IntrospectionSupport.hasProperties(parameters, CLIENT_REALM_CONFIG_PREFIX)) {
+ if (PropertiesHelper.hasProperties(parameters, CLIENT_REALM_CONFIG_PREFIX)) {
// set and validate additional parameters on client config
- Map<String, Object> realmParams = IntrospectionSupport.extractProperties(parameters, CLIENT_REALM_CONFIG_PREFIX);
+ Map<String, Object> realmParams = PropertiesHelper.extractProperties(parameters, CLIENT_REALM_CONFIG_PREFIX);
// copy the parameters for the endpoint to have
endpoint.setClientConfigRealmOptions(new LinkedHashMap<>(realmParams));
@@ -127,7 +127,7 @@ public class AhcComponent extends HeaderFilterStrategyComponent implements SSLCo
}
// set and validate additional parameters on client config
- Map<String, Object> clientParams = IntrospectionSupport.extractProperties(parameters, CLIENT_CONFIG_PREFIX);
+ Map<String, Object> clientParams = PropertiesHelper.extractProperties(parameters, CLIENT_CONFIG_PREFIX);
// copy the parameters for the endpoint to have
endpoint.setClientConfigOptions(new LinkedHashMap<>(clientParams));
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientComponent.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientComponent.java
index 88b2fee..43562f2 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientComponent.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientComponent.java
@@ -25,7 +25,7 @@ import io.atomix.catalyst.transport.Address;
import org.apache.camel.CamelContext;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.EndpointHelper;
-import org.apache.camel.support.IntrospectionSupport;
+import org.apache.camel.util.PropertiesHelper;
public abstract class AbstractAtomixClientComponent<C extends AtomixClientConfiguration> extends DefaultComponent {
protected AbstractAtomixClientComponent() {
@@ -83,7 +83,7 @@ public abstract class AbstractAtomixClientComponent<C extends AtomixClientConfig
protected C setConfigurationProperties(C configuration, Map<String, Object> parameters) throws Exception {
// Resolve config for named maps
- Map<String, Object> configs = IntrospectionSupport.extractProperties(parameters, "resource.config.");
+ Map<String, Object> configs = PropertiesHelper.extractProperties(parameters, "resource.config.");
for (Map.Entry<String, Object> entry : configs.entrySet()) {
String ref = (String)entry.getValue();
if (!EndpointHelper.isReferenceParameter(ref)) {
@@ -96,7 +96,7 @@ public abstract class AbstractAtomixClientComponent<C extends AtomixClientConfig
}
// Resolve options for named maps
- Map<String, Object> options = IntrospectionSupport.extractProperties(parameters, "resource.options.");
+ Map<String, Object> options = PropertiesHelper.extractProperties(parameters, "resource.options.");
for (Map.Entry<String, Object> entry : options.entrySet()) {
String ref = (String)entry.getValue();
if (!EndpointHelper.isReferenceParameter(ref)) {
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
index 3e5bd11..51cb967 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
@@ -26,8 +26,8 @@ import org.apache.camel.Endpoint;
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.util.ObjectHelper;
+import org.apache.camel.util.PropertiesHelper;
@Component("aws-swf")
public class SWFComponent extends DefaultComponent {
@@ -54,9 +54,9 @@ public class SWFComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- Map<String, Object> clientConfigurationParameters = IntrospectionSupport.extractProperties(parameters, "clientConfiguration.");
- Map<String, Object> sWClientParameters = IntrospectionSupport.extractProperties(parameters, "sWClient.");
- Map<String, Object> startWorkflowOptionsParameters = IntrospectionSupport.extractProperties(parameters, "startWorkflowOptions.");
+ Map<String, Object> clientConfigurationParameters = PropertiesHelper.extractProperties(parameters, "clientConfiguration.");
+ Map<String, Object> sWClientParameters = PropertiesHelper.extractProperties(parameters, "sWClient.");
+ Map<String, Object> startWorkflowOptionsParameters = PropertiesHelper.extractProperties(parameters, "startWorkflowOptions.");
SWFConfiguration configuration = this.configuration.copy();
configuration.setType(remaining);
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
index 19a111d..5b27e1b 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
@@ -21,9 +21,9 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.support.LRUCache;
import org.apache.camel.support.LRUCacheFactory;
+import org.apache.camel.util.PropertiesHelper;
/**
* The <a href="http://camel.apache.org/bean.html">Bean Component</a> is for invoking Java beans from Camel.
@@ -53,7 +53,7 @@ public class BeanComponent extends DefaultComponent {
setProperties(endpoint, parameters);
// the bean.xxx options is for the bean
- Map<String, Object> options = IntrospectionSupport.extractProperties(parameters, "bean.");
+ Map<String, Object> options = PropertiesHelper.extractProperties(parameters, "bean.");
endpoint.setParameters(options);
return endpoint;
}
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java b/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
index 2c59d6b..5cb9201 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
@@ -23,7 +23,7 @@ import org.apache.camel.component.bean.BeanComponent;
import org.apache.camel.component.bean.BeanHolder;
import org.apache.camel.component.bean.ConstantBeanHolder;
import org.apache.camel.component.bean.ConstantTypeBeanHolder;
-import org.apache.camel.support.IntrospectionSupport;
+import org.apache.camel.util.PropertiesHelper;
/**
* The <a href="http://camel.apache.org/class.html">Class Component</a> is for binding JavaBeans to Camel message exchanges based on class name.
@@ -46,7 +46,7 @@ public class ClassComponent extends BeanComponent {
Class<?> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(name);
// the bean.xxx options is for the bean
- Map<String, Object> options = IntrospectionSupport.extractProperties(parameters, "bean.");
+ Map<String, Object> options = PropertiesHelper.extractProperties(parameters, "bean.");
endpoint.setParameters(options);
BeanHolder holder;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
index 03d1342..31a679b 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.HeaderFilterStrategyComponent;
-import org.apache.camel.support.IntrospectionSupport;
+import org.apache.camel.util.PropertiesHelper;
import org.apache.cxf.message.Message;
/**
@@ -120,13 +120,12 @@ public class CxfComponent extends HeaderFilterStrategyComponent implements SSLCo
setProperties(result, parameters);
// extract the properties.xxx and set them as properties
- Map<String, Object> properties = IntrospectionSupport.extractProperties(parameters, "properties.");
- if (properties != null) {
- result.setProperties(properties);
- }
+ Map<String, Object> properties = PropertiesHelper.extractProperties(parameters, "properties.");
+ result.setProperties(properties);
+
if (result.getProperties() != null) {
// set the properties of MTOM
- result.setMtomEnabled(Boolean.valueOf((String) result.getProperties().get(Message.MTOM_ENABLED)));
+ result.setMtomEnabled(Boolean.parseBoolean((String) result.getProperties().get(Message.MTOM_ENABLED)));
}
// use global ssl config if set
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
index 7dcc368..1065bf5 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
@@ -25,8 +25,8 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
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.PropertiesHelper;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@Component("elsql")
@@ -63,7 +63,7 @@ public class ElsqlComponent extends DefaultComponent {
}
NamedParameterJdbcTemplate jdbcTemplate = new NamedParameterJdbcTemplate(target);
- Map<String, Object> params = IntrospectionSupport.extractProperties(parameters, "template.");
+ Map<String, Object> params = PropertiesHelper.extractProperties(parameters, "template.");
PropertyBindingSupport.bindProperties(getCamelContext(), jdbcTemplate, params);
String elsqlName = remaining;
diff --git a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
index 2101f1c..712fdf0 100644
--- a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
+++ b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
@@ -31,8 +31,8 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.support.PropertyBindingSupport;
+import org.apache.camel.util.PropertiesHelper;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
@@ -99,9 +99,8 @@ public class FopProducer extends DefaultProducer {
}
@SuppressWarnings("unchecked")
- private void setEncryptionParameters(FOUserAgent userAgent, Map<String, Object> headers)
- throws Exception {
- Map<String, Object> encryptionParameters = IntrospectionSupport
+ private void setEncryptionParameters(FOUserAgent userAgent, Map<String, Object> headers) {
+ Map<String, Object> encryptionParameters = PropertiesHelper
.extractProperties(headers, FopConstants.CAMEL_FOP_ENCRYPT);
if (!encryptionParameters.isEmpty()) {
PDFEncryptionParams encryptionParams = new PDFEncryptionParams();
@@ -111,14 +110,14 @@ public class FopProducer extends DefaultProducer {
}
private void setUserAgentRendererOptions(FOUserAgent userAgent, Map<String, Object> headers) {
- Map<String, Object> parameters = IntrospectionSupport.extractProperties(headers, FopConstants.CAMEL_FOP_RENDERER_OPTIONS);
+ Map<String, Object> parameters = PropertiesHelper.extractProperties(headers, FopConstants.CAMEL_FOP_RENDERER_OPTIONS);
if (!parameters.isEmpty()) {
userAgent.getRendererOptions().putAll(parameters);
}
}
- private void setRenderParameters(FOUserAgent userAgent, Map<String, Object> headers) throws Exception {
- Map<String, Object> parameters = IntrospectionSupport.extractProperties(headers, FopConstants.CAMEL_FOP_RENDER);
+ private void setRenderParameters(FOUserAgent userAgent, Map<String, Object> headers) {
+ Map<String, Object> parameters = PropertiesHelper.extractProperties(headers, FopConstants.CAMEL_FOP_RENDER);
if (!parameters.isEmpty()) {
PropertyBindingSupport.bindProperties(getEndpoint().getCamelContext(), userAgent, parameters);
}