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 d5fae4f1052 (chores) components: remove string literal duplications (#12552) d5fae4f1052 is described below commit d5fae4f10525bc1759c950428190780d85fc6c98 Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Thu Dec 21 17:33:32 2023 -0300 (chores) components: remove string literal duplications (#12552) - camel-cxf - camel-djl - camel-docker - camel-huawei - camel-lra - camel-test --- .../AbstractCamelContextBeanDefinitionParser.java | 2 +- .../component/djl/model/AbstractPredictor.java | 2 ++ .../model/CustomImageClassificationPredictor.java | 8 ++++---- .../djl/model/CustomObjectDetectionPredictor.java | 8 ++++---- .../djl/model/ZooImageClassificationPredictor.java | 8 ++++---- .../djl/model/ZooObjectDetectionPredictor.java | 8 ++++---- .../docker/producer/AsyncDockerProducer.java | 7 ++++--- .../component/docker/producer/DockerProducer.java | 23 +++++++++++----------- .../camel/component/huaweicloud/dms/DmsMeta.java | 18 +++++++++-------- .../org/apache/camel/service/lra/LRAClient.java | 8 +++++--- .../apache/camel/test/junit5/CamelTestSupport.java | 9 +++++---- .../camel/test/main/junit5/CamelMainExtension.java | 9 +++++---- 12 files changed, 60 insertions(+), 50 deletions(-) diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/main/java/org/apache/camel/component/cxf/spring/transport/AbstractCamelContextBeanDefinitionParser.java b/components/camel-cxf/camel-cxf-spring-transport/src/main/java/org/apache/camel/component/cxf/spring/transport/AbstractCamelContextBeanDefinitionParser.java index 20ff9e5b928..6e6bf4f4fea 100644 --- a/components/camel-cxf/camel-cxf-spring-transport/src/main/java/org/apache/camel/component/cxf/spring/transport/AbstractCamelContextBeanDefinitionParser.java +++ b/components/camel-cxf/camel-cxf-spring-transport/src/main/java/org/apache/camel/component/cxf/spring/transport/AbstractCamelContextBeanDefinitionParser.java @@ -40,7 +40,7 @@ public class AbstractCamelContextBeanDefinitionParser extends AbstractBeanDefini } protected void wireCamelContext(BeanDefinitionBuilder bean, String camelContextId) { - bean.addPropertyReference("camelContext", camelContextId); + bean.addPropertyReference(DEFAULT_CAMEL_CONTEXT_NAME, camelContextId); } @Override diff --git a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/AbstractPredictor.java b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/AbstractPredictor.java index 65cc5384a3b..87bc1d30bcc 100644 --- a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/AbstractPredictor.java +++ b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/AbstractPredictor.java @@ -20,6 +20,8 @@ import org.apache.camel.Exchange; public abstract class AbstractPredictor { + protected static final String FAILED_TO_TRANSFORM_MESSAGE = "Couldn't transform input into a BufferedImage"; + public abstract void process(Exchange exchange) throws Exception; } diff --git a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomImageClassificationPredictor.java b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomImageClassificationPredictor.java index cfc75488a5c..7e1a088645d 100644 --- a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomImageClassificationPredictor.java +++ b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomImageClassificationPredictor.java @@ -69,8 +69,8 @@ public class CustomImageClassificationPredictor extends AbstractPredictor { Image image = ImageFactory.getInstance().fromInputStream(fileInputStream); return classify(model, translator, image); } catch (IOException e) { - LOG.error("Couldn't transform input into a BufferedImage"); - throw new RuntimeCamelException("Couldn't transform input into a BufferedImage", e); + LOG.error(FAILED_TO_TRANSFORM_MESSAGE); + throw new RuntimeCamelException(FAILED_TO_TRANSFORM_MESSAGE, e); } } @@ -79,8 +79,8 @@ public class CustomImageClassificationPredictor extends AbstractPredictor { Image image = ImageFactory.getInstance().fromInputStream(input); return classify(model, translator, image); } catch (IOException e) { - LOG.error("Couldn't transform input into a BufferedImage"); - throw new RuntimeCamelException("Couldn't transform input into a BufferedImage", e); + LOG.error(FAILED_TO_TRANSFORM_MESSAGE); + throw new RuntimeCamelException(FAILED_TO_TRANSFORM_MESSAGE, e); } } diff --git a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomObjectDetectionPredictor.java b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomObjectDetectionPredictor.java index 1a4877c641f..8c7b95255e3 100644 --- a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomObjectDetectionPredictor.java +++ b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomObjectDetectionPredictor.java @@ -76,8 +76,8 @@ public class CustomObjectDetectionPredictor extends AbstractPredictor { Image image = ImageFactory.getInstance().fromInputStream(fileInputStream); return classify(model, translator, image); } catch (IOException e) { - LOG.error("Couldn't transform input into a BufferedImage"); - throw new RuntimeCamelException("Couldn't transform input into a BufferedImage", e); + LOG.error(FAILED_TO_TRANSFORM_MESSAGE); + throw new RuntimeCamelException(FAILED_TO_TRANSFORM_MESSAGE, e); } } @@ -86,8 +86,8 @@ public class CustomObjectDetectionPredictor extends AbstractPredictor { Image image = ImageFactory.getInstance().fromInputStream(input); return classify(model, translator, image); } catch (IOException e) { - LOG.error("Couldn't transform input into a BufferedImage"); - throw new RuntimeCamelException("Couldn't transform input into a BufferedImage", e); + LOG.error(FAILED_TO_TRANSFORM_MESSAGE); + throw new RuntimeCamelException(FAILED_TO_TRANSFORM_MESSAGE, e); } } } diff --git a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/ZooImageClassificationPredictor.java b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/ZooImageClassificationPredictor.java index a0334373b11..44d3f6fd8fd 100644 --- a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/ZooImageClassificationPredictor.java +++ b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/ZooImageClassificationPredictor.java @@ -76,8 +76,8 @@ public class ZooImageClassificationPredictor extends AbstractPredictor { Image image = ImageFactory.getInstance().fromInputStream(fileInputStream); return classify(image); } catch (IOException e) { - LOG.error("Couldn't transform input into a BufferedImage"); - throw new RuntimeCamelException("Couldn't transform input into a BufferedImage", e); + LOG.error(FAILED_TO_TRANSFORM_MESSAGE); + throw new RuntimeCamelException(FAILED_TO_TRANSFORM_MESSAGE, e); } } @@ -86,8 +86,8 @@ public class ZooImageClassificationPredictor extends AbstractPredictor { Image image = ImageFactory.getInstance().fromInputStream(input); return classify(image); } catch (IOException e) { - LOG.error("Couldn't transform input into a BufferedImage"); - throw new RuntimeCamelException("Couldn't transform input into a BufferedImage", e); + LOG.error(FAILED_TO_TRANSFORM_MESSAGE); + throw new RuntimeCamelException(FAILED_TO_TRANSFORM_MESSAGE, e); } } diff --git a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/ZooObjectDetectionPredictor.java b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/ZooObjectDetectionPredictor.java index c18ebe3871e..c2098889570 100644 --- a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/ZooObjectDetectionPredictor.java +++ b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/ZooObjectDetectionPredictor.java @@ -82,8 +82,8 @@ public class ZooObjectDetectionPredictor extends AbstractPredictor { Image image = ImageFactory.getInstance().fromInputStream(fileInputStream); return classify(image); } catch (IOException e) { - LOG.error("Couldn't transform input into a BufferedImage"); - throw new RuntimeCamelException("Couldn't transform input into a BufferedImage", e); + LOG.error(FAILED_TO_TRANSFORM_MESSAGE); + throw new RuntimeCamelException(FAILED_TO_TRANSFORM_MESSAGE, e); } } @@ -92,8 +92,8 @@ public class ZooObjectDetectionPredictor extends AbstractPredictor { Image image = ImageFactory.getInstance().fromInputStream(input); return classify(image); } catch (IOException e) { - LOG.error("Couldn't transform input into a BufferedImage"); - throw new RuntimeCamelException("Couldn't transform input into a BufferedImage", e); + LOG.error(FAILED_TO_TRANSFORM_MESSAGE); + throw new RuntimeCamelException(FAILED_TO_TRANSFORM_MESSAGE, e); } } } diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java index 57b3f6797b5..e0ed670c3ed 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java @@ -61,6 +61,7 @@ import org.slf4j.LoggerFactory; */ public class AsyncDockerProducer extends DefaultAsyncProducer { private static final Logger LOG = LoggerFactory.getLogger(AsyncDockerProducer.class); + public static final String MISSING_CONTAINER_ID = "Container ID must be specified"; private DockerConfiguration configuration; private DockerComponent component; @@ -349,7 +350,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); AttachContainerCmd attachContainerCmd = client.attachContainerCmd(containerId); @@ -398,7 +399,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); LogContainerCmd logContainerCmd = client.logContainerCmd(containerId); @@ -453,7 +454,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); return client.waitContainerCmd(containerId); } diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java index ff6ce16ec01..14f2ad7879f 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java @@ -79,6 +79,7 @@ import static com.github.dockerjava.api.model.HostConfig.newHostConfig; */ public class DockerProducer extends DefaultProducer { private static final Logger LOGGER = LoggerFactory.getLogger(DockerProducer.class); + public static final String MISSING_CONTAINER_ID = "Container ID must be specified"; private DockerConfiguration configuration; private DockerComponent component; @@ -501,7 +502,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); CommitCmd commitCmd = client.commitCmd(containerId); @@ -883,7 +884,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); ContainerDiffCmd diffContainerCmd = client.containerDiffCmd(containerId); @@ -912,7 +913,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); return client.inspectContainerCmd(containerId); } @@ -931,7 +932,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); KillContainerCmd killContainerCmd = client.killContainerCmd(containerId); @@ -1006,7 +1007,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); return client.pauseContainerCmd(containerId); } @@ -1025,7 +1026,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); RemoveContainerCmd removeContainerCmd = client.removeContainerCmd(containerId); @@ -1087,7 +1088,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); return client.startContainerCmd(containerId); } @@ -1132,7 +1133,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); TopContainerCmd topContainerCmd = client.topContainerCmd(containerId); @@ -1160,7 +1161,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); return client.unpauseContainerCmd(containerId); } @@ -1216,7 +1217,7 @@ public class DockerProducer extends DefaultProducer { = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); ObjectHelper.notNull(networkId, "Network ID must be specified"); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); return client.connectToNetworkCmd().withNetworkId(networkId).withContainerId(containerId); @@ -1240,7 +1241,7 @@ public class DockerProducer extends DefaultProducer { String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class); - ObjectHelper.notNull(containerId, "Container ID must be specified"); + ObjectHelper.notNull(containerId, MISSING_CONTAINER_ID); ExecCreateCmd execCreateCmd = client.execCreateCmd(containerId); diff --git a/components/camel-huawei/camel-huaweicloud-dms/src/main/java/org/apache/camel/component/huaweicloud/dms/DmsMeta.java b/components/camel-huawei/camel-huaweicloud-dms/src/main/java/org/apache/camel/component/huaweicloud/dms/DmsMeta.java index 9aa9da70fa1..18f4b83b498 100644 --- a/components/camel-huawei/camel-huaweicloud-dms/src/main/java/org/apache/camel/component/huaweicloud/dms/DmsMeta.java +++ b/components/camel-huawei/camel-huaweicloud-dms/src/main/java/org/apache/camel/component/huaweicloud/dms/DmsMeta.java @@ -45,6 +45,8 @@ public final class DmsMeta { public static final HttpRequestDef<QueryInstanceRequest, DmsInstance> QUERY_INSTANCE = genForqueryInstance(); public static final HttpRequestDef<UpdateInstanceRequest, UpdateInstanceResponse> UPDATE_INSTANCE = genForupdateInstsance(); + public static final String JSON_CONTENT_TYPE = "application/json"; + public static final String INSTANCE_ID = "instance_id"; private DmsMeta() { } @@ -55,7 +57,7 @@ public final class DmsMeta { = HttpRequestDef.builder(HttpMethod.POST, CreateInstanceRequest.class, CreateInstanceResponse.class) .withName("CreateInstanceKafka") .withUri("/v1.0/{project_id}/instances") - .withContentType("application/json"); + .withContentType(JSON_CONTENT_TYPE); // requests builder.withRequestField("body", @@ -73,10 +75,10 @@ public final class DmsMeta { = HttpRequestDef.builder(HttpMethod.DELETE, DeleteInstanceRequest.class, DeleteInstanceResponse.class) .withName("DeleteInstance") .withUri("/v1.0/{project_id}/instances/{instance_id}") - .withContentType("application/json"); + .withContentType(JSON_CONTENT_TYPE); // requests - builder.withRequestField("instance_id", + builder.withRequestField(INSTANCE_ID, LocationType.Path, FieldExistence.NON_NULL_NON_EMPTY, String.class, @@ -91,7 +93,7 @@ public final class DmsMeta { = HttpRequestDef.builder(HttpMethod.GET, ListInstancesRequest.class, ListInstancesResponse.class) .withName("ListInstances") .withUri("/v1.0/{project_id}/instances") - .withContentType("application/json"); + .withContentType(JSON_CONTENT_TYPE); // requests builder.withRequestField("engine", @@ -109,10 +111,10 @@ public final class DmsMeta { = HttpRequestDef.builder(HttpMethod.GET, QueryInstanceRequest.class, DmsInstance.class) .withName("QueryInstance") .withUri("/v1.0/{project_id}/instances/{instance_id}") - .withContentType("application/json"); + .withContentType(JSON_CONTENT_TYPE); // requests - builder.withRequestField("instance_id", + builder.withRequestField(INSTANCE_ID, LocationType.Path, FieldExistence.NON_NULL_NON_EMPTY, String.class, @@ -127,10 +129,10 @@ public final class DmsMeta { = HttpRequestDef.builder(HttpMethod.PUT, UpdateInstanceRequest.class, UpdateInstanceResponse.class) .withName("UpdateInstance") .withUri("/v1.0/{project_id}/instances/{instance_id}") - .withContentType("application/json"); + .withContentType(JSON_CONTENT_TYPE); // requests - builder.withRequestField("instance_id", + builder.withRequestField(INSTANCE_ID, LocationType.Path, FieldExistence.NON_NULL_NON_EMPTY, String.class, diff --git a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java index 01dbb2fc6e3..58400543103 100644 --- a/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java +++ b/components/camel-lra/src/main/java/org/apache/camel/service/lra/LRAClient.java @@ -42,6 +42,8 @@ import static org.apache.camel.service.lra.LRAConstants.PARTICIPANT_PATH_COMPLET public class LRAClient implements Closeable { + public static final String CONTENT_TYPE = "Content-Type"; + public static final String TEXT_PLAIN_CONTENT = "text/plain"; private final LRASagaService sagaService; private final HttpClient client; private final String lraUrl; @@ -118,7 +120,7 @@ public class LRAClient implements Closeable { HttpRequest request = prepareRequest(URI.create(lraEndpoint), exchange) .setHeader(HEADER_LINK, link.toString()) .setHeader(Exchange.SAGA_LONG_RUNNING_ACTION, lra.toString()) - .setHeader("Content-Type", "text/plain") + .setHeader(CONTENT_TYPE, TEXT_PLAIN_CONTENT) .PUT(HttpRequest.BodyPublishers.ofString(link.toString())) .build(); @@ -136,7 +138,7 @@ public class LRAClient implements Closeable { public CompletableFuture<Void> complete(URL lra, Exchange exchange) { HttpRequest request = prepareRequest(URI.create(lra.toString() + COORDINATOR_PATH_CLOSE), exchange) - .setHeader("Content-Type", "text/plain") + .setHeader(CONTENT_TYPE, TEXT_PLAIN_CONTENT) .PUT(HttpRequest.BodyPublishers.ofString("")) .build(); @@ -153,7 +155,7 @@ public class LRAClient implements Closeable { public CompletableFuture<Void> compensate(URL lra, Exchange exchange) { HttpRequest request = prepareRequest(URI.create(lra.toString() + COORDINATOR_PATH_CANCEL), exchange) - .setHeader("Content-Type", "text/plain") + .setHeader(CONTENT_TYPE, TEXT_PLAIN_CONTENT) .PUT(HttpRequest.BodyPublishers.ofString("")) .build(); 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 89788104aa6..4c8ab045c1c 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 @@ -102,6 +102,7 @@ public abstract class CamelTestSupport 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<>(); + public static final String SEPARATOR = "********************************************************************************"; protected Properties extra; protected volatile ModelCamelContext context; protected volatile ProducerTemplate template; @@ -342,9 +343,9 @@ public abstract class CamelTestSupport @BeforeEach public void setUp() throws Exception { - LOG.info("********************************************************************************"); + LOG.info(SEPARATOR); LOG.info("Testing: {} ({})", currentTestName, getClass().getName()); - LOG.info("********************************************************************************"); + LOG.info(SEPARATOR); doSpringBootCheck(); doQuarkusCheck(); @@ -566,7 +567,7 @@ public abstract class CamelTestSupport public void tearDown() throws Exception { long time = watch.taken(); - LOG.info("********************************************************************************"); + LOG.info(SEPARATOR); LOG.info("Testing done: {} ({})", currentTestName, getClass().getName()); LOG.info("Took: {} ({} millis)", TimeUtils.printDuration(time, true), time); @@ -587,7 +588,7 @@ public abstract class CamelTestSupport timeTaken()); } } - LOG.info("********************************************************************************"); + LOG.info(SEPARATOR); if (isCreateCamelContextPerClass()) { // will tear down test specially in afterAll callback diff --git a/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java b/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java index 838da726604..17928ba28d6 100644 --- a/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java +++ b/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java @@ -67,6 +67,7 @@ final class CamelMainExtension * The name of the key used to store the watch instance. */ private static final String WATCH = "watch"; + public static final String SEPARATOR = "********************************************************************************"; /** * The utility class allowing to dump the route coverage of a given test. */ @@ -83,9 +84,9 @@ final class CamelMainExtension if (LOG.isInfoEnabled()) { final Class<?> requiredTestClass = context.getRequiredTestClass(); final String currentTestName = context.getDisplayName(); - LOG.info("********************************************************************************"); + LOG.info(SEPARATOR); LOG.info("Testing: {} ({})", currentTestName, requiredTestClass.getName()); - LOG.info("********************************************************************************"); + LOG.info(SEPARATOR); } } @@ -95,10 +96,10 @@ final class CamelMainExtension final String currentTestName = context.getDisplayName(); if (LOG.isInfoEnabled()) { final Class<?> requiredTestClass = context.getRequiredTestClass(); - LOG.info("********************************************************************************"); + LOG.info(SEPARATOR); LOG.info("Testing done: {} ({})", currentTestName, requiredTestClass.getName()); LOG.info("Took: {} ({} millis)", TimeUtils.printDuration(time, true), time); - LOG.info("********************************************************************************"); + LOG.info(SEPARATOR); } dumpRouteCoverageIfNeeded(context, time, currentTestName); }