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/12/12 12:07:43 UTC
[camel] branch master updated: CAMEL-14284: Configuring endpoint
should set properties on endpoint and not configuration object - spring-ws
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 c36f04e CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - spring-ws
c36f04e is described below
commit c36f04e758fbf5e180ec6fd57d91ad0ce3c69c8a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 12 13:07:13 2019 +0100
CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - spring-ws
---
.../spring/ws/SpringWebserviceComponent.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
index 5c04f6c..3054498 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
@@ -20,7 +20,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.SSLContextParametersAware;
@@ -45,16 +44,9 @@ import org.springframework.xml.xpath.XPathExpressionFactory;
@Component("spring-ws")
public class SpringWebserviceComponent extends DefaultComponent implements SSLContextParametersAware {
- @Metadata(label = "security", defaultValue = "false")
+ @Metadata(label = "security")
private boolean useGlobalSslContextParameters;
- public SpringWebserviceComponent() {
- }
-
- public SpringWebserviceComponent(CamelContext context) {
- super(context);
- }
-
@Override
@Deprecated
protected String preProcessUri(String uri) {
@@ -65,16 +57,19 @@ public class SpringWebserviceComponent extends DefaultComponent implements SSLCo
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
SpringWebserviceConfiguration configuration = new SpringWebserviceConfiguration();
+ // need to do this first
addConsumerConfiguration(remaining, parameters, configuration);
- setProperties(configuration, parameters);
+
+ SpringWebserviceEndpoint endpoint = new SpringWebserviceEndpoint(this, uri, configuration);
+ setProperties(endpoint, parameters);
+ // configure and setup configuration after it has its properties set via the endpoint
configureProducerConfiguration(remaining, configuration);
configureMessageFilter(configuration);
-
if (configuration.getSslContextParameters() == null) {
configuration.setSslContextParameters(retrieveGlobalSslContextParameters());
}
- return new SpringWebserviceEndpoint(this, uri, configuration);
+ return endpoint;
}
private void addConsumerConfiguration(String remaining, Map<String, Object> parameters, SpringWebserviceConfiguration configuration) {