You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2011/09/14 02:34:57 UTC
svn commit: r1170401 - in
/camel/branches/camel-2.8.x/components/camel-cxf/src:
main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
Author: hadrian
Date: Wed Sep 14 00:34:56 2011
New Revision: 1170401
URL: http://svn.apache.org/viewvc?rev=1170401&view=rev
Log:
checkstyle fixes
Modified:
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1170401&r1=1170400&r2=1170401&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java Wed Sep 14 00:34:56 2011
@@ -26,9 +26,9 @@ import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.component.cxf.CxfEndpointUtils;
import org.apache.camel.component.cxf.spring.SpringJAXRSClientFactoryBean;
import org.apache.camel.component.cxf.spring.SpringJAXRSServerFactoryBean;
-import org.apache.camel.component.cxf.CxfEndpointUtils;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
@@ -57,7 +57,7 @@ public class CxfRsEndpoint extends Defau
private AtomicBoolean bindingInitialized = new AtomicBoolean(false);
private AtomicBoolean getBusHasBeenCalled = new AtomicBoolean(false);
- private boolean isSetDefaultBus;
+ private boolean isSetDefaultBus;
public CxfRsEndpoint(String endpointUri, CamelContext camelContext) {
super(endpointUri, camelContext);
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java?rev=1170401&r1=1170400&r2=1170401&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java Wed Sep 14 00:34:56 2011
@@ -49,41 +49,37 @@ public class CxfRsProducerClientFactoryC
@Before
public void setUp() throws Exception {
- AbstractApplicationContext ac = new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml");
- context1 = SpringCamelContext.springCamelContext(ac, false);
- context1.start();
-
- template1 = context1.createProducerTemplate();
- template1.start();
+ AbstractApplicationContext ac = new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml");
+ context1 = SpringCamelContext.springCamelContext(ac, false);
+ context1.start();
+
+ template1 = context1.createProducerTemplate();
+ template1.start();
- ac = new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest2.xml");
- context2 = SpringCamelContext.springCamelContext(ac, false);
- context2.start();
-
- template2 = context2.createProducerTemplate();
- template2.start();
-
+ ac = new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest2.xml");
+ context2 = SpringCamelContext.springCamelContext(ac, false);
+ context2.start();
+
+ template2 = context2.createProducerTemplate();
+ template2.start();
}
@After
public void tearDown() throws Exception {
- context1.stop();
- template1.stop();
-
- context2.stop();
- template2.stop();
-
+ context1.stop();
+ template1.stop();
+
+ context2.stop();
+ template2.stop();
}
@Test
public void testGetConstumerWithHttpCentralClientAPI() throws Exception {
-
- doRunTest(template2);
- doRunTest(template1);
-
+ doRunTest(template2);
+ doRunTest(template1);
}
- private void doRunTest(ProducerTemplate template) {
+ private void doRunTest(ProducerTemplate template) {
Exchange exchange = template.send("direct://http", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.setPattern(ExchangePattern.InOut);
@@ -103,10 +99,9 @@ public class CxfRsProducerClientFactoryC
assertEquals("Get a wrong customer id ", String.valueOf(response.getId()), "123");
assertEquals("Get a wrong customer name", response.getName(), "John");
assertEquals("Get a wrong response code", 200, exchange.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE));
-
- }
+ }
- public int getPort1() {
+ public int getPort1() {
return port1;
}
}