CAMEL-8229: Moved some impl classes to support.

camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java

@@ -17,7 +17,7 @@
 package org.apache.camel.component.file;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.impl.LoggingExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.Synchronization;
 import org.apache.camel.util.ObjectHelper;

camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java

@@ -31,7 +31,7 @@
 import org.apache.camel.Processor;
 import org.apache.camel.ShutdownRunningTask;
 import org.apache.camel.SuspendableService;
-import org.apache.camel.impl.LoggingExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.processor.MulticastProcessor;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.ShutdownAware;

camel-core/src/main/java/org/apache/camel/impl/BridgeExceptionHandlerToErrorHandler.java

@@ -20,6 +20,7 @@
 import org.apache.camel.Processor;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.UnitOfWork;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.util.UnitOfWorkHelper;
 
 /**

camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java

@@ -26,6 +26,7 @@
 import org.apache.camel.RouteAware;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.UnitOfWork;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.AsyncProcessorConverterHelper;
 import org.apache.camel.util.ServiceHelper;

camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java

@@ -29,6 +29,7 @@
 import org.apache.camel.PollingConsumerPollingStrategy;
 import org.apache.camel.Processor;
 import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.util.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

camel-core/src/main/java/org/apache/camel/impl/LoggingExceptionHandler.java

@@ -17,105 +17,36 @@
 package org.apache.camel.impl;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.CamelExchangeException;
-import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
-import org.apache.camel.RollbackExchangeException;
-import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.util.CamelLogger;
-import org.slf4j.LoggerFactory;
 
 /**
- * A default implementation of {@link ExceptionHandler} which uses a {@link org.apache.camel.util.CamelLogger} to
- * log the exception.
- * <p/>
- * This implementation will by default log the exception with stack trace at WARN level.
- * <p/>
- * This implementation honors the {@link org.apache.camel.impl.DefaultShutdownStrategy#isSuppressLoggingOnTimeout()}
- * option to avoid logging if the logging should be suppressed.
- *
- * @version 
+ * @deprecated use {@link org.apache.camel.support.LoggingExceptionHandler}
  */
