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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new f19b9ad CAMEL-17596: Fix main-xxx examples main entry (#69)
f19b9ad is described below
commit f19b9adcd010b0a275f2b9334d68cfbe69d55b05
Author: Marouane Trabelsi <[email protected]>
AuthorDate: Fri Feb 4 10:31:37 2022 +0100
CAMEL-17596: Fix main-xxx examples main entry (#69)
- Updated `MyConfiguration` sample to implement `CamelConfiguration`
- Updated `MyConfiguration#configure` signature to match super-type
- Removed closed `MainConfigurationProperties#addConfigurationClass`
usage
Refs CAMEL-17567
---
.../src/main/java/org/apache/camel/example/MyApplication.java | 2 +-
.../src/main/java/org/apache/camel/example/MyConfiguration.java | 8 ++++++--
.../src/main/java/org/apache/camel/example/MyRouteBuilder.java | 2 +-
.../src/main/java/org/apache/camel/example/MyApplication.java | 4 ++--
.../src/main/java/org/apache/camel/example/MyConfiguration.java | 3 ++-
.../src/main/java/org/apache/camel/example/MyApplication.java | 2 +-
.../src/main/java/org/apache/camel/example/MyConfiguration.java | 7 +++++--
.../src/main/java/org/apache/camel/example/MyApplication.java | 2 +-
.../src/main/java/org/apache/camel/example/MyConfiguration.java | 7 +++++--
.../src/main/java/org/apache/camel/example/MyApplication.java | 2 +-
.../src/main/java/org/apache/camel/example/MyConfiguration.java | 7 +++++--
examples/main/src/main/resources/application.properties | 2 +-
12 files changed, 31 insertions(+), 17 deletions(-)
diff --git
a/examples/main-artemis/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/main-artemis/src/main/java/org/apache/camel/example/MyApplication.java
index b6dce99..23ac6cd 100644
---
a/examples/main-artemis/src/main/java/org/apache/camel/example/MyApplication.java
+++
b/examples/main-artemis/src/main/java/org/apache/camel/example/MyApplication.java
@@ -31,7 +31,7 @@ public final class MyApplication {
Main main = new Main();
// lets use a configuration class (you can specify multiple classes)
// (properties are automatic loaded from application.properties)
- main.configure().addConfigurationClass(MyConfiguration.class);
+ main.configure().addConfiguration(MyConfiguration.class);
// and add the routes (you can specify multiple classes)
main.configure().addRoutesBuilder(MyRouteBuilder.class);
// now keep the application running until the JVM is terminated (ctrl
+ c or sigterm)
diff --git
a/examples/main-artemis/src/main/java/org/apache/camel/example/MyConfiguration.java
b/examples/main-artemis/src/main/java/org/apache/camel/example/MyConfiguration.java
index 92feb42..dfd648c 100644
---
a/examples/main-artemis/src/main/java/org/apache/camel/example/MyConfiguration.java
+++
b/examples/main-artemis/src/main/java/org/apache/camel/example/MyConfiguration.java
@@ -16,10 +16,13 @@
*/
package org.apache.camel.example;
+import org.apache.camel.CamelConfiguration;
+import org.apache.camel.CamelContext;
+
/**
* Class to configure the Camel application.
*/
-public class MyConfiguration {
+public class MyConfiguration implements CamelConfiguration {
/**
* Creates the Artemis JMS ConnectionFactory and bind it to the Camel
registry
@@ -34,7 +37,8 @@ public class MyConfiguration {
// return cf;
// }
- public void configure() {
+ @Override
+ public void configure(CamelContext camelContext) {
// this method is optional and can be removed if no additional
configuration is needed.
}
diff --git
a/examples/main-artemis/src/main/java/org/apache/camel/example/MyRouteBuilder.java
b/examples/main-artemis/src/main/java/org/apache/camel/example/MyRouteBuilder.java
index 9f87933..5a17279 100644
---
a/examples/main-artemis/src/main/java/org/apache/camel/example/MyRouteBuilder.java
+++
b/examples/main-artemis/src/main/java/org/apache/camel/example/MyRouteBuilder.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
public class MyRouteBuilder extends RouteBuilder {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:foo?period={{myPeriod}}")
.transform(constant("Hello World"))
.to("jms:queue:cheese");
diff --git
a/examples/main-lambda/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/main-lambda/src/main/java/org/apache/camel/example/MyApplication.java
index 1013f33..3646957 100644
---
a/examples/main-lambda/src/main/java/org/apache/camel/example/MyApplication.java
+++
b/examples/main-lambda/src/main/java/org/apache/camel/example/MyApplication.java
@@ -29,10 +29,10 @@ public final class MyApplication {
public static void main(String[] args) throws Exception {
// use Camels Main class
Main main = new Main();
- // lets use a configuration class (you can specify multiple classes)
+ // let's use a configuration class (you can specify multiple classes)
// (properties are automatic loaded from application.properties)
// the configuration class has the configuration and also the routes
to be used
- main.configure().addConfigurationClass(MyConfiguration.class);
+ main.configure().addConfiguration(MyConfiguration.class);
// now keep the application running until the JVM is terminated (ctrl
+ c or sigterm)
main.run(args);
}
diff --git
a/examples/main-lambda/src/main/java/org/apache/camel/example/MyConfiguration.java
b/examples/main-lambda/src/main/java/org/apache/camel/example/MyConfiguration.java
index 14fd61b..f5dd990 100644
---
a/examples/main-lambda/src/main/java/org/apache/camel/example/MyConfiguration.java
+++
b/examples/main-lambda/src/main/java/org/apache/camel/example/MyConfiguration.java
@@ -19,11 +19,12 @@ package org.apache.camel.example;
import org.apache.camel.BindToRegistry;
import org.apache.camel.PropertyInject;
import org.apache.camel.builder.LambdaRouteBuilder;
+import org.apache.camel.CamelConfiguration;
/**
* Class to configure the Camel application.
*/
-public class MyConfiguration {
+public class MyConfiguration implements CamelConfiguration {
@BindToRegistry
public MyBean myBean(@PropertyInject("hi") String hi,
@PropertyInject("bye") String bye) {
diff --git
a/examples/main-xml/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/main-xml/src/main/java/org/apache/camel/example/MyApplication.java
index 0476b5f..0e1b14d 100644
---
a/examples/main-xml/src/main/java/org/apache/camel/example/MyApplication.java
+++
b/examples/main-xml/src/main/java/org/apache/camel/example/MyApplication.java
@@ -31,7 +31,7 @@ public final class MyApplication {
Main main = new Main();
// lets use a configuration class (you can specify multiple classes)
// (properties are automatic loaded from application.properties)
- main.configure().addConfigurationClass(MyConfiguration.class);
+ main.configure().addConfiguration(MyConfiguration.class);
// and add all the XML routes
main.configure().withRoutesIncludePattern("routes/*.xml");
// turn on reloading routes on code-changes
diff --git
a/examples/main-xml/src/main/java/org/apache/camel/example/MyConfiguration.java
b/examples/main-xml/src/main/java/org/apache/camel/example/MyConfiguration.java
index 9c26fdd..87418ed 100644
---
a/examples/main-xml/src/main/java/org/apache/camel/example/MyConfiguration.java
+++
b/examples/main-xml/src/main/java/org/apache/camel/example/MyConfiguration.java
@@ -17,12 +17,14 @@
package org.apache.camel.example;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
import org.apache.camel.PropertyInject;
+import org.apache.camel.CamelConfiguration;
/**
* Class to configure the Camel application.
*/
-public class MyConfiguration {
+public class MyConfiguration implements CamelConfiguration {
@BindToRegistry
public MyBean myBean(@PropertyInject("hi") String hi,
@PropertyInject("bye") String bye) {
@@ -30,7 +32,8 @@ public class MyConfiguration {
return new MyBean(hi, bye);
}
- public void configure() {
+ @Override
+ public void configure(CamelContext camelContext) {
// this method is optional and can be removed if no additional
configuration is needed.
}
diff --git
a/examples/main-yaml/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/main-yaml/src/main/java/org/apache/camel/example/MyApplication.java
index c49cba3..66007d3 100644
---
a/examples/main-yaml/src/main/java/org/apache/camel/example/MyApplication.java
+++
b/examples/main-yaml/src/main/java/org/apache/camel/example/MyApplication.java
@@ -31,7 +31,7 @@ public final class MyApplication {
Main main = new Main();
// lets use a configuration class (you can specify multiple classes)
// (properties are automatic loaded from application.properties)
- main.configure().addConfigurationClass(MyConfiguration.class);
+ main.configure().addConfiguration(MyConfiguration.class);
// and add all the YAML routes
main.configure().withRoutesIncludePattern("routes/*.yaml");
// turn on reloading routes on code-changes
diff --git
a/examples/main-yaml/src/main/java/org/apache/camel/example/MyConfiguration.java
b/examples/main-yaml/src/main/java/org/apache/camel/example/MyConfiguration.java
index 9c26fdd..87418ed 100644
---
a/examples/main-yaml/src/main/java/org/apache/camel/example/MyConfiguration.java
+++
b/examples/main-yaml/src/main/java/org/apache/camel/example/MyConfiguration.java
@@ -17,12 +17,14 @@
package org.apache.camel.example;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
import org.apache.camel.PropertyInject;
+import org.apache.camel.CamelConfiguration;
/**
* Class to configure the Camel application.
*/
-public class MyConfiguration {
+public class MyConfiguration implements CamelConfiguration {
@BindToRegistry
public MyBean myBean(@PropertyInject("hi") String hi,
@PropertyInject("bye") String bye) {
@@ -30,7 +32,8 @@ public class MyConfiguration {
return new MyBean(hi, bye);
}
- public void configure() {
+ @Override
+ public void configure(CamelContext camelContext) {
// this method is optional and can be removed if no additional
configuration is needed.
}
diff --git
a/examples/main/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/main/src/main/java/org/apache/camel/example/MyApplication.java
index b6dce99..23ac6cd 100644
--- a/examples/main/src/main/java/org/apache/camel/example/MyApplication.java
+++ b/examples/main/src/main/java/org/apache/camel/example/MyApplication.java
@@ -31,7 +31,7 @@ public final class MyApplication {
Main main = new Main();
// lets use a configuration class (you can specify multiple classes)
// (properties are automatic loaded from application.properties)
- main.configure().addConfigurationClass(MyConfiguration.class);
+ main.configure().addConfiguration(MyConfiguration.class);
// and add the routes (you can specify multiple classes)
main.configure().addRoutesBuilder(MyRouteBuilder.class);
// now keep the application running until the JVM is terminated (ctrl
+ c or sigterm)
diff --git
a/examples/main/src/main/java/org/apache/camel/example/MyConfiguration.java
b/examples/main/src/main/java/org/apache/camel/example/MyConfiguration.java
index 9c26fdd..326d4ae 100644
--- a/examples/main/src/main/java/org/apache/camel/example/MyConfiguration.java
+++ b/examples/main/src/main/java/org/apache/camel/example/MyConfiguration.java
@@ -17,12 +17,14 @@
package org.apache.camel.example;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelConfiguration;
+import org.apache.camel.CamelContext;
import org.apache.camel.PropertyInject;
/**
* Class to configure the Camel application.
*/
-public class MyConfiguration {
+public class MyConfiguration implements CamelConfiguration {
@BindToRegistry
public MyBean myBean(@PropertyInject("hi") String hi,
@PropertyInject("bye") String bye) {
@@ -30,7 +32,8 @@ public class MyConfiguration {
return new MyBean(hi, bye);
}
- public void configure() {
+ @Override
+ public void configure(CamelContext camelContext) {
// this method is optional and can be removed if no additional
configuration is needed.
}
diff --git a/examples/main/src/main/resources/application.properties
b/examples/main/src/main/resources/application.properties
index a442f7f..2854c44 100644
--- a/examples/main/src/main/resources/application.properties
+++ b/examples/main/src/main/resources/application.properties
@@ -34,4 +34,4 @@ myCron = 0/2 * * * * ?
# application properties
hi = Hello
-
+bye = Bye
