CAMEL-13283: Add @BindRegistry annotation to allow to bind beans/clas…

…ses to registry.

core/camel-core/src/main/java/org/apache/camel/main/Main.java

@@ -34,7 +34,7 @@ public class Main extends MainSupport {
     public Main() {
     }
 
-    public Main(Class configurationClass) {
+    public Main(Class... configurationClass) {
         super(configurationClass);
     }
 

core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java

@@ -79,7 +79,7 @@ public abstract class MainSupport extends ServiceSupport {
 
     protected CamelContext camelContext;
     protected List<RouteBuilder> routeBuilders = new ArrayList<>();
-    protected Class configurationClass;
+    protected List<Class> configurationClasses;
     protected String routeBuilderClasses;
     protected String fileWatchDirectory;
     protected boolean fileWatchDirectoryRecursively;
@@ -112,9 +112,9 @@ public void run() {
         }
     }
 
-    protected MainSupport(Class configurationClass) {
+    protected MainSupport(Class... configurationClasses) {
         this();
-        this.configurationClass = configurationClass;
+        addConfigurationClass(configurationClasses);
     }
 
     protected MainSupport() {
@@ -429,16 +429,23 @@ public int getExitCode() {
         return exitCode.get();
     }
 
-    public Class getConfigurationClass() {
-        return configurationClass;
+    public List<Class> getConfigurationClasses() {
+        return configurationClasses;
     }
 
     /**
-     * Sets optional configuration class which allows to do any initial configuration.
+     * Sets optional configuration classes which allows to do any initial configuration.
      * The class can/should have a method named <tt>configure</tt> which is called.
      */
-    public void setConfigurationClass(Class configurationClass) {
-        this.configurationClass = configurationClass;
+    public void setConfigurationClasses(List<Class> configurationClasses) {
+        this.configurationClasses = configurationClasses;
+    }
+
+    public void addConfigurationClass(Class... configurationClasses) {
+        if (this.configurationClasses == null) {
+            this.configurationClasses = new ArrayList<>();
+        }
+        this.configurationClasses.addAll(Arrays.asList(configurationClasses));
     }
 
     public String getRouteBuilderClasses() {
@@ -517,6 +524,11 @@ public boolean isAutoConfigurationEnabled() {
      * - camel.language.name.option2=value2
      * Where name is the name of the component, dataformat or language such as seda,direct,jaxb.
      * <p/>
+     * The auto configuration also works for any options on components
+     * that is a complex type (not standard Java type) and there has been an explicit single
+     * bean instance registered to the Camel registry via the {@link org.apache.camel.spi.Registry#bind(String, Object)} method
+     * or by using the {@link org.apache.camel.BindToRegistry} annotation style.
+     * <p/>
      * This option is default enabled.
      */
     public void setAutoConfigurationEnabled(boolean autoConfigurationEnabled) {
@@ -691,14 +703,16 @@ protected void postProcessCamelContext(CamelContext camelContext) throws Excepti
             camelContext.getManagementStrategy().addEventNotifier(notifier);
         }
 
-        if (configurationClass != null) {
-            // create instance of configuration class as it may do dependency injection and bind to registry
-            Object config = camelContext.getInjector().newInstance(configurationClass);
-            // invoke configure method if exists
-            Method method = findMethod(configurationClass, "configure");
-            if (method != null) {
-                log.info("Calling configure method on configuration class: {}", configurationClass);
-                invokeMethod(method, config);
+        if (configurationClasses != null) {
+            for (Class clazz : configurationClasses) {
+                // create instance of configuration class as it may do dependency injection and bind to registry
+                Object config = camelContext.getInjector().newInstance(clazz);
+                // invoke configure method if exists
+                Method method = findMethod(clazz, "configure");
+                if (method != null) {
+                    log.info("Calling configure method on configuration class: {}", clazz.getName());
+                    invokeMethod(method, config);
+                }
             }
         }
 
@@ -841,12 +855,18 @@ public void addRouteBuilder(RouteBuilder routeBuilder) {
         getRouteBuilders().add(routeBuilder);
     }
 
-    public void addRouteBuilder(Class routeBuilder) {
+    public void addRouteBuilder(Class... routeBuilder) {
         String existing = routeBuilderClasses;
-        if (existing != null) {
-            existing = existing + "," + routeBuilder.getName();
-        } else {
-            existing = routeBuilder.getName();
+        if (existing == null) {
+            existing = "";
+        }
+        if (routeBuilder != null) {
+            for (Class clazz : routeBuilder) {
+                if (!existing.isEmpty()) {
+                    existing = existing + ",";
+                }
+                existing = existing + clazz.getName();
+            }
         }
         setRouteBuilderClasses(existing);
     }

core/camel-core/src/test/java/org/apache/camel/main/MainIoCTest.java

@@ -34,7 +34,9 @@ public class MainIoCTest extends Assert {
     @Test
     public void testMainIoC() throws Exception {
         // use configuration class
-        Main main = new Main(MyConfiguration.class);
+        Main main = new Main();
+        // add the configuration
+        main.addConfigurationClass(MyConfiguration.class);
         // add as class so we get IoC
         main.addRouteBuilder(MyRouteBuilder.class);
         main.start();

examples/camel-example-main/src/main/java/org/apache/camel/example/MyApplication.java

@@ -29,10 +29,10 @@ private MyApplication() {
     public static void main(String[] args) throws Exception {
         // use Camels Main class
         Main main = new Main();
-        // lets use a configuration class
-        // properties are automatic loaded from application.properties
-        main.setConfigurationClass(MyConfiguration.class);
-        // and add the routes
+        // lets use a configuration class (you can specify multiple classes)
+        // (properties are automatic loaded from application.properties)
+        main.addConfigurationClass(MyConfiguration.class);
+        // and add the routes (you can specify multiple classes)
         main.addRouteBuilder(MyRouteBuilder.class);
         // now keep the application running until the JVM is terminated (ctrl + c or sigterm)
         main.run(args);