You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/02/02 15:12:58 UTC
[camel] branch main updated (03fbe30 -> fc7df19)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 03fbe30 CAMEL-17543 - Camel Azure Eventhubs: Support adding properties to the Event mapped from Camel Header
new 96c3ed7 CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes.
new fc7df19 CAMEL-17569: camel-jbang and java-dsl: Support loading camel configuration classes, and servicies (BindToRegistry).
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel}/CamelConfiguration.java | 14 +++--
.../main/java/org/apache/camel/Configuration.java} | 23 +++++---
.../camel/impl/engine/AbstractCamelContext.java | 1 -
.../MainConfigurationPropertiesConfigurer.java | 2 +-
.../org/apache/camel/main/BaseMainSupport.java | 61 +++++++++++-----------
.../src/main/java/org/apache/camel/main/Main.java | 1 +
.../apache/camel/main/MainCommandLineSupport.java | 2 +
.../camel/main/MainConfigurationProperties.java | 1 +
.../java/org/apache/camel/main/MainSupport.java | 1 +
.../org/apache/camel/main/ContextEventsTest.java | 1 +
.../org/apache/camel/main/MainCustomizerTest.java | 1 +
.../camel/main/MainIoCNewRouteBuilderTest.java | 4 +-
.../java/org/apache/camel/main/MainIoCTest.java | 4 +-
.../main/MainRoutesCollectorPackageScanTest.java | 3 ++
.../camel/main/scan/MyScanConfiguration.java | 2 +-
.../main/scan/MyScanConfigurationAnnotation.java} | 16 +++---
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 20 +++++--
.../dsl/java/joor/JavaMainConfigurationTest.java | 28 +++++++---
.../src/test/resources/routes/MyConfiguration.java | 21 ++++----
.../resources/routes/MyConfigurationRoute.java | 17 +++---
20 files changed, 139 insertions(+), 84 deletions(-)
copy core/{camel-main/src/main/java/org/apache/camel/main => camel-api/src/main/java/org/apache/camel}/CamelConfiguration.java (72%)
copy core/{camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java => camel-api/src/main/java/org/apache/camel/Configuration.java} (57%)
copy core/camel-main/src/{main/java/org/apache/camel/main/CamelConfiguration.java => test/java/org/apache/camel/main/scan/MyScanConfigurationAnnotation.java} (71%)
copy core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java => dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainConfigurationTest.java (52%)
copy core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java => dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfiguration.java (70%)
rename core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java => dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfigurationRoute.java (75%)
[camel] 01/02: CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96c3ed7228f36ed3602bed37d4e1db215641118c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Feb 2 16:01:54 2022 +0100
CAMEL-17580: CamelConfiguration to camel-api to make it generic for all Camel runtimes.
---
.../java/org/apache/camel}/CamelConfiguration.java | 14 +++--
.../main/java/org/apache/camel/Configuration.java} | 23 +++++---
.../camel/impl/engine/AbstractCamelContext.java | 1 -
.../MainConfigurationPropertiesConfigurer.java | 2 +-
.../org/apache/camel/main/BaseMainSupport.java | 61 +++++++++++-----------
.../src/main/java/org/apache/camel/main/Main.java | 1 +
.../apache/camel/main/MainCommandLineSupport.java | 2 +
.../camel/main/MainConfigurationProperties.java | 1 +
.../java/org/apache/camel/main/MainSupport.java | 1 +
.../org/apache/camel/main/ContextEventsTest.java | 1 +
.../org/apache/camel/main/MainCustomizerTest.java | 1 +
.../camel/main/MainIoCNewRouteBuilderTest.java | 4 +-
.../java/org/apache/camel/main/MainIoCTest.java | 4 +-
.../main/MainRoutesCollectorPackageScanTest.java | 3 ++
.../camel/main/scan/MyScanConfiguration.java | 2 +-
.../main/scan/MyScanConfigurationAnnotation.java} | 16 +++---
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 26 +++++++--
.../dsl/java/joor/JavaMainConfigurationTest.java | 28 +++++++---
.../src/test/resources/routes/MyConfiguration.java | 21 ++++----
.../resources/routes/MyConfigurationRoute.java | 17 +++---
20 files changed, 147 insertions(+), 82 deletions(-)
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java b/core/camel-api/src/main/java/org/apache/camel/CamelConfiguration.java
similarity index 72%
copy from core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
copy to core/camel-api/src/main/java/org/apache/camel/CamelConfiguration.java
index 0c871bb..85d2b6e 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelConfiguration.java
@@ -14,15 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.main;
-
-import org.apache.camel.CamelContext;
+package org.apache.camel;
/**
- * Configuration class for Camel Main applications.
+ * Configuration class for Camel applications.
+ *
+ * This class allows doing custom configuration during Camel startup such as setting up custom beans using the
+ * {@link BindToRegistry} annotation.
*/
public interface CamelConfiguration {
+ /**
+ * Method that allows to do custom configuration during Camel startup.
+ *
+ * @param camelContext the context
+ */
default void configure(CamelContext camelContext) throws Exception {
}
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java b/core/camel-api/src/main/java/org/apache/camel/Configuration.java
similarity index 57%
copy from core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
copy to core/camel-api/src/main/java/org/apache/camel/Configuration.java
index 0c871bb..c12dbef 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Configuration.java
@@ -14,16 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.main;
+package org.apache.camel;
-import org.apache.camel.CamelContext;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
- * Configuration class for Camel Main applications.
+ * Marks the class as a {@link CamelConfiguration} class.
+ *
+ * This allows runtimes such as Camel Main to do package scan and automatic discover Camel configuration classes.
*/
-public interface CamelConfiguration {
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({ ElementType.TYPE })
+public @interface Configuration {
- default void configure(CamelContext camelContext) throws Exception {
- }
+ /**
+ * The name of the configuration bean
+ */
+ String value() default "";
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index d6522f6..468ef34 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -248,7 +248,6 @@ public abstract class AbstractCamelContext extends BaseService
private List<RoutePolicyFactory> routePolicyFactories = new ArrayList<>();
// special flags to control the first startup which can are special
private volatile boolean firstStartDone;
- private volatile boolean firstStopDone;
private volatile boolean doNotStartRoutesOnFirstStart;
private Initialization initialization = Initialization.Default;
private Boolean autoStartup = Boolean.TRUE;
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index 8ec80c7..000c931 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
@@ -692,7 +692,7 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
case "configurations":
- case "Configurations": return org.apache.camel.main.CamelConfiguration.class;
+ case "Configurations": return org.apache.camel.CamelConfiguration.class;
case "globaloptions":
case "GlobalOptions": return java.lang.String.class;
case "routesbuilders":
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 5c108df..deb63b4 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
@@ -19,7 +19,6 @@ package org.apache.camel.main;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -35,8 +34,10 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
+import org.apache.camel.Configuration;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoSuchLanguageException;
import org.apache.camel.RuntimeCamelException;
@@ -75,8 +76,6 @@ import static org.apache.camel.main.MainHelper.computeProperties;
import static org.apache.camel.main.MainHelper.optionKey;
import static org.apache.camel.main.MainHelper.setPropertiesOnTarget;
import static org.apache.camel.main.MainHelper.validateOptionAndValue;
-import static org.apache.camel.support.ObjectHelper.invokeMethod;
-import static org.apache.camel.util.ReflectionHelper.findMethod;
import static org.apache.camel.util.StringHelper.matches;
/**
@@ -295,19 +294,15 @@ public abstract class BaseMainSupport extends BaseService {
}
protected void loadConfigurations(CamelContext camelContext) throws Exception {
- // lets use Camel's bean post processor on any existing configuration classes
- // so the instance has some support for dependency injection
- CamelBeanPostProcessor postProcessor = camelContext.adapt(ExtendedCamelContext.class).getBeanPostProcessor();
- for (Object configuration : mainConfigurationProperties.getConfigurations()) {
- postProcessor.postProcessBeforeInitialization(configuration, configuration.getClass().getName());
- postProcessor.postProcessAfterInitialization(configuration, configuration.getClass().getName());
- }
-
// auto-detect camel configurations via base package scanning
String basePackage = camelContext.adapt(ExtendedCamelContext.class).getBasePackageScan();
if (basePackage != null) {
PackageScanClassResolver pscr = camelContext.adapt(ExtendedCamelContext.class).getPackageScanClassResolver();
- Set<Class<?>> found = pscr.findImplementations(CamelConfiguration.class, basePackage);
+ Set<Class<?>> found1 = pscr.findImplementations(CamelConfiguration.class, basePackage);
+ Set<Class<?>> found2 = pscr.findAnnotated(Configuration.class, basePackage);
+ Set<Class<?>> found = new LinkedHashSet<>();
+ found.addAll(found1);
+ found.addAll(found2);
for (Class<?> clazz : found) {
// lets use Camel's injector so the class has some support for dependency injection
Object config = camelContext.getInjector().newInstance(clazz);
@@ -340,24 +335,30 @@ public abstract class BaseMainSupport extends BaseService {
}
}
- for (Object config : mainConfigurationProperties.getConfigurations()) {
- // invoke configure method if exists
- Method method = findMethod(config.getClass(), "configure");
- if (method != null) {
- LOG.info("Calling configure method on configuration class: {}", config.getClass().getName());
- invokeMethod(method, config);
- } else {
- Object arg = camelContext;
- method = findMethod(config.getClass(), "configure", CamelContext.class);
- if (method == null) {
- method = findMethod(config.getClass(), "configure", Main.class);
- arg = this;
- }
- if (method != null) {
- LOG.info("Calling configure method on configuration class: {}", config.getClass().getName());
- invokeMethod(method, config, arg);
- }
- }
+ // lets use Camel's bean post processor on any existing configuration classes
+ // so the instance has some support for dependency injection
+ CamelBeanPostProcessor postProcessor = camelContext.adapt(ExtendedCamelContext.class).getBeanPostProcessor();
+
+ // discover configurations from the registry
+ Set<CamelConfiguration> registryConfigurations = camelContext.getRegistry().findByType(CamelConfiguration.class);
+ for (CamelConfiguration configuration : registryConfigurations) {
+ postProcessor.postProcessBeforeInitialization(configuration, configuration.getClass().getName());
+ postProcessor.postProcessAfterInitialization(configuration, configuration.getClass().getName());
+ }
+
+ // prepare the directly configured instances (from registry should have been post processed already)
+ for (Object configuration : mainConfigurationProperties.getConfigurations()) {
+ postProcessor.postProcessBeforeInitialization(configuration, configuration.getClass().getName());
+ postProcessor.postProcessAfterInitialization(configuration, configuration.getClass().getName());
+ }
+
+ // invoke configure on configurations
+ for (CamelConfiguration config : mainConfigurationProperties.getConfigurations()) {
+ config.configure(camelContext);
+ }
+ // invoke configure on configurations that are from registry
+ for (CamelConfiguration config : registryConfigurations) {
+ config.configure(camelContext);
}
}
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/Main.java b/core/camel-main/src/main/java/org/apache/camel/main/Main.java
index ae367a1..e42779a 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/Main.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/Main.java
@@ -18,6 +18,7 @@ package org.apache.camel.main;
import java.util.Map;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainCommandLineSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/MainCommandLineSupport.java
index c8688b8..1b7c2f39 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainCommandLineSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainCommandLineSupport.java
@@ -21,6 +21,8 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
+import org.apache.camel.CamelConfiguration;
+
/**
* Support for command line arguments to Camel main.
*/
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
index b8334b3..8138bef 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
@@ -19,6 +19,7 @@ package org.apache.camel.main;
import java.util.ArrayList;
import java.util.List;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.LambdaRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
index 820d721..85e24b8 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
@@ -19,6 +19,7 @@ package org.apache.camel.main;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/ContextEventsTest.java b/core/camel-main/src/test/java/org/apache/camel/main/ContextEventsTest.java
index 734cd7b..4062dde 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/ContextEventsTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/ContextEventsTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.main;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.spi.OnCamelContextInitialized;
import org.apache.camel.spi.OnCamelContextInitializing;
import org.apache.camel.spi.OnCamelContextStart;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainCustomizerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainCustomizerTest.java
index 07bc162..f076933 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainCustomizerTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainCustomizerTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.main;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.component.log.LogComponent;
import org.apache.camel.spi.ComponentCustomizer;
import org.apache.camel.support.CustomizersSupport;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
index fe7ba54..2306425 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCNewRouteBuilderTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.main;
import org.apache.camel.BeanInject;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.CamelContext;
import org.apache.camel.PropertyInject;
import org.apache.camel.builder.RouteBuilder;
@@ -73,7 +74,8 @@ public class MainIoCNewRouteBuilderTest {
}
}
- public void configure() {
+ @Override
+ public void configure(CamelContext camel) {
camel.getGlobalOptions().put("foo", "123");
}
}
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
index 70881df..15be359 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.main;
import org.apache.camel.BeanInject;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.CamelContext;
import org.apache.camel.PropertyInject;
import org.apache.camel.builder.RouteBuilder;
@@ -146,7 +147,8 @@ public class MainIoCTest {
return cool.getName();
}
- public void configure() {
+ @Override
+ public void configure(CamelContext context) {
camel.getGlobalOptions().put("foo", "123");
}
}
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainRoutesCollectorPackageScanTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainRoutesCollectorPackageScanTest.java
index 81c0711..f61d7bf 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainRoutesCollectorPackageScanTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainRoutesCollectorPackageScanTest.java
@@ -53,6 +53,9 @@ public class MainRoutesCollectorPackageScanTest {
// camel configuration should be scanned
Assertions.assertEquals("true", camelContext.getGlobalOption("scanConfigured"));
+ MyAddress adr = camelContext.getRegistry().lookupByNameAndType("address", MyAddress.class);
+ Assertions.assertEquals(4444, adr.getZip());
+ Assertions.assertEquals("Somestreet 123", adr.getStreet());
// custom type converter should be scanned
MyFoo foo = camelContext.getTypeConverter().convertTo(MyFoo.class, "Donald");
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java b/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java
index ce78a59..272f6ab 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.main.scan;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.CamelContext;
-import org.apache.camel.main.CamelConfiguration;
import org.junit.jupiter.api.Assertions;
public class MyScanConfiguration implements CamelConfiguration {
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java b/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfigurationAnnotation.java
similarity index 71%
copy from core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
copy to core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfigurationAnnotation.java
index 0c871bb..b1a30c2 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfigurationAnnotation.java
@@ -14,16 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.main;
+package org.apache.camel.main.scan;
-import org.apache.camel.CamelContext;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Configuration;
+import org.apache.camel.main.MyAddress;
-/**
- * Configuration class for Camel Main applications.
- */
-public interface CamelConfiguration {
+@Configuration
+public class MyScanConfigurationAnnotation {
- default void configure(CamelContext camelContext) throws Exception {
+ @BindToRegistry
+ public MyAddress address() {
+ return new MyAddress(4444, "Somestreet 123");
}
}
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
index d0ef958..3ec8e0a 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
@@ -22,6 +22,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.Configuration;
import org.apache.camel.Converter;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.LoggingLevel;
@@ -36,6 +37,7 @@ import org.apache.camel.spi.annotations.RoutesLoader;
import org.apache.camel.support.ResourceHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
import org.joor.Reflect;
@ManagedResource(description = "Managed JavaRoutesBuilderLoader")
@@ -55,8 +57,8 @@ public class JavaRoutesBuilderLoader extends RouteBuilderLoaderSupport {
if (is == null) {
throw new FileNotFoundException(resource.getLocation());
}
- final String content = IOHelper.loadText(is);
- final String name = determineName(resource, content);
+ String content = IOHelper.loadText(is);
+ String name = determineName(resource, content);
Reflect ref = Reflect.compile(name, content).create();
Class<?> clazz = ref.type();
@@ -84,6 +86,25 @@ public class JavaRoutesBuilderLoader extends RouteBuilderLoaderSupport {
BindToRegistry bir = obj.getClass().getAnnotation(BindToRegistry.class);
if (bir != null) {
CamelBeanPostProcessor bpp = getCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor();
+ if (ObjectHelper.isNotEmpty(bir.value())) {
+ name = bir.value();
+ }
+
+ // to support hot reloading of beans then we need to enable unbind mode in bean post processor
+ bpp.setUnbindEnabled(true);
+ try {
+ // this class is a bean service which needs to be post processed and registered which happens
+ // automatic by the bean post processor
+ bpp.postProcessBeforeInitialization(obj, name);
+ bpp.postProcessAfterInitialization(obj, name);
+ } finally {
+ bpp.setUnbindEnabled(false);
+ }
+ return null;
+ }
+ Configuration cfg = obj.getClass().getAnnotation(Configuration.class);
+ if (cfg != null) {
+ CamelBeanPostProcessor bpp = getCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor();
// to support hot reloading of beans then we need to enable unbind mode in bean post processor
bpp.setUnbindEnabled(true);
@@ -97,7 +118,6 @@ public class JavaRoutesBuilderLoader extends RouteBuilderLoaderSupport {
}
return null;
}
- // TODO: CamelConfiguration
}
return null;
}
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java b/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainConfigurationTest.java
similarity index 52%
copy from core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java
copy to dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainConfigurationTest.java
index ce78a59..98b71a9 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/scan/MyScanConfiguration.java
+++ b/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/JavaMainConfigurationTest.java
@@ -14,18 +14,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.main.scan;
+package org.apache.camel.dsl.java.joor;
import org.apache.camel.CamelContext;
-import org.apache.camel.main.CamelConfiguration;
-import org.junit.jupiter.api.Assertions;
+import org.apache.camel.main.Main;
+import org.junit.jupiter.api.Test;
-public class MyScanConfiguration implements CamelConfiguration {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
- @Override
- public void configure(CamelContext camelContext) throws Exception {
- Assertions.assertNotNull(camelContext);
- camelContext.getGlobalOptions().put("scanConfigured", "true");
+public class JavaMainConfigurationTest {
+
+ @Test
+ public void testMainConfiguration() throws Exception {
+ Main main = new Main();
+ main.configure().withRoutesIncludePattern("routes/MyConfigurationRoute.java,routes/MyConfiguration.java");
+ main.start();
+
+ CamelContext camelContext = main.getCamelContext();
+ assertNotNull(camelContext);
+
+ String out = main.getCamelTemplate().requestBody("direct:start", "Hello", String.class);
+ assertEquals("Hello Donald", out);
+
+ main.stop();
}
}
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfiguration.java
similarity index 70%
copy from core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
copy to dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfiguration.java
index 0c871bb..ffcf6ac 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
+++ b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfiguration.java
@@ -14,16 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.main;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Configuration;
+import org.apache.camel.dsl.java.joor.support.MyUser;
-import org.apache.camel.CamelContext;
+@Configuration
+public class MyConfiguration {
-/**
- * Configuration class for Camel Main applications.
- */
-public interface CamelConfiguration {
-
- default void configure(CamelContext camelContext) throws Exception {
+ @BindToRegistry
+ public MyUser user() {
+ MyUser user = new MyUser();
+ user.setName("Donald");
+ user.setAge(42);
+ return user;
}
-}
+}
\ No newline at end of file
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfigurationRoute.java
similarity index 75%
rename from core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
rename to dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfigurationRoute.java
index 0c871bb..3313d6d 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/CamelConfiguration.java
+++ b/dsl/camel-java-joor-dsl/src/test/resources/routes/MyConfigurationRoute.java
@@ -14,16 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.main;
+import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.CamelContext;
+public class MyConfigurationRoute extends RouteBuilder {
-/**
- * Configuration class for Camel Main applications.
- */
-public interface CamelConfiguration {
-
- default void configure(CamelContext camelContext) throws Exception {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .setBody().simple("${body} ${bean:user.name}");
}
-
-}
+}
\ No newline at end of file
[camel] 02/02: CAMEL-17569: camel-jbang and java-dsl: Support loading camel configuration classes, and servicies (BindToRegistry).
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fc7df19986fe63de7d04f9d92d8036c8c8967984
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Feb 2 16:12:14 2022 +0100
CAMEL-17569: camel-jbang and java-dsl: Support loading camel configuration classes, and servicies (BindToRegistry).
---
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 26 +++++++---------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
index 3ec8e0a..dd149db 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
@@ -22,6 +22,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelConfiguration;
import org.apache.camel.Configuration;
import org.apache.camel.Converter;
import org.apache.camel.ExtendedCamelContext;
@@ -84,12 +85,14 @@ public class JavaRoutesBuilderLoader extends RouteBuilderLoaderSupport {
return (RouteBuilder) obj;
} else if (obj != null) {
BindToRegistry bir = obj.getClass().getAnnotation(BindToRegistry.class);
- if (bir != null) {
+ Configuration cfg = obj.getClass().getAnnotation(Configuration.class);
+ if (bir != null || cfg != null || obj instanceof CamelConfiguration) {
CamelBeanPostProcessor bpp = getCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor();
- if (ObjectHelper.isNotEmpty(bir.value())) {
+ if (bir != null && ObjectHelper.isNotEmpty(bir.value())) {
name = bir.value();
+ } else if (cfg != null && ObjectHelper.isNotEmpty(cfg.value())) {
+ name = cfg.value();
}
-
// to support hot reloading of beans then we need to enable unbind mode in bean post processor
bpp.setUnbindEnabled(true);
try {
@@ -100,21 +103,8 @@ public class JavaRoutesBuilderLoader extends RouteBuilderLoaderSupport {
} finally {
bpp.setUnbindEnabled(false);
}
- return null;
- }
- Configuration cfg = obj.getClass().getAnnotation(Configuration.class);
- if (cfg != null) {
- CamelBeanPostProcessor bpp = getCamelContext().adapt(ExtendedCamelContext.class).getBeanPostProcessor();
-
- // to support hot reloading of beans then we need to enable unbind mode in bean post processor
- bpp.setUnbindEnabled(true);
- try {
- // this class is a bean service which needs to be post processed and registered which happens
- // automatic by the bean post processor
- bpp.postProcessBeforeInitialization(obj, name);
- bpp.postProcessAfterInitialization(obj, name);
- } finally {
- bpp.setUnbindEnabled(false);
+ if (obj instanceof CamelConfiguration) {
+ ((CamelConfiguration) obj).configure(getCamelContext());
}
return null;
}