camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/3] camel git commit: CAMEL-8103 polish the code, removed the CamelContextAware interface as the DefaultEndpoint already implements it
Date Tue, 02 Dec 2014 12:44:32 GMT
CAMEL-8103 polish the code, removed the CamelContextAware interface as the DefaultEndpoint
already implements it


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0a9fa98e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0a9fa98e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0a9fa98e

Branch: refs/heads/master
Commit: 0a9fa98e79107dbb77b44d97d75a35e79728441e
Parents: 897805a
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Dec 2 20:42:21 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Dec 2 20:44:15 2014 +0800

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cxf/CxfEndpoint.java    | 3 +--
 .../component/cxf/CxfJavaOnlyCamelContextAwareTest.java     | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0a9fa98e/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index e6abc2a..dffc1d7 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -43,7 +43,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
 import org.apache.camel.CamelException;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -113,7 +112,7 @@ import org.slf4j.LoggerFactory;
  * mode is {@link DataFormat#POJO}.
  */
 @UriEndpoint(scheme = "cxf", consumerClass = CxfConsumer.class, label = "http,soap,webservice")
-public class CxfEndpoint extends DefaultEndpoint implements CamelContextAware, HeaderFilterStrategyAware,
Service, Cloneable {
+public class CxfEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware, Service,
Cloneable {
 
     private static final Logger LOG = LoggerFactory.getLogger(CxfEndpoint.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/0a9fa98e/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyCamelContextAwareTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyCamelContextAwareTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyCamelContextAwareTest.java
index 71acc66..4c91dbf 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyCamelContextAwareTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyCamelContextAwareTest.java
@@ -16,11 +16,14 @@
  */
 
 package org.apache.camel.component.cxf;
+
 import javax.xml.namespace.QName;
+
 import org.w3c.dom.Document;
+
+import org.apache.camel.CamelContextAware;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.CamelContextAware;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
@@ -65,8 +68,8 @@ public class CxfJavaOnlyCamelContextAwareTest extends CamelTestSupport {
             public void configure() throws Exception {
                 CxfEndpoint endpoint = new CxfEndpoint();
                 endpoint.setAddress("http://localhost:" + port1 + "/PersonService");
-                endpoint.setServiceName(new QName("http://camel.apache.org/wsdl-first","PersonService"));
-                endpoint.setPortName(new QName("http://camel.apache.org/wsdl-first","soap"));
+                endpoint.setServiceName(new QName("http://camel.apache.org/wsdl-first", "PersonService"));
+                endpoint.setPortName(new QName("http://camel.apache.org/wsdl-first", "soap"));
                 endpoint.setWsdlURL("classpath:person.wsdl");
                 endpoint.setDataFormat(DataFormat.PAYLOAD);
                 context.addEndpoint("personService", endpoint);


Mime
View raw message