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/23 07:59:02 UTC
[camel] 02/02: (chores) camel-core-processor: removed 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
commit a987a493e8450f420204eb471077dd728b8d978e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jun 23 07:56:42 2022 +0200
(chores) camel-core-processor: removed unused parameters
---
.../src/main/java/org/apache/camel/processor/CatchProcessor.java | 3 +--
.../src/main/java/org/apache/camel/processor/RestBindingAdvice.java | 4 ++--
.../apache/camel/processor/errorhandler/RedeliveryErrorHandler.java | 4 ++--
.../src/main/java/org/apache/camel/reifier/CatchReifier.java | 2 +-
.../src/main/java/org/apache/camel/reifier/OnExceptionReifier.java | 2 +-
.../apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java | 4 ++--
.../apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java | 4 ++--
7 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/CatchProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/CatchProcessor.java
index 8b7ad4df738..b13fc20f890 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/CatchProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/CatchProcessor.java
@@ -47,8 +47,7 @@ public class CatchProcessor extends DelegateAsyncProcessor implements Traceable,
private final List<Class<? extends Throwable>> exceptions;
private final Predicate onWhen;
- public CatchProcessor(List<Class<? extends Throwable>> exceptions, Processor processor, Predicate onWhen,
- Predicate handled) {
+ public CatchProcessor(List<Class<? extends Throwable>> exceptions, Processor processor, Predicate onWhen) {
super(processor);
this.exceptions = exceptions;
this.onWhen = onWhen;
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
index 983664a76be..8ddfedefeba 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
@@ -146,7 +146,7 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
@Override
public void after(Exchange exchange, Map<String, Object> state) throws Exception {
if (enableCORS) {
- setCORSHeaders(exchange, state);
+ setCORSHeaders(exchange);
}
if (state.get(STATE_KEY_DO_MARSHAL) != null) {
marshal(exchange, state);
@@ -515,7 +515,7 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
}
}
- private void setCORSHeaders(Exchange exchange, Map<String, Object> state) {
+ private void setCORSHeaders(Exchange exchange) {
// add the CORS headers after routing, but before the consumer writes the response
Message msg = exchange.getMessage();
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index 2bdff91e388..2777c48bce9 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -1040,7 +1040,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport
logFailedDelivery(true, false, false, false, isDeadLetterChannel(), exchange, msg, e);
}
- redeliveryCounter = incrementRedeliveryCounter(exchange, e);
+ redeliveryCounter = incrementRedeliveryCounter(exchange);
}
/**
@@ -1519,7 +1519,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport
/**
* Increments the redelivery counter and adds the redelivered flag if the message has been redelivered
*/
- private int incrementRedeliveryCounter(Exchange exchange, Throwable e) {
+ private int incrementRedeliveryCounter(Exchange exchange) {
Message in = exchange.getIn();
Integer counter = in.getHeader(Exchange.REDELIVERY_COUNTER, Integer.class);
int next = counter != null ? counter + 1 : 1;
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/CatchReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/CatchReifier.java
index f8d800992cd..3890a42f5cd 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/CatchReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/CatchReifier.java
@@ -58,7 +58,7 @@ public class CatchReifier extends ProcessorReifier<CatchDefinition> {
when = createPredicate(definition.getOnWhen().getExpression());
}
- return new CatchProcessor(definition.getExceptionClasses(), childProcessor, when, null);
+ return new CatchProcessor(definition.getExceptionClasses(), childProcessor, when);
}
protected List<Class<? extends Throwable>> createExceptionClasses() throws ClassNotFoundException {
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
index f1a19a1e9e0..836b5ba0c16 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
@@ -88,7 +88,7 @@ public class OnExceptionReifier extends ProcessorReifier<OnExceptionDefinition>
handle = createPredicate(definition.getHandled());
}
- return new CatchProcessor(classes, childProcessor, when, handle);
+ return new CatchProcessor(classes, childProcessor, when);
}
protected List<Class<? extends Throwable>> createExceptionClasses(ClassResolver resolver) throws ClassNotFoundException {
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
index 98ce1482b4e..072a3e58d5f 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
@@ -49,7 +49,7 @@ public class DeadLetterChannelReifier extends ErrorHandlerReifier<DeadLetterChan
// optimize to use shared default instance if using out of the box settings
RedeliveryPolicy redeliveryPolicy = resolveRedeliveryPolicy(definition, camelContext);
- CamelLogger logger = resolveLogger(definition, camelContext);
+ CamelLogger logger = resolveLogger(definition);
Processor deadLetterProcessor = createDeadLetterChannelProcessor(definition.getDeadLetterUri());
@@ -83,7 +83,7 @@ public class DeadLetterChannelReifier extends ErrorHandlerReifier<DeadLetterChan
return answer;
}
- private CamelLogger resolveLogger(DeadLetterChannelDefinition definition, CamelContext camelContext) {
+ private CamelLogger resolveLogger(DeadLetterChannelDefinition definition) {
CamelLogger answer = definition.getLoggerBean();
if (answer == null && definition.getLoggerRef() != null) {
answer = mandatoryLookup(definition.getLoggerRef(), CamelLogger.class);
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
index 72f819d7858..013849b8719 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
@@ -48,7 +48,7 @@ public class DefaultErrorHandlerReifier extends ErrorHandlerReifier<DefaultError
// optimize to use shared default instance if using out of the box settings
RedeliveryPolicy redeliveryPolicy = resolveRedeliveryPolicy(definition, camelContext);
- CamelLogger logger = resolveLogger(definition, camelContext);
+ CamelLogger logger = resolveLogger(definition);
DefaultErrorHandler answer = new DefaultErrorHandler(
camelContext, processor, logger,
@@ -76,7 +76,7 @@ public class DefaultErrorHandlerReifier extends ErrorHandlerReifier<DefaultError
return answer;
}
- private CamelLogger resolveLogger(DefaultErrorHandlerDefinition definition, CamelContext camelContext) {
+ private CamelLogger resolveLogger(DefaultErrorHandlerDefinition definition) {
CamelLogger answer = definition.getLoggerBean();
if (answer == null && definition.getLoggerRef() != null) {
answer = mandatoryLookup(definition.getLoggerRef(), CamelLogger.class);