[camel] 01/02: Camel-Base: Fixed CS

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ebebf301f78c5424199bdbde939985f22bac9cf1
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jan 23 15:22:56 2020 +0100

    Camel-Base: Fixed CS
---
 .../org/apache/camel/impl/converter/BaseTypeConverterRegistry.java  | 4 ++--
 .../src/main/java/org/apache/camel/processor/Resequencer.java       | 6 +++---
 .../org/apache/camel/processor/aggregate/AggregateProcessor.java    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
 
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index a6fea6e..67f97e7 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -69,8 +69,6 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class BaseTypeConverterRegistry extends ServiceSupport 
implements TypeConverter, TypeConverterRegistry {
 
-    private static final Logger LOG = 
LoggerFactory.getLogger(BaseTypeConverterRegistry.class);
-
     public static final String META_INF_SERVICES_TYPE_CONVERTER_LOADER = 
"META-INF/services/org/apache/camel/TypeConverterLoader";
     public static final String META_INF_SERVICES_FALLBACK_TYPE_CONVERTER = 
"META-INF/services/org/apache/camel/FallbackTypeConverter";
 
@@ -81,6 +79,8 @@ public abstract class BaseTypeConverterRegistry extends 
ServiceSupport implement
         }
     };
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(BaseTypeConverterRegistry.class);
+
     protected final DoubleMap<Class<?>, Class<?>, TypeConverter> typeMappings 
= new DoubleMap<>(200);
     protected final List<TypeConverterLoader> typeConverterLoaders = new 
ArrayList<>();
     protected final List<FallbackTypeConverter> fallbackConverters = new 
CopyOnWriteArrayList<>();
diff --git 
a/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java 
b/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
index ed662d7..ff316e0 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
@@ -60,11 +60,11 @@ import org.slf4j.LoggerFactory;
  */
 public class Resequencer extends AsyncProcessorSupport implements 
Navigate<Processor>, IdAware, RouteIdAware, Traceable {
 
-    private static final Logger LOG = 
LoggerFactory.getLogger(Resequencer.class);
-
     public static final long DEFAULT_BATCH_TIMEOUT = 1000L;
     public static final int DEFAULT_BATCH_SIZE = 100;
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(Resequencer.class);
+
     private String id;
     private String routeId;
     private long batchTimeout = DEFAULT_BATCH_TIMEOUT;
@@ -548,4 +548,4 @@ public class Resequencer extends AsyncProcessorSupport 
implements Navigate<Proce
         }
     }
 
-}
\ No newline at end of file
+}
diff --git 
a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
 
b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 42cdae8..9eac797 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -90,8 +90,6 @@ import org.slf4j.LoggerFactory;
  */
 public class AggregateProcessor extends AsyncProcessorSupport implements 
Navigate<Processor>, Traceable, ShutdownPrepared, ShutdownAware, IdAware, 
RouteIdAware {
 
-    private static final Logger LOG = 
LoggerFactory.getLogger(AggregateProcessor.class);
-
     public static final String AGGREGATE_TIMEOUT_CHECKER = 
"AggregateTimeoutChecker";
     public static final String AGGREGATE_OPTIMISTIC_LOCKING_EXECUTOR = 
"AggregateOptimisticLockingExecutor";
 
@@ -103,6 +101,8 @@ public class AggregateProcessor extends 
AsyncProcessorSupport implements Navigat
     public static final String COMPLETED_BY_TIMEOUT = "timeout";
     public static final String COMPLETED_BY_FORCE = "force";
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(AggregateProcessor.class);
+
     private volatile Lock lock;
     private final AtomicBoolean aggregateRepositoryWarned = new 
AtomicBoolean();
     private final CamelContext camelContext;
@@ -434,7 +434,7 @@ public class AggregateProcessor extends 
AsyncProcessorSupport implements Navigat
     private Object removeFlagCompleteAllGroups(Exchange exchange) {
         Object removedHeader = 
exchange.getIn().removeHeader(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS);
         Object removedProp = 
exchange.removeProperty(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS);
-        return removedHeader == null ? removedProp: removedHeader;
+        return removedHeader == null ? removedProp : removedHeader;
     }
 
     private Boolean isCompleteAllGroups(Exchange exchange) {