[camel] 26/43: Trivial changes

[gnodet]

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

gnodet pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit c1d989db894e582f52faac7df66e1846ce354451
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Oct 1 17:20:49 2018 +0200

    Trivial changes
---
 .../src/main/java/org/apache/camel/impl/DefaultRouteController.java    | 3 ++-
 camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java   | 1 -
 .../test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteController.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteController.java
index 9d8956f..766423a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteController.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteController.java
@@ -25,9 +25,10 @@ import org.apache.camel.Experimental;
 import org.apache.camel.Route;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.spi.RouteController;
+import org.apache.camel.support.ServiceSupport;
 
 @Experimental
-public class DefaultRouteController extends 
org.apache.camel.support.ServiceSupport implements RouteController  {
+public class DefaultRouteController extends ServiceSupport implements 
RouteController  {
     private DefaultCamelContext camelContext;
 
     public DefaultRouteController() {
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
index c74e264..76b69df 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -200,7 +200,6 @@ public class RouteDefinition extends 
ProcessorDefinition<RouteDefinition> {
     public List<RouteContext> addRoutes(ModelCamelContext camelContext, 
Collection<Route> routes) throws Exception {
         List<RouteContext> answer = new ArrayList<>();
 
-        @SuppressWarnings("deprecation")
         ErrorHandlerFactory handler = camelContext.getErrorHandlerFactory();
         if (handler != null) {
             setErrorHandlerBuilderIfNull(handler);
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java
index 879cd63..7af04c0 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java
@@ -49,7 +49,7 @@ public class WireTapShutdownBeanTest extends 
ContextTestSupport {
 
         LATCH.countDown();
 
-        // shutdown Camel which should let the inlfight wire-tap message route 
to completion
+        // shutdown Camel which should let the inflight wire-tap message route 
to completion
         context.stop();
 
         // should allow to shutdown nicely