You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/04/18 06:34:01 UTC
[camel] branch main updated: (chores) camel-cxf: remove unused parameters
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a3764f4f92b (chores) camel-cxf: remove unused parameters
a3764f4f92b is described below
commit a3764f4f92b5a9a0c13d63628b2adff24aa737ae
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 18 07:00:25 2023 +0200
(chores) camel-cxf: remove unused parameters
---
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java | 8 ++++----
.../component/cxf/interceptors/RawMessageWSDLGetInterceptor.java | 8 ++------
.../java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java | 4 ++--
.../org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java | 4 +---
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 3de8051a28e..bf10629cfdc 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -69,10 +69,10 @@ public class CxfRsInvoker extends JAXRSInvoker {
Continuation continuation;
if (!endpoint.isSynchronous() && (continuation = getContinuation(cxfExchange)) != null) {
LOG.trace("Calling the Camel async processors.");
- return asyncInvoke(cxfExchange, serviceObject, method, paramArray, continuation, response);
+ return asyncInvoke(cxfExchange, method, paramArray, continuation, response);
} else {
LOG.trace("Calling the Camel sync processors.");
- return syncInvoke(cxfExchange, serviceObject, method, paramArray, response);
+ return syncInvoke(cxfExchange, method, paramArray, response);
}
}
@@ -83,7 +83,7 @@ public class CxfRsInvoker extends JAXRSInvoker {
}
private Object asyncInvoke(
- Exchange cxfExchange, final Object serviceObject, Method method,
+ Exchange cxfExchange, Method method,
Object[] paramArray, final Continuation continuation, Object response)
throws Exception {
synchronized (continuation) {
@@ -136,7 +136,7 @@ public class CxfRsInvoker extends JAXRSInvoker {
}
private Object syncInvoke(
- Exchange cxfExchange, final Object serviceObject, Method method,
+ Exchange cxfExchange, Method method,
Object[] paramArray,
Object response)
throws Exception {
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
index d57b11891a6..0e3c5b493f5 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
@@ -33,7 +33,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.EndpointInfo;
/**
* Just copy the from WSDLGetInterceptor to provide backward compatible support for 2.7.x
@@ -60,7 +59,7 @@ public class RawMessageWSDLGetInterceptor extends AbstractPhaseInterceptor<Messa
String ctx = (String) message.get(Message.PATH_INFO);
Map<String, String> map = UrlUtils.parseQueryString(query);
- if (isRecognizedQuery(map, baseUri, ctx, message.getExchange().getEndpoint().getEndpointInfo())) {
+ if (isRecognizedQuery(map)) {
Document doc = getDocument(message, baseUri, map, ctx);
Endpoint e = message.getExchange().get(Endpoint.class);
@@ -109,10 +108,7 @@ public class RawMessageWSDLGetInterceptor extends AbstractPhaseInterceptor<Messa
}
}
- private boolean isRecognizedQuery(
- Map<String, String> map, String baseUri, String ctx,
- EndpointInfo endpointInfo) {
-
+ private boolean isRecognizedQuery(Map<String, String> map) {
if (map.containsKey("wsdl") || map.containsKey("xsd")) {
return true;
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
index 3e01915bde1..b1a6ec064fc 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
@@ -984,10 +984,10 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
LOG.warn("Error creating Cxf Bus from SpringBootCamelContext: {} This exception will be ignored.",
ex.getMessage(), ex);
}
- bus = CxfEndpointUtils.createBus(getCamelContext());
+ bus = CxfEndpointUtils.createBus();
}
} else {
- bus = CxfEndpointUtils.createBus(getCamelContext());
+ bus = CxfEndpointUtils.createBus();
}
this.createBus = true;
LOG.debug("Using DefaultBus {}", bus);
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
index 97c94c6e72a..1c3eff1a697 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
@@ -23,7 +23,6 @@ import jakarta.xml.ws.WebServiceProvider;
import javax.xml.namespace.QName;
-import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
import org.apache.camel.Exchange;
import org.apache.camel.component.cxf.common.message.CxfConstants;
@@ -103,9 +102,8 @@ public final class CxfEndpointUtils {
* Create a CXF bus with either BusFactory or SpringBusFactory if Camel Context is SpringCamelContext. In the latter
* case, this method updates the bus configuration with the applicationContext which SpringCamelContext holds
*
- * @param context - the Camel Context
*/
- public static Bus createBus(CamelContext context) {
+ public static Bus createBus() {
BusFactory busFactory = BusFactory.newInstance();
return busFactory.createBus();