[camel] 02/04: CAMEL-15126: camel-health - polished and fix TODO with route controller not an extension

[davsclaus]

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 bc2c52b9f112fe47fa59718ff6f704387d2c4f1d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu May 28 09:54:22 2020 +0200

    CAMEL-15126: camel-health - polished and fix TODO with route controller not 
an extension
---
 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java   | 8 ++++++--
 .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java  | 6 ------
 .../src/main/java/org/apache/camel/main/BaseMainSupport.java      | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 4e3a469..a772ac7 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -376,9 +376,8 @@ public abstract class AbstractCamelContext extends 
BaseService
             }
         });
 
+        // TODO:
         setDefaultExtension(HealthCheckRegistry.class, 
this::createHealthCheckRegistry);
-        // TODO: is route controller needed as extension?
-        setDefaultExtension(RouteController.class, 
this::createRouteController);
 
         if (build) {
             try {
@@ -3232,6 +3231,11 @@ public abstract class AbstractCamelContext extends 
BaseService
     }
 
     protected void doStartEagerServices() {
+        // initialize health-check registry
+        HealthCheckRegistry hcr = getExtension(HealthCheckRegistry.class);
+        if (hcr == null) {
+            setExtension(HealthCheckRegistry.class, 
createHealthCheckRegistry());
+        }
         getFactoryFinderResolver();
         getDefaultFactoryFinder();
         getComponentResolver();
diff --git 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index a53f472..67e34f7 100644
--- 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -298,12 +298,6 @@ public class DefaultCamelContext extends 
SimpleCamelContext implements ModelCame
     }
 
     @Override
-    protected void doStartEagerServices() {
-        getExtension(HealthCheckRegistry.class);
-        super.doStartEagerServices();
-    }
-
-    @Override
     protected void bindDataFormats() throws Exception {
         // eager lookup data formats and bind to registry so the dataformats 
can
         // be looked up and used
diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java 
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index ef615c3..5bde1e9 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -403,7 +403,7 @@ public abstract class BaseMainSupport extends BaseService {
 
         if (mainConfigurationProperties.getPackageScanRouteBuilders() != null) 
{
             String[] pkgs = 
mainConfigurationProperties.getPackageScanRouteBuilders().split(",");
-            Set<Class<?>> set = 
camelContext.getExtension(ExtendedCamelContext.class).getPackageScanClassResolver().findImplementations(RoutesBuilder.class,
 pkgs);
+            Set<Class<?>> set = 
camelContext.adapt(ExtendedCamelContext.class).getPackageScanClassResolver().findImplementations(RoutesBuilder.class,
 pkgs);
             for (Class<?> routeClazz : set) {
                 Object builder = 
camelContext.getInjector().newInstance(routeClazz);
                 if (builder instanceof RoutesBuilder) {