You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/06/23 06:16:31 UTC
[camel] branch main updated (5fc5a52c242 -> a6c9b10a21f)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 5fc5a52c242 (chores) camel-salesforce-component: removed unused method
new dd5de1c6a2b (chores) camel-test-spring-junit5: removed unused parameters
new a6c9b10a21f (chores) camel-test-spring: removed unused parameters
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:
.../apache/camel/test/spring/junit5/CamelAnnotationsHandler.java | 9 +++------
.../test/spring/junit5/CamelSpringBootExecutionListener.java | 4 ++--
.../camel/test/spring/junit5/CamelSpringTestContextLoader.java | 8 ++++----
.../org/apache/camel/test/spring/CamelAnnotationsHandler.java | 9 +++------
.../test/spring/CamelSpringDelegatingTestContextLoader.java | 4 ++--
.../apache/camel/test/spring/CamelSpringTestContextLoader.java | 8 ++++----
6 files changed, 18 insertions(+), 24 deletions(-)
[camel] 02/02: (chores) camel-test-spring: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a6c9b10a21f9ecae6eaa16865f0a09f8eae5abc7
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jun 23 07:22:06 2022 +0200
(chores) camel-test-spring: removed unused parameters
---
.../org/apache/camel/test/spring/CamelAnnotationsHandler.java | 9 +++------
.../test/spring/CamelSpringDelegatingTestContextLoader.java | 4 ++--
.../apache/camel/test/spring/CamelSpringTestContextLoader.java | 8 ++++----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
index 8e13b6daf87..4fb6d052fff 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
@@ -55,19 +55,17 @@ public final class CamelAnnotationsHandler {
/**
* Cleanup/restore global state to defaults / pre-test values after the test setup is complete.
*
- * @param testClass the test class being executed
*/
- public static void cleanup(Class<?> testClass) {
+ public static void cleanup() {
DefaultCamelContext.clearOptions();
}
/**
* Handles @ExcludeRoutes to make it easier to exclude other routes when testing with Spring.
*
- * @param context the initialized Spring context
* @param testClass the test class being executed
*/
- public static void handleExcludeRoutes(ConfigurableApplicationContext context, Class<?> testClass) {
+ public static void handleExcludeRoutes(Class<?> testClass) {
String key = SpringCamelContext.EXCLUDE_ROUTES;
String exists = System.getProperty(key);
if (exists != null) {
@@ -90,10 +88,9 @@ public final class CamelAnnotationsHandler {
/**
* Handles disabling of JMX on Camel contexts based on {@link DisableJmx}.
*
- * @param context the initialized Spring context
* @param testClass the test class being executed
*/
- public static void handleDisableJmx(ConfigurableApplicationContext context, Class<?> testClass) {
+ public static void handleDisableJmx(Class<?> testClass) {
if (testClass.isAnnotationPresent(DisableJmx.class)) {
if (testClass.getAnnotation(DisableJmx.class).value()) {
LOGGER.info("Disabling Camel JMX globally as DisableJmx annotation was found and disableJmx is set to true.");
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
index d949d807faf..4d359af9f99 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
@@ -51,14 +51,14 @@ public class CamelSpringDelegatingTestContextLoader extends DelegatingSmartConte
}
// Pre CamelContext(s) instantiation setup
- CamelAnnotationsHandler.handleDisableJmx(null, testClass);
+ CamelAnnotationsHandler.handleDisableJmx(testClass);
try {
SpringCamelContext.setNoStart(true);
ConfigurableApplicationContext context = (ConfigurableApplicationContext) super.loadContext(mergedConfig);
return loadContext(context, testClass);
} finally {
- CamelAnnotationsHandler.cleanup(testClass);
+ CamelAnnotationsHandler.cleanup();
SpringCamelContext.setNoStart(false);
}
}
diff --git a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
index 810449d5484..b5e4dfd0b91 100644
--- a/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
+++ b/components/camel-test/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
@@ -71,7 +71,7 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
loadBeanDefinitions(context, mergedConfig);
return loadContext(context, testClass);
} finally {
- CamelAnnotationsHandler.cleanup(testClass);
+ CamelAnnotationsHandler.cleanup();
}
}
@@ -99,7 +99,7 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
loadBeanDefinitions(context, locations);
return loadContext(context, testClass);
} finally {
- CamelAnnotationsHandler.cleanup(testClass);
+ CamelAnnotationsHandler.cleanup();
}
}
@@ -126,8 +126,8 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
// Pre CamelContext(s) instantiation setup
- CamelAnnotationsHandler.handleDisableJmx(context, testClass);
- CamelAnnotationsHandler.handleExcludeRoutes(context, testClass);
+ CamelAnnotationsHandler.handleDisableJmx(testClass);
+ CamelAnnotationsHandler.handleExcludeRoutes(testClass);
CamelAnnotationsHandler.handleUseOverridePropertiesWithPropertiesComponent(context, testClass);
// Temporarily disable CamelContext start while the contexts are instantiated.
[camel] 01/02: (chores) camel-test-spring-junit5: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dd5de1c6a2bf1fe43a3f06a0af29fa18d0292028
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jun 23 07:20:57 2022 +0200
(chores) camel-test-spring-junit5: removed unused parameters
---
.../apache/camel/test/spring/junit5/CamelAnnotationsHandler.java | 9 +++------
.../test/spring/junit5/CamelSpringBootExecutionListener.java | 4 ++--
.../camel/test/spring/junit5/CamelSpringTestContextLoader.java | 8 ++++----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
index cbce2dc6d72..6b9828110fb 100644
--- a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
+++ b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelAnnotationsHandler.java
@@ -56,19 +56,17 @@ public final class CamelAnnotationsHandler {
/**
* Cleanup/restore global state to defaults / pre-test values after the test setup is complete.
*
- * @param testClass the test class being executed
*/
- public static void cleanup(Class<?> testClass) {
+ public static void cleanup() {
DefaultCamelContext.clearOptions();
}
/**
* Handles @ExcludeRoutes to make it easier to exclude other routes when testing with Spring.
*
- * @param context the initialized Spring context
* @param testClass the test class being executed
*/
- public static void handleExcludeRoutes(ConfigurableApplicationContext context, Class<?> testClass) {
+ public static void handleExcludeRoutes(Class<?> testClass) {
String key = SpringCamelContext.EXCLUDE_ROUTES;
String exists = System.getProperty(key);
if (exists != null) {
@@ -91,10 +89,9 @@ public final class CamelAnnotationsHandler {
/**
* Handles disabling of JMX on Camel contexts based on {@link DisableJmx}.
*
- * @param context the initialized Spring context
* @param testClass the test class being executed
*/
- public static void handleDisableJmx(ConfigurableApplicationContext context, Class<?> testClass) {
+ public static void handleDisableJmx(Class<?> testClass) {
if (isCamelDebugPresent()) {
LOGGER.info("Enabling Camel JMX as camel-debug has been found in the classpath.");
DefaultCamelContext.setDisableJmx(false);
diff --git a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringBootExecutionListener.java b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringBootExecutionListener.java
index 1b836dddca2..cf19b82c11e 100644
--- a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringBootExecutionListener.java
+++ b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringBootExecutionListener.java
@@ -53,8 +53,8 @@ public class CamelSpringBootExecutionListener extends AbstractTestExecutionListe
Class<?> testClass = testContext.getTestClass();
// need to prepare this before we load spring application context
- CamelAnnotationsHandler.handleDisableJmx(null, testClass);
- CamelAnnotationsHandler.handleExcludeRoutes(null, testClass);
+ CamelAnnotationsHandler.handleDisableJmx(testClass);
+ CamelAnnotationsHandler.handleExcludeRoutes(testClass);
// prevent the Camel context to be started to be able to extend it.
preventContextStart();
diff --git a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestContextLoader.java b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestContextLoader.java
index 800d5ebc31f..c901b89e3f4 100644
--- a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestContextLoader.java
+++ b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestContextLoader.java
@@ -75,7 +75,7 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
return loadContext(context, testClass);
} finally {
- CamelAnnotationsHandler.cleanup(testClass);
+ CamelAnnotationsHandler.cleanup();
}
}
@@ -103,7 +103,7 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
loadBeanDefinitions(context, testClass, locations);
return loadContext(context, testClass);
} finally {
- CamelAnnotationsHandler.cleanup(testClass);
+ CamelAnnotationsHandler.cleanup();
}
}
@@ -130,8 +130,8 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
// Pre CamelContext(s) instantiation setup
- CamelAnnotationsHandler.handleDisableJmx(context, testClass);
- CamelAnnotationsHandler.handleExcludeRoutes(context, testClass);
+ CamelAnnotationsHandler.handleDisableJmx(testClass);
+ CamelAnnotationsHandler.handleExcludeRoutes(testClass);
CamelAnnotationsHandler.handleUseOverridePropertiesWithPropertiesComponent(context, testClass);
// Temporarily disable CamelContext start while the contexts are instantiated.