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 2023/08/07 10:55:41 UTC
[camel] branch main updated: (chores) camel-test-junit5: minor cleanups (#11023)
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
The following commit(s) were added to refs/heads/main by this push:
new 35d13b6fa07 (chores) camel-test-junit5: minor cleanups (#11023)
35d13b6fa07 is described below
commit 35d13b6fa0727fe1f1f32521a1af34b9783ecd09
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Mon Aug 7 12:55:35 2023 +0200
(chores) camel-test-junit5: minor cleanups (#11023)
- make a few static variables final
- remove methods checking for older Java versions
---
.../apache/camel/test/junit5/CamelTestSupport.java | 58 +++++++++++-----------
.../org/apache/camel/test/junit5/TestSupport.java | 20 --------
2 files changed, 29 insertions(+), 49 deletions(-)
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index ed8a777a80e..c29f5fa2c04 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -96,11 +96,11 @@ public abstract class CamelTestSupport
public static final String ROUTE_COVERAGE_ENABLED = "CamelTestRouteCoverage";
private static final Logger LOG = LoggerFactory.getLogger(CamelTestSupport.class);
- private static ThreadLocal<ModelCamelContext> threadCamelContext = new ThreadLocal<>();
- private static ThreadLocal<ProducerTemplate> threadTemplate = new ThreadLocal<>();
- private static ThreadLocal<FluentProducerTemplate> threadFluentTemplate = new ThreadLocal<>();
- private static ThreadLocal<ConsumerTemplate> threadConsumer = new ThreadLocal<>();
- private static ThreadLocal<Service> threadService = new ThreadLocal<>();
+ private static final ThreadLocal<ModelCamelContext> THREAD_CAMEL_CONTEXT = new ThreadLocal<>();
+ private static final ThreadLocal<ProducerTemplate> THREAD_TEMPLATE = new ThreadLocal<>();
+ private static final ThreadLocal<FluentProducerTemplate> THREAD_FLUENT_TEMPLATE = new ThreadLocal<>();
+ private static final ThreadLocal<ConsumerTemplate> THREAD_CONSUMER = new ThreadLocal<>();
+ private static final ThreadLocal<Service> THREAD_SERVICE = new ThreadLocal<>();
protected Properties extra;
protected volatile ModelCamelContext context;
protected volatile ProducerTemplate template;
@@ -117,7 +117,7 @@ public abstract class CamelTestSupport
private static final ThreadLocal<CamelTestSupport> INSTANCE = new ThreadLocal<>();
private String currentTestName;
private boolean isCreateCamelContextPerClass = false;
- private CamelRouteCoverageDumper routeCoverageDumper = new CamelRouteCoverageDumper();
+ private final CamelRouteCoverageDumper routeCoverageDumper = new CamelRouteCoverageDumper();
private ExtensionContext.Store globalStore;
@Override
@@ -336,7 +336,7 @@ public abstract class CamelTestSupport
*/
public void setCamelContextService(Service service) {
camelContextService = service;
- threadService.set(camelContextService);
+ THREAD_SERVICE.set(camelContextService);
}
@BeforeEach
@@ -431,7 +431,7 @@ public abstract class CamelTestSupport
}
context = (ModelCamelContext) createCamelContext();
- threadCamelContext.set(context);
+ THREAD_CAMEL_CONTEXT.set(context);
assertNotNull(context, "No context found!");
@@ -461,9 +461,9 @@ public abstract class CamelTestSupport
consumer = context.createConsumerTemplate();
consumer.start();
- threadTemplate.set(template);
- threadFluentTemplate.set(fluentTemplate);
- threadConsumer.set(consumer);
+ THREAD_TEMPLATE.set(template);
+ THREAD_FLUENT_TEMPLATE.set(fluentTemplate);
+ THREAD_CONSUMER.set(consumer);
// enable auto mocking if enabled
String pattern = isMockEndpoints();
@@ -550,7 +550,7 @@ public abstract class CamelTestSupport
for (final Map.Entry<String, String> entry : fromEndpoints.entrySet()) {
AdviceWith.adviceWith(context.getRouteDefinition(entry.getKey()), context, new AdviceWithRouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
replaceFromWith(entry.getValue());
}
});
@@ -602,8 +602,8 @@ public abstract class CamelTestSupport
void tearDownCreateCamelContextPerClass() throws Exception {
LOG.debug("tearDownCreateCamelContextPerClass()");
TESTS.remove();
- doStopTemplates(threadConsumer.get(), threadTemplate.get(), threadFluentTemplate.get());
- doStopCamelContext(threadCamelContext.get(), threadService.get());
+ doStopTemplates(THREAD_CONSUMER.get(), THREAD_TEMPLATE.get(), THREAD_FLUENT_TEMPLATE.get());
+ doStopCamelContext(THREAD_CAMEL_CONTEXT.get(), THREAD_SERVICE.get());
doPostTearDown();
cleanupResources();
}
@@ -669,11 +669,11 @@ public abstract class CamelTestSupport
}
protected void postProcessTest() throws Exception {
- context = threadCamelContext.get();
- template = threadTemplate.get();
- fluentTemplate = threadFluentTemplate.get();
- consumer = threadConsumer.get();
- camelContextService = threadService.get();
+ context = THREAD_CAMEL_CONTEXT.get();
+ template = THREAD_TEMPLATE.get();
+ fluentTemplate = THREAD_FLUENT_TEMPLATE.get();
+ consumer = THREAD_CONSUMER.get();
+ camelContextService = THREAD_SERVICE.get();
applyCamelPostProcessor();
}
@@ -717,14 +717,14 @@ public abstract class CamelTestSupport
protected void doStopCamelContext(CamelContext context, Service camelContextService) {
if (camelContextService != null) {
- if (camelContextService == threadService.get()) {
- threadService.remove();
+ if (camelContextService == THREAD_SERVICE.get()) {
+ THREAD_SERVICE.remove();
}
camelContextService.stop();
} else {
if (context != null) {
- if (context == threadCamelContext.get()) {
- threadCamelContext.remove();
+ if (context == THREAD_CAMEL_CONTEXT.get()) {
+ THREAD_CAMEL_CONTEXT.remove();
}
context.stop();
}
@@ -734,20 +734,20 @@ public abstract class CamelTestSupport
private static void doStopTemplates(
ConsumerTemplate consumer, ProducerTemplate template, FluentProducerTemplate fluentTemplate) {
if (consumer != null) {
- if (consumer == threadConsumer.get()) {
- threadConsumer.remove();
+ if (consumer == THREAD_CONSUMER.get()) {
+ THREAD_CONSUMER.remove();
}
consumer.stop();
}
if (template != null) {
- if (template == threadTemplate.get()) {
- threadTemplate.remove();
+ if (template == THREAD_TEMPLATE.get()) {
+ THREAD_TEMPLATE.remove();
}
template.stop();
}
if (fluentTemplate != null) {
- if (fluentTemplate == threadFluentTemplate.get()) {
- threadFluentTemplate.remove();
+ if (fluentTemplate == THREAD_FLUENT_TEMPLATE.get()) {
+ THREAD_FLUENT_TEMPLATE.remove();
}
fluentTemplate.stop();
}
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
index e0450b6b9c2..f717a3cefdb 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
@@ -548,26 +548,6 @@ public final class TestSupport {
return javaVendor.contains(expectedVendor.toLowerCase(Locale.US));
}
- /**
- * Tells whether the current Java version is 1.8.
- *
- * @return <tt>true</tt> if its Java 1.8, <tt>false</tt> if its not (for example Java 1.7 or older)
- */
- public static boolean isJava18() {
- return getJavaMajorVersion() == 8;
-
- }
-
- /**
- * Tells whether the current Java version is 1.9.
- *
- * @return <tt>true</tt> if its Java 1.9, <tt>false</tt> if its not (for example Java 1.8 or older)
- */
- public static boolean isJava19() {
- return getJavaMajorVersion() == 9;
-
- }
-
/**
* Returns the current major Java version e.g 8.
* <p/>