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 2022/06/17 10:32:00 UTC
[camel] 05/14: (chores) camel-cxf: removed unused method 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
commit a3c6081b1e33372ebc02c9986a092fbd695d2ceb
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:17:00 2022 +0200
(chores) camel-cxf: removed unused method parameters
---
.../java/org/apache/camel/component/cxf/DefaultCxfBinding.java | 7 +++----
.../component/cxf/interceptors/RawMessageWSDLGetInterceptor.java | 7 ++-----
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java | 8 ++++----
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java | 4 ++--
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 09006a9ff5f..f92db1c4f3d 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -118,7 +118,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
requestContext, CxfConstants.REQUEST_CONTEXT);
// propagate headers
- propagateHeadersFromCamelToCxf(camelExchange, camelHeaders, cxfExchange,
+ propagateHeadersFromCamelToCxf(camelExchange, camelHeaders,
requestContext);
String overrideAddress = camelExchange.getIn().getHeader(CxfConstants.DESTINATION_OVERRIDE_URL, String.class);
@@ -391,7 +391,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
extractInvocationContextFromCamel(camelExchange, camelHeaders,
responseContext, CxfConstants.RESPONSE_CONTEXT);
- propagateHeadersFromCamelToCxf(camelExchange, camelHeaders, cxfExchange,
+ propagateHeadersFromCamelToCxf(camelExchange, camelHeaders,
responseContext);
if (cxfExchange.getOutMessage() != null) {
cxfExchange.getOutMessage().put(CxfConstants.PROTOCOL_HEADERS, responseContext.get(CxfConstants.PROTOCOL_HEADERS));
@@ -432,7 +432,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
extractInvocationContextFromCamel(camelExchange, camelHeaders,
responseContext, CxfConstants.RESPONSE_CONTEXT);
- propagateHeadersFromCamelToCxf(camelExchange, camelHeaders, cxfExchange,
+ propagateHeadersFromCamelToCxf(camelExchange, camelHeaders,
responseContext);
// create out message
Endpoint ep = cxfExchange.get(Endpoint.class);
@@ -750,7 +750,6 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
protected void propagateHeadersFromCamelToCxf(
Exchange camelExchange,
Map<String, Object> camelHeaders,
- org.apache.cxf.message.Exchange cxfExchange,
Map<String, Object> cxfContext) {
// get cxf transport headers (if any) from camel exchange
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
index d57b11891a6..e3107f5aff8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
+++ b/components/camel-cxf/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,9 +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/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 8e8a2d8d321..0c18bfe4a9c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++ b/components/camel-cxf/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/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index ec80fc864d0..82e0da8efa0 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -587,7 +587,7 @@ public class CxfRsProducer extends DefaultAsyncProducer {
CxfOperationException exception;
String uri = exchange.getFromEndpoint().getEndpointUri();
String statusText = statusTextFromResponseCode(responseCode);
- Map<String, String> headers = parseResponseHeaders(response, exchange);
+ Map<String, String> headers = parseResponseHeaders(response);
//Get the response detail string
String copy = exchange.getContext().getTypeConverter().convertTo(String.class, response.getEntity());
if (responseCode >= 300 && responseCode < 400) {
@@ -632,7 +632,7 @@ public class CxfRsProducer extends DefaultAsyncProducer {
return Response.Status.Family.familyOf(responseCode).name();
}
- protected Map<String, String> parseResponseHeaders(Object response, Exchange camelExchange) {
+ protected Map<String, String> parseResponseHeaders(Object response) {
Map<String, String> answer = new HashMap<>();
if (response instanceof Response) {