-public class LoggingExceptionHandler implements ExceptionHandler {
-    private final CamelLogger logger;
-    private final CamelContext camelContext;
+@Deprecated
+public class LoggingExceptionHandler extends org.apache.camel.support.LoggingExceptionHandler {
 
-    @Deprecated
     public LoggingExceptionHandler(Class<?> ownerType) {
-        this(null, new CamelLogger(LoggerFactory.getLogger(ownerType), LoggingLevel.WARN));
+        super(ownerType);
     }
 
     public LoggingExceptionHandler(CamelContext camelContext, Class<?> ownerType) {
-        this(camelContext, new CamelLogger(LoggerFactory.getLogger(ownerType), LoggingLevel.WARN));
+        super(camelContext, ownerType);
     }
 
-    @Deprecated
     public LoggingExceptionHandler(Class<?> ownerType, LoggingLevel level) {
-        this(null, new CamelLogger(LoggerFactory.getLogger(ownerType), level));
+        super(ownerType, level);
     }
 
     public LoggingExceptionHandler(CamelContext camelContext, Class<?> ownerType, LoggingLevel level) {
-        this(camelContext, new CamelLogger(LoggerFactory.getLogger(ownerType), level));
+        super(camelContext, ownerType, level);
     }
 
-    @Deprecated
     public LoggingExceptionHandler(CamelLogger logger) {
-        this(null, logger);
+        super(logger);
     }
 
     public LoggingExceptionHandler(CamelContext camelContext, CamelLogger logger) {
-        this.camelContext = camelContext;
-        this.logger = logger;
-    }
-
-    public void handleException(Throwable exception) {
-        handleException(null, null, exception);
-    }
-
-    public void handleException(String message, Throwable exception) {
-        handleException(message, null, exception);
-    }
-
-    public void handleException(String message, Exchange exchange, Throwable exception) {
-        try {
-            if (!isSuppressLogging()) {
-                String msg = CamelExchangeException.createExceptionMessage(message, exchange, exception);
-                if (isCausedByRollbackExchangeException(exception)) {
-                    // do not log stack trace for intended rollbacks
-                    logger.log(msg);
-                } else {
-                    if (exception != null) {
-                        logger.log(msg, exception);
-                    } else {
-                        logger.log(msg);
-                    }
-                }
-            }
-        } catch (Throwable e) {
-            // the logging exception handler must not cause new exceptions to occur
-        }
-    }
-
-    protected boolean isCausedByRollbackExchangeException(Throwable exception) {
-        if (exception == null) {
-            return false;
-        }
-        if (exception instanceof RollbackExchangeException) {
-            return true;
-        } else if (exception.getCause() != null) {
-            // recursive children
-            return isCausedByRollbackExchangeException(exception.getCause());
-        }
-
-        return false;
-    }
-
-    protected boolean isSuppressLogging() {
-        if (camelContext != null) {
-            return (camelContext.getStatus().isStopping() || camelContext.getStatus().isStopped())
-                    && camelContext.getShutdownStrategy().hasTimeoutOccurred() && camelContext.getShutdownStrategy().isSuppressLoggingOnTimeout();
-        } else {
-            return false;
-        }
+        super(camelContext, logger);
     }
 }

camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java

@@ -19,6 +19,7 @@
 import org.apache.camel.Endpoint;
 import org.apache.camel.PollingConsumer;
 import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.support.ServiceSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

camel-core/src/main/java/org/apache/camel/impl/RoutePolicySupport.java

@@ -16,135 +16,9 @@
  */
 package org.apache.camel.impl;
 
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.Consumer;
-import org.apache.camel.Exchange;
-import org.apache.camel.Route;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.RoutePolicy;
-import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.ServiceHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
- * A base class for developing custom {@link RoutePolicy} implementations.
- *
- * @version 
+ * @deprecated use {@link org.apache.camel.support.RoutePolicySupport}
  */
-public abstract class RoutePolicySupport extends ServiceSupport implements RoutePolicy {
-
-    // TODO: Move to support package
-
-    protected final Logger log = LoggerFactory.getLogger(getClass());
-    private ExceptionHandler exceptionHandler;
-
-    public void onInit(Route route) {
-        if (exceptionHandler == null) {
-            exceptionHandler = new LoggingExceptionHandler(route.getRouteContext().getCamelContext(), getClass());
-        }
-    }
-
-    public void onRemove(Route route) {
-        // noop
-    }
-
-    @Override
-    public void onStart(Route route) {
-        // noop
-    }
-
-    @Override
-    public void onStop(Route route) {
-        // noop
-    }
-
-    @Override
-    public void onSuspend(Route route) {
-        // noop
-    }
-
-    @Override
-    public void onResume(Route route) {
-        // noop
-    }
-
-    public void onExchangeBegin(Route route, Exchange exchange) {
-        // noop
-    }
-
-    public void onExchangeDone(Route route, Exchange exchange) {
-        // noop
-    }
-
-    protected boolean startConsumer(Consumer consumer) throws Exception {
-        boolean resumed = ServiceHelper.resumeService(consumer);
-        if (resumed) {
-            log.debug("Resuming consumer {}", consumer);
-        }
-        return resumed;
-    }
-
-    protected boolean stopConsumer(Consumer consumer) throws Exception {
-        boolean suspended = ServiceHelper.suspendService(consumer);
-        if (suspended) {
-            log.debug("Suspended consumer {}", consumer);
-        }
-        return suspended;
-    }
-
-    protected void startRoute(Route route) throws Exception {
-        route.getRouteContext().getCamelContext().startRoute(route.getId());
-    }
-
-    protected void resumeRoute(Route route) throws Exception {
-        route.getRouteContext().getCamelContext().resumeRoute(route.getId());
-    }
-
-    protected void suspendRoute(Route route) throws Exception {
-        route.getRouteContext().getCamelContext().suspendRoute(route.getId());
-    }
-
-    protected void suspendRoute(Route route, long timeout, TimeUnit timeUnit) throws Exception {
-        route.getRouteContext().getCamelContext().suspendRoute(route.getId(), timeout, timeUnit);
-    }
-
-    protected void stopRoute(Route route) throws Exception {
-        route.getRouteContext().getCamelContext().stopRoute(route.getId());
-    }
-
-    protected void stopRoute(Route route, long timeout, TimeUnit timeUnit) throws Exception {
-        route.getRouteContext().getCamelContext().stopRoute(route.getId(), timeout, timeUnit);
-    }
-
-    /**
-     * Handles the given exception using the {@link #getExceptionHandler()}
-     *
-     * @param t the exception to handle
-     */
-    protected void handleException(Throwable t) {
-        if (exceptionHandler != null) {
-            exceptionHandler.handleException(t);
-        }
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        // noop
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        // noop
-    }
-
-    public ExceptionHandler getExceptionHandler() {
-        return exceptionHandler;
-    }
-
-    public void setExceptionHandler(ExceptionHandler exceptionHandler) {
-        this.exceptionHandler = exceptionHandler;
-    }
-
+@Deprecated
+public class RoutePolicySupport extends org.apache.camel.support.RoutePolicySupport {
 }

camel-core/src/main/java/org/apache/camel/impl/ThrottlingInflightRoutePolicy.java

@@ -30,6 +30,7 @@
 import org.apache.camel.Route;
 import org.apache.camel.management.event.ExchangeCompletedEvent;
 import org.apache.camel.support.EventNotifierSupport;
+import org.apache.camel.support.RoutePolicySupport;
 import org.apache.camel.util.CamelLogger;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ServiceHelper;

camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java

@@ -37,7 +37,7 @@
 import org.apache.camel.Navigate;
 import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
-import org.apache.camel.impl.LoggingExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.AsyncProcessorHelper;

camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java

@@ -31,7 +31,7 @@
 import org.apache.camel.Navigate;
 import org.apache.camel.Processor;
 import org.apache.camel.Traceable;
-import org.apache.camel.impl.LoggingExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.processor.resequencer.ResequencerEngine;
 import org.apache.camel.processor.resequencer.SequenceElementComparator;
 import org.apache.camel.processor.resequencer.SequenceSender;

camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java

@@ -45,7 +45,7 @@
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.TimeoutMap;
 import org.apache.camel.Traceable;
-import org.apache.camel.impl.LoggingExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
 import org.apache.camel.spi.AggregationRepository;
 import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.OptimisticLockingAggregationRepository;