[
https://issues.apache.org/jira/browse/CAMEL-12252?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16403673#comment-16403673
]
ASF GitHub Bot commented on CAMEL-12252:
----------------------------------------
aldettinger closed pull request #2256: CAMEL-12252: Corrected a bug in the URL
override mechanism
URL: https://github.com/apache/camel/pull/2256
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
index fa96d3c874c..d10d6c52848 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpoint.java
@@ -18,25 +18,31 @@
package org.apache.camel.component.cxf.jaxrs;
import org.apache.camel.Component;
+import org.apache.camel.component.cxf.spring.SpringJAXRSClientFactoryBean;
+import org.apache.camel.spring.SpringCamelContext;
+import org.apache.cxf.configuration.spring.ConfigurerImpl;
import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+import org.springframework.context.ApplicationContext;
public class CxfRsSpringEndpoint extends CxfRsEndpoint implements BeanIdAware {
private AbstractJAXRSFactoryBean bean;
+ private ConfigurerImpl configurer;
private String beanId;
-
- @Deprecated
+
+ @Deprecated
/**
* It will be removed in Camel 3.0
+ *
* @param comp
* @param bean
*/
public CxfRsSpringEndpoint(Component component, AbstractJAXRSFactoryBean
bean) throws Exception {
- super(bean.getAddress(), component);
+ super(bean.getAddress(), component);
init(bean);
}
-
+
public CxfRsSpringEndpoint(Component component, String uri,
AbstractJAXRSFactoryBean bean) throws Exception {
super(uri, component);
setAddress(bean.getAddress());
@@ -44,31 +50,40 @@ public CxfRsSpringEndpoint(Component component, String uri,
AbstractJAXRSFactory
bean.setAddress(getAddress());
init(bean);
}
-
+
private void init(AbstractJAXRSFactoryBean bean) {
this.bean = bean;
if (bean instanceof BeanIdAware) {
setBeanId(((BeanIdAware)bean).getBeanId());
}
+
+ ApplicationContext applicationContext =
((SpringCamelContext)getCamelContext()).getApplicationContext();
+ configurer = new ConfigurerImpl(applicationContext);
}
-
+
@Override
protected JAXRSServerFactoryBean newJAXRSServerFactoryBean() {
checkBeanType(bean, JAXRSServerFactoryBean.class);
return (JAXRSServerFactoryBean)bean;
}
-
+
@Override
protected JAXRSClientFactoryBean newJAXRSClientFactoryBean() {
- checkBeanType(bean, JAXRSClientFactoryBean.class);
- return (JAXRSClientFactoryBean)bean;
+ return new SpringJAXRSClientFactoryBean();
}
-
+
+ @Override
+ protected void setupJAXRSClientFactoryBean(JAXRSClientFactoryBean cfb,
String address) {
+ configurer.configureBean(beanId, cfb);
+ cfb.setAddress(address);
+ cfb.setThreadSafe(true);
+ }
+
public String getBeanId() {
return beanId;
}
-
- public void setBeanId(String id) {
+
+ public void setBeanId(String id) {
this.beanId = id;
}
}
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
index 4690778bcd2..9f9d5c360cf 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
@@ -30,7 +30,7 @@
public class CxfRsProducerAddressOverrideTest extends CamelSpringTestSupport {
private static int port1 = CXFTestSupport.getPort1();
- private static int port2 =
CXFTestSupport.getPort("CxfRsProducerAddressOverrideTest.jetty");
+ private static int port2 =
CXFTestSupport.getPort("CxfRsProducerAddressOverrideTest.jetty");
public int getPort1() {
return port1;
}
@@ -39,7 +39,7 @@ public int getPort2() {
}
@Override
- protected AbstractXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducerAddressOverride.xml");
}
@@ -84,7 +84,7 @@ public void process(Exchange exchange) throws Exception {
// set the Http method
inMessage.setHeader(Exchange.HTTP_METHOD, "GET");
// set the relative path
- inMessage.setHeader(Exchange.HTTP_PATH,
"/customerservice/customers/123");
+ inMessage.setHeader(Exchange.HTTP_PATH,
"/customerservice/customers/123");
// Specify the response class , cxfrs will use InputStream as
the response object type
inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS,
Customer.class);
setupDestinationURL(inMessage);
@@ -115,7 +115,7 @@ public void process(Exchange exchange) throws Exception {
setupDestinationURL(inMessage);
}
});
-
+
// get the response message
Customer response = (Customer) exchange.getOut().getBody();
@@ -123,7 +123,7 @@ public void process(Exchange exchange) throws Exception {
assertEquals("Get a wrong customer id ", 123, response.getId());
assertEquals("Get a wrong customer name", "John", response.getName());
}
-
+
@Test
public void testGetCustomerWithAsyncHttpAPIByOverrideDest() {
Exchange exchange = template.send("cxfrs:bean:rsClientHttp", new
Processor() {
@@ -135,18 +135,61 @@ public void process(Exchange exchange) throws Exception {
// set the Http method
inMessage.setHeader(Exchange.HTTP_METHOD, "GET");
// set the relative path
- inMessage.setHeader(Exchange.HTTP_PATH,
"/customerservice/customers/123");
- // Specify the response class , cxfrs will use InputStream as
the response object type
+ inMessage.setHeader(Exchange.HTTP_PATH,
"/customerservice/customers/123");
+ // Specify the response class , cxfrs will use InputStream as
+ // the response object type
inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS,
Customer.class);
setupDestinationURL(inMessage);
}
});
-
- // get the response message
- Customer response = (Customer) exchange.getOut().getBody();
-
+
+ // get the response message
+ Customer response = (Customer)exchange.getOut().getBody();
+
assertNotNull("The response should not be null", response);
assertEquals("Get a wrong customer id ", 123, response.getId());
assertEquals("Get a wrong customer name", "John", response.getName());
}
+
+ @Test
+ public void testAddressMultiOverride() {
+ // First call with override url
+ Exchange exchange = template.send("direct://http", new
SendProcessor("http://localhost:"; + getPort1() +
"/CxfRsProducerAddressOverrideTest"));
+ // get the response message
+ Customer response = exchange.getOut().getBody(Customer.class);
+ assertNotNull("The response should not be null ", response);
+
+ // Second call with override url
+ exchange = template.send("direct://http", new
SendProcessor("http://localhost:"; + getPort1() +
"/CxfRsProducerNonExistingAddressOverrideTest"));
+
+ // Third call with override url ( we reuse the first url there )
+ exchange = template.send("direct://http", new
SendProcessor("http://localhost:"; + getPort1() +
"/CxfRsProducerAddressOverrideTest"));
+ // get the response message
+ response = exchange.getOut().getBody(Customer.class);
+ assertNotNull("The response should not be null ", response);
+ }
+
+ class SendProcessor implements Processor {
+ private String address;
+
+ public SendProcessor(String address) {
+ this.address = address;
+ }
+
+ public void process(Exchange exchange) throws Exception {
+ exchange.setPattern(ExchangePattern.InOut);
+ Message inMessage = exchange.getIn();
+
+ // using the http central client API
+ inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_USING_HTTP_API,
Boolean.TRUE);
+ // set the Http method
+ inMessage.setHeader(Exchange.HTTP_METHOD, "GET");
+ // set the relative path
+ inMessage.setHeader(Exchange.HTTP_PATH,
"/customerservice/customers/123");
+ // Specify the response class , cxfrs will use InputStream as the
+ // response object type
+ inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS,
Customer.class);
+ inMessage.setHeader(Exchange.DESTINATION_OVERRIDE_URL, address);
+ }
+ }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Dynamic setting the DESTINATION_OVERRIDE_URL doesn't work on CXFRS producer
> ---------------------------------------------------------------------------
>
> Key: CAMEL-12252
> URL: https://issues.apache.org/jira/browse/CAMEL-12252
> Project: Camel
> Issue Type: Bug
> Components: camel-cxfrs
> Affects Versions: 2.17.0, 2.18.5, 2.19.4, 2.20.2
> Environment: Java 8
> Reporter: Xilai Dai
> Assignee: Alex Dettinger
> Priority: Major
>
> Given the sample MyProcessor, setting the DESTINATION_OVERRIDE_URL
> dynamically during the invoke:
> {code}
> public void process(Exchange exchange) throws Exception {
> String env = (String)exchange.getIn().getHeader("Environnement");
> if (env.equalsIgnoreCase("DEV")) {
> exchange.getIn().setHeader(exchange.DESTINATION_OVERRIDE_URL,
> "http://esbdev11.local:8080/server1/metaServlet";);
> } else {
> exchange.getIn().setHeader(exchange.DESTINATION_OVERRIDE_URL,
> "http://esblab11.local:8080/server2/metaServlet";);
> }
> }
> {code}
> Given the sample Route:
> {code}
> from("cxfrs:bean:MyREST")
> .process(new HeaderProcessor())
> .setHeader("Environnement")
> .simple("${header.http_query[env][0]}")
> .process(new MyProcessor())
> .setHeader(org.apache.camel.Exchange.HTTP_METHOD, constant("GET"))
> .setHeader(org.apache.camel.Exchange.ACCEPT_CONTENT_TYPE,
> constant("*/*"))
> .setHeader(org.apache.camel.Exchange.HTTP_PATH, constant("/"))
> .to("cxfrs:bean:restClient?maxClientCacheSize=5");
> {code}
> Send request to cxfrs:bean:MyREST with different http header "dev", then the
> cxfrs:bean:restClient always make call to the last setting Address.
> (Only it works as expected when setting maxClientCacheSize=0 on the
> cxfrs:bean:restClient)
> There is no this issue on Camel 2.16.x, but start problem from Camel 2.17.x
> and later versions. Investigations show that the CxfRsEndpoint becoming
> Singleton after CAMEL-9628, that explain why the last Address setting always
> applied.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
