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 3727f024471 (chores) camel-core: code cleanups
3727f024471 is described below
commit 3727f0244717d41fb95d14c8ffbfdd500c202cce
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Sep 27 12:04:42 2023 +0200
(chores) camel-core: code cleanups
- use final when possible
- removed unused variable
- use java-style array declaration
- fixed malformed junit test
---
.../src/main/java/org/apache/camel/processor/PausableProcessor.java | 5 +----
.../src/main/java/org/apache/camel/processor/Throttler.java | 4 ++--
.../src/main/java/org/apache/camel/reifier/PausableReifier.java | 2 +-
.../org/apache/camel/processor/IdempotentConsumerConcurrentTest.java | 2 +-
.../src/test/java/org/apache/camel/processor/SplitterPojoTest.java | 2 +-
.../test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java | 1 -
.../src/main/java/org/apache/camel/management/mbean/ManagedStep.java | 2 +-
7 files changed, 7 insertions(+), 11 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PausableProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PausableProcessor.java
index 09c3ab6db35..f7aaddf33a1 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PausableProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PausableProcessor.java
@@ -27,7 +27,6 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Navigate;
import org.apache.camel.Processor;
-import org.apache.camel.resume.ConsumerListener;
import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorConverterHelper;
@@ -36,14 +35,12 @@ import org.apache.camel.support.AsyncProcessorSupport;
public class PausableProcessor extends AsyncProcessorSupport
implements Navigate<Processor>, CamelContextAware, IdAware,
RouteIdAware {
- private final ConsumerListener<?, ?> consumerListener;
private final AsyncProcessor processor;
private CamelContext camelContext;
private String id;
private String routeId;
- public PausableProcessor(ConsumerListener<?, ?> consumerListener,
Processor processor) {
- this.consumerListener = consumerListener;
+ public PausableProcessor(Processor processor) {
this.processor = AsyncProcessorConverterHelper.convert(processor);
}
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java
index a70cb7419a2..2b0722a8e29 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Throttler.java
@@ -76,14 +76,14 @@ public class Throttler extends AsyncProcessorSupport
implements Traceable, IdAwa
private final boolean shutdownAsyncExecutor;
private volatile long timePeriodMillis;
- private volatile long cleanPeriodMillis;
+ private final long cleanPeriodMillis;
private String id;
private String routeId;
private Expression maxRequestsPerPeriodExpression;
private boolean rejectExecution;
private boolean asyncDelayed;
private boolean callerRunsWhenRejected = true;
- private Expression correlationExpression;
+ private final Expression correlationExpression;
private final Map<String, ThrottlingState> states = new
ConcurrentHashMap<>();
public Throttler(final CamelContext camelContext, final Expression
maxRequestsPerPeriodExpression,
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PausableReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PausableReifier.java
index f67406b871d..f049f2bc8d5 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PausableReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/PausableReifier.java
@@ -42,7 +42,7 @@ public class PausableReifier extends
ProcessorReifier<PausableDefinition> {
route.setConsumerListener(consumerListener);
- return new PausableProcessor(consumerListener, childProcessor);
+ return new PausableProcessor(childProcessor);
}
protected ConsumerListener<?, ?> resolveConsumerListener() {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
index 843f5b9f5d7..c3e5a7ac108 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerConcurrentTest.java
@@ -156,7 +156,7 @@ public class IdempotentConsumerConcurrentTest extends
ContextTestSupport {
resultEndpoint.reset();
resultEndpoint.expectedMessageCount(loopCount);
- final boolean failedFlag[] = new boolean[1];
+ final boolean[] failedFlag = new boolean[1];
failedFlag[0] = false;
Thread[] threads = new Thread[threadCount];
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
index dda0ba3ed7a..71717cef6c9 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterPojoTest.java
@@ -56,7 +56,7 @@ public class SplitterPojoTest extends ContextTestSupport {
@Test
public void testSplitMessageWithPojoBean() throws Exception {
- String users[] = { "James", "Jonathan", "Hadrian", "Claus", "Willem" };
+ String[] users = { "James", "Jonathan", "Hadrian", "Claus", "Willem" };
MockEndpoint mock = getMockEndpoint("mock:result");
mock.reset();
mock.expectedMessageCount(5);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java
index 566fe2e0de2..1282c69a9e8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapAbortPolicyTest.java
@@ -57,7 +57,6 @@ public class WireTapAbortPolicyTest extends
ContextTestSupport {
}
}
- @Test
@RepeatedTest(value = 1000)
public void testSend() throws Exception {
// hello must come first, as we have delay on the tapped route
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedStep.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedStep.java
index bc9119732f7..a38e96bb604 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedStep.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedStep.java
@@ -25,7 +25,7 @@ import org.apache.camel.processor.StepProcessor;
@ManagedResource(description = "Managed Step")
public class ManagedStep extends ManagedProcessor implements ManagedStepMBean {
// TODO processor is reported unused, if it is needed, then place
@SuppressWarnings("unused")
- private StepProcessor processor;
+ private final StepProcessor processor;
public ManagedStep(CamelContext context, StepProcessor processor,
ProcessorDefinition<?> definition) {
super(context, processor, definition);
