[
https://issues.apache.org/jira/browse/CAMEL-12059?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16289005#comment-16289005
]
ASF GitHub Bot commented on CAMEL-12059:
----------------------------------------
oscerd closed pull request #2129: CAMEL-12059: Remove redundant null checks
from instanceof checks
URL: https://github.com/apache/camel/pull/2129
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
index e5933494d67..efda215fe49 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
@@ -192,7 +192,7 @@ public boolean onExchange(Exchange exchange) {
// and just continue to route that on the consumer side, which
causes the EventNotifier not to
// emit events when the consumer received the exchange, as its
already done. For example by
// ProducerTemplate which creates the UoW before producing
messages.
- if (exchange.getFromEndpoint() != null &&
exchange.getFromEndpoint() instanceof DirectEndpoint) {
+ if (exchange.getFromEndpoint() instanceof DirectEndpoint) {
return true;
}
return EndpointHelper.matchPattern(exchange.getFromRouteId(),
"*");
diff --git
a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
index 8c5d6008047..063ccf90d3c 100644
---
a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
@@ -118,7 +118,7 @@ public boolean process(Exchange exchange, AsyncCallback
callback) {
// is the message proxied using a BeanInvocation?
BeanInvocation beanInvoke = null;
- if (in.getBody() != null && in.getBody() instanceof BeanInvocation) {
+ if (in.getBody() instanceof BeanInvocation) {
// BeanInvocation would be stored directly as the message body
// do not force any type conversion attempts as it would just be
unnecessary and cost a bit performance
// so a regular instanceof check is sufficient
diff --git
a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
index 8285b06bb18..d9a836abba3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
@@ -262,7 +262,7 @@ public Method getMethod() {
public boolean proceed(AsyncCallback callback) {
Object body = exchange.getIn().getBody();
- if (body != null && body instanceof StreamCache) {
+ if (body instanceof StreamCache) {
// ensure the stream cache is reset before calling the
method
((StreamCache) body).reset();
}
@@ -682,7 +682,7 @@ protected boolean hasExceptionParameter() {
Object[] answer = new Object[expressions.length];
for (int i = 0; i < expressions.length; i++) {
- if (body != null && body instanceof StreamCache) {
+ if (body instanceof StreamCache) {
// need to reset stream cache for each expression as you
may access the message body in multiple parameters
((StreamCache) body).reset();
}
diff --git
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 619bf6b4686..6a942c1a1f3 100644
---
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -422,7 +422,7 @@ protected boolean processExchange(final Exchange exchange) {
// throw exception to handle the problem with
retrieving the file
// then if the method return false or throws an
exception is handled the same in here
// as in both cases an exception is being thrown
- if (cause != null && cause instanceof
GenericFileOperationFailedException) {
+ if (cause instanceof
GenericFileOperationFailedException) {
throw cause;
} else {
throw new
GenericFileOperationFailedException("Cannot retrieve file: " + file + " from: "
+ endpoint, cause);
diff --git
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
index d96884bc6ec..4ecce747d92 100644
---
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
+++
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
@@ -310,7 +310,7 @@ public String createFileName(Exchange exchange) {
// expression support
Expression expression = endpoint.getFileName();
- if (value != null && value instanceof Expression) {
+ if (value instanceof Expression) {
expression = (Expression) value;
}
diff --git
a/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
b/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
index 752eb689f6e..c8b09929888 100644
---
a/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
+++
b/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
@@ -76,7 +76,7 @@ public boolean
acquireExclusiveReadLock(GenericFileOperations<T> operations, Gen
try {
exclusive = operations.renameFile(file.getAbsoluteFilePath(),
newFile.getAbsoluteFilePath());
} catch (GenericFileOperationFailedException ex) {
- if (ex.getCause() != null && ex.getCause() instanceof
FileNotFoundException) {
+ if (ex.getCause() instanceof FileNotFoundException) {
exclusive = false;
} else {
throw ex;
diff --git
a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
index 1fe72993871..7a6dbfc6b46 100644
---
a/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
+++
b/camel-core/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
@@ -214,11 +214,11 @@ public Consumer createConsumer(Processor processor)
throws Exception {
// the API then uses the api component (eg usually camel-swagger-java)
to build the API
if (getComponentName() != null) {
Object comp =
getCamelContext().getRegistry().lookupByName(getComponentName());
- if (comp != null && comp instanceof RestApiConsumerFactory) {
+ if (comp instanceof RestApiConsumerFactory) {
factory = (RestApiConsumerFactory) comp;
} else {
comp = getCamelContext().getComponent(getComponentName());
- if (comp != null && comp instanceof RestApiConsumerFactory) {
+ if (comp instanceof RestApiConsumerFactory) {
factory = (RestApiConsumerFactory) comp;
}
}
@@ -237,7 +237,7 @@ public Consumer createConsumer(Processor processor) throws
Exception {
if (factory == null) {
for (String name : getCamelContext().getComponentNames()) {
Component comp = getCamelContext().getComponent(name);
- if (comp != null && comp instanceof RestApiConsumerFactory) {
+ if (comp instanceof RestApiConsumerFactory) {
factory = (RestApiConsumerFactory) comp;
cname = name;
break;
diff --git
a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
index 5518a10e6dc..645ac7ff095 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
@@ -298,11 +298,11 @@ public Producer createProducer() throws Exception {
String cname = getComponentName();
if (cname != null) {
Object comp =
getCamelContext().getRegistry().lookupByName(getComponentName());
- if (comp != null && comp instanceof RestProducerFactory) {
+ if (comp instanceof RestProducerFactory) {
factory = (RestProducerFactory) comp;
} else {
comp = getCamelContext().getComponent(getComponentName());
- if (comp != null && comp instanceof RestProducerFactory) {
+ if (comp instanceof RestProducerFactory) {
factory = (RestProducerFactory) comp;
}
}
@@ -321,7 +321,7 @@ public Producer createProducer() throws Exception {
if (factory == null) {
for (String name : getCamelContext().getComponentNames()) {
Component comp = getCamelContext().getComponent(name);
- if (comp != null && comp instanceof RestProducerFactory) {
+ if (comp instanceof RestProducerFactory) {
factory = (RestProducerFactory) comp;
cname = name;
break;
@@ -346,7 +346,7 @@ public Producer createProducer() throws Exception {
String foundName = null;
for (String name : DEFAULT_REST_PRODUCER_COMPONENTS) {
Object comp = getCamelContext().getComponent(name, true);
- if (comp != null && comp instanceof RestProducerFactory) {
+ if (comp instanceof RestProducerFactory) {
if (found == null) {
found = (RestProducerFactory) comp;
foundName = name;
@@ -390,11 +390,11 @@ public Consumer createConsumer(Processor processor)
throws Exception {
String cname = null;
if (getComponentName() != null) {
Object comp =
getCamelContext().getRegistry().lookupByName(getComponentName());
- if (comp != null && comp instanceof RestConsumerFactory) {
+ if (comp instanceof RestConsumerFactory) {
factory = (RestConsumerFactory) comp;
} else {
comp = getCamelContext().getComponent(getComponentName());
- if (comp != null && comp instanceof RestConsumerFactory) {
+ if (comp instanceof RestConsumerFactory) {
factory = (RestConsumerFactory) comp;
}
}
@@ -413,7 +413,7 @@ public Consumer createConsumer(Processor processor) throws
Exception {
if (factory == null) {
for (String name : getCamelContext().getComponentNames()) {
Component comp = getCamelContext().getComponent(name);
- if (comp != null && comp instanceof RestConsumerFactory) {
+ if (comp instanceof RestConsumerFactory) {
factory = (RestConsumerFactory) comp;
cname = name;
break;
@@ -436,7 +436,7 @@ public Consumer createConsumer(Processor processor) throws
Exception {
String foundName = null;
for (String name : DEFAULT_REST_CONSUMER_COMPONENTS) {
Object comp = getCamelContext().getComponent(name, true);
- if (comp != null && comp instanceof RestConsumerFactory) {
+ if (comp instanceof RestConsumerFactory) {
if (found == null) {
found = (RestConsumerFactory) comp;
foundName = name;
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 4eb6ba8e0db..c54f7e4edcb 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -4461,7 +4461,7 @@ public DataFormat resolveDataFormat(String name) {
DataFormat answer = dataFormatResolver.resolveDataFormat(name, this);
// inject CamelContext if aware
- if (answer != null && answer instanceof CamelContextAware) {
+ if (answer instanceof CamelContextAware) {
((CamelContextAware) answer).setCamelContext(this);
}
@@ -4472,7 +4472,7 @@ public DataFormat createDataFormat(String name) {
DataFormat answer = dataFormatResolver.createDataFormat(name, this);
// inject CamelContext if aware
- if (answer != null && answer instanceof CamelContextAware) {
+ if (answer instanceof CamelContextAware) {
((CamelContextAware) answer).setCamelContext(this);
}
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
index bb9d982e562..417eaaee18c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
@@ -317,7 +317,7 @@ public void setIn(Message in) {
public Message getOut() {
// lazy create
if (out == null) {
- out = (in != null && in instanceof MessageSupport)
+ out = (in instanceof MessageSupport)
? ((MessageSupport)in).newInstance() : new
DefaultMessage(getContext());
configureMessage(out);
}
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java
index f958435035a..3519e3e07a5 100644
---
a/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java
+++
b/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java
@@ -45,7 +45,7 @@ public Processor createChildProcessor(RouteContext
routeContext, ProcessorDefini
try {
if (finder != null) {
Object object = finder.newInstance(name);
- if (object != null && object instanceof ProcessorFactory) {
+ if (object instanceof ProcessorFactory) {
ProcessorFactory pc = (ProcessorFactory) object;
return pc.createChildProcessor(routeContext, definition,
mandatory);
}
@@ -64,7 +64,7 @@ public Processor createProcessor(RouteContext routeContext,
ProcessorDefinition<
try {
if (finder != null) {
Object object = finder.newInstance(name);
- if (object != null && object instanceof ProcessorFactory) {
+ if (object instanceof ProcessorFactory) {
ProcessorFactory pc = (ProcessorFactory) object;
return pc.createProcessor(routeContext, definition);
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
index eb731da5521..01bef6c157f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
@@ -427,7 +427,7 @@ private void doGetRouteScopedErrorHandler(Set<Service>
services, Route route) {
for (Service service : services) {
if (service instanceof Channel) {
Processor eh = ((Channel) service).getErrorHandler();
- if (eh != null && eh instanceof Service) {
+ if (eh instanceof Service) {
extra.add((Service) eh);
}
}
@@ -447,7 +447,7 @@ private void doGetRouteScopedServices(List<Service>
services, Route route) {
OnExceptionDefinition onExceptionDefinition =
(OnExceptionDefinition) output;
if (onExceptionDefinition.isRouteScoped()) {
Processor errorHandler =
onExceptionDefinition.getErrorHandler(route.getId());
- if (errorHandler != null && errorHandler instanceof
Service) {
+ if (errorHandler instanceof Service) {
services.add((Service) errorHandler);
}
}
@@ -455,7 +455,7 @@ private void doGetRouteScopedServices(List<Service>
services, Route route) {
OnCompletionDefinition onCompletionDefinition =
(OnCompletionDefinition) output;
if (onCompletionDefinition.isRouteScoped()) {
Processor onCompletionProcessor =
onCompletionDefinition.getOnCompletion(route.getId());
- if (onCompletionProcessor != null && onCompletionProcessor
instanceof Service) {
+ if (onCompletionProcessor instanceof Service) {
services.add((Service) onCompletionProcessor);
}
}
diff --git
a/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
b/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
index afd53059bc1..cd6ceecbb89 100644
--- a/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
+++ b/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
@@ -49,9 +49,9 @@ public Object evaluate(Exchange exchange) {
Object lookup = exp.evaluate(exchange, Object.class);
// must favor expression over predicate
- if (lookup != null && lookup instanceof Expression) {
+ if (lookup instanceof Expression) {
target = (Expression) lookup;
- } else if (lookup != null && lookup instanceof Predicate) {
+ } else if (lookup instanceof Predicate) {
target =
PredicateToExpressionAdapter.toExpression((Predicate) lookup);
}
diff --git
a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
index d9a259679fa..36a6f174006 100644
---
a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++
b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
@@ -554,7 +554,7 @@ private Object getManagedObjectForService(CamelContext
context, Service service,
answer =
getManagementObjectStrategy().getManagedObjectForService(context, service);
}
- if (answer != null && answer instanceof ManagedService) {
+ if (answer instanceof ManagedService) {
ManagedService ms = (ManagedService) answer;
ms.setRoute(route);
ms.init(getManagementStrategy());
diff --git
a/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
b/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
index 82f6760c304..449102e106f 100644
---
a/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
+++
b/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
@@ -189,10 +189,10 @@ public boolean manageProcessor(ProcessorDefinition<?>
definition) {
private ObjectName getObjectName(Object managedObject, Object
preferedName) throws Exception {
ObjectName objectName;
- if (preferedName != null && preferedName instanceof String) {
+ if (preferedName instanceof String) {
String customName = (String) preferedName;
objectName = getManagedObjectName(managedObject, customName,
ObjectName.class);
- } else if (preferedName != null && preferedName instanceof ObjectName)
{
+ } else if (preferedName instanceof ObjectName) {
objectName = (ObjectName) preferedName;
} else {
objectName = getManagedObjectName(managedObject, null,
ObjectName.class);
diff --git
a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index 86b4032ae6d..0de43b0755a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -293,7 +293,7 @@ protected AggregateProcessor createAggregator(RouteContext
routeContext) throws
@Override
public void configureChild(ProcessorDefinition<?> output) {
- if (expression != null && expression instanceof ExpressionClause) {
+ if (expression instanceof ExpressionClause) {
ExpressionClause<?> clause = (ExpressionClause<?>) expression;
if (clause.getExpressionType() != null) {
// if using the Java DSL then the expression may have been set
using the
diff --git
a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
index 6143f1730ef..50766c33178 100644
--- a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
@@ -114,7 +114,7 @@ private AggregationStrategy
createAggregationStrategy(RouteContext routeContext)
}
}
- if (strategy != null && strategy instanceof CamelContextAware) {
+ if (strategy instanceof CamelContextAware) {
((CamelContextAware)
strategy).setCamelContext(routeContext.getCamelContext());
}
diff --git
a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
index 365cc8193b7..442a17c91d7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
@@ -121,7 +121,7 @@ private AggregationStrategy
createAggregationStrategy(RouteContext routeContext)
}
}
- if (strategy != null && strategy instanceof CamelContextAware) {
+ if (strategy instanceof CamelContextAware) {
((CamelContextAware)
strategy).setCamelContext(routeContext.getCamelContext());
}
diff --git
a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
index d4a30dbbf9a..451a8866cc9 100644
---
a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
+++
b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
@@ -696,7 +696,7 @@ public static void resolvePropertyPlaceholders(CamelContext
camelContext, Object
if (Constants.PLACEHOLDER_QNAME.equals(key.getNamespaceURI()))
{
String local = key.getLocalPart();
Object value = other.getOtherAttributes().get(key);
- if (value != null && value instanceof String) {
+ if (value instanceof String) {
// enforce a properties component to be created if
none existed
CamelContextHelper.lookupPropertiesComponent(camelContext, true);
diff --git
a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
index 2a38fe8a6b9..ad3fcc54b94 100644
---
a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
+++
b/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
@@ -103,7 +103,7 @@ private static RestDefinition
cloneRestDefinition(JAXBContext jaxbContext, RestD
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
Object clone = unmarshaller.unmarshal(bis);
- if (clone != null && clone instanceof RestDefinition) {
+ if (clone instanceof RestDefinition) {
RestDefinition def2 = (RestDefinition) clone;
Iterator<VerbDefinition> verbit1 = def.getVerbs().iterator();
diff --git
a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
index 19aa9eb2182..5b4dad2bf75 100644
---
a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
+++
b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
@@ -100,7 +100,7 @@ private static RouteDefinition
cloneRouteDefinition(JAXBContext jaxbContext, Rou
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
Object clone = unmarshaller.unmarshal(bis);
- if (clone != null && clone instanceof RouteDefinition) {
+ if (clone instanceof RouteDefinition) {
RouteDefinition def2 = (RouteDefinition) clone;
// need to clone the namespaces also as they are not JAXB
marshalled (as they are transient)
diff --git
a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
b/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
index e7305e8bfbf..f25fb64e365 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
@@ -143,7 +143,7 @@ private AggregationStrategy
createAggregationStrategy(RouteContext routeContext)
}
}
- if (strategy != null && strategy instanceof CamelContextAware) {
+ if (strategy instanceof CamelContextAware) {
((CamelContextAware)
strategy).setCamelContext(routeContext.getCamelContext());
}
diff --git
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
index 81182335d98..ecaf6b5779c 100644
---
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
+++
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
@@ -248,7 +248,7 @@ public Expression newInstance(CamelContext camelContext)
throws Exception {
parameters.replaceAll(
(k, v) -> {
- if (v != null && v instanceof String) {
+ if (v instanceof String) {
try {
v =
camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
diff --git
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
index e34940986be..a5fa93bf281 100644
---
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
+++
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
@@ -164,7 +164,7 @@ public ServiceChooser newInstance(CamelContext
camelContext) throws Exception {
parameters.replaceAll(
(k, v) -> {
- if (v != null && v instanceof String) {
+ if (v instanceof String) {
try {
v =
camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
diff --git
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
index 6e3a6850b2f..72fad03e3f8 100644
---
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
+++
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
@@ -171,7 +171,7 @@ public ServiceDiscovery newInstance(CamelContext
camelContext) throws Exception
parameters.replaceAll(
(k, v) -> {
- if (v != null && v instanceof String) {
+ if (v instanceof String) {
try {
v =
camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
diff --git
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
index 60b993809f5..5889f9e49f3 100644
---
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
+++
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
@@ -164,7 +164,7 @@ public ServiceFilter newInstance(CamelContext camelContext)
throws Exception {
parameters.replaceAll(
(k, v) -> {
- if (v != null && v instanceof String) {
+ if (v instanceof String) {
try {
v =
camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
diff --git
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
index 094e2f5ac5d..e5fe4a9231c 100644
---
a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
+++
b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
@@ -164,7 +164,7 @@ public ServiceLoadBalancer newInstance(CamelContext
camelContext) throws Excepti
parameters.replaceAll(
(k, v) -> {
- if (v != null && v instanceof String) {
+ if (v instanceof String) {
try {
v =
camelContext.resolvePropertyPlaceholders((String) v);
} catch (Exception e) {
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index eb59fc1fdec..9b9450a3761 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -822,7 +822,7 @@ public void after(Exchange exchange, StreamCache sc) throws
Exception {
} else {
body = exchange.getIn().getBody();
}
- if (body != null && body instanceof StreamCache) {
+ if (body instanceof StreamCache) {
// reset so the cache is ready to be reused after processing
((StreamCache) body).reset();
}
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index f924561a588..693a9ffd12a 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -879,7 +879,7 @@ protected void doDone(Exchange original, Exchange
subExchange, final Iterable<Pr
AsyncCallback callback, boolean doneSync, boolean
forceExhaust) {
// we are done so close the pairs iterator
- if (pairs != null && pairs instanceof Closeable) {
+ if (pairs instanceof Closeable) {
IOHelper.close((Closeable) pairs, "pairs", LOG);
}
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
b/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
index 61a00d5cfb9..33a353e926a 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
@@ -223,7 +223,7 @@ public boolean process(Exchange exchange, AsyncCallback
callback) {
boolean bridgeErrorHandler = false;
if (delegate instanceof DefaultConsumer) {
ExceptionHandler handler = ((DefaultConsumer)
delegate).getExceptionHandler();
- if (handler != null && handler instanceof
BridgeExceptionHandlerToErrorHandler) {
+ if (handler instanceof BridgeExceptionHandlerToErrorHandler) {
bridgeErrorHandler = true;
}
}
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index 65fec636000..d7938f0c383 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -1460,7 +1460,7 @@ public boolean determineIfRedeliveryIsEnabled() throws
Exception {
*/
public int getPendingRedeliveryCount() {
int answer = redeliverySleepCounter.get();
- if (executorService != null && executorService instanceof
ThreadPoolExecutor) {
+ if (executorService instanceof ThreadPoolExecutor) {
answer += ((ThreadPoolExecutor) executorService).getQueue().size();
}
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
index ba6b93d0d75..64ea3f89118 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
@@ -225,7 +225,7 @@ protected void doStart() throws Exception {
mi = bi.createMethodInfo();
// in case the POJO is CamelContextAware
- if (pojo != null && pojo instanceof CamelContextAware) {
+ if (pojo instanceof CamelContextAware) {
((CamelContextAware) pojo).setCamelContext(getCamelContext());
}
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
index 5e347ac80aa..50500e3812a 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
@@ -218,7 +218,7 @@ public void initChannel(ProcessorDefinition<?>
outputDefinition, RouteContext ro
// setup instrumentation processor for management (jmx)
// this is later used in postInitChannel as we need to setup the error
handler later as well
InterceptStrategy managed = routeContext.getManagedInterceptStrategy();
- if (managed != null && managed instanceof
InstrumentationInterceptStrategy) {
+ if (managed instanceof InstrumentationInterceptStrategy) {
InstrumentationInterceptStrategy iis =
(InstrumentationInterceptStrategy) managed;
instrumentationProcessor = new
InstrumentationProcessor(targetOutputDef.getShortName(), target);
iis.prepareProcessor(targetOutputDef, target,
instrumentationProcessor);
diff --git
a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
index 1ffb9d901d0..ba35b5688ad 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
@@ -708,7 +708,7 @@ public static Component
lookupPropertiesComponent(CamelContext camelContext, boo
if (answer == null) {
// lookup what is stored under properties, as it may not be the
Camel properties component
Object found =
camelContext.getRegistry().lookupByName("properties");
- if (found != null && found instanceof PropertiesComponent) {
+ if (found instanceof PropertiesComponent) {
answer = (PropertiesComponent) found;
camelContext.addComponent("properties", answer);
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 8631ccab257..2d8a891dd56 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -125,7 +125,7 @@ public static void resetStreamCache(Message message) {
return;
}
Object body = message.getBody();
- if (body != null && body instanceof StreamCache) {
+ if (body instanceof StreamCache) {
((StreamCache) body).reset();
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
index 91010dc79de..55c9bd3bfbf 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
@@ -483,12 +483,12 @@ private static void doGetChildServices(Set<Service>
services, Service service, b
if (includeErrorHandler) {
// special for error handler as they are tied to
the Channel
Processor errorHandler = ((Channel)
child).getErrorHandler();
- if (errorHandler != null && errorHandler
instanceof Service) {
+ if (errorHandler instanceof Service) {
services.add((Service) errorHandler);
}
}
Processor next = ((Channel) child).getNextProcessor();
- if (next != null && next instanceof Service) {
+ if (next instanceof Service) {
services.add((Service) next);
}
}
diff --git
a/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
b/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
index ce11576869a..c5e5bb5f9cf 100644
---
a/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
+++
b/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
@@ -83,7 +83,7 @@ public void configure() throws Exception {
public final class Extractor {
public String extractName(DataHandler body) {
DataSource ds = (body != null) ? body.getDataSource() : null;
- if (ds != null && ds instanceof FileDataSource) {
+ if (ds instanceof FileDataSource) {
return ((FileDataSource)ds).getName();
}
return null;
diff --git
a/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
b/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
index 29bcf9b7a2c..5bc819e6598 100644
--- a/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
@@ -107,7 +107,7 @@ private void assertNamespacesPresent(RoutesDefinition
routesDefinition, Map<Stri
NamespaceAware na = null;
Expression exp = ed.getExpressionValue();
- if (exp != null && exp instanceof NamespaceAware) {
+ if (exp instanceof NamespaceAware) {
na = (NamespaceAware) exp;
} else if (ed instanceof NamespaceAware) {
na = (NamespaceAware) ed;
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index 3ad1f04e73d..7470f1ac691 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -956,7 +956,7 @@ public void afterDestroy(Object bean, String beanName) {
protected boolean isSingleton(Object bean, String beanName) {
if (beanName != null) {
ComponentMetadata meta =
blueprintContainer.getComponentMetadata(beanName);
- if (meta != null && meta instanceof BeanMetadata) {
+ if (meta instanceof BeanMetadata) {
String scope = ((BeanMetadata) meta).getScope();
if (scope != null) {
return BeanMetadata.SCOPE_SINGLETON.equals(scope);
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
index 6d72aaad89d..4e1ae02de2f 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
@@ -99,14 +99,14 @@ public Processor createErrorHandler(final RouteContext
routeContext, final Proce
Map<String, TransactedPolicy> mapPolicy =
routeContext.lookupByType(TransactedPolicy.class);
if (mapPolicy != null && mapPolicy.size() == 1) {
TransactedPolicy policy = mapPolicy.values().iterator().next();
- if (policy != null && policy instanceof JtaTransactionPolicy) {
+ if (policy instanceof JtaTransactionPolicy) {
transactionPolicy = (JtaTransactionPolicy) policy;
}
}
if (transactionPolicy == null) {
TransactedPolicy policy =
routeContext.lookup(PROPAGATION_REQUIRED, TransactedPolicy.class);
- if (policy != null && policy instanceof JtaTransactionPolicy) {
+ if (policy instanceof JtaTransactionPolicy) {
transactionPolicy = (JtaTransactionPolicy) policy;
}
}
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 064ed363bed..4298742973e 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
@@ -243,9 +243,9 @@ private BuildImageCmd executeBuildImageRequest(DockerClient
client, Message mess
BuildImageCmd buildImageCmd;
- if (body != null && body instanceof InputStream) {
+ if (body instanceof InputStream) {
buildImageCmd = client.buildImageCmd((InputStream)body);
- } else if (body != null && body instanceof File) {
+ } else if (body instanceof File) {
buildImageCmd = client.buildImageCmd((File)body);
} else {
throw new DockerException("Unable to location source Image");
diff --git
a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
index 0067f497f2c..fffd82bf2fa 100644
---
a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
+++
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdWatchConsumer.java
@@ -65,7 +65,7 @@ public void onResponse(ResponsePromise<EtcdKeysResponse>
promise) {
Exchange exchange = null;
Throwable throwable = promise.getException();
- if (throwable != null && throwable instanceof EtcdException) {
+ if (throwable instanceof EtcdException) {
EtcdException exception = (EtcdException) throwable;
// Etcd only keeps the responses of the most recent 1000 events
// across all etcd keys so if we wait for a cleared index, we
diff --git
a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/cloud/EtcdWatchServiceDiscovery.java
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/cloud/EtcdWatchServiceDiscovery.java
index 27c1c01bd84..f14b41f89a9 100644
---
a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/cloud/EtcdWatchServiceDiscovery.java
+++
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/cloud/EtcdWatchServiceDiscovery.java
@@ -76,7 +76,7 @@ public void onResponse(ResponsePromise<EtcdKeysResponse>
promise) {
}
Throwable throwable = promise.getException();
- if (throwable != null && throwable instanceof EtcdException) {
+ if (throwable instanceof EtcdException) {
EtcdException exception = (EtcdException) throwable;
if (EtcdHelper.isOutdatedIndexException(exception)) {
LOGGER.debug("Outdated index, key={}, cause={}", servicePath,
exception.etcdCause);
diff --git
a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/policy/EtcdRoutePolicy.java
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/policy/EtcdRoutePolicy.java
index cf36df83596..57cdea00f88 100644
---
a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/policy/EtcdRoutePolicy.java
+++
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/policy/EtcdRoutePolicy.java
@@ -300,7 +300,7 @@ public void onResponse(ResponsePromise<EtcdKeysResponse>
promise) {
}
Throwable throwable = promise.getException();
- if (throwable != null && throwable instanceof EtcdException) {
+ if (throwable instanceof EtcdException) {
EtcdException exception = (EtcdException) throwable;
if (EtcdHelper.isOutdatedIndexException(exception)) {
LOGGER.debug("Outdated index, key={}, cause={}", servicePath,
exception.etcdCause);
diff --git
a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java
b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java
index 521382ffaa5..c49dcebbeb4 100644
---
a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java
+++
b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecResultConverter.java
@@ -145,7 +145,7 @@ private static InputStream toInputStream(ExecResult
execResult) throws FileNotFo
* Resets the stream, only if it's a ByteArrayInputStream.
*/
private static void resetIfByteArrayInputStream(InputStream stream) {
- if (stream != null && stream instanceof ByteArrayInputStream) {
+ if (stream instanceof ByteArrayInputStream) {
try {
stream.reset();
} catch (IOException ioe) {
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelper.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelper.java
index 4e7f7bf1e96..fae95e410a8 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelper.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelper.java
@@ -352,7 +352,7 @@ public static Object invokeMethod(Facebook facebook,
FacebookMethodsType method,
} catch (Throwable e) {
// skip wrapper exception to simplify stack
String msg;
- if (e.getCause() != null && e.getCause() instanceof
FacebookException) {
+ if (e.getCause() instanceof FacebookException) {
e = e.getCause();
msg = ((FacebookException)e).getErrorMessage();
} else {
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
index 33f153da83d..b54f927742f 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
@@ -211,7 +211,7 @@ protected boolean ignoreCannotRetrieveFile(String name,
Exchange exchange, Excep
return true;
}
}
- if (cause != null && cause instanceof
GenericFileOperationFailedException) {
+ if (cause instanceof GenericFileOperationFailedException) {
GenericFileOperationFailedException generic =
ObjectHelper.getException(GenericFileOperationFailedException.class, cause);
//exchange is null and cause has the reason for failure to
read directories
if (generic.getCode() == 550) {
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
index aa79b07781d..cddd51f1ff3 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
@@ -209,7 +209,7 @@ protected void doStop() throws Exception {
// need to shutdown the ConnectionManager
clientConnectionManager.shutdown();
}
- if (httpClient != null && httpClient instanceof Closeable) {
+ if (httpClient instanceof Closeable) {
IOHelper.close((Closeable)httpClient);
}
}
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
index d752ffa4d2c..f91805cc44e 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
@@ -363,7 +363,7 @@ public Message createMessage(Session session) throws
JMSException {
// the reply to is a String, so we need to look up its
Destination instance
// and if needed create the destination using the session if
needed to
- if (jmsReplyTo != null && jmsReplyTo instanceof String) {
+ if (jmsReplyTo instanceof String) {
String replyTo = (String) jmsReplyTo;
// we need to null it as we use the String to resolve it
as a Destination instance
jmsReplyTo = resolveOrCreateDestination(replyTo, session);
diff --git
a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
index 86112249ecb..a81f2c91712 100644
---
a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
+++
b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
@@ -90,7 +90,7 @@ protected void doStop() throws Exception {
@Override
protected void doResume() throws Exception {
- if (delegatedConsumer != null && delegatedConsumer instanceof
SuspendableService) {
+ if (delegatedConsumer instanceof SuspendableService) {
((SuspendableService)delegatedConsumer).resume();
}
super.doResume();
@@ -98,7 +98,7 @@ protected void doResume() throws Exception {
@Override
protected void doSuspend() throws Exception {
- if (delegatedConsumer != null && delegatedConsumer instanceof
SuspendableService) {
+ if (delegatedConsumer instanceof SuspendableService) {
((SuspendableService)delegatedConsumer).suspend();
}
super.doSuspend();
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
index 8392b4bd972..621e5c08f80 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
@@ -139,7 +139,7 @@ public void process(Exchange exchange) throws Exception {
return;
} catch (MllpException mllpEx) {
Throwable mllpExCause = mllpEx.getCause();
- if (mllpExCause != null && mllpExCause instanceof IOException) {
+ if (mllpExCause instanceof IOException) {
MllpSocketUtil.reset(socket, log, mllpEx.getMessage());
}
exchange.setException(mllpEx);
diff --git
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index 99c425a4ce1..766cf41a3c3 100644
---
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -68,17 +68,17 @@ private void declareAndBindExchangeWithQueue(final Channel
channel) throws IOExc
private void formatSpecialQueueArguments(Map<String, Object> queueArgs) {
// some arguments must be in numeric values so we need to fix this
Object queueLengthLimit =
queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY);
- if (queueLengthLimit != null && queueLengthLimit instanceof String) {
+ if (queueLengthLimit instanceof String) {
queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY,
Long.parseLong((String) queueLengthLimit));
}
Object queueMessageTtl =
queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY);
- if (queueMessageTtl != null && queueMessageTtl instanceof String) {
+ if (queueMessageTtl instanceof String) {
queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY,
Long.parseLong((String) queueMessageTtl));
}
Object queueExpiration =
queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_TTL_KEY);
- if (queueExpiration != null && queueExpiration instanceof String) {
+ if (queueExpiration instanceof String) {
queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_TTL_KEY,
Long.parseLong((String) queueExpiration));
}
}
diff --git
a/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
b/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
index ac88b514c14..3b0cb386496 100644
---
a/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
+++
b/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
@@ -108,7 +108,7 @@ public Object invoke(Object proxy, Method method, Object[]
args) throws Throwabl
break;
}
}
- if (match != null && match instanceof Throwable) {
+ if (match instanceof Throwable) {
// we have a match
throw (Throwable) match;
} else {
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
index b05ed15dc08..0a616ef3ef3 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
@@ -62,14 +62,14 @@ public Processor createErrorHandler(RouteContext
routeContext, Processor process
Map<String, TransactedPolicy> mapPolicy =
routeContext.lookupByType(TransactedPolicy.class);
if (mapPolicy != null && mapPolicy.size() == 1) {
TransactedPolicy policy = mapPolicy.values().iterator().next();
- if (policy != null && policy instanceof
SpringTransactionPolicy) {
+ if (policy instanceof SpringTransactionPolicy) {
transactionTemplate = ((SpringTransactionPolicy)
policy).getTransactionTemplate();
}
}
if (transactionTemplate == null) {
TransactedPolicy policy =
routeContext.lookup(PROPAGATION_REQUIRED, TransactedPolicy.class);
- if (policy != null && policy instanceof
SpringTransactionPolicy) {
+ if (policy instanceof SpringTransactionPolicy) {
transactionTemplate = ((SpringTransactionPolicy)
policy).getTransactionTemplate();
}
}
diff --git
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshHelper.java
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshHelper.java
index 936241c6344..cd910c89763 100644
---
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshHelper.java
+++
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshHelper.java
@@ -51,7 +51,7 @@ public static SshResult sendExecCommand(Map<String, Object>
headers, String comm
String userName = configuration.getUsername();
Object userNameHeaderObj = headers.get(SshConstants.USERNAME_HEADER);
- if (userNameHeaderObj != null && userNameHeaderObj instanceof String) {
+ if (userNameHeaderObj instanceof String) {
userName = (String) headers.get(SshConstants.USERNAME_HEADER);
}
@@ -91,7 +91,7 @@ public static SshResult sendExecCommand(Map<String, Object>
headers, String comm
String password = configuration.getPassword();
Object passwordHeaderObj =
headers.get(SshConstants.PASSWORD_HEADER);
- if (passwordHeaderObj != null && passwordHeaderObj instanceof
String) {
+ if (passwordHeaderObj instanceof String) {
password = (String)
headers.get(SshConstants.PASSWORD_HEADER);
}
diff --git
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ContextCreationTimeoutTest.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ContextCreationTimeoutTest.java
index 230cc33ccd5..953a6ae2090 100644
---
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ContextCreationTimeoutTest.java
+++
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ContextCreationTimeoutTest.java
@@ -88,8 +88,7 @@ public void testSystemPropertyWrongFormat() {
ts.getCamelContextCreationTimeout();
fail();
} catch (IllegalArgumentException e) {
- assertTrue(e.getCause() != null
- && e.getCause() instanceof NumberFormatException);
+ assertTrue(e.getCause() instanceof NumberFormatException);
}
}
diff --git
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
index b6f0a027a79..084885a7eef 100644
---
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
+++
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
@@ -135,10 +135,10 @@ private Object getMessageBody(Message message) {
Map<String, Object> answer = new HashMap<String, Object>();
ExtensionElement jpe =
stanza.getExtension(JivePropertiesExtension.NAMESPACE);
- if (jpe != null && jpe instanceof JivePropertiesExtension) {
+ if (jpe instanceof JivePropertiesExtension) {
extractHeadersFrom((JivePropertiesExtension)jpe, exchange, answer);
}
- if (jpe != null && jpe instanceof DefaultExtensionElement) {
+ if (jpe instanceof DefaultExtensionElement) {
extractHeadersFrom((DefaultExtensionElement)jpe, exchange, answer);
}
diff --git
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
index b32ee704cf2..8eed4383fca 100644
---
a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
+++
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
@@ -621,9 +621,9 @@ private static String buildJSonLineFromRow(Map<String,
String> row) {
Set<String> enums = null;
// the enum can either be a List or String
value = row.get("enum");
- if (value != null && value instanceof List) {
+ if (value instanceof List) {
enums = new LinkedHashSet<String>((List)value);
- } else if (value != null && value instanceof String) {
+ } else if (value instanceof String) {
String[] array = value.toString().split(",");
enums = Arrays.stream(array).collect(Collectors.toSet());
}
diff --git
a/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java
b/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java
index 77f5bfd042f..5e5b88595af 100644
---
a/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java
+++
b/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java
@@ -35,7 +35,7 @@ public void configure(Map<String, ?> configs) {
public int partition(String topic, Object key, byte[] keyBytes, Object
value, byte[] valueBytes, Cluster cluster) {
int partId = 0;
- if (key != null && key instanceof String) {
+ if (key instanceof String) {
String sKey = (String) key;
int len = sKey.length();
diff --git
a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
index cad1166784c..ef75a96a8a2 100644
---
a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
+++
b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
@@ -142,7 +142,7 @@ private CamelJavaParserHelper() {
}
}
}
- if (exp != null && exp instanceof ClassInstanceCreation) {
+ if (exp instanceof ClassInstanceCreation) {
ClassInstanceCreation cic = (ClassInstanceCreation) exp;
boolean isRouteBuilder = false;
if (cic.getType() instanceof SimpleType) {
@@ -477,7 +477,7 @@ private static void doParseCamelSimple(String node,
JavaClassSource clazz, Block
}
}
}
- if (parent != null && parent instanceof MethodInvocation) {
+ if (parent instanceof MethodInvocation) {
MethodInvocation emi = (MethodInvocation) parent;
String parentName = emi.getName().getIdentifier();
predicate = isSimplePredicate(parentName);
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index b4f754d3fa8..6630a088cee 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -153,7 +153,7 @@ public void execute() throws MojoExecutionException,
MojoFailureException {
String baseDir = ".";
JavaType out = Roaster.parse(file);
// we should only parse java classes (not interfaces and
enums etc)
- if (out != null && out instanceof JavaClassSource) {
+ if (out instanceof JavaClassSource) {
JavaClassSource clazz = (JavaClassSource) out;
List<CamelNodeDetails> result =
RouteBuilderParser.parseRouteBuilderTree(clazz, baseDir, fqn, true);
routeTrees.addAll(result);
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 5a9b8f63343..8ba28834a71 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -258,7 +258,7 @@ public void execute() throws MojoExecutionException,
MojoFailureException {
String baseDir = ".";
JavaType out = Roaster.parse(file);
// we should only parse java classes (not interfaces and
enums etc)
- if (out != null && out instanceof JavaClassSource) {
+ if (out instanceof JavaClassSource) {
JavaClassSource clazz = (JavaClassSource) out;
RouteBuilderParser.parseRouteBuilderEndpoints(clazz,
baseDir, fqn, fileEndpoints, unparsable, includeTest);
RouteBuilderParser.parseRouteBuilderSimpleExpressions(clazz, baseDir, fqn,
fileSimpleExpressions);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Remove redundant null checks from instanceof checks
> ---------------------------------------------------
>
> Key: CAMEL-12059
> URL: https://issues.apache.org/jira/browse/CAMEL-12059
> Project: Camel
> Issue Type: Improvement
> Affects Versions: 2.20.1
> Reporter: Marc Carter
> Assignee: Andrea Cosentino
> Priority: Trivial
> Fix For: 2.21.0
>
>
> The null check in
> {{if (exchange.getFromEndpoint() != null && exchange.getFromEndpoint()
> instanceof DirectEndpoint)}}
> is redundant, this is equivalent to
> {{if (exchange.getFromEndpoint() instanceof DirectEndpoint)}}
> Basic use of IntelliJ Structural Search and Replace with:
> {{$Expr$ != null && $Expr$ instanceof $Type$}}
> finds (and can correct) dozens of examples
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
