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 b6e4283 CAMEL-17574: Specify a main class and avoid overriding
getPropertyPlaceholderLocations (#76)
b6e4283 is described below
commit b6e4283f1bffe81c9640bb21dd7c8275fa79fec3
Author: Nicolas Filotto <[email protected]>
AuthorDate: Mon Feb 21 13:41:53 2022 +0100
CAMEL-17574: Specify a main class and avoid overriding
getPropertyPlaceholderLocations (#76)
* CAMEL-17574: Avoid overriding getPropertyPlaceholderLocations as it is
not needed
* CAMEL-17574: Specify the main class when needed
---
.../src/test/java/org/apache/camel/example/ftp/FtpTest.java | 12 ++++++------
.../src/test/java/org/apache/camel/example/KameletTest.java | 5 ++---
.../test/java/org/apache/camel/example/MainLambdaTest.java | 5 ++---
.../src/test/java/org/apache/camel/example/MainYAMLTest.java | 5 ++---
.../src/test/java/org/apache/camel/example/MainTest.java | 5 ++---
5 files changed, 14 insertions(+), 18 deletions(-)
diff --git
a/examples/ftp/src/test/java/org/apache/camel/example/ftp/FtpTest.java
b/examples/ftp/src/test/java/org/apache/camel/example/ftp/FtpTest.java
index 53cd31b..4507087 100644
--- a/examples/ftp/src/test/java/org/apache/camel/example/ftp/FtpTest.java
+++ b/examples/ftp/src/test/java/org/apache/camel/example/ftp/FtpTest.java
@@ -37,6 +37,8 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.apache.camel.util.PropertiesHelper.asProperties;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -67,7 +69,7 @@ class FtpTest extends CamelMainTestSupport {
serverFactory.setFileSystem(fsf);
// Create the admin home
- new File("./target/ftp-server").mkdirs();
+ createDirectory("./target/ftp-server");
SERVER = serverFactory.createServer();
// start the server
@@ -76,17 +78,15 @@ class FtpTest extends CamelMainTestSupport {
@AfterAll
static void destroy() {
+ // Delete directories
+ deleteDirectory("./target/ftp-server");
+ deleteDirectory("./target/upload");
if (SERVER != null) {
SERVER.stop();
}
}
@Override
- protected String getPropertyPlaceholderLocations() {
- return "classpath:ftp.properties";
- }
-
- @Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
return asProperties(
"ftp.port", Integer.toString(PORT),
diff --git
a/examples/kamelet/src/test/java/org/apache/camel/example/KameletTest.java
b/examples/kamelet/src/test/java/org/apache/camel/example/KameletTest.java
index 7b7b036..0bd43b1 100644
--- a/examples/kamelet/src/test/java/org/apache/camel/example/KameletTest.java
+++ b/examples/kamelet/src/test/java/org/apache/camel/example/KameletTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.example;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
@@ -40,7 +39,7 @@ class KameletTest extends CamelMainTestSupport {
}
@Override
- protected void configure(MainConfigurationProperties configuration) {
-
configuration.withBasePackageScan(MyApplication.class.getPackageName());
+ protected Class<?> getMainClass() {
+ return MyApplication.class;
}
}
diff --git
a/examples/main-lambda/src/test/java/org/apache/camel/example/MainLambdaTest.java
b/examples/main-lambda/src/test/java/org/apache/camel/example/MainLambdaTest.java
index 9a1185e..51253ab 100644
---
a/examples/main-lambda/src/test/java/org/apache/camel/example/MainLambdaTest.java
+++
b/examples/main-lambda/src/test/java/org/apache/camel/example/MainLambdaTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.example;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
@@ -41,7 +40,7 @@ class MainLambdaTest extends CamelMainTestSupport {
}
@Override
- protected void configure(MainConfigurationProperties configuration) {
-
configuration.withBasePackageScan(MyApplication.class.getPackageName());
+ protected Class<?> getMainClass() {
+ return MyApplication.class;
}
}
diff --git
a/examples/main-yaml/src/test/java/org/apache/camel/example/MainYAMLTest.java
b/examples/main-yaml/src/test/java/org/apache/camel/example/MainYAMLTest.java
index ce7cf55..4e07dfa 100644
---
a/examples/main-yaml/src/test/java/org/apache/camel/example/MainYAMLTest.java
+++
b/examples/main-yaml/src/test/java/org/apache/camel/example/MainYAMLTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.example;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
@@ -39,7 +38,7 @@ class MainYAMLTest extends CamelMainTestSupport {
}
@Override
- protected void configure(MainConfigurationProperties configuration) {
-
configuration.withBasePackageScan(MyApplication.class.getPackageName());
+ protected Class<?> getMainClass() {
+ return MyApplication.class;
}
}
diff --git a/examples/main/src/test/java/org/apache/camel/example/MainTest.java
b/examples/main/src/test/java/org/apache/camel/example/MainTest.java
index 971c730..2bedd32 100644
--- a/examples/main/src/test/java/org/apache/camel/example/MainTest.java
+++ b/examples/main/src/test/java/org/apache/camel/example/MainTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.example;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.junit.jupiter.api.Test;
@@ -40,7 +39,7 @@ class MainTest extends CamelMainTestSupport {
}
@Override
- protected void configure(MainConfigurationProperties configuration) {
-
configuration.withBasePackageScan(MyApplication.class.getPackageName());
+ protected Class<?> getMainClass() {
+ return MyApplication.class;
}
}
