CAMEL-11194 Upgrade Checkstyle and update rules
This fixes a number of Checkstyle issues mostly whitespace and `final`
keyword use and removing unused imports.
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
index 3f58401..7172154 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
@@ -100,7 +100,7 @@
}
}
- public abstract Object doInvokeProxy(final Object proxy, final Method method, final Object[] args) throws Throwable;
+ public abstract Object doInvokeProxy(Object proxy, Method method, Object[] args) throws Throwable;
@SuppressWarnings("unchecked")
protected Object invokeProxy(final Method method, final ExchangePattern pattern, Object[] args, boolean binding) throws Throwable {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
index 3f1b96c..1b32408 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
@@ -415,7 +415,7 @@
* @return Customized object for the tracked item or <code>null</code> if
* the item is not to be tracked.
*/
- abstract Object customizerAdding(final Object item, final Object related);
+ abstract Object customizerAdding(Object item, Object related);
/**
* Call the specific customizer modified method. This method must not be
@@ -425,7 +425,7 @@
* @param related Action related object.
* @param object Customized object for the tracked item.
*/
- abstract void customizerModified(final Object item, final Object related, final Object object);
+ abstract void customizerModified(Object item, Object related, Object object);
/**
* Call the specific customizer removed method. This method must not be
@@ -435,5 +435,5 @@
* @param related Action related object.
* @param object Customized object for the tracked item.
*/
- abstract void customizerRemoved(final Object item, final Object related, final Object object);
+ abstract void customizerRemoved(Object item, Object related, Object object);
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
index b9bdaaa..8e74f89 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
@@ -271,10 +271,8 @@
redeliveryPolicy,
onRedeliveryRef,
onRedelivery,
- onExceptionOccurred
- ).orElseThrow(
- () -> new IllegalArgumentException(this + " is not configured.")
- );
+ onExceptionOccurred)
+ .orElseThrow(() -> new IllegalArgumentException(this + " is not configured."));
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceStrategy.java b/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceStrategy.java
index 685f99f..37763e0 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceStrategy.java
@@ -247,7 +247,7 @@
* @param daemon whether or not the created threads is daemon or not
* @return the created thread pool
*/
- ExecutorService newThreadPool(Object source, final String name, int corePoolSize, int maxPoolSize,
+ ExecutorService newThreadPool(Object source, String name, int corePoolSize, int maxPoolSize,
long keepAliveTime, TimeUnit timeUnit, int maxQueueSize,
RejectedExecutionHandler rejectedExecutionHandler, boolean daemon);
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
index f856261..f65c4be 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
@@ -57,7 +57,7 @@
definition.setInheritErrorHandler(false);
}
- public abstract void run(final Runnable runnable) throws Throwable;
+ public abstract void run(Runnable runnable) throws Throwable;
@Override
public Processor wrap(RouteContext routeContext, Processor processor) {
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 4342e28c..90ac075 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
@@ -962,7 +962,7 @@
}
public static Method findMethod(Class<?> cls,
String name,
- Class<?> ... params) {
+ Class<?>... params) {
if (cls == null) {
return null;
}
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/AbstractLifecycleAwareExchangeEventHandler.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/AbstractLifecycleAwareExchangeEventHandler.java
index c7b7924..af93b53 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/AbstractLifecycleAwareExchangeEventHandler.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/AbstractLifecycleAwareExchangeEventHandler.java
@@ -31,7 +31,7 @@
private volatile CountDownLatch stoppedLatch = new CountDownLatch(1);
@Override
- public abstract void onEvent(final ExchangeEvent event, long sequence, boolean endOfBatch)
+ public abstract void onEvent(ExchangeEvent event, long sequence, boolean endOfBatch)
throws Exception;
@Override
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
index 809168c..c99b9b8 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
@@ -28,7 +28,7 @@
public interface JettyContentExchange {
- void init(Exchange exchange, JettyHttpBinding jettyBinding, final HttpClient client, AsyncCallback callback);
+ void init(Exchange exchange, JettyHttpBinding jettyBinding, HttpClient client, AsyncCallback callback);
// Methods to prepare the request
void setRequestContentType(String contentType);
diff --git a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfComponent.java b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfComponent.java
index 791ed9f..4fd6d1d 100644
--- a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfComponent.java
+++ b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfComponent.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.pdf;
- import java.net.URI;
+import java.net.URI;
import java.util.Map;
import org.apache.camel.Endpoint;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index e8e38e0..2f3bad9 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -25,12 +25,9 @@
import java.util.Map;
import java.util.Optional;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.thoughtworks.xstream.XStream;
-import org.apache.camel.component.salesforce.NotFoundBehaviour;
import org.apache.camel.component.salesforce.SalesforceHttpClient;
import org.apache.camel.component.salesforce.api.NoSuchSObjectException;
import org.apache.camel.component.salesforce.api.SalesforceException;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
index d52601f..b361fb3 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
@@ -21,15 +21,14 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.component.salesforce.NotFoundBehaviour;
import org.apache.camel.component.salesforce.SalesforceEndpoint;
-import org.apache.camel.component.salesforce.SalesforceEndpointConfig;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.TypeReferences;
import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
index 2cbfdc2..76f46a4 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
@@ -200,7 +200,7 @@
}
}
- public abstract void sendMessage(Exchange exchange, final AsyncCallback callback, final MessageProducerResources producer, final ReleaseProducerCallback releaseProducerCallback) throws Exception;
+ public abstract void sendMessage(Exchange exchange, AsyncCallback callback, MessageProducerResources producer, ReleaseProducerCallback releaseProducerCallback) throws Exception;
@Override
public boolean process(final Exchange exchange, final AsyncCallback callback) {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
index 2b61bc3..1152c83 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
@@ -118,7 +118,7 @@
}
}
- public abstract void handleMessage(final Exchange exchange);
+ public abstract void handleMessage(Exchange exchange);
/**
* Method will be called to
diff --git a/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/AbstractJdbcMessageIdRepository.java b/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/AbstractJdbcMessageIdRepository.java
index 8050bfc..3443ffb 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/AbstractJdbcMessageIdRepository.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/AbstractJdbcMessageIdRepository.java
@@ -77,7 +77,7 @@
* @param key the key
* @return int number of rows
*/
- protected abstract int queryForInt(final T key);
+ protected abstract int queryForInt(T key);
/**
* Operation that inserts the key if it does not already exist
@@ -85,7 +85,7 @@
* @param key the key
* @return int number of rows inserted
*/
- protected abstract int insert(final T key);
+ protected abstract int insert(T key);
/**
* Operations that deletes the key if it exists
@@ -93,7 +93,7 @@
* @param key the key
* @return int number of rows deleted
*/
- protected abstract int delete(final T key);
+ protected abstract int delete(T key);
/**
* Operations that deletes all the rows
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 59244ff..48f41ba 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -107,7 +107,7 @@
public static BundleContext createBundleContext(String name, String descriptors, boolean includeTestBundle,
String bundleFilter, String testBundleVersion, String testBundleDirectives,
- String[] ... configAdminPidFiles) throws Exception {
+ String[]... configAdminPidFiles) throws Exception {
return createBundleContext(name, descriptors, includeTestBundle,
bundleFilter, testBundleVersion, testBundleDirectives,
null,
@@ -117,7 +117,7 @@
public static BundleContext createBundleContext(String name, String descriptors, boolean includeTestBundle,
String bundleFilter, String testBundleVersion, String testBundleDirectives,
ClassLoader loader,
- String[] ... configAdminPidFiles) throws Exception {
+ String[]... configAdminPidFiles) throws Exception {
TinyBundle bundle = null;
TinyBundle configAdminInitBundle = null;
@@ -368,7 +368,7 @@
}
}
- protected static TinyBundle createConfigAdminInitBundle(String[] ... configAdminPidFiles) throws IOException {
+ protected static TinyBundle createConfigAdminInitBundle(String[]... configAdminPidFiles) throws IOException {
TinyBundle bundle = TinyBundles.newBundle();
StringWriter configAdminInit = null;
for (String[] configAdminPidFile : configAdminPidFiles) {
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
index ebcb272..6eaf746 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
@@ -140,11 +140,11 @@
return createBundleContext(getClass().getSimpleName());
}
- protected BundleContext createBundleContext(String name, String[] ... configAdminPidFiles) throws Exception {
+ protected BundleContext createBundleContext(String name, String[]... configAdminPidFiles) throws Exception {
return createBundleContext(name, loader, configAdminPidFiles);
}
- protected BundleContext createBundleContext(String name, ClassLoader loader, String[] ... configAdminPidFiles) throws Exception {
+ protected BundleContext createBundleContext(String name, ClassLoader loader, String[]... configAdminPidFiles) throws Exception {
return CamelBlueprintHelper.createBundleContext(name, descriptors, isIncludeSelfAsBundle(),
CamelBlueprintHelper.BUNDLE_FILTER, CamelBlueprintHelper.BUNDLE_VERSION, null,
loader, configAdminPidFiles);
diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java
index d624064..9068a60 100644
--- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java
+++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java
@@ -95,7 +95,7 @@
* @param command The command to execute
* @param principals The principals (e.g. RolePrincipal objects) to run the command under
*/
- protected String executeCommand(final String command, Principal ... principals) {
+ protected String executeCommand(final String command, Principal... principals) {
return executeCommand(command, COMMAND_TIMEOUT, false, principals);
}
@@ -108,7 +108,7 @@
* @param silent Specifies if the command should be displayed in the screen.
* @param principals The principals (e.g. RolePrincipal objects) to run the command under
*/
- protected String executeCommand(final String command, final Long timeout, final Boolean silent, final Principal ... principals) {
+ protected String executeCommand(final String command, final Long timeout, final Boolean silent, final Principal... principals) {
waitForCommandService(command);
String response;
diff --git a/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsNamedEngineTest.java b/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsNamedEngineTest.java
index 8088d15..1fb289e 100644
--- a/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsNamedEngineTest.java
+++ b/platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/test/java/org/apache/camel/component/reactive/streams/springboot/test/ReactiveStreamsNamedEngineTest.java
@@ -30,6 +30,7 @@
import org.apache.camel.component.reactive.streams.springboot.ReactiveStreamsComponentAutoConfiguration;
import org.apache.camel.component.reactive.streams.springboot.ReactiveStreamsServiceAutoConfiguration;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.reactivestreams.Publisher;
@@ -41,8 +42,6 @@
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
-import org.junit.Assert;
-
@RunWith(SpringRunner.class)
@SpringBootApplication
@DirtiesContext
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 3c7a381..7a26db9 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -229,7 +229,7 @@
boolean multiValue = false;
boolean asPredicate = false;
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(),"property", required, entry.getType(), defaultValue, doc,
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(), "property", required, entry.getType(), defaultValue, doc,
entry.isDeprecated(), entry.isSecret(), entry.getGroup(), entry.getLabel(), entry.isEnumType(), entry.getEnums(),
false, null, asPredicate, optionalPrefix, prefix, multiValue));
}
@@ -281,7 +281,7 @@
boolean multiValue = false;
boolean asPredicate = false;
- buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(),"path", required, entry.getType(), defaultValue, doc,
+ buffer.append(JsonSchemaHelper.toJson(entry.getName(), entry.getDisplayName(), "path", required, entry.getType(), defaultValue, doc,
entry.isDeprecated(), entry.isSecret(), entry.getGroup(), entry.getLabel(), entry.isEnumType(), entry.getEnums(),
false, null, asPredicate, optionalPrefix, prefix, multiValue));
}
