[camel] branch master updated (b53f408 -> 7ac5f34)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (b53f408 -> 7ac5f34)

dkulp@apache.org
This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from b53f408  CAMEL-12559: camel-testcontainers : add documentation
     new e78c34d  CAMEL-12599: Upgrade to CXF 3.2.5
     new 7ac5f34  CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of copy/paste from CXF

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/camel/component/cxf/CxfEndpoint.java    | 83 +++-------------------
 parent/pom.xml                                     |  2 +-
 .../camel-spring-boot-dependencies/pom.xml         | 56 +++++++--------
 3 files changed, 37 insertions(+), 104 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[camel] 01/02: CAMEL-12599: Upgrade to CXF 3.2.5

dkulp@apache.org
This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit e78c34d02f7c461a354f5ecaf4e0e36894f9baad
Author: Peter Palaga <[hidden email]>
AuthorDate: Tue Jun 26 22:00:52 2018 +0200

    CAMEL-12599: Upgrade to CXF 3.2.5
---
 parent/pom.xml                                     |  2 +-
 .../camel-spring-boot-dependencies/pom.xml         | 56 +++++++++++-----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index d599f50..6fd6216 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -170,7 +170,7 @@
     <couchbase-client-version>1.4.13</couchbase-client-version>
     <couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
     <curator-version>2.12.0</curator-version>
-    <cxf-version>3.2.4</cxf-version>
+    <cxf-version>3.2.5</cxf-version>
     <cxf-version-range>[3.1,4.0)</cxf-version-range>
     <cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
     <cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index ab91351..6026c50 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3117,142 +3117,142 @@
       <dependency>
         <groupId>org.apache.cxf.services.sts</groupId>
         <artifactId>cxf-services-sts-core</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf.services.ws-discovery</groupId>
         <artifactId>cxf-services-ws-discovery-api</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-features-clustering</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-features-logging</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-client</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-security-oauth2</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http-jetty</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-jms</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-local</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-mex</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-rm</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security-oauth2</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-wsdl</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-testutils</artifactId>
-        <version>3.2.4</version>
+        <version>3.2.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.ftpserver</groupId>

Reply | Threaded
Open this post in threaded view
|

[camel] 02/02: CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of copy/paste from CXF

dkulp@apache.org
In reply to this post by dkulp@apache.org
This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 7ac5f347bad2049bacd619215ffcb360c85f8fca
Author: Daniel Kulp <[hidden email]>
AuthorDate: Wed Jun 27 18:50:32 2018 +0200

    CAMEL-12599 - refactor how CAMEL-12326 was handled to avoid a bunch of copy/paste from CXF
---
 .../apache/camel/component/cxf/CxfEndpoint.java    | 83 +++-------------------
 1 file changed, 8 insertions(+), 75 deletions(-)

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 81316be..58051c2 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
@@ -88,12 +88,12 @@ import org.apache.cxf.databinding.source.SourceDataBinding;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.ext.logging.AbstractLoggingInterceptor;
 import org.apache.cxf.ext.logging.LoggingFeature;
 import org.apache.cxf.feature.Feature;
 import org.apache.cxf.frontend.ClientFactoryBean;
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.headers.Header;
-import org.apache.cxf.interceptor.AbstractLoggingInterceptor;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxws.JaxWsClientFactoryBean;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
@@ -1177,85 +1177,18 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
         CamelCxfClientImpl(Bus bus, Endpoint ep) {
             super(bus, ep);
         }
-
-        public Bus getBus() {
-            return bus;
-        }
-        
+  
         @Override
         protected Object[] processResult(Message message, org.apache.cxf.message.Exchange exchange,
                                          BindingOperationInfo oi, Map<String, Object> resContext)
                                              throws Exception {
-            Exception ex = null;
-            // Check to see if there is a Fault from the outgoing chain if it's an out Message
-            if (!message.get(Message.INBOUND_MESSAGE).equals(Boolean.TRUE)) {
-                ex = message.getContent(Exception.class);
-            }
-            boolean mepCompleteCalled = false;
-            if (ex != null) {
-                completeExchange(exchange);
-                mepCompleteCalled = true;
-                if (message.getContent(Exception.class) != null) {
-                    throw ex;
-                }
-            }
-            ex = message.getExchange().get(Exception.class);
-            if (ex != null) {
-                if (!mepCompleteCalled) {
-                    completeExchange(exchange);
-                }
-                throw ex;
-            }
-
-            Integer responseCode = (Integer)exchange.get(Message.RESPONSE_CODE);
-            if (null != responseCode && 202 == responseCode) {
-                Endpoint ep = exchange.getEndpoint();
-                if (null != ep && null != ep.getEndpointInfo() && null == ep.getEndpointInfo()
-                    .getProperty("org.apache.cxf.ws.addressing.MAPAggregator.decoupledDestination")) {
-                    return null;
-                }
-            }
-
-            // Wait for a response if we need to
-            if (oi != null && !oi.getOperationInfo().isOneWay()) {
-                waitResponse(exchange);
-            }
-
-            // leave the input stream open for the caller
-            Boolean keepConduitAlive = (Boolean)exchange.get(Client.KEEP_CONDUIT_ALIVE);
-            if (keepConduitAlive == null || !keepConduitAlive) {
-                completeExchange(exchange);
-            }
-
-            // Grab the response objects if there are any
-            List<Object> resList = null;
-            Message inMsg = exchange.getInMessage();
-            if (inMsg != null) {
-                if (null != resContext) {
-                    resContext.putAll(inMsg);
-                    // remove the recursive reference if present
-                    resContext.remove(Message.INVOCATION_CONTEXT);
-                    responseContext.put(Thread.currentThread(), resContext);
-                }
-                resList = CastUtils.cast(inMsg.getContent(List.class));
-            }
-
-            // check for an incoming fault
-            ex = getException(exchange);
-
-            if (ex != null) {
-                throw ex;
-            }
-
-            if (resList != null) {
-                return resList.toArray();
+            try {
+                return super.processResult(message, exchange, oi, resContext);
+            } catch (IllegalEmptyResponseException ex) {
+                //Camel does not strickly enforce returning a value when a value is required from the WSDL/contract
+                //Thus, we'll capture the exception raised and return a null
+                return null;
             }
-
-            return null;
-        }
-
-        private void completeExchange(org.apache.cxf.message.Exchange exchange) {
-            getConduitSelector().complete(exchange);
         }
         
         @SuppressWarnings("unchecked")