You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/09 07:38:07 UTC
[camel] branch main updated: Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for core (#9832)
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.git
The following commit(s) were added to refs/heads/main by this push:
new ccef29b6822 Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for core (#9832)
ccef29b6822 is described below
commit ccef29b68228af284e159814bdcc1998829b2331
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Sun Apr 9 10:38:00 2023 +0300
Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for core (#9832)
Co-authored-by: dk2k <dk...@ya.ru>
---
.../camel/impl/engine/DefaultFactoryFinder.java | 6 +--
.../impl/engine/DefaultFluentProducerTemplate.java | 3 +-
.../camel/impl/engine/IntrospectionSupport.java | 6 +--
.../AbstractLocationPropertiesSource.java | 3 +-
.../camel/converter/CollectionConverter.java | 3 +-
.../camel/catalog/impl/AbstractCamelCatalog.java | 3 +-
.../language/csimple/CSimpleExpressionParser.java | 3 +-
.../language/csimple/CSimplePredicateParser.java | 3 +-
.../language/simple/SimpleExpressionBuilder.java | 6 +--
.../camel/language/simple/SimpleTokenizer.java | 3 +-
.../apache/camel/model/rest/RestsDefinition.java | 3 +-
.../camel/processor/SendDynamicAwareResolver.java | 5 +-
.../errorhandler/RedeliveryErrorHandler.java | 5 +-
.../apache/camel/reifier/LoadBalanceReifier.java | 3 +-
.../org/apache/camel/reifier/MulticastReifier.java | 3 +-
.../apache/camel/reifier/OnCompletionReifier.java | 3 +-
.../org/apache/camel/main/BaseMainSupport.java | 5 +-
.../camel/main/DefaultConfigurationConfigurer.java | 55 +++++++++++-----------
.../management/mbean/ManagedBrowsableEndpoint.java | 6 +--
.../converter/stream/FileInputStreamCache.java | 3 +-
.../camel/support/builder/ExpressionBuilder.java | 6 +--
.../DefaultAnnotationExpressionFactory.java | 3 +-
.../apache/camel/util/BaseOrderedProperties.java | 3 +-
.../apache/camel/util/concurrent/ThreadHelper.java | 3 +-
24 files changed, 58 insertions(+), 87 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
index ad56d74e62c..01649342f6d 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFactoryFinder.java
@@ -65,9 +65,8 @@ public class DefaultFactoryFinder implements FactoryFinder {
@Override
public Optional<Class<?>> findClass(String key) {
- final String classKey = key;
- Class<?> clazz = addToClassMap(classKey, () -> {
+ Class<?> clazz = addToClassMap(key, () -> {
Properties prop = doFindFactoryProperties(key);
if (prop != null) {
return doNewInstance(prop, true).orElse(null);
@@ -80,9 +79,8 @@ public class DefaultFactoryFinder implements FactoryFinder {
@Override
public Optional<Class<?>> findOptionalClass(String key) {
- final String classKey = key;
- Class<?> clazz = addToClassMap(classKey, () -> {
+ Class<?> clazz = addToClassMap(key, () -> {
Properties prop = doFindFactoryProperties(key);
if (prop != null) {
return doNewInstance(prop, false).orElse(null);
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
index 386ddbdde26..e82381e50b5 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
@@ -226,10 +226,9 @@ public class DefaultFluentProducerTemplate extends ServiceSupport implements Flu
throw new IllegalArgumentException("Cannot use both withBodyAs and withProcessor with FluentProducerTemplate");
}
- Object b = type != null
+ clone.body = type != null
? clone.context.getTypeConverter().convertTo(type, body)
: body;
- clone.body = b;
return clone;
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
index 7798898204d..0b1f3cc8d53 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
@@ -720,11 +720,9 @@ final class IntrospectionSupport {
// lets unwrap the exception
Throwable throwable = e.getCause();
if (throwable instanceof Exception) {
- Exception exception = (Exception) throwable;
- throw exception;
+ throw (Exception) throwable;
} else {
- Error error = (Error) throwable;
- throw error;
+ throw (Error) throwable;
}
}
// ignore exceptions as there could be another setter method where we could type convert successfully
diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
index a11044d76dc..89d3c2dbd5f 100644
--- a/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
+++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
@@ -150,8 +150,7 @@ public abstract class AbstractLocationPropertiesSource extends ServiceSupport
break;
}
}
- String answer = s.substring(0, endIndex);
- return answer;
+ return s.substring(0, endIndex);
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
index b99de79a338..78759eca0f6 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
@@ -99,8 +99,7 @@ public final class CollectionConverter {
@Converter(order = 6)
public static Set<Object> toSet(Object[] array) {
- Set<Object> answer = new HashSet<>(Arrays.asList(array));
- return answer;
+ return new HashSet<>(Arrays.asList(array));
}
@Converter(order = 7)
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index 2f76f063e91..965e7befdfa 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -771,8 +771,7 @@ public abstract class AbstractCamelCatalog {
Map<String, String> answer = new LinkedHashMap<>();
// and covert the values to String so its JMX friendly
- parameters.forEach((k, v) -> {
- String key = k;
+ parameters.forEach((key, v) -> {
String value = v != null ? v.toString() : "";
// is the key a prefix property
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpressionParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpressionParser.java
index 01bc576195b..0922212d514 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpressionParser.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpressionParser.java
@@ -26,8 +26,7 @@ public class CSimpleExpressionParser {
public String parseExpression(String expression) {
// reuse simple language parser but output the result as java code
SimpleExpressionParser parser = new SimpleExpressionParser(null, expression, true, null);
- String code = parser.parseCode();
- return code;
+ return parser.parseCode();
}
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimplePredicateParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimplePredicateParser.java
index 5a1b53ae047..3ba6f1a5a02 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimplePredicateParser.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimplePredicateParser.java
@@ -26,8 +26,7 @@ public class CSimplePredicateParser {
public String parsePredicate(String predicate) {
// reuse simple language parser but output the result as java code
SimplePredicateParser parser = new SimplePredicateParser(null, predicate, true, null);
- String code = parser.parseCode();
- return code;
+ return parser.parseCode();
}
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index fcda2ed14d3..a89121eb416 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -230,8 +230,7 @@ public final class SimpleExpressionBuilder {
int num1 = exp1.evaluate(exchange, Integer.class);
int num2 = exp2.evaluate(exchange, Integer.class);
Random random = new Random(); // NOSONAR
- int randomNum = random.nextInt(num2 - num1) + num1;
- return randomNum;
+ return random.nextInt(num2 - num1) + num1;
}
@Override
@@ -264,8 +263,7 @@ public final class SimpleExpressionBuilder {
@Override
public Object evaluate(Exchange exchange) {
Random random = new Random(); // NOSONAR
- int randomNum = random.nextInt(max - min) + min;
- return randomNum;
+ return random.nextInt(max - min) + min;
}
@Override
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
index df30325f3d6..c0d0e242f52 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
@@ -228,8 +228,7 @@ public final class SimpleTokenizer {
// fallback and create a character token
char ch = expression.charAt(index);
- SimpleToken token = new SimpleToken(new SimpleTokenType(TokenType.character, String.valueOf(ch)), index);
- return token;
+ return new SimpleToken(new SimpleTokenType(TokenType.character, String.valueOf(ch)), index);
}
private static boolean acceptType(TokenType type, TokenType... filters) {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
index 3ea0f1b3047..3e4a4a39523 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
@@ -106,8 +106,7 @@ public class RestsDefinition extends OptionalIdentifiedDefinition<RestsDefinitio
// -------------------------------------------------------------------------
protected RestDefinition createRest() {
- RestDefinition rest = new RestDefinition();
- return rest;
+ return new RestDefinition();
}
}
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
index e03ee68b85b..6bf215137f3 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
@@ -33,19 +33,18 @@ public class SendDynamicAwareResolver {
private FactoryFinder factoryFinder;
public SendDynamicAware resolve(CamelContext context, String scheme) {
- String name = scheme;
// use factory finder to find a custom implementations
Class<?> type = null;
try {
- type = findFactory(name, context);
+ type = findFactory(scheme, context);
} catch (Exception e) {
// ignore
}
if (type != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Found SendDynamicAware: {} via: {}{}", type.getName(), factoryFinder.getResourcePath(), name);
+ LOG.debug("Found SendDynamicAware: {} via: {}{}", type.getName(), factoryFinder.getResourcePath(), scheme);
}
if (SendDynamicAware.class.isAssignableFrom(type)) {
SendDynamicAware answer = (SendDynamicAware) context.getInjector().newInstance(type, false);
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index 688b7cf1cd6..396d6f23b33 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -1424,9 +1424,8 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport
if (msg == null) {
msg = "New exception " + ExchangeHelper.logIds(exchange);
// special for logging the new exception
- Throwable cause = e;
- if (cause != null) {
- msg = msg + " due: " + cause.getMessage();
+ if (e != null) {
+ msg = msg + " due: " + e.getMessage();
}
}
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
index cccdf1c121d..95404bf3073 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
@@ -66,8 +66,7 @@ public class LoadBalanceReifier extends ProcessorReifier<LoadBalanceDefinition>
// handler can react afterwards
inherit = true;
}
- Processor target = wrapChannel(loadBalancer, definition, inherit);
- return target;
+ return wrapChannel(loadBalancer, definition, inherit);
}
}
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java
index 2f638e8629e..103eb79cc14 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/MulticastReifier.java
@@ -75,10 +75,9 @@ public class MulticastReifier extends ProcessorReifier<MulticastDefinition> {
prepare = mandatoryLookup(definition.getOnPrepare(), Processor.class);
}
- MulticastProcessor answer = new MulticastProcessor(
+ return new MulticastProcessor(
camelContext, route, list, strategy, isParallelProcessing, threadPool, shutdownThreadPool, isStreaming,
isStopOnException, timeout, prepare, isShareUnitOfWork, isParallelAggregate);
- return answer;
}
private AggregationStrategy createAggregationStrategy() {
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
index 96753213850..ddb7402f96f 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
@@ -70,10 +70,9 @@ public class OnCompletionReifier extends ProcessorReifier<OnCompletionDefinition
boolean afterConsumer = definition.getMode() == null
|| parse(OnCompletionMode.class, definition.getMode()) == OnCompletionMode.AfterConsumer;
- OnCompletionProcessor answer = new OnCompletionProcessor(
+ return new OnCompletionProcessor(
camelContext, target, threadPool, shutdownThreadPool, isOnCompleteOnly, isOnFailureOnly, when,
original, afterConsumer, definition.isRouteScoped());
- return answer;
}
}
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index edabad2bcc9..47329806d26 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -1390,12 +1390,11 @@ public abstract class BaseMainSupport extends BaseService {
// then create beans first (beans with #class values etc)
for (String key : keys) {
if (key.indexOf('.') == -1 && key.indexOf('[') == -1) {
- String name = key;
Object value = properties.remove(key);
Object bean = PropertyBindingSupport.resolveBean(camelContext, value);
if (bean == null) {
throw new IllegalArgumentException(
- "Cannot create/resolve bean with name " + name + " from value: " + value);
+ "Cannot create/resolve bean with name " + key + " from value: " + value);
}
// register bean
if (logSummary) {
@@ -1403,7 +1402,7 @@ public abstract class BaseMainSupport extends BaseService {
} else {
LOG.debug("Binding bean: {} (type: {}) to the registry", key, ObjectHelper.classCanonicalName(bean));
}
- camelContext.getRegistry().bind(name, bean);
+ camelContext.getRegistry().bind(key, bean);
}
}
// create map beans if none already exists
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index bceee6d6010..71cefa2418b 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -362,35 +362,34 @@ public final class DefaultConfigurationConfigurer {
public static void afterConfigure(final CamelContext camelContext) throws Exception {
final Registry registry = camelContext.getRegistry();
final ManagementStrategy managementStrategy = camelContext.getManagementStrategy();
- final CamelContext ecc = camelContext;
StartupStepRecorder ssr = getSingleBeanOfType(registry, StartupStepRecorder.class);
if (ssr != null) {
- ecc.getCamelContextExtension().setStartupStepRecorder(ssr);
+ camelContext.getCamelContextExtension().setStartupStepRecorder(ssr);
}
CliConnectorFactory ccf = getSingleBeanOfType(registry, CliConnectorFactory.class);
if (ccf != null) {
- ecc.getCamelContextExtension().addContextPlugin(CliConnectorFactory.class, ccf);
+ camelContext.getCamelContextExtension().addContextPlugin(CliConnectorFactory.class, ccf);
}
PropertiesComponent pc = getSingleBeanOfType(registry, PropertiesComponent.class);
if (pc != null) {
- ecc.setPropertiesComponent(pc);
+ camelContext.setPropertiesComponent(pc);
}
BacklogTracer bt = getSingleBeanOfType(registry, BacklogTracer.class);
if (bt != null) {
- ecc.getCamelContextExtension().addContextPlugin(BacklogTracer.class, bt);
+ camelContext.getCamelContextExtension().addContextPlugin(BacklogTracer.class, bt);
}
InflightRepository ir = getSingleBeanOfType(registry, InflightRepository.class);
if (ir != null) {
- ecc.setInflightRepository(ir);
+ camelContext.setInflightRepository(ir);
}
AsyncProcessorAwaitManager apam = getSingleBeanOfType(registry, AsyncProcessorAwaitManager.class);
if (apam != null) {
- ecc.getCamelContextExtension().addContextPlugin(AsyncProcessorAwaitManager.class, apam);
+ camelContext.getCamelContextExtension().addContextPlugin(AsyncProcessorAwaitManager.class, apam);
}
ManagementStrategy ms = getSingleBeanOfType(registry, ManagementStrategy.class);
if (ms != null) {
- ecc.setManagementStrategy(ms);
+ camelContext.setManagementStrategy(ms);
}
ManagementObjectNameStrategy mons = getSingleBeanOfType(registry, ManagementObjectNameStrategy.class);
if (mons != null) {
@@ -402,67 +401,67 @@ public final class DefaultConfigurationConfigurer {
}
UnitOfWorkFactory uowf = getSingleBeanOfType(registry, UnitOfWorkFactory.class);
if (uowf != null) {
- ecc.getCamelContextExtension().addContextPlugin(UnitOfWorkFactory.class, uowf);
+ camelContext.getCamelContextExtension().addContextPlugin(UnitOfWorkFactory.class, uowf);
}
RuntimeEndpointRegistry rer = getSingleBeanOfType(registry, RuntimeEndpointRegistry.class);
if (rer != null) {
- ecc.setRuntimeEndpointRegistry(rer);
+ camelContext.setRuntimeEndpointRegistry(rer);
}
ModelJAXBContextFactory mjcf = getSingleBeanOfType(registry, ModelJAXBContextFactory.class);
if (mjcf != null) {
- ecc.getCamelContextExtension().addContextPlugin(ModelJAXBContextFactory.class, mjcf);
+ camelContext.getCamelContextExtension().addContextPlugin(ModelJAXBContextFactory.class, mjcf);
}
ClassResolver cr = getSingleBeanOfType(registry, ClassResolver.class);
if (cr != null) {
- ecc.setClassResolver(cr);
+ camelContext.setClassResolver(cr);
}
FactoryFinderResolver ffr = getSingleBeanOfType(registry, FactoryFinderResolver.class);
if (ffr != null) {
- ecc.getCamelContextExtension().addContextPlugin(FactoryFinderResolver.class, ffr);
+ camelContext.getCamelContextExtension().addContextPlugin(FactoryFinderResolver.class, ffr);
}
RouteController rc = getSingleBeanOfType(registry, RouteController.class);
if (rc != null) {
- ecc.setRouteController(rc);
+ camelContext.setRouteController(rc);
}
UuidGenerator ug = getSingleBeanOfType(registry, UuidGenerator.class);
if (ug != null) {
- ecc.setUuidGenerator(ug);
+ camelContext.setUuidGenerator(ug);
}
ExecutorServiceManager esm = getSingleBeanOfType(registry, ExecutorServiceManager.class);
if (esm != null) {
- ecc.setExecutorServiceManager(esm);
+ camelContext.setExecutorServiceManager(esm);
}
ThreadPoolFactory tpf = getSingleBeanOfType(registry, ThreadPoolFactory.class);
if (tpf != null) {
- ecc.getExecutorServiceManager().setThreadPoolFactory(tpf);
+ camelContext.getExecutorServiceManager().setThreadPoolFactory(tpf);
}
ProcessorFactory pf = getSingleBeanOfType(registry, ProcessorFactory.class);
if (pf != null) {
- ecc.getCamelContextExtension().addContextPlugin(ProcessorFactory.class, pf);
+ camelContext.getCamelContextExtension().addContextPlugin(ProcessorFactory.class, pf);
}
Debugger debugger = getSingleBeanOfType(registry, Debugger.class);
if (debugger != null) {
- ecc.setDebugger(debugger);
+ camelContext.setDebugger(debugger);
}
NodeIdFactory nif = getSingleBeanOfType(registry, NodeIdFactory.class);
if (nif != null) {
- ecc.getCamelContextExtension().addContextPlugin(NodeIdFactory.class, nif);
+ camelContext.getCamelContextExtension().addContextPlugin(NodeIdFactory.class, nif);
}
MessageHistoryFactory mhf = getSingleBeanOfType(registry, MessageHistoryFactory.class);
if (mhf != null) {
- ecc.setMessageHistoryFactory(mhf);
+ camelContext.setMessageHistoryFactory(mhf);
}
ReactiveExecutor re = getSingleBeanOfType(registry, ReactiveExecutor.class);
if (re != null) {
- ecc.getCamelContextExtension().setReactiveExecutor(re);
+ camelContext.getCamelContextExtension().setReactiveExecutor(re);
}
ShutdownStrategy ss = getSingleBeanOfType(registry, ShutdownStrategy.class);
if (ss != null) {
- ecc.setShutdownStrategy(ss);
+ camelContext.setShutdownStrategy(ss);
}
ExchangeFactory exf = getSingleBeanOfType(registry, ExchangeFactory.class);
if (exf != null) {
- ecc.getCamelContextExtension().setExchangeFactory(exf);
+ camelContext.getCamelContextExtension().setExchangeFactory(exf);
}
Set<TypeConverters> tcs = registry.findByType(TypeConverters.class);
if (!tcs.isEmpty()) {
@@ -470,7 +469,7 @@ public final class DefaultConfigurationConfigurer {
}
Set<EndpointStrategy> ess = registry.findByType(EndpointStrategy.class);
if (!ess.isEmpty()) {
- ess.forEach(ecc.getCamelContextExtension()::registerEndpointCallback);
+ ess.forEach(camelContext.getCamelContextExtension()::registerEndpointCallback);
}
Set<CamelClusterService> csss = registry.findByType(CamelClusterService.class);
if (!csss.isEmpty()) {
@@ -502,10 +501,10 @@ public final class DefaultConfigurationConfigurer {
Map<String, LogListener> logListeners = registry.findByTypeWithName(LogListener.class);
if (logListeners != null && !logListeners.isEmpty()) {
for (LogListener logListener : logListeners.values()) {
- boolean contains = ecc.getCamelContextExtension().getLogListeners() != null
- && ecc.getCamelContextExtension().getLogListeners().contains(logListener);
+ boolean contains = camelContext.getCamelContextExtension().getLogListeners() != null
+ && camelContext.getCamelContextExtension().getLogListeners().contains(logListener);
if (!contains) {
- ecc.getCamelContextExtension().addLogListener(logListener);
+ camelContext.getCamelContextExtension().addLogListener(logListener);
}
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
index 3b5cd4a0b79..7a9a04ba9c1 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
@@ -75,9 +75,8 @@ public class ManagedBrowsableEndpoint extends ManagedEndpoint implements Managed
}
// must use java type with JMX such as java.lang.String
- String body = exchange.getMessage().getBody(String.class);
- return body;
+ return exchange.getMessage().getBody(String.class);
}
@Override
@@ -93,9 +92,8 @@ public class ManagedBrowsableEndpoint extends ManagedEndpoint implements Managed
}
Message msg = exchange.getMessage();
- String xml = MessageHelper.dumpAsXml(msg, includeBody);
- return xml;
+ return MessageHelper.dumpAsXml(msg, includeBody);
}
@Override
diff --git a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
index 2af4f309917..5b80d5e2292 100644
--- a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
+++ b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
@@ -102,8 +102,7 @@ public final class FileInputStreamCache extends InputStream implements StreamCac
@Override
public StreamCache copy(Exchange exchange) throws IOException {
tempFileManager.addExchange(exchange);
- FileInputStreamCache copy = new FileInputStreamCache(tempFileManager);
- return copy;
+ return new FileInputStreamCache(tempFileManager);
}
@Override
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index 70c57a4592f..9bea955d3fb 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -1292,8 +1292,7 @@ public class ExpressionBuilder {
public Object evaluate(Exchange exchange) {
String text = token.evaluate(exchange, String.class);
Object value = expression.evaluate(exchange, Object.class);
- Scanner scanner = ExchangeHelper.getScanner(exchange, value, text);
- return scanner;
+ return ExchangeHelper.getScanner(exchange, value, text);
}
@Override
@@ -1352,8 +1351,7 @@ public class ExpressionBuilder {
@Override
public Object evaluate(Exchange exchange) {
Object value = expression.evaluate(exchange, Object.class);
- Scanner scanner = ExchangeHelper.getScanner(exchange, value, regexTokenizer);
- return scanner;
+ return ExchangeHelper.getScanner(exchange, value, regexTokenizer);
}
@Override
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/language/DefaultAnnotationExpressionFactory.java b/core/camel-support/src/main/java/org/apache/camel/support/language/DefaultAnnotationExpressionFactory.java
index e0e9a1a59eb..59ffa652db6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/language/DefaultAnnotationExpressionFactory.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/language/DefaultAnnotationExpressionFactory.java
@@ -66,8 +66,7 @@ public class DefaultAnnotationExpressionFactory implements AnnotationExpressionF
protected Object getAnnotationObjectValue(Annotation annotation, String methodName) {
try {
Method method = annotation.annotationType().getDeclaredMethod(methodName);
- Object value = ObjectHelper.invokeMethod(method, annotation);
- return value;
+ return ObjectHelper.invokeMethod(method, annotation);
} catch (NoSuchMethodException e) {
throw new IllegalArgumentException(
"Cannot determine the Object value of the annotation: " + annotation
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/BaseOrderedProperties.java b/core/camel-util/src/main/java/org/apache/camel/util/BaseOrderedProperties.java
index c85c868941f..f999eed7cf2 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/BaseOrderedProperties.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/BaseOrderedProperties.java
@@ -96,8 +96,7 @@ abstract class BaseOrderedProperties extends Properties {
@Override
@SuppressWarnings("unchecked")
public Set<Map.Entry<Object, Object>> entrySet() {
- Set entrySet = map.entrySet();
- return entrySet;
+ return (Set) map.entrySet();
}
@Override
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
index 7532c42ef39..870a0dd6294 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
@@ -54,11 +54,10 @@ public final class ThreadHelper {
}
// we support #longName# and #name# as name placeholders
- String longName = name;
String shortName = name.contains("?") ? StringHelper.before(name, "?") : name;
// replace tokens
- String answer = StringHelper.replaceFirst(pattern, "#longName#", longName);
+ String answer = StringHelper.replaceFirst(pattern, "#longName#", name);
if (shortName != null) {
answer = StringHelper.replaceFirst(answer, "#name#", shortName);
}