This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ba757ce8c17bef9145c94613fde82fe189054fda
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Nov 7 09:39:00 2020 +0100
camel-core - Favour static logger
---
.../org/apache/camel/reifier/AggregateReifier.java | 6 ++++-
.../java/org/apache/camel/reifier/LogReifier.java | 10 ++++----
.../org/apache/camel/reifier/ProcessorReifier.java | 23 +++++++++---------
.../org/apache/camel/reifier/RouteReifier.java | 28 ++++++++++++----------
.../org/apache/camel/reifier/ThreadsReifier.java | 1 -
.../reifier/errorhandler/ErrorHandlerReifier.java | 3 ++-
6 files changed, 41 insertions(+), 30 deletions(-)
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
index cef3a42..a01b4de 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
@@ -36,9 +36,13 @@ import
org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter;
import org.apache.camel.processor.aggregate.OptimisticLockRetryPolicy;
import org.apache.camel.spi.AggregationRepository;
import org.apache.camel.util.concurrent.SynchronousExecutorService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AggregateReifier extends ProcessorReifier<AggregateDefinition> {
+ private static final Logger LOG =
LoggerFactory.getLogger(AggregateReifier.class);
+
public AggregateReifier(Route route, ProcessorDefinition<?> definition) {
super(route, AggregateDefinition.class.cast(definition));
}
@@ -124,7 +128,7 @@ public class AggregateReifier extends
ProcessorReifier<AggregateDefinition> {
} else if (strategy instanceof Predicate) {
// if aggregation strategy implements predicate and was not
// configured then use as fallback
- log.debug("Using AggregationStrategy as completion predicate: {}",
strategy);
+ LOG.debug("Using AggregationStrategy as completion predicate: {}",
strategy);
answer.setCompletionPredicate((Predicate) strategy);
}
if (definition.getCompletionTimeoutExpression() != null) {
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LogReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LogReifier.java
index b46c302..4c20812 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LogReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LogReifier.java
@@ -38,6 +38,8 @@ import org.slf4j.LoggerFactory;
public class LogReifier extends ProcessorReifier<LogDefinition> {
+ private static final Logger LOG =
LoggerFactory.getLogger(LogReifier.class);
+
public LogReifier(Route route, ProcessorDefinition<?> definition) {
super(route, (LogDefinition) definition);
}
@@ -67,10 +69,10 @@ public class LogReifier extends
ProcessorReifier<LogDefinition> {
Map<String, Logger> availableLoggers =
findByTypeWithName(Logger.class);
if (availableLoggers.size() == 1) {
logger = availableLoggers.values().iterator().next();
- log.debug("Using custom Logger: {}", logger);
+ LOG.debug("Using custom Logger: {}", logger);
} else if (availableLoggers.size() > 1) {
// we should log about this somewhere...
- log.debug("More than one {} instance found in the registry.
Falling back to create logger by name.",
+ LOG.debug("More than one {} instance found in the registry.
Falling back to create logger by name.",
Logger.class.getName());
}
}
@@ -80,12 +82,12 @@ public class LogReifier extends
ProcessorReifier<LogDefinition> {
if (name == null) {
name = camelContext.getGlobalOption(Exchange.LOG_EIP_NAME);
if (name != null) {
- log.debug("Using logName from CamelContext properties:
{}", name);
+ LOG.debug("Using logName from CamelContext properties:
{}", name);
}
}
if (name == null) {
name = route.getRouteId();
- log.debug("LogName is not configured, using route id as
logName: {}", name);
+ LOG.debug("LogName is not configured, using route id as
logName: {}", name);
}
logger = LoggerFactory.getLogger(name);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index 4eccd71..8178b0b 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -116,13 +116,14 @@ import org.slf4j.LoggerFactory;
public abstract class ProcessorReifier<T extends ProcessorDefinition<?>>
extends AbstractReifier {
+ private static final Logger LOG =
LoggerFactory.getLogger(ProcessorReifier.class);
+
private static final Map<Class<?>, BiFunction<Route,
ProcessorDefinition<?>, ProcessorReifier<? extends ProcessorDefinition<?>>>>
PROCESSORS;
static {
// for custom reifiers
PROCESSORS = new HashMap<>(0);
ReifierStrategy.addReifierClearer(ProcessorReifier::clearReifiers);
}
- protected final Logger log = LoggerFactory.getLogger(getClass());
protected final T definition;
@@ -584,9 +585,9 @@ public abstract class ProcessorReifier<T extends
ProcessorDefinition<?>> extends
// only add regular processors as event driven
if (endpointInterceptor) {
- log.debug("Endpoint interceptor should not be added as an event
driven consumer route: {}", processor);
+ LOG.debug("Endpoint interceptor should not be added as an event
driven consumer route: {}", processor);
} else {
- log.trace("Adding event driven processor: {}", processor);
+ LOG.trace("Adding event driven processor: {}", processor);
route.getEventDrivenProcessors().add(processor);
}
}
@@ -654,7 +655,7 @@ public abstract class ProcessorReifier<T extends
ProcessorDefinition<?>> extends
|| definition instanceof FinallyDefinition) {
// do not use error handler for try .. catch .. finally blocks as
it
// will handle errors itself
- log.trace("{} is part of doTry .. doCatch .. doFinally so no error
handler is applied", definition);
+ LOG.trace("{} is part of doTry .. doCatch .. doFinally so no error
handler is applied", definition);
} else if
(ProcessorDefinitionHelper.isParentOfType(TryDefinition.class, definition, true)
||
ProcessorDefinitionHelper.isParentOfType(CatchDefinition.class, definition,
true)
||
ProcessorDefinitionHelper.isParentOfType(FinallyDefinition.class, definition,
true)) {
@@ -662,10 +663,10 @@ public abstract class ProcessorReifier<T extends
ProcessorDefinition<?>> extends
// will handle errors itself
// by checking that any of our parent(s) is not a try .. catch or
// finally type
- log.trace("{} is part of doTry .. doCatch .. doFinally so no error
handler is applied", definition);
+ LOG.trace("{} is part of doTry .. doCatch .. doFinally so no error
handler is applied", definition);
} else if (definition instanceof OnExceptionDefinition
||
ProcessorDefinitionHelper.isParentOfType(OnExceptionDefinition.class,
definition, true)) {
- log.trace("{} is part of OnException so no error handler is
applied", definition);
+ LOG.trace("{} is part of OnException so no error handler is
applied", definition);
// do not use error handler for onExceptions blocks as it will
// handle errors itself
} else if (definition instanceof CircuitBreakerDefinition
@@ -676,7 +677,7 @@ public abstract class ProcessorReifier<T extends
ProcessorDefinition<?>> extends
// only wrap the parent (not the children of the circuit
breaker)
wrap = true;
} else {
- log.trace("{} is part of CircuitBreaker so no error handler is
applied", definition);
+ LOG.trace("{} is part of CircuitBreaker so no error handler is
applied", definition);
}
} else if (definition instanceof MulticastDefinition) {
// do not use error handler for multicast as it offers fine grained
@@ -689,7 +690,7 @@ public abstract class ProcessorReifier<T extends
ProcessorDefinition<?>> extends
// only wrap the parent (not the children of the multicast)
wrap = true;
} else {
- log.trace("{} is part of multicast which have special error
handling so no error handler is applied",
+ LOG.trace("{} is part of multicast which have special error
handling so no error handler is applied",
definition);
}
} else {
@@ -702,7 +703,7 @@ public abstract class ProcessorReifier<T extends
ProcessorDefinition<?>> extends
// do post init at the end
channel.postInitChannel();
- log.trace("{} wrapped in Channel: {}", definition, channel);
+ LOG.trace("{} wrapped in Channel: {}", definition, channel);
return channel;
}
@@ -716,13 +717,13 @@ public abstract class ProcessorReifier<T extends
ProcessorDefinition<?>> extends
*/
private void wrapChannelInErrorHandler(Channel channel, Boolean
inheritErrorHandler) throws Exception {
if (inheritErrorHandler == null || inheritErrorHandler) {
- log.trace("{} is configured to inheritErrorHandler", definition);
+ LOG.trace("{} is configured to inheritErrorHandler", definition);
Processor output = channel.getOutput();
Processor errorHandler = wrapInErrorHandler(output, true);
// set error handler on channel
channel.setErrorHandler(errorHandler);
} else {
- log.debug("{} is configured to not inheritErrorHandler.",
definition);
+ LOG.debug("{} is configured to not inheritErrorHandler.",
definition);
}
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
index fb2dbdf..06e7b20 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
@@ -44,9 +44,13 @@ import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.ManagementInterceptStrategy;
import org.apache.camel.spi.RoutePolicy;
import org.apache.camel.spi.RoutePolicyFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RouteReifier extends ProcessorReifier<RouteDefinition> {
+ private static final Logger LOG =
LoggerFactory.getLogger(RouteReifier.class);
+
private static final String[] RESERVED_PROPERTIES = new String[] {
Route.ID_PROPERTY, Route.CUSTOM_ID_PROPERTY, Route.PARENT_PROPERTY,
Route.DESCRIPTION_PROPERTY, Route.GROUP_PROPERTY,
@@ -102,7 +106,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
if (isTrace != null) {
route.setTracing(isTrace);
if (isTrace) {
- log.debug("Tracing is enabled on route: {}",
definition.getId());
+ LOG.debug("Tracing is enabled on route: {}",
definition.getId());
// tracing is added in the DefaultChannel so we can enable
// it on the fly
}
@@ -115,7 +119,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
if (isMessageHistory != null) {
route.setMessageHistory(isMessageHistory);
if (isMessageHistory) {
- log.debug("Message history is enabled on route: {}",
definition.getId());
+ LOG.debug("Message history is enabled on route: {}",
definition.getId());
}
}
}
@@ -126,7 +130,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
if (isLogMask != null) {
route.setLogMask(isLogMask);
if (isLogMask) {
- log.debug("Security mask for Logging is enabled on route:
{}", definition.getId());
+ LOG.debug("Security mask for Logging is enabled on route:
{}", definition.getId());
}
}
}
@@ -137,7 +141,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
if (isStreamCache != null) {
route.setStreamCaching(isStreamCache);
if (isStreamCache) {
- log.debug("StreamCaching is enabled on route: {}",
definition.getId());
+ LOG.debug("StreamCaching is enabled on route: {}",
definition.getId());
}
}
}
@@ -148,9 +152,9 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
if (delayer != null) {
route.setDelayer(delayer);
if (delayer > 0) {
- log.debug("Delayer is enabled with: {} ms. on route: {}",
delayer, definition.getId());
+ LOG.debug("Delayer is enabled with: {} ms. on route: {}",
delayer, definition.getId());
} else {
- log.debug("Delayer is disabled on route: {}",
definition.getId());
+ LOG.debug("Delayer is disabled on route: {}",
definition.getId());
}
}
}
@@ -158,7 +162,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
// configure route policy
if (definition.getRoutePolicies() != null &&
!definition.getRoutePolicies().isEmpty()) {
for (RoutePolicy policy : definition.getRoutePolicies()) {
- log.debug("RoutePolicy is enabled: {} on route: {}", policy,
definition.getId());
+ LOG.debug("RoutePolicy is enabled: {} on route: {}", policy,
definition.getId());
route.getRoutePolicyList().add(policy);
}
}
@@ -167,7 +171,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
while (policyTokens.hasMoreTokens()) {
String ref = policyTokens.nextToken().trim();
RoutePolicy policy = mandatoryLookup(ref, RoutePolicy.class);
- log.debug("RoutePolicy is enabled: {} on route: {}", policy,
definition.getId());
+ LOG.debug("RoutePolicy is enabled: {} on route: {}", policy,
definition.getId());
route.getRoutePolicyList().add(policy);
}
}
@@ -175,7 +179,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
for (RoutePolicyFactory factory :
camelContext.getRoutePolicyFactories()) {
RoutePolicy policy = factory.createRoutePolicy(camelContext,
definition.getId(), definition);
if (policy != null) {
- log.debug("RoutePolicy is enabled: {} on route: {}",
policy, definition.getId());
+ LOG.debug("RoutePolicy is enabled: {} on route: {}",
policy, definition.getId());
route.getRoutePolicyList().add(policy);
}
}
@@ -189,11 +193,11 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
// configure shutdown
if (definition.getShutdownRoute() != null) {
- log.debug("Using ShutdownRoute {} on route: {}",
definition.getShutdownRoute(), definition.getId());
+ LOG.debug("Using ShutdownRoute {} on route: {}",
definition.getShutdownRoute(), definition.getId());
route.setShutdownRoute(parse(ShutdownRoute.class,
definition.getShutdownRoute()));
}
if (definition.getShutdownRunningTask() != null) {
- log.debug("Using ShutdownRunningTask {} on route: {}",
definition.getShutdownRunningTask(), definition.getId());
+ LOG.debug("Using ShutdownRunningTask {} on route: {}",
definition.getShutdownRunningTask(), definition.getId());
route.setShutdownRunningTask(parse(ShutdownRunningTask.class,
definition.getShutdownRunningTask()));
}
@@ -302,7 +306,7 @@ public class RouteReifier extends
ProcessorReifier<RouteDefinition> {
route.getProperties().putAll(routeProperties);
route.setStartupOrder(startupOrder);
if (isAutoStartup != null) {
- log.debug("Using AutoStartup {} on route: {}", isAutoStartup,
definition.getId());
+ LOG.debug("Using AutoStartup {} on route: {}", isAutoStartup,
definition.getId());
route.setAutoStartup(isAutoStartup);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
index 89e32f2..08f57d8 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ThreadsReifier.java
@@ -52,7 +52,6 @@ public class ThreadsReifier extends
ProcessorReifier<ThreadsDefinition> {
policy = ThreadPoolRejectedPolicy.Abort;
}
}
- log.debug("Using ThreadPoolRejectedPolicy: {}", policy);
// if no explicit then create from the options
if (threadPool == null) {
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
index 3effc41..be7e68e 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
@@ -51,7 +51,8 @@ import org.apache.camel.util.ObjectHelper;
public abstract class ErrorHandlerReifier<T extends ErrorHandlerFactory>
extends AbstractReifier {
- private static final Map<Class<?>, BiFunction<Route, ErrorHandlerFactory,
ErrorHandlerReifier<? extends ErrorHandlerFactory>>> ERROR_HANDLERS = new
HashMap<>(0);
+ private static final Map<Class<?>, BiFunction<Route, ErrorHandlerFactory,
ErrorHandlerReifier<? extends ErrorHandlerFactory>>> ERROR_HANDLERS
+ = new HashMap<>(0);
protected T definition;
