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 5a042f93a7a (chores) core: remove string literal duplications (#12553) 5a042f93a7a is described below commit 5a042f93a7a7ab78810bfe4f53e300bf5025e03d Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Thu Dec 21 17:34:32 2023 -0300 (chores) core: remove string literal duplications (#12553) --- .../apache/camel/model/rest/RestDefinition.java | 25 +++++++++++----------- .../processor/aggregate/AggregateProcessor.java | 2 +- .../camel/support/cache/DefaultConsumerCache.java | 7 +++--- .../concurrent/SizedScheduledExecutorService.java | 25 +++++++++++----------- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java index b91846cde8b..dc55acc2edb 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java @@ -57,6 +57,7 @@ import org.apache.camel.util.URISupport; @XmlAccessorType(XmlAccessType.FIELD) public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> implements ResourceAware { + public static final String MISSING_VERB = "Must add verb first, such as get/post/delete"; @XmlAttribute private String path; @XmlAttribute @@ -414,7 +415,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition routeId(String routeId) { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } // add on last verb as that is how the Java DSL works VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); @@ -458,7 +459,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public ParamDefinition param() { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); return param(verb); @@ -466,7 +467,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition param(ParamDefinition param) { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); verb.getParams().add(param); @@ -475,7 +476,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition params(List<ParamDefinition> params) { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); verb.getParams().addAll(params); @@ -488,7 +489,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition responseMessage(ResponseMessageDefinition msg) { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); verb.getResponseMsgs().add(msg); @@ -497,7 +498,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public ResponseMessageDefinition responseMessage() { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); return responseMessage(verb); @@ -509,7 +510,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition responseMessages(List<ResponseMessageDefinition> msgs) { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); verb.getResponseMsgs().addAll(msgs); @@ -518,7 +519,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition responseMessage(int code, String message) { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); ResponseMessageDefinition msg = responseMessage(verb); @@ -529,7 +530,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition responseMessage(String code, String message) { if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); ResponseMessageDefinition response = responseMessage(verb); @@ -564,7 +565,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition type(Class<?> classType) { // add to last verb if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); @@ -576,7 +577,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition outType(Class<?> classType) { // add to last verb if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); @@ -708,7 +709,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> public RestDefinition to(String uri) { // add to last verb if (getVerbs().isEmpty()) { - throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); + throw new IllegalArgumentException(MISSING_VERB); } ToDefinition to = new ToDefinition(uri); diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java index cf3a29a31ff..d97227d0d65 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java @@ -680,7 +680,7 @@ public class AggregateProcessor extends AsyncProcessorSupport * pre-completion */ protected String isPreCompleted(String key, Exchange oldExchange, Exchange newExchange) { - return aggregationStrategy.preComplete(oldExchange, newExchange) ? "strategy" : null; + return aggregationStrategy.preComplete(oldExchange, newExchange) ? COMPLETED_BY_STRATEGY : null; } /** diff --git a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultConsumerCache.java b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultConsumerCache.java index 6a6f03227fc..8a5316fd511 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultConsumerCache.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultConsumerCache.java @@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory; public class DefaultConsumerCache extends ServiceSupport implements ConsumerCache { private static final Logger LOG = LoggerFactory.getLogger(DefaultConsumerCache.class); + public static final String CONTEXT_IS_STOPPED = "CamelContext is stopped"; private final CamelContext camelContext; private final PollingConsumerServicePool consumers; @@ -111,7 +112,7 @@ public class DefaultConsumerCache extends ServiceSupport implements ConsumerCach @Override public Exchange receive(Endpoint endpoint) { if (camelContext.isStopped()) { - throw new RejectedExecutionException("CamelContext is stopped"); + throw new RejectedExecutionException(CONTEXT_IS_STOPPED); } LOG.debug("<<<< {}", endpoint); @@ -129,7 +130,7 @@ public class DefaultConsumerCache extends ServiceSupport implements ConsumerCach @Override public Exchange receive(Endpoint endpoint, long timeout) { if (camelContext.isStopped()) { - throw new RejectedExecutionException("CamelContext is stopped"); + throw new RejectedExecutionException(CONTEXT_IS_STOPPED); } LOG.debug("<<<< {}", endpoint); @@ -147,7 +148,7 @@ public class DefaultConsumerCache extends ServiceSupport implements ConsumerCach @Override public Exchange receiveNoWait(Endpoint endpoint) { if (camelContext.isStopped()) { - throw new RejectedExecutionException("CamelContext is stopped"); + throw new RejectedExecutionException(CONTEXT_IS_STOPPED); } LOG.debug("<<<< {}", endpoint); diff --git a/core/camel-util/src/main/java/org/apache/camel/util/concurrent/SizedScheduledExecutorService.java b/core/camel-util/src/main/java/org/apache/camel/util/concurrent/SizedScheduledExecutorService.java index 32d7ad5f7e5..2f7ca5094cf 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/concurrent/SizedScheduledExecutorService.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/concurrent/SizedScheduledExecutorService.java @@ -45,6 +45,7 @@ import org.slf4j.LoggerFactory; public class SizedScheduledExecutorService implements ScheduledExecutorService { private static final Logger LOG = LoggerFactory.getLogger(SizedScheduledExecutorService.class); + public static final String QUEUE_SIZE_LIMIT_REACHED = "Task rejected due queue size limit reached"; private final ScheduledThreadPoolExecutor delegate; private final long queueSize; @@ -71,7 +72,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.schedule(task, delay, timeUnit); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -80,7 +81,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.schedule(task, delay, timeUnit); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -89,7 +90,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.scheduleAtFixedRate(task, initialDelay, period, timeUnit); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -98,7 +99,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.scheduleWithFixedDelay(task, initialDelay, period, timeUnit); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -152,7 +153,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.invokeAll(tasks); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -162,7 +163,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.invokeAll(tasks, timeout, timeUnit); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -171,7 +172,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.invokeAny(tasks); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -181,7 +182,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.invokeAny(tasks, timeout, timeUnit); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -246,7 +247,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.submit(task); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -255,7 +256,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.submit(task); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -264,7 +265,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { return delegate.submit(task, result); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } } @@ -273,7 +274,7 @@ public class SizedScheduledExecutorService implements ScheduledExecutorService { if (canScheduleOrExecute()) { delegate.execute(task); } else { - throw new RejectedExecutionException("Task rejected due queue size limit reached"); + throw new RejectedExecutionException(QUEUE_SIZE_LIMIT_REACHED); } }