You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2021/06/21 12:35:46 UTC
[camel] branch maven-checkstyle-upgrade-and-violation-fixes created
(now ba4b645)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch maven-checkstyle-upgrade-and-violation-fixes
in repository https://gitbox.apache.org/repos/asf/camel.git.
at ba4b645 upgrade to use com.puppycrawl.tools:checkstyle:8.43 and fix the violations
This branch includes the following new commits:
new ba4b645 upgrade to use com.puppycrawl.tools:checkstyle:8.43 and fix the violations
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: upgrade to use com.puppycrawl.tools:checkstyle:8.43
and fix the violations
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch maven-checkstyle-upgrade-and-violation-fixes
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ba4b645d968fde65f92db9b7f2666b1c03f47de6
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Mon Jun 21 14:35:06 2021 +0200
upgrade to use com.puppycrawl.tools:checkstyle:8.43 and fix the violations
---
camel-dependencies/pom.xml | 2 +-
.../parser/helper/CamelXmlRestDslParserHelper.java | 12 +++++-----
.../camel/component/as2/api/util/AS2Utils.java | 2 +-
.../websocket/WebsocketRouteWithInitParamTest.java | 2 +-
.../camel/component/avro/AvroConfiguration.java | 4 ++--
.../apache/camel/component/avro/AvroListener.java | 2 +-
.../component/aws2/lambda/Lambda2Producer.java | 9 ++++---
.../camel/component/aws2/sqs/Sqs2Component.java | 2 +-
.../dataformat/bindy/BindyAbstractFactory.java | 2 +-
.../dataformat/bindy/BindyFixedLengthFactory.java | 2 +-
.../dataformat/bindy/BindyKeyValuePairFactory.java | 6 ++---
.../bindy/fixed/BindyFixedLengthDataFormat.java | 4 ++--
.../camel/component/cbor/CBORDataFormat.java | 2 +-
.../org/apache/camel/cdi/XmlCdiBeanFactory.java | 2 +-
.../apache/camel/component/cxf/CxfConsumer.java | 2 +-
.../component/cxf/jaxrs/SimpleCxfRsBinding.java | 2 +-
.../spring/CxfEndpointBeanDefinitionParser.java | 2 +-
.../soap/headers/CxfMessageHeadersRelayTest.java | 4 ++--
.../cxf/soap/headers/HeaderTesterImpl.java | 4 ++--
.../headers/HeaderTesterWithInsertionImpl.java | 4 ++--
.../component/disruptor/DisruptorProducer.java | 2 +-
.../facebook/data/FacebookMethodsType.java | 2 +-
.../component/file/remote/RemoteFileEndpoint.java | 2 +-
.../FtpChangedExclusiveReadLockStrategy.java | 4 ++--
.../SftpChangedExclusiveReadLockStrategy.java | 4 ++--
.../AbstractGoogleCalendarTestSupport.java | 6 ++---
.../camel/component/hdfs/DefaultHdfsFile.java | 2 +-
.../camel/component/hdfs/HdfsInputStream.java | 2 +-
.../camel/http/common/DefaultHttpBinding.java | 2 +-
.../apache/camel/component/http/HttpProducer.java | 2 +-
.../camel/converter/jaxb/JaxbDataFormat.java | 2 +-
.../camel/converter/jaxb/NonXmlCharFilterer.java | 4 ++--
.../jira/consumer/AbstractJiraConsumer.java | 2 +-
.../org/apache/camel/component/jms/JmsBinding.java | 6 ++---
.../apache/camel/component/jms/JmsProducer.java | 6 ++---
.../jta/JtaTransactionErrorHandlerReifier.java | 2 +-
.../org/apache/camel/jta/JtaTransactionPolicy.java | 2 +-
.../camel/component/kafka/KafkaProducer.java | 2 +-
.../component/kubernetes/KubernetesHelper.java | 2 +-
.../cloud/KubernetesClientServiceDiscovery.java | 2 +-
.../cluster/KubernetesClusterServiceTest.java | 2 +-
.../server/core/integ5/DSAnnotationProcessor.java | 4 ++--
.../server/core/integ5/DirectoryExtension.java | 4 ++--
.../core/integ5/ServerAnnotationProcessor.java | 2 +-
.../server/core/integ5/DSAnnotationProcessor.java | 4 ++--
.../server/core/integ5/DirectoryExtension.java | 4 ++--
.../core/integ5/ServerAnnotationProcessor.java | 2 +-
.../component/lucene/LuceneConfiguration.java | 8 +++----
.../camel/component/lucene/LuceneIndexer.java | 2 +-
.../apache/camel/component/mail/MailBinding.java | 2 +-
.../component/milo/server/MiloServerComponent.java | 2 +-
.../component/mllp/internal/MllpSocketBuffer.java | 4 ++--
.../camel/component/mongodb/MongoDbEndpoint.java | 2 +-
.../netty/http/DefaultNettyHttpBinding.java | 2 +-
.../http/handlers/HttpInboundStreamHandler.java | 2 +-
.../component/olingo2/api/impl/Olingo2AppImpl.java | 4 ++--
.../camel/component/olingo2/Olingo2Consumer.java | 2 +-
.../camel/component/olingo4/Olingo4Consumer.java | 4 ++--
.../pdf/text/DefaultLineBuilderStrategy.java | 2 +-
.../http/vertx/VertxPlatformHttpSupport.java | 2 +-
.../camel/component/printer/PrintDocument.java | 6 ++---
.../apache/camel/component/quartz/CamelJob.java | 4 ++--
.../quartz/CronScheduledRoutePolicy.java | 4 ++--
.../routepolicy/quartz/ScheduledRoutePolicy.java | 2 +-
.../quartz/SimpleScheduledRoutePolicy.java | 4 ++--
.../quickfixj/examples/trading/TradeExecutor.java | 4 ++--
.../salesforce/internal/SalesforceSession.java | 2 +-
.../java/org/apache/camel/maven/GenerateMojo.java | 2 +-
.../apache/camel/component/seda/SedaProducer.java | 2 +-
.../camel/component/sip/SipConfiguration.java | 4 ++--
.../apache/camel/component/sip/SipPublisher.java | 2 +-
.../apache/camel/component/sjms/SjmsProducer.java | 2 +-
.../apache/camel/component/smpp/SmppSmCommand.java | 2 +-
.../component/snakeyaml/SnakeYAMLDataFormat.java | 2 +-
.../camel/component/snmp/SnmpTrapConsumer.java | 4 ++--
.../camel/dataformat/soap/name/MethodInfo.java | 4 ++--
.../soap/name/ServiceInterfaceStrategy.java | 4 ++--
.../camel/component/splunk/SplunkEndpoint.java | 4 ++--
.../component/splunk/support/TcpDataWriter.java | 2 +-
.../xml/handler/ErrorHandlerDefinitionParser.java | 2 +-
.../camel/component/syslog/SyslogConverter.java | 2 +-
.../org/apache/camel/test/junit5/TestSupport.java | 2 +-
.../org/apache/camel/test/junit4/TestSupport.java | 2 +-
.../undertow/DefaultUndertowHttpBinding.java | 2 +-
.../camel/component/undertow/UndertowConsumer.java | 2 +-
.../camel/component/undertow/UndertowProducer.java | 2 +-
.../vertx/http/DefaultVertxHttpBinding.java | 4 ++--
.../vertx/websocket/VertxWebsocketHelper.java | 2 +-
.../component/websocket/WebsocketComponent.java | 2 +-
.../camel/component/xj/JsonXmlStreamReader.java | 28 +++++++++++-----------
.../camel/component/xj/XmlJsonStreamWriter.java | 2 +-
.../xmlsecurity/api/XAdESSignatureProperties.java | 8 +++----
.../xmlsecurity/SignatureAlgorithmTest.java | 4 ++--
.../xmlsecurity/SignatureDigestMethodTest.java | 4 ++--
.../component/xmlsecurity/XmlSignatureTest.java | 4 ++--
.../util/SameDocumentUriDereferencer.java | 2 +-
.../zendesk/AbstractZendeskTestSupport.java | 4 ++--
.../group/internal/ZooKeeperGroup.java | 2 +-
parent/pom.xml | 2 +-
.../org/apache/camel/maven/JavaSourceParser.java | 4 ++--
100 files changed, 167 insertions(+), 168 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index a069ffe..5920897 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -384,7 +384,7 @@
<maven-archetype-plugin-version>3.2.0</maven-archetype-plugin-version>
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
- <maven-checkstyle-version>8.40</maven-checkstyle-version>
+ <maven-checkstyle-version>8.43</maven-checkstyle-version>
<maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
<maven-jboss-as-maven-plugin-version>7.9.Final</maven-jboss-as-maven-plugin-version>
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlRestDslParserHelper.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlRestDslParserHelper.java
index 11a5b2e..e4fee74 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlRestDslParserHelper.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlRestDslParserHelper.java
@@ -85,7 +85,7 @@ public final class CamelXmlRestDslParserHelper {
}
if ("componentProperty".equals(xmlNode.getNodeName())
- && (xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName()))) {
+ && xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName())) {
NamedNodeMap map = xmlNode.getAttributes();
String key = extractAttribute(map, "key");
String value = extractAttribute(map, "value");
@@ -93,7 +93,7 @@ public final class CamelXmlRestDslParserHelper {
detail.addComponentProperty(key, value);
}
} else if ("endpointProperty".equals(xmlNode.getNodeName())
- && (xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName()))) {
+ && xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName())) {
NamedNodeMap map = xmlNode.getAttributes();
String key = extractAttribute(map, "key");
String value = extractAttribute(map, "value");
@@ -101,7 +101,7 @@ public final class CamelXmlRestDslParserHelper {
detail.addEndpointProperty(key, value);
}
} else if ("consumerProperty".equals(xmlNode.getNodeName())
- && (xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName()))) {
+ && xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName())) {
NamedNodeMap map = xmlNode.getAttributes();
String key = extractAttribute(map, "key");
String value = extractAttribute(map, "value");
@@ -109,7 +109,7 @@ public final class CamelXmlRestDslParserHelper {
detail.addConsumerProperty(key, value);
}
} else if ("dataFormatProperty".equals(xmlNode.getNodeName())
- && (xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName()))) {
+ && xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName())) {
NamedNodeMap map = xmlNode.getAttributes();
String key = extractAttribute(map, "key");
String value = extractAttribute(map, "value");
@@ -117,7 +117,7 @@ public final class CamelXmlRestDslParserHelper {
detail.addDataFormatProperty(key, value);
}
} else if ("apiProperty".equals(xmlNode.getNodeName())
- && (xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName()))) {
+ && xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName())) {
NamedNodeMap map = xmlNode.getAttributes();
String key = extractAttribute(map, "key");
String value = extractAttribute(map, "value");
@@ -125,7 +125,7 @@ public final class CamelXmlRestDslParserHelper {
detail.addApiProperty(key, value);
}
} else if ("corsHeaders".equals(xmlNode.getNodeName())
- && (xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName()))) {
+ && xmlNode.getParentNode() != null && "restConfiguration".equals(xmlNode.getParentNode().getNodeName())) {
NamedNodeMap map = xmlNode.getAttributes();
String key = extractAttribute(map, "key");
String value = extractAttribute(map, "value");
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
index 76dfb62..86dbd80 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
@@ -99,7 +99,7 @@ public final class AS2Utils {
*/
public static boolean isPrintableChar(char c) {
Character.UnicodeBlock block = Character.UnicodeBlock.of(c);
- return (!Character.isISOControl(c)) && c != KeyEvent.CHAR_UNDEFINED && block != null
+ return !Character.isISOControl(c) && c != KeyEvent.CHAR_UNDEFINED && block != null
&& block != Character.UnicodeBlock.SPECIALS;
}
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
index cb1f0aa..f6b7fcd 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
@@ -290,7 +290,7 @@ public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithIni
assertEquals(null, msg);
assertNotNull(connectionKey);
- if ((eventType instanceof Integer) && eventType.equals(WebsocketConstants.ONOPEN_EVENT_TYPE)) {
+ if (eventType instanceof Integer && eventType.equals(WebsocketConstants.ONOPEN_EVENT_TYPE)) {
String param1 = (String) exchange.getIn().getHeader("param1");
String param2 = (String) exchange.getIn().getHeader("param2");
diff --git a/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java b/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
index 56e010a..b9054b1 100644
--- a/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
+++ b/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
@@ -70,8 +70,8 @@ public class AvroConfiguration implements Cloneable {
setHost(uri.getHost());
setPort(uri.getPort());
- if ((uri.getPath() != null)
- && (StringUtils.indexOf(uri.getPath(), AVRO_MESSAGE_NAME_SEPARATOR) != -1)) {
+ if (uri.getPath() != null
+ && StringUtils.indexOf(uri.getPath(), AVRO_MESSAGE_NAME_SEPARATOR) != -1) {
String path = StringUtils.substringAfter(uri.getPath(), AVRO_MESSAGE_NAME_SEPARATOR);
if (!path.contains(AVRO_MESSAGE_NAME_SEPARATOR)) {
setMessageName(path);
diff --git a/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroListener.java b/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroListener.java
index b38bed1..3f3f21a 100644
--- a/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroListener.java
+++ b/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroListener.java
@@ -121,7 +121,7 @@ public class AvroListener {
defaultConsumer = null;
}
- if ((defaultConsumer == null) && (consumerRegistry.isEmpty())) {
+ if (defaultConsumer == null && consumerRegistry.isEmpty()) {
if (server != null) {
server.close();
}
diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
index 19fd833..86e672c 100644
--- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
+++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
@@ -271,8 +271,8 @@ public class Lambda2Producer extends DefaultProducer {
if (ObjectHelper.isNotEmpty(exchange.getIn().getBody())
|| ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE))
- || (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
- && ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY)))) {
+ || ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
+ && ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY))) {
builder.code(functionCode.build());
} else {
throw new IllegalArgumentException("At least S3 bucket/S3 key or zip file must be specified");
@@ -360,7 +360,6 @@ public class Lambda2Producer extends DefaultProducer {
}
try {
result = lambdaClient.createFunction(request);
-
} catch (AwsServiceException ase) {
LOG.trace("createFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
throw ase;
@@ -380,8 +379,8 @@ public class Lambda2Producer extends DefaultProducer {
builder.functionName(getEndpoint().getFunction());
if (ObjectHelper.isEmpty(exchange.getIn().getBody())
- && (ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
- && ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY)))) {
+ && ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
+ && ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY))) {
throw new IllegalArgumentException("At least S3 bucket/S3 key or zip file must be specified");
}
diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
index 9ccc689..1b6c730 100644
--- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
+++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
@@ -75,7 +75,7 @@ public class Sqs2Component extends DefaultComponent {
// Verify that visibilityTimeout is set if extendMessageVisibility is
// set to true.
- if (configuration.isExtendMessageVisibility() && (configuration.getVisibilityTimeout() == null)) {
+ if (configuration.isExtendMessageVisibility() && configuration.getVisibilityTimeout() == null) {
throw new IllegalArgumentException(
"Extending message visibility (extendMessageVisibility) requires visibilityTimeout to be set on the Endpoint.");
}
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
index 9a3f149..99a90e8 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
@@ -195,7 +195,7 @@ public abstract class BindyAbstractFactory implements BindyFactory {
String keyGenerated;
// BigIntegerFormatFactory added for ticket - camel-2773
- if ((key1 != null) && (key2 != null)) {
+ if (key1 != null && key2 != null) {
key2Formatted = getNumberFormat().format((long) key2);
keyGenerated = String.valueOf(key1) + key2Formatted;
} else {
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
index f77cca5..6b1e688 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
@@ -462,7 +462,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
int fieldLength = datafield.length();
- if (fieldLength == 0 && (datafield.lengthPos() > 0)) {
+ if (fieldLength == 0 && datafield.lengthPos() > 0) {
List<String> resultVals = results.get(datafield.lengthPos());
fieldLength = Integer.valueOf(resultVals.get(0));
}
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
index c2cd8c2..35e1f32 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
@@ -320,7 +320,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
for (int i = 0; i < values.size(); i++) {
// BigIntegerFormatFactory if object exist
- if ((!l.isEmpty()) && (l.size() > i)) {
+ if (!l.isEmpty() && l.size() > i) {
obj = l.get(i);
} else {
obj = clazz.newInstance();
@@ -353,7 +353,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
}
// Add object created to the list
- if ((!l.isEmpty()) && (l.size() > i)) {
+ if (!l.isEmpty() && l.size() > i) {
l.set(i, obj);
} else {
l.add(i, obj);
@@ -619,7 +619,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
* Get parameters defined in @Message annotation
*/
private void initMessageParameters() {
- if ((pairSeparator == null) || (keyValuePairSeparator == null)) {
+ if (pairSeparator == null || keyValuePairSeparator == null) {
for (Class<?> cl : models) {
// Get annotation @Message from the class
Message message = cl.getAnnotation(Message.class);
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index ef097be..5152f34 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -297,8 +297,8 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
if (isTrimmingNeededAndEnabled(factory, myLine)) {
myLine = myLine.substring(0, factory.recordLength());
}
- if ((myLine.length() < factory.recordLength()
- && !factory.isIgnoreMissingChars()) || (myLine.length() > factory.recordLength())) {
+ if (myLine.length() < factory.recordLength()
+ && !factory.isIgnoreMissingChars() || myLine.length() > factory.recordLength()) {
throw new java.lang.IllegalArgumentException(
"Size of the record: " + myLine.length()
+ " is not equal to the value provided in the model: "
diff --git a/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java b/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
index f400f38..60bc27d 100644
--- a/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
+++ b/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
@@ -312,7 +312,7 @@ public class CBORDataFormat extends ServiceSupport implements DataFormat, DataFo
protected void doInit() throws Exception {
super.doInit();
- if (unmarshalTypeName != null && (unmarshalType == null)) {
+ if (unmarshalTypeName != null && unmarshalType == null) {
unmarshalType = camelContext.getClassResolver().resolveClass(unmarshalTypeName);
}
if (collectionTypeName != null && collectionType == null) {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
index a46f94d..3ffbcf2 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
@@ -432,7 +432,7 @@ final class XmlCdiBeanFactory {
}
if (isNotEmpty(definition.getRollbackLoggingLevel())
- && (!type.equals(ErrorHandlerType.TransactionErrorHandler))) {
+ && !type.equals(ErrorHandlerType.TransactionErrorHandler)) {
throw attributeNotSupported("rollbackLoggingLevel", type, definition.getId());
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index 1168c4b..193e9d6 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -202,7 +202,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
throw ex;
}
- } else if (continuation.isTimeout() || (!continuation.isResumed() && !continuation.isPending())) {
+ } else if (continuation.isTimeout() || !continuation.isResumed() && !continuation.isPending()) {
org.apache.camel.Exchange camelExchange = (org.apache.camel.Exchange) continuation.getObject();
try {
if (!continuation.isPending()) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
index f78d65e..d05c536 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
@@ -227,7 +227,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
= (MultivaluedMap<String, String>) cxfExchange.getInMessage().get(URITemplate.TEMPLATE_PARAMETERS);
// return immediately if we have no path parameters
- if (pathParams == null || (pathParams.size() == 1 && pathParams.containsKey(URITemplate.FINAL_MATCH_GROUP))) {
+ if (pathParams == null || pathParams.size() == 1 && pathParams.containsKey(URITemplate.FINAL_MATCH_GROUP)) {
return;
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
index 059ab51..54c9794 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
@@ -37,7 +37,7 @@ public class CxfEndpointBeanDefinitionParser extends AbstractCxfBeanDefinitionPa
}
private boolean isSpringPlaceHolder(String value) {
- if (value != null && (value.startsWith("${") && value.endsWith("}"))
+ if (value != null && value.startsWith("${") && value.endsWith("}")
|| value.startsWith("{{") && value.endsWith("}}")) {
return true;
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
index bd796a9..1a3f468 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
@@ -598,7 +598,7 @@ public class CxfMessageHeadersRelayTest {
OutofBandHeader hdrToTest = null;
List<Header> oobHdr = CastUtils.cast((List<?>) responseContext.get(Header.HEADER_LIST));
if (!expect) {
- if (oobHdr == null || (oobHdr != null && oobHdr.size() == 0)) {
+ if (oobHdr == null || oobHdr != null && oobHdr.size() == 0) {
return;
}
fail("Should have got *no* out-of-band headers, but some were found");
@@ -655,7 +655,7 @@ public class CxfMessageHeadersRelayTest {
List<OutofBandHeader> hdrToTest = new ArrayList<>();
List<Header> oobHdr = CastUtils.cast((List<?>) responseContext.get(Header.HEADER_LIST));
if (!expect) {
- if (oobHdr == null || (oobHdr != null && oobHdr.size() == 0)) {
+ if (oobHdr == null || oobHdr != null && oobHdr.size() == 0) {
return;
}
fail("Should have got *no* out-of-band headers, but some were found");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index a87acad..e455833 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -182,8 +182,8 @@ public class HeaderTesterImpl implements HeaderTester {
if (!relayHeaders) {
if (ctx != null
&& !ctx.containsKey(Header.HEADER_LIST)
- || (ctx.containsKey(Header.HEADER_LIST)
- && ((List<?>) ctx.get(Header.HEADER_LIST)).size() == 0)) {
+ || ctx.containsKey(Header.HEADER_LIST)
+ && ((List<?>) ctx.get(Header.HEADER_LIST)).size() == 0) {
return true;
}
return false;
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
index ce58722..41029ec 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
@@ -37,8 +37,8 @@ public class HeaderTesterWithInsertionImpl extends HeaderTesterImpl {
if (!relayHeaders) {
if (ctx != null
&& !ctx.containsKey(Header.HEADER_LIST)
- || (ctx.containsKey(Header.HEADER_LIST)
- && ((List<?>) ctx.get(Header.HEADER_LIST)).size() == 0)) {
+ || ctx.containsKey(Header.HEADER_LIST)
+ && ((List<?>) ctx.get(Header.HEADER_LIST)).size() == 0) {
return true;
}
return false;
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
index 67223c2..529fe90 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
@@ -77,7 +77,7 @@ public class DisruptorProducer extends DefaultAsyncProducer {
}
if (wait == WaitForTaskToComplete.Always
- || (wait == WaitForTaskToComplete.IfReplyExpected && ExchangeHelper.isOutCapable(exchange))) {
+ || wait == WaitForTaskToComplete.IfReplyExpected && ExchangeHelper.isOutCapable(exchange)) {
// do not handover the completion as we wait for the copy to complete, and copy its result back when it done
final Exchange copy = prepareCopy(exchange, false);
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
index 6a81227..a8ed089 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
@@ -863,7 +863,7 @@ public enum FacebookMethodsType {
public static FacebookMethodsType findMethod(String name, Class<?>... args) {
for (FacebookMethodsType method : values()) {
if (method.name.equals(name)) {
- if ((method.argTypes.isEmpty() && (args == null || args.length == 0))
+ if (method.argTypes.isEmpty() && (args == null || args.length == 0)
|| Arrays.equals(method.argTypes.toArray(), args)) {
return method;
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
index e51c780..7070a83 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
@@ -113,7 +113,7 @@ public abstract class RemoteFileEndpoint<T> extends GenericFileEndpoint<T> {
afterPropertiesSet();
// you cannot use temp file and file exists append
- if (getFileExist() == GenericFileExist.Append && ((getTempPrefix() != null) || (getTempFileName() != null))) {
+ if (getFileExist() == GenericFileExist.Append && (getTempPrefix() != null || getTempFileName() != null)) {
throw new IllegalArgumentException("You cannot set both fileExist=Append and tempPrefix/tempFileName options");
}
// ensure fileExist and moveExisting is configured correctly if in use
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
index f085576..6a99189 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
@@ -128,8 +128,8 @@ public class FtpChangedExclusiveReadLockStrategy implements GenericFileExclusive
long newOlderThan = startTime + watch.taken() - minAge;
LOG.trace("New older than threshold: {}", newOlderThan);
- if (newLength >= minLength && ((minAge == 0 && newLastModified == lastModified && newLength == length)
- || (minAge != 0 && newLastModified < newOlderThan))) {
+ if (newLength >= minLength && (minAge == 0 && newLastModified == lastModified && newLength == length
+ || minAge != 0 && newLastModified < newOlderThan)) {
LOG.trace("Read lock acquired.");
exclusive = true;
} else {
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
index c3157c4..4aa838e 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
@@ -127,8 +127,8 @@ public class SftpChangedExclusiveReadLockStrategy implements GenericFileExclusiv
long newOlderThan = startTime + watch.taken() - minAge;
LOG.trace("New older than threshold: {}", newOlderThan);
- if (newLength >= minLength && ((minAge == 0 && newLastModified == lastModified && newLength == length)
- || (minAge != 0 && newLastModified < newOlderThan))) {
+ if (newLength >= minLength && (minAge == 0 && newLastModified == lastModified && newLength == length
+ || minAge != 0 && newLastModified < newOlderThan)) {
LOG.trace("Read lock acquired.");
exclusive = true;
} else {
diff --git a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java
index 1c536e9..4f36792 100644
--- a/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java
+++ b/components/camel-google/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/AbstractGoogleCalendarTestSupport.java
@@ -63,9 +63,9 @@ public class AbstractGoogleCalendarTestSupport extends CamelTestSupport {
private static boolean hasCredentials() {
loadProperties();
- return (!properties.getProperty("clientId", "").isEmpty())
- && (!properties.getProperty("clientSecret", "").isEmpty())
- && (!properties.getProperty("accessToken", "").isEmpty());
+ return !properties.getProperty("clientId", "").isEmpty()
+ && !properties.getProperty("clientSecret", "").isEmpty()
+ && !properties.getProperty("accessToken", "").isEmpty();
}
@BeforeEach
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/DefaultHdfsFile.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/DefaultHdfsFile.java
index 7c4a40d..f414e52 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/DefaultHdfsFile.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/DefaultHdfsFile.java
@@ -50,7 +50,7 @@ abstract class DefaultHdfsFile<T extends Closeable, U extends Closeable> impleme
while (bytesRead >= 0) {
out.write(buf, 0, bytesRead);
numBytes += bytesRead;
- if ((ps != null) && ps.checkError()) {
+ if (ps != null && ps.checkError()) {
throw new IOException("Unable to write to output stream.");
}
bytesRead = in.read(buf);
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInputStream.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInputStream.java
index 13968d6..41d3ea2 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInputStream.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsInputStream.java
@@ -111,7 +111,7 @@ public class HdfsInputStream implements Closeable {
long nb = fileType.next(this, key, value);
// when zero bytes was read from given type of file, we may still have a record (e.g., empty file)
// null value.value is the only indication that no (new) record/chunk was read
- if ((nb == 0 && numOfReadMessages.get() > 0) || Objects.isNull(value.getValue())) {
+ if (nb == 0 && numOfReadMessages.get() > 0 || Objects.isNull(value.getValue())) {
// we've read all chunks from file, which size is exact multiple the chunk size
nb = -1;
} else {
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 17bae00..66b6bfd 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -448,7 +448,7 @@ public class DefaultHttpBinding implements HttpBinding {
int codeToUse = currentCode == null ? defaultCode : currentCode;
if (codeToUse != 500) {
- if ((body == null) || (body instanceof String && ((String) body).trim().isEmpty())) {
+ if (body == null || body instanceof String && ((String) body).trim().isEmpty()) {
// no content
codeToUse = currentCode == null ? 204 : currentCode;
}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 7df069b..91c51db 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -413,7 +413,7 @@ public class HttpProducer extends DefaultProducer {
}
Header locationHeader = httpResponse.getFirstHeader("location");
- if (locationHeader != null && (responseCode >= 300 && responseCode < 400)) {
+ if (locationHeader != null && responseCode >= 300 && responseCode < 400) {
answer = new HttpOperationFailedException(uri, responseCode, statusText, locationHeader.getValue(), headers, copy);
} else {
answer = new HttpOperationFailedException(uri, responseCode, statusText, null, headers, copy);
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index 8f76b74..5b48740 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -274,7 +274,7 @@ public class JaxbDataFormat extends ServiceSupport
}
private boolean asXmlStreamWriter(Exchange exchange) {
- return needFiltering(exchange) || (xmlStreamWriterWrapper != null);
+ return needFiltering(exchange) || xmlStreamWriterWrapper != null;
}
@Override
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NonXmlCharFilterer.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NonXmlCharFilterer.java
index c4153a5..e9d9e42 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NonXmlCharFilterer.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/NonXmlCharFilterer.java
@@ -36,8 +36,8 @@ class NonXmlCharFilterer {
// Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] |
// [#x10000-#x10FFFF]
// Won't be checking last interval, as it goes beyond 0xFFFF.
- if (c == 0x9 || c == 0xA || c == 0xD || (c >= 0x20 && c <= 0xD7FF)
- || (c >= 0xE000 && c <= 0xFFFD)) {
+ if (c == 0x9 || c == 0xA || c == 0xD || c >= 0x20 && c <= 0xD7FF
+ || c >= 0xE000 && c <= 0xFFFD) {
return false;
}
return true;
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJiraConsumer.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJiraConsumer.java
index d7fcabc..6d721eb 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJiraConsumer.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/consumer/AbstractJiraConsumer.java
@@ -60,7 +60,7 @@ public abstract class AbstractJiraConsumer extends ScheduledPollConsumer {
// Note: #getTotal == the total # the query would return *without* pagination, effectively telling us
// we've reached the end. Also exit early if we're limiting the # of results.
- if (start >= searchResult.getTotal() || (maxResults > 0 && issues.size() >= maxResults)) {
+ if (start >= searchResult.getTotal() || maxResults > 0 && issues.size() >= maxResults) {
break;
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index 0eaf5f1..f9e9386 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -410,7 +410,7 @@ public class JmsBinding {
// see message properties: http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html
Object value = getValidJMSHeaderValue(headerName, headerValue);
// if the value was null, then it may be allowed as an additional header
- if (value == null && (endpoint != null && endpoint.getConfiguration().getAllowAdditionalHeaders() != null)) {
+ if (value == null && endpoint != null && endpoint.getConfiguration().getAllowAdditionalHeaders() != null) {
Iterator it = ObjectHelper.createIterator(endpoint.getConfiguration().getAllowAdditionalHeaders());
while (it.hasNext()) {
String pattern = (String) it.next();
@@ -559,7 +559,7 @@ public class JmsBinding {
// create the JmsMessage based on the type
if (type != null) {
- if (body == null && (endpoint != null && !endpoint.getConfiguration().isAllowNullBody())) {
+ if (body == null && endpoint != null && !endpoint.getConfiguration().isAllowNullBody()) {
throw new JMSException("Cannot send message as message body is null, and option allowNullBody is false.");
}
LOG.trace("Using JmsMessageType: {}", type);
@@ -570,7 +570,7 @@ public class JmsBinding {
}
// check for null body
- if (body == null && (endpoint != null && !endpoint.getConfiguration().isAllowNullBody())) {
+ if (body == null && endpoint != null && !endpoint.getConfiguration().isAllowNullBody()) {
throw new JMSException("Cannot send message as message body is null, and option allowNullBody is false.");
}
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 f4b63a6..1f58603 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
@@ -209,8 +209,8 @@ public class JmsProducer extends DefaultAsyncProducer {
final String originalCorrelationId = in.getHeader(correlationPropertyToUse, String.class);
- boolean generateFreshCorrId = (ObjectHelper.isEmpty(originalCorrelationId) && !msgIdAsCorrId)
- || (originalCorrelationId != null && originalCorrelationId.startsWith(GENERATED_CORRELATION_ID_PREFIX));
+ boolean generateFreshCorrId = ObjectHelper.isEmpty(originalCorrelationId) && !msgIdAsCorrId
+ || originalCorrelationId != null && originalCorrelationId.startsWith(GENERATED_CORRELATION_ID_PREFIX);
if (generateFreshCorrId) {
// we append the 'Camel-' prefix to know it was generated by us
in.setHeader(correlationPropertyToUse, GENERATED_CORRELATION_ID_PREFIX + getUuidGenerator().generateUuid());
@@ -433,7 +433,7 @@ public class JmsProducer extends DefaultAsyncProducer {
Destination dest = null;
boolean isPubSub = isTopicPrefix(destinationName)
- || (!isQueuePrefix(destinationName) && endpoint.isPubSubDomain());
+ || !isQueuePrefix(destinationName) && endpoint.isPubSubDomain();
// try using destination resolver to lookup the destination
if (endpoint.getDestinationResolver() != null) {
dest = endpoint.getDestinationResolver().resolveDestinationName(session, destinationName,
diff --git a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
index 4667235..d41edb7 100644
--- a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandlerReifier.java
@@ -100,7 +100,7 @@ public class JtaTransactionErrorHandlerReifier extends ErrorHandlerReifier<JtaTr
final Map<String, String> properties = camelContext.getGlobalOptions();
LoggingLevel rollbackLoggingLevel = definition.getRollbackLoggingLevel();
- if ((properties != null) && properties.containsKey(ROLLBACK_LOGGING_LEVEL_PROPERTY)) {
+ if (properties != null && properties.containsKey(ROLLBACK_LOGGING_LEVEL_PROPERTY)) {
rollbackLoggingLevel = LoggingLevel.valueOf(properties.get(ROLLBACK_LOGGING_LEVEL_PROPERTY));
}
diff --git a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
index b7f38c0..20d75c1 100644
--- a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
@@ -86,7 +86,7 @@ public abstract class JtaTransactionPolicy implements TransactedPolicy {
}
JtaTransactionErrorHandlerBuilder txBuilder;
- if ((builder != null) && builder.supportTransacted()) {
+ if (builder != null && builder.supportTransacted()) {
if (!(builder instanceof JtaTransactionErrorHandlerBuilder)) {
throw new RuntimeCamelException(
"The given transactional error handler builder '" + builder
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 7b73036..335c7b2 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -162,7 +162,7 @@ public class KafkaProducer extends DefaultAsyncProducer {
}
Object overrideTimeStamp = exchange.getIn().removeHeader(KafkaConstants.OVERRIDE_TIMESTAMP);
- if ((overrideTimeStamp != null) && (overrideTimeStamp instanceof Long)) {
+ if (overrideTimeStamp != null && overrideTimeStamp instanceof Long) {
LOG.debug("Using override TimeStamp: {}", overrideTimeStamp);
timeStamp = ((Long) overrideTimeStamp).longValue();
}
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java
index fe9175f..ddea930 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesHelper.java
@@ -50,7 +50,7 @@ public final class KubernetesHelper {
ConfigBuilder builder = new ConfigBuilder();
builder.withMasterUrl(configuration.getMasterUrl());
- if ((ObjectHelper.isNotEmpty(configuration.getUsername()) && ObjectHelper.isNotEmpty(configuration.getPassword()))
+ if (ObjectHelper.isNotEmpty(configuration.getUsername()) && ObjectHelper.isNotEmpty(configuration.getPassword())
&& ObjectHelper.isEmpty(configuration.getOauthToken())) {
builder.withUsername(configuration.getUsername());
builder.withPassword(configuration.getPassword());
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
index db29c5d..c4f0059 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cloud/KubernetesClientServiceDiscovery.java
@@ -99,7 +99,7 @@ public class KubernetesClientServiceDiscovery extends KubernetesServiceDiscovery
ConfigBuilder builder = new ConfigBuilder();
builder.withMasterUrl(configuration.getMasterUrl());
- if ((ObjectHelper.isNotEmpty(configuration.getUsername()) && ObjectHelper.isNotEmpty(configuration.getPassword()))
+ if (ObjectHelper.isNotEmpty(configuration.getUsername()) && ObjectHelper.isNotEmpty(configuration.getPassword())
&& ObjectHelper.isEmpty(configuration.getOauthToken())) {
builder.withUsername(configuration.getUsername());
builder.withPassword(configuration.getPassword());
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
index cdaedc9..74ece15 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
@@ -314,7 +314,7 @@ public class KubernetesClusterServiceTest extends CamelTestSupport {
String leader = null;
for (LeaderRecorder recorder : partitionRecorders.get(partition)) {
String partitionLeader = recorder.getCurrentLeader();
- if (partitionLeader == null || (leader != null && !leader.equals(partitionLeader))) {
+ if (partitionLeader == null || leader != null && !leader.equals(partitionLeader)) {
return false;
}
leader = partitionLeader;
diff --git a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
index 79c5c28..0ae07da 100644
--- a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
+++ b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
@@ -350,7 +350,7 @@ public final class DSAnnotationProcessor {
Class<?> clazz,
DirectoryService service, String[] ldifFiles)
throws Exception {
- if ((ldifFiles != null) && (ldifFiles.length > 0)) {
+ if (ldifFiles != null && ldifFiles.length > 0) {
for (String ldifFile : ldifFiles) {
InputStream is = clazz.getClassLoader().getResourceAsStream(
ldifFile);
@@ -438,7 +438,7 @@ public final class DSAnnotationProcessor {
ApplyLdifs applyLdifs = desc.getAnnotation(ApplyLdifs.class);
- if ((applyLdifs != null) && (applyLdifs.value() != null)) {
+ if (applyLdifs != null && applyLdifs.value() != null) {
String[] ldifs = applyLdifs.value();
String dnStart = "dn:";
diff --git a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
index 5852370..58718ef 100644
--- a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
+++ b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
@@ -220,7 +220,7 @@ public class DirectoryExtension implements BeforeAllCallback, AfterAllCallback,
}
private long getCurrentRevision(DirectoryService dirService) throws Exception {
- if ((dirService != null) && (dirService.getChangeLog().isEnabled())) {
+ if (dirService != null && dirService.getChangeLog().isEnabled()) {
long revision = dirService.getChangeLog().getCurrentRevision();
LOG.debug("Create revision {}", revision);
return revision;
@@ -233,7 +233,7 @@ public class DirectoryExtension implements BeforeAllCallback, AfterAllCallback,
return;
}
ChangeLog cl = dirService.getChangeLog();
- if (cl.isEnabled() && (revision < cl.getCurrentRevision())) {
+ if (cl.isEnabled() && revision < cl.getCurrentRevision()) {
LOG.debug("Revert revision {}", revision);
dirService.revert(revision);
}
diff --git a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index 2aaa3ec..ae9fbca 100644
--- a/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++ b/components/camel-ldap/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -155,7 +155,7 @@ public final class ServerAnnotationProcessor {
if (ntlmHandler != null) {
Class<?> ntlmProviderClass = createLdapServer.ntlmProvider();
// default value is a invalid Object.class
- if ((ntlmProviderClass != null) && (ntlmProviderClass != Object.class)) {
+ if (ntlmProviderClass != null && ntlmProviderClass != Object.class) {
try {
ntlmHandler.setNtlmProvider((NtlmProvider) ntlmProviderClass
.getDeclaredConstructor().newInstance());
diff --git a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
index 79c5c28..0ae07da 100644
--- a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
+++ b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DSAnnotationProcessor.java
@@ -350,7 +350,7 @@ public final class DSAnnotationProcessor {
Class<?> clazz,
DirectoryService service, String[] ldifFiles)
throws Exception {
- if ((ldifFiles != null) && (ldifFiles.length > 0)) {
+ if (ldifFiles != null && ldifFiles.length > 0) {
for (String ldifFile : ldifFiles) {
InputStream is = clazz.getClassLoader().getResourceAsStream(
ldifFile);
@@ -438,7 +438,7 @@ public final class DSAnnotationProcessor {
ApplyLdifs applyLdifs = desc.getAnnotation(ApplyLdifs.class);
- if ((applyLdifs != null) && (applyLdifs.value() != null)) {
+ if (applyLdifs != null && applyLdifs.value() != null) {
String[] ldifs = applyLdifs.value();
String dnStart = "dn:";
diff --git a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
index 5852370..58718ef 100644
--- a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
+++ b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/DirectoryExtension.java
@@ -220,7 +220,7 @@ public class DirectoryExtension implements BeforeAllCallback, AfterAllCallback,
}
private long getCurrentRevision(DirectoryService dirService) throws Exception {
- if ((dirService != null) && (dirService.getChangeLog().isEnabled())) {
+ if (dirService != null && dirService.getChangeLog().isEnabled()) {
long revision = dirService.getChangeLog().getCurrentRevision();
LOG.debug("Create revision {}", revision);
return revision;
@@ -233,7 +233,7 @@ public class DirectoryExtension implements BeforeAllCallback, AfterAllCallback,
return;
}
ChangeLog cl = dirService.getChangeLog();
- if (cl.isEnabled() && (revision < cl.getCurrentRevision())) {
+ if (cl.isEnabled() && revision < cl.getCurrentRevision()) {
LOG.debug("Revert revision {}", revision);
dirService.revert(revision);
}
diff --git a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
index 2aaa3ec..ae9fbca 100644
--- a/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
+++ b/components/camel-ldif/src/test/java/org/apache/directory/server/core/integ5/ServerAnnotationProcessor.java
@@ -155,7 +155,7 @@ public final class ServerAnnotationProcessor {
if (ntlmHandler != null) {
Class<?> ntlmProviderClass = createLdapServer.ntlmProvider();
// default value is a invalid Object.class
- if ((ntlmProviderClass != null) && (ntlmProviderClass != Object.class)) {
+ if (ntlmProviderClass != null && ntlmProviderClass != Object.class) {
try {
ntlmHandler.setNtlmProvider((NtlmProvider) ntlmProviderClass
.getDeclaredConstructor().newInstance());
diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
index 522ac2d..8437e6b 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
@@ -88,10 +88,10 @@ public class LuceneConfiguration {
}
private boolean isValidAuthority() throws URISyntaxException {
- if ((!authority.contains(":"))
- || ((authority.split(":")[0]) == null)
- || ((!authority.split(":")[1].equalsIgnoreCase("insert"))
- && (!authority.split(":")[1].equalsIgnoreCase("query")))) {
+ if (!authority.contains(":")
+ || authority.split(":")[0] == null
+ || !authority.split(":")[1].equalsIgnoreCase("insert")
+ && !authority.split(":")[1].equalsIgnoreCase("query")) {
return false;
}
return true;
diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
index 1952a5a..5f64ba3 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
@@ -60,7 +60,7 @@ public class LuceneIndexer {
this.setAnalyzer(analyzer);
- if ((sourceDirectory != null) && (!sourceDirectoryIndexed)) {
+ if (sourceDirectory != null && !sourceDirectoryIndexed) {
this.setSourceDirectory(sourceDirectory);
add(getSourceDirectory());
sourceDirectoryIndexed = true;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
index eaa8f19..f051399 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
@@ -781,7 +781,7 @@ public class MailBinding {
}
private static boolean isCollection(Object value) {
- return value instanceof Collection || (value != null && value.getClass().isArray());
+ return value instanceof Collection || value != null && value.getClass().isArray();
}
}
diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
index 0c1841c..2d12d18 100644
--- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
+++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
@@ -246,7 +246,7 @@ public class MiloServerComponent extends DefaultComponent {
hostnames.add(HostnameUtil.getHostname());
hostnames.addAll(HostnameUtil.getHostnames(bindAddress));
- boolean anonymous = (this.enableAnonymousAuthentication != null && this.enableAnonymousAuthentication)
+ boolean anonymous = this.enableAnonymousAuthentication != null && this.enableAnonymousAuthentication
|| Boolean.getBoolean("org.apache.camel.milo.server.default.enableAnonymous");
UserTokenPolicy[] tokenPolicies
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
index 041e08b..e7aac30 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
@@ -487,8 +487,8 @@ public class MllpSocketBuffer {
public synchronized boolean hasEndOfData() {
if (hasEndOfBlock()) {
int potentialEndOfDataIndex = endOfBlockIndex + 1;
- if ((potentialEndOfDataIndex < availableByteCount)
- && (buffer[potentialEndOfDataIndex] == MllpProtocolConstants.END_OF_DATA)) {
+ if (potentialEndOfDataIndex < availableByteCount
+ && buffer[potentialEndOfDataIndex] == MllpProtocolConstants.END_OF_DATA) {
return true;
}
}
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index 8b62fbc..f7d3357 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -233,7 +233,7 @@ public class MongoDbEndpoint extends DefaultEndpoint {
*/
public void initializeConnection() throws CamelMongoDbException {
LOG.info("Initialising MongoDb endpoint: {}", this);
- if (database == null || (collection == null && !(getDbStats.equals(operation) || command.equals(operation)))) {
+ if (database == null || collection == null && !getDbStats.equals(operation) || command.equals(operation)) {
throw new CamelMongoDbException("Missing required endpoint configuration: database and/or collection");
}
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
index c4fbcf8..aa5e05d 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
@@ -552,7 +552,7 @@ public class DefaultNettyHttpBinding implements NettyHttpBinding, Cloneable {
int codeToUse = currentCode == null ? defaultCode : currentCode;
if (codeToUse != 500) {
- if ((body == null) || (body instanceof String && ((String) body).trim().isEmpty())) {
+ if (body == null || body instanceof String && ((String) body).trim().isEmpty()) {
// no content
codeToUse = currentCode == null ? 204 : currentCode;
}
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpInboundStreamHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpInboundStreamHandler.java
index bc877ff..4491b46 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpInboundStreamHandler.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpInboundStreamHandler.java
@@ -67,7 +67,7 @@ public class HttpInboundStreamHandler extends MessageToMessageDecoder<HttpObject
HttpHeaders headers = ((HttpMessage) msg).headers();
return isChunked = headers.contains(TRANSFER_ENCODING, CHUNKED, true);
} else {
- return (msg instanceof HttpContent) && isChunked;
+ return msg instanceof HttpContent && isChunked;
}
}
diff --git a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2AppImpl.java b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2AppImpl.java
index ee5faaf..ed460ac 100644
--- a/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2AppImpl.java
+++ b/components/camel-olingo2/camel-olingo2-api/src/main/java/org/apache/camel/component/olingo2/api/impl/Olingo2AppImpl.java
@@ -980,7 +980,7 @@ public final class Olingo2AppImpl implements Olingo2App {
// Olingo is sensitive to batch part charset case!!
headers.put(HttpHeaders.ACCEPT, contentType.withCharset("").toString().toLowerCase());
}
- if (!headers.containsKey(HttpHeaders.ACCEPT_CHARSET) && (null != charset)) {
+ if (!headers.containsKey(HttpHeaders.ACCEPT_CHARSET) && null != charset) {
headers.put(HttpHeaders.ACCEPT_CHARSET, charset.name().toLowerCase());
}
@@ -1230,7 +1230,7 @@ public final class Olingo2AppImpl implements Olingo2App {
}
// set user specified endpoint headers
- if ((endpointHttpHeaders != null) && !endpointHttpHeaders.isEmpty()) {
+ if (endpointHttpHeaders != null && !endpointHttpHeaders.isEmpty()) {
for (Map.Entry<String, String> entry : endpointHttpHeaders.entrySet()) {
httpUriRequest.setHeader(entry.getKey(), entry.getValue());
}
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
index a7bc29cb..6420ed7 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
@@ -97,7 +97,7 @@ public class Olingo2Consumer extends AbstractApiConsumer<Olingo2ApiName, Olingo2
// Allow consumer idle properties to properly handle an empty
// polling response
//
- if ((result[0] == null) || (result[0] instanceof ODataFeed && (((ODataFeed) result[0]).getEntries().isEmpty()))) {
+ if (result[0] == null || result[0] instanceof ODataFeed && (((ODataFeed) result[0]).getEntries().isEmpty())) {
return 0;
} else {
int processed = ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
index df3c35c..5051b18 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
@@ -101,8 +101,8 @@ public class Olingo4Consumer extends AbstractApiConsumer<Olingo4ApiName, Olingo4
// Allow consumer idle properties to properly handle an empty
// polling response
//
- if ((result[0] == null)
- || (result[0] instanceof ClientEntitySet && (((ClientEntitySet) result[0]).getEntities().isEmpty()))) {
+ if (result[0] == null
+ || result[0] instanceof ClientEntitySet && (((ClientEntitySet) result[0]).getEntities().isEmpty())) {
return 0;
} else {
int processed = ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
diff --git a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/text/DefaultLineBuilderStrategy.java b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/text/DefaultLineBuilderStrategy.java
index 2cd1c3b..c8975a4 100644
--- a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/text/DefaultLineBuilderStrategy.java
+++ b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/text/DefaultLineBuilderStrategy.java
@@ -88,7 +88,7 @@ public class DefaultLineBuilderStrategy implements LineBuilderStrategy {
end = middle;
middle = currentSplitIndex + (word.substring(currentSplitIndex, middle).length() >> 1);
}
- } while ((currentSplitIndex == -1) || !isSplitIndexFound(word, allowedLineWidth, currentSplitIndex));
+ } while (currentSplitIndex == -1 || !isSplitIndexFound(word, allowedLineWidth, currentSplitIndex));
return currentSplitIndex;
}
diff --git a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSupport.java b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSupport.java
index 728b5e4..133953b 100644
--- a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSupport.java
+++ b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSupport.java
@@ -146,7 +146,7 @@ public final class VertxPlatformHttpSupport {
int codeToUse = currentCode == null ? defaultCode : currentCode;
if (codeToUse != 500) {
- if ((body == null) || (body instanceof String && ((String) body).trim().isEmpty())) {
+ if (body == null || body instanceof String && ((String) body).trim().isEmpty()) {
// no content
codeToUse = currentCode == null ? 204 : currentCode;
}
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrintDocument.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrintDocument.java
index 9d1955a..a59d948 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrintDocument.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrintDocument.java
@@ -61,9 +61,9 @@ class PrintDocument implements Doc {
if (docFlavor.getMediaType().equalsIgnoreCase("image")) {
reader = null;
- } else if ((docFlavor.getMediaType().equalsIgnoreCase("text"))
- || ((docFlavor.getMediaType().equalsIgnoreCase("application"))
- && (docFlavor.getMediaSubtype().equalsIgnoreCase("xml")))) {
+ } else if (docFlavor.getMediaType().equalsIgnoreCase("text")
+ || docFlavor.getMediaType().equalsIgnoreCase("application")
+ && docFlavor.getMediaSubtype().equalsIgnoreCase("xml")) {
buffer = new byte[stream.available()];
int n = stream.available();
for (int i = 0; i < n; i++) {
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java
index bfb0c59..1041c96 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/CamelJob.java
@@ -127,8 +127,8 @@ public class CamelJob implements Job {
LOG.trace("Checking route endpoint={} with checkTriggerKey={}", quartzEndpoint, checkTriggerKey);
}
if (triggerKey.equals(checkTriggerKey)
- || (jobDetail.requestsRecovery() && jobKey.getGroup().equals(checkTriggerKey.getGroup())
- && jobKey.getName().equals(checkTriggerKey.getName()))) {
+ || jobDetail.requestsRecovery() && jobKey.getGroup().equals(checkTriggerKey.getGroup())
+ && jobKey.getName().equals(checkTriggerKey.getName())) {
return quartzEndpoint;
}
}
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java
index ab2c07d..baf8460 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicy.java
@@ -61,8 +61,8 @@ public class CronScheduledRoutePolicy extends ScheduledRoutePolicy implements Sc
}
// validate time options has been configured
- if ((getRouteStartTime() == null) && (getRouteStopTime() == null) && (getRouteSuspendTime() == null)
- && (getRouteResumeTime() == null)) {
+ if (getRouteStartTime() == null && getRouteStopTime() == null && getRouteSuspendTime() == null
+ && getRouteResumeTime() == null) {
throw new IllegalArgumentException(
"Scheduled Route Policy for route " + route.getId()
+ " has no start/stop/suspend/resume times specified");
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
index 6dbe7797..a66eaf1 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
@@ -69,7 +69,7 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport
resumeOrStartConsumer(route.getConsumer());
}
} else if (action == Action.STOP) {
- if ((routeStatus == ServiceStatus.Started) || (routeStatus == ServiceStatus.Suspended)) {
+ if (routeStatus == ServiceStatus.Started || routeStatus == ServiceStatus.Suspended) {
stopRoute(route, getRouteStopGracePeriod(), getTimeUnit());
} else {
LOG.warn("Route is not in a started/suspended state and cannot be stopped. The current route state is {}",
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
index c51f3b6..0628900 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
@@ -67,8 +67,8 @@ public class SimpleScheduledRoutePolicy extends ScheduledRoutePolicy {
}
// validate time options has been configured
- if ((getRouteStartDate() == null) && (getRouteStopDate() == null) && (getRouteSuspendDate() == null)
- && (getRouteResumeDate() == null)) {
+ if (getRouteStartDate() == null && getRouteStopDate() == null && getRouteSuspendDate() == null
+ && getRouteResumeDate() == null) {
throw new IllegalArgumentException(
"Scheduled Route Policy for route " + route.getId()
+ " has no start/stop/suspend/resume times specified");
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
index 6c44398..e2c823e 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
@@ -169,8 +169,8 @@ public class TradeExecutor {
char side = order.getChar(Side.FIELD);
BigDecimal thePrice = new BigDecimal(price.getValue());
- return (side == Side.BUY && thePrice.compareTo(limitPrice) <= 0)
- || ((side == Side.SELL || side == Side.SELL_SHORT) && thePrice.compareTo(limitPrice) >= 0);
+ return side == Side.BUY && thePrice.compareTo(limitPrice) <= 0
+ || (side == Side.SELL || side == Side.SELL_SHORT) && thePrice.compareTo(limitPrice) >= 0;
}
return true;
}
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index 967b535..0c3a408 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -109,7 +109,7 @@ public class SalesforceSession extends ServiceSupport {
// check if we need a new session
// this way there's always a single valid session
- if ((accessToken == null) || accessToken.equals(oldToken)) {
+ if (accessToken == null || accessToken.equals(oldToken)) {
// try revoking the old access token before creating a new one
accessToken = oldToken;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
index bcc2113..63df0fb 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
@@ -454,7 +454,7 @@ public class GenerateMojo extends AbstractSalesforceMojo {
}
// write required Enumerations for any picklists
- if (!useStringsForPicklists || (picklistToEnums != null && picklistToEnums.length > 0)) {
+ if (!useStringsForPicklists || picklistToEnums != null && picklistToEnums.length > 0) {
for (final SObjectField field : description.getFields()) {
if (utility.isPicklist(field) || utility.isMultiSelectPicklist(field)) {
final String enumName = utility.enumTypeName(description.getName(),
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
index e3294a3..f37d859 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
@@ -60,7 +60,7 @@ public class SedaProducer extends DefaultAsyncProducer {
}
if (wait == WaitForTaskToComplete.Always
- || (wait == WaitForTaskToComplete.IfReplyExpected && ExchangeHelper.isOutCapable(exchange))) {
+ || wait == WaitForTaskToComplete.IfReplyExpected && ExchangeHelper.isOutCapable(exchange)) {
// do not handover the completion as we wait for the copy to complete, and copy its result back when it done
Exchange copy = prepareCopy(exchange, false);
diff --git a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
index 59d8480..350c96a 100644
--- a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
+++ b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
@@ -162,7 +162,7 @@ public class SipConfiguration {
public void parseURI() throws Exception {
protocol = uri.getScheme();
- if ((!protocol.equalsIgnoreCase("sip")) && (!protocol.equalsIgnoreCase("sips"))) {
+ if (!protocol.equalsIgnoreCase("sip") && !protocol.equalsIgnoreCase("sips")) {
throw new IllegalArgumentException("Unrecognized SIP protocol: " + protocol + " for uri: " + uri);
}
@@ -407,7 +407,7 @@ public class SipConfiguration {
properties.setProperty("gov.nist.javax.sip.MAX_MESSAGE_SIZE", "" + getMaxMessageSize());
properties.setProperty("gov.nist.javax.sip.CACHE_CLIENT_CONNECTIONS", "" + isCacheConnections());
properties.setProperty("javax.sip.USE_ROUTER_FOR_ALL_URIS", "" + isUseRouterForAllUris());
- if ((implementationDebugLogFile != null) && (implementationServerLogFile != null)) {
+ if (implementationDebugLogFile != null && implementationServerLogFile != null) {
properties.setProperty("gov.nist.javax.sip.DEBUG_LOG", implementationDebugLogFile);
properties.setProperty("gov.nist.javax.sip.SERVER_LOG", implementationServerLogFile);
properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", implementationTraceLevel);
diff --git a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java
index 5e764c3..e6ec726 100644
--- a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java
+++ b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java
@@ -59,7 +59,7 @@ public class SipPublisher extends DefaultProducer {
if (provider != null) {
for (ListeningPoint listeningPoint : provider.getListeningPoints()) {
if (listeningPoint.getIPAddress().equalsIgnoreCase(configuration.getListeningPoint().getIPAddress())
- && (listeningPoint.getPort() == configuration.getListeningPoint().getPort())) {
+ && listeningPoint.getPort() == configuration.getListeningPoint().getPort()) {
found = true;
}
}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
index 7474639..27c8af6 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java
@@ -473,7 +473,7 @@ public class SjmsProducer extends DefaultAsyncProducer {
throws JMSException {
boolean isPubSub = isTopicPrefix(destinationName)
- || (!isQueuePrefix(destinationName) && endpoint.isTopic());
+ || !isQueuePrefix(destinationName) && endpoint.isTopic();
// must normalize the destination name
String before = destinationName;
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java
index 9c16256..4724124 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSmCommand.java
@@ -149,7 +149,7 @@ public abstract class SmppSmCommand extends AbstractSmppCommand {
}
if (providedAlphabet == Alphabet.ALPHA_UCS2.value()
- || (providedAlphabet == SmppConstants.UNKNOWN_ALPHABET && determinedAlphabet == Alphabet.ALPHA_UCS2.value())) {
+ || providedAlphabet == SmppConstants.UNKNOWN_ALPHABET && determinedAlphabet == Alphabet.ALPHA_UCS2.value()) {
// change charset to use multilang messages
return Charset.forName(SmppConstants.UCS2_ENCODING);
}
diff --git a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
index 6b9fa25..da05d04 100644
--- a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
+++ b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
@@ -130,7 +130,7 @@ public final class SnakeYAMLDataFormat extends ServiceSupport implements DataFor
protected void doInit() throws Exception {
super.doInit();
- if (unmarshalTypeName != null && (unmarshalType == null)) {
+ if (unmarshalTypeName != null && unmarshalType == null) {
setUnmarshalType(camelContext.getClassResolver().resolveClass(unmarshalTypeName));
}
}
diff --git a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
index 0de0f65..8a07b8e 100644
--- a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
+++ b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
@@ -104,8 +104,8 @@ public class SnmpTrapConsumer extends DefaultConsumer implements CommandResponde
if (pdu != null) {
// check for INFORM
// code take from the book "Essential SNMP"
- if ((pdu.getType() != PDU.TRAP) && (pdu.getType() != PDU.V1TRAP) && (pdu.getType() != PDU.REPORT)
- && (pdu.getType() != PDU.RESPONSE)) {
+ if (pdu.getType() != PDU.TRAP && pdu.getType() != PDU.V1TRAP && pdu.getType() != PDU.REPORT
+ && pdu.getType() != PDU.RESPONSE) {
// first response the inform-message and then process the
// message
pdu.setErrorIndex(0);
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/MethodInfo.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/MethodInfo.java
index 0c6635f..0219e3e 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/MethodInfo.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/MethodInfo.java
@@ -51,8 +51,8 @@ public final class MethodInfo {
this.inTypeMap = new HashMap<>();
for (TypeInfo typeInfo : in) {
if (inTypeMap.containsKey(typeInfo.getTypeName())
- && (!(typeInfo.getTypeName().equals("javax.xml.ws.Holder")))
- && (!(inTypeMap.get(typeInfo.getTypeName()).getElName().equals(typeInfo.getElName())))) {
+ && !typeInfo.getTypeName().equals("javax.xml.ws.Holder")
+ && !inTypeMap.get(typeInfo.getTypeName()).getElName().equals(typeInfo.getElName())) {
throw new RuntimeCamelException(
"Ambiguous QName mapping. The type [ "
+ typeInfo.getTypeName()
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
index 7e36c4d..5a79d26 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
@@ -159,8 +159,8 @@ public class ServiceInterfaceStrategy implements ElementNameStrategy {
TypeInfo ti = info.getIn()[i];
if (inTypeNameToQName.containsKey(ti.getTypeName())) {
if (ti.getTypeName() != null) {
- if (!(ti.getTypeName().equals("javax.xml.ws.Holder"))
- && (!(inTypeNameToQName.get(ti.getTypeName()).equals(ti.getElName())))) {
+ if (!ti.getTypeName().equals("javax.xml.ws.Holder")
+ && !inTypeNameToQName.get(ti.getTypeName()).equals(ti.getElName())) {
LOG.warn("Ambiguous QName mapping. The type [{}] is already mapped to a QName in this context.",
ti.getTypeName());
continue;
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
index e584d19..1014505 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
@@ -112,8 +112,8 @@ public class SplunkEndpoint extends ScheduledPollEndpoint {
public synchronized boolean reset(Exception e) {
boolean answer = false;
- if ((e instanceof RuntimeException && ((RuntimeException) e).getCause() instanceof ConnectException)
- || ((e instanceof SocketException) || (e instanceof SSLException))) {
+ if (e instanceof RuntimeException && ((RuntimeException) e).getCause() instanceof ConnectException
+ || e instanceof SocketException || e instanceof SSLException) {
LOG.warn("Got exception from Splunk. Service will be reset.");
this.service = null;
answer = true;
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/TcpDataWriter.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/TcpDataWriter.java
index 415457f..f1878ef 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/TcpDataWriter.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/TcpDataWriter.java
@@ -60,7 +60,7 @@ public class TcpDataWriter extends SplunkDataWriter {
}
Socket getSocket(TcpInput tcpInput, Service service) throws IOException {
- if (localPort.isPresent() || (host != null && !host.equals(tcpInput.getHost()))) {
+ if (localPort.isPresent() || host != null && !host.equals(tcpInput.getHost())) {
String h = host == null ? service.getHost() : host;
return new Socket(h, port);
}
diff --git a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
index 68c5454..aecbea4 100644
--- a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.java
@@ -148,7 +148,7 @@ public class ErrorHandlerDefinitionParser extends BeanDefinitionParser {
+ ", in error handler with id: " + id);
}
String rollbackLoggingLevel = element.getAttribute("rollbackLoggingLevel");
- if (ObjectHelper.isNotEmpty(rollbackLoggingLevel) && (!type.equals(ErrorHandlerType.TransactionErrorHandler))) {
+ if (ObjectHelper.isNotEmpty(rollbackLoggingLevel) && !type.equals(ErrorHandlerType.TransactionErrorHandler)) {
throw new IllegalArgumentException(
"Attribute rollbackLoggingLevel can only be used if type is "
+ ErrorHandlerType.TransactionErrorHandler.name()
diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConverter.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConverter.java
index 2908e6b..95b89fc 100644
--- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConverter.java
+++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConverter.java
@@ -243,7 +243,7 @@ public final class SyslogConverter {
StringBuilder structuredData = new StringBuilder();
boolean inblock = false;
- while (((charFound = (char) (byteBuffer.get() & 0xff)) != ' ') || inblock) {
+ while ((charFound = (char) (byteBuffer.get() & 0xff)) != ' ' || inblock) {
if (charFound == '[') {
inblock = true;
}
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
index 7d9b659..4e7cc08 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
@@ -452,7 +452,7 @@ public final class TestSupport {
int tries = 0;
int maxTries = 5;
boolean exists = true;
- while (exists && (tries < maxTries)) {
+ while (exists && tries < maxTries) {
recursivelyDeleteDirectory(file);
tries++;
exists = file.exists();
diff --git a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index c5f01d9..5503b96 100644
--- a/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++ b/components/camel-test/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -355,7 +355,7 @@ public abstract class TestSupport extends Assert {
int tries = 0;
int maxTries = 5;
boolean exists = true;
- while (exists && (tries < maxTries)) {
+ while (exists && tries < maxTries) {
recursivelyDeleteDirectory(file);
tries++;
exists = file.exists();
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
index 50d82cd..c578495 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
@@ -405,7 +405,7 @@ public class DefaultUndertowHttpBinding implements UndertowHttpBinding {
int codeToUse = currentCode == null ? defaultCode : currentCode;
if (codeToUse != 500) {
- if ((body == null) || (body instanceof String && ((String) body).trim().isEmpty())) {
+ if (body == null || body instanceof String && ((String) body).trim().isEmpty()) {
// no content
codeToUse = currentCode == null ? 204 : currentCode;
}
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java
index 0dbdcad..f3d230c 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java
@@ -256,7 +256,7 @@ public class UndertowConsumer extends DefaultConsumer implements HttpHandler, Su
return;
}
- if (getEndpoint().isUseStreaming() && (body instanceof InputStream)) {
+ if (getEndpoint().isUseStreaming() && body instanceof InputStream) {
httpExchange.startBlocking();
try (InputStream input = (InputStream) body;
OutputStream output = httpExchange.getOutputStream()) {
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
index 0f38e99..b0b4be1 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowProducer.java
@@ -145,7 +145,7 @@ public class UndertowProducer extends DefaultAsyncProducer {
final Object body = undertowHttpBinding.toHttpRequest(request, camelExchange.getIn());
final UndertowClientCallback clientCallback;
final boolean streaming = getEndpoint().isUseStreaming();
- if (streaming && (body instanceof InputStream)) {
+ if (streaming && body instanceof InputStream) {
// For streaming, make it chunked encoding instead of specifying content length
requestHeaders.put(Headers.TRANSFER_ENCODING, "chunked");
clientCallback = new UndertowStreamingClientCallback(
diff --git a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
index 8731f8b..4cfe8be 100644
--- a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
+++ b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/DefaultVertxHttpBinding.java
@@ -154,7 +154,7 @@ public class DefaultVertxHttpBinding implements VertxHttpBinding {
Message message = exchange.getMessage();
VertxHttpConfiguration configuration = endpoint.getConfiguration();
boolean ok = endpoint.isStatusCodeOk(result.statusCode());
- if ((!configuration.isThrowExceptionOnFailure()) || (configuration.isThrowExceptionOnFailure() && ok)) {
+ if (!configuration.isThrowExceptionOnFailure() || configuration.isThrowExceptionOnFailure() && ok) {
populateResponseHeaders(exchange, result, configuration.getHeaderFilterStrategy());
message.setBody(processResponseBody(endpoint, exchange, result));
} else {
@@ -203,7 +203,7 @@ public class DefaultVertxHttpBinding implements VertxHttpBinding {
boolean transferException = endpoint.getConfiguration().isTransferException();
boolean allowJavaSerializedObject = endpoint.getComponent().isAllowJavaSerializedObject();
- if (allowJavaSerializedObject || (exceptionOnly && transferException)) {
+ if (allowJavaSerializedObject || exceptionOnly && transferException) {
InputStream inputStream
= exchange.getContext().getTypeConverter().convertTo(InputStream.class, responseBody.getBytes());
if (inputStream != null) {
diff --git a/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketHelper.java b/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketHelper.java
index b0998ae..41f727e 100644
--- a/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketHelper.java
+++ b/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketHelper.java
@@ -29,7 +29,7 @@ public final class VertxWebsocketHelper {
public static int extractPortNumber(String remaining) {
int index1 = remaining.indexOf(':');
int index2 = remaining.indexOf('/');
- if ((index1 != -1) && (index2 != -1)) {
+ if (index1 != -1 && index2 != -1) {
String result = remaining.substring(index1 + 1, index2);
if (result.isEmpty()) {
throw new IllegalArgumentException("Unable to resolve port from URI: " + remaining);
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index dacc4f4..13fa53b 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -573,7 +573,7 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
int index1 = remaining.indexOf(':');
int index2 = remaining.indexOf('/');
- if ((index1 != -1) && (index2 != -1)) {
+ if (index1 != -1 && index2 != -1) {
String result = remaining.substring(index1 + 1, index2);
return Integer.parseInt(result);
} else {
diff --git a/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java b/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
index fd26365..c196952 100644
--- a/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
+++ b/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
@@ -178,9 +178,9 @@ public class JsonXmlStreamReader implements XMLStreamReader {
private void removeStackElement(JsonToken jsonToken) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.jsonToken != jsonToken)) {
+ if (stackElement == null || stackElement.jsonToken != jsonToken) {
if (stackElement != null && jsonToken == JsonToken.FIELD_NAME
- && (stackElement.jsonToken == JsonToken.START_ARRAY)) {
+ && stackElement.jsonToken == JsonToken.START_ARRAY) {
// anonymous array
return;
}
@@ -280,7 +280,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public int getAttributeCount() {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
}
@@ -290,7 +290,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public QName getAttributeName(int index) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
}
@@ -300,7 +300,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public String getAttributeNamespace(int index) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
}
@@ -310,7 +310,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public String getAttributeLocalName(int index) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
}
@@ -320,7 +320,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public String getAttributePrefix(int index) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
}
@@ -330,7 +330,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public String getAttributeType(int index) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
}
@@ -340,7 +340,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public String getAttributeValue(int index) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
}
@@ -365,8 +365,8 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public String getNamespacePrefix(int index) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT
- && stackElement.xmlEvent != XMLStreamConstants.END_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT
+ && stackElement.xmlEvent != XMLStreamConstants.END_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_END_ELEMENT);
}
@@ -376,8 +376,8 @@ public class JsonXmlStreamReader implements XMLStreamReader {
@Override
public String getNamespaceURI(int index) {
final StackElement stackElement = tokenStack.peek();
- if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT
- && stackElement.xmlEvent != XMLStreamConstants.END_ELEMENT)) {
+ if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT
+ && stackElement.xmlEvent != XMLStreamConstants.END_ELEMENT) {
throw new IllegalStateException(ERROR_MSG_NOT_IN_START_END_ELEMENT);
}
@@ -556,7 +556,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
for (int i = offset; i < (offset + length); i++) {
final char cur = input[i];
- if ((cur < 9) || (cur > 10 && cur < 13) || (cur > 13 && cur < 32)) { // non valid xml characters
+ if (cur < 9 || cur > 10 && cur < 13 || cur > 13 && cur < 32) { // non valid xml characters
continue;
}
diff --git a/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java b/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java
index 88204c9..3ad2348 100644
--- a/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java
+++ b/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java
@@ -524,7 +524,7 @@ public class XmlJsonStreamWriter implements XMLStreamWriter {
int len = text.length();
int st = 0;
- while ((st < len) && (text.charAt(st) <= ' ')) {
+ while (st < len && text.charAt(st) <= ' ') {
st++;
}
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
index d800c46..4ac4dc9 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
@@ -776,9 +776,9 @@ public class XAdESSignatureProperties implements XmlSignatureProperties {
}
protected boolean isAddDataObjectFormat() {
- return (getDataObjectFormatIdentifier() != null && !getDataObjectFormatIdentifier().isEmpty())
- || (getDataObjectFormatDescription() != null && !getDataObjectFormatDescription().isEmpty())
- || (getDataObjectFormatMimeType() != null && !getDataObjectFormatMimeType().isEmpty());
+ return getDataObjectFormatIdentifier() != null && !getDataObjectFormatIdentifier().isEmpty()
+ || getDataObjectFormatDescription() != null && !getDataObjectFormatDescription().isEmpty()
+ || getDataObjectFormatMimeType() != null && !getDataObjectFormatMimeType().isEmpty();
}
protected void addSignedSignatureProperties(Document doc, Element signedProperties, Input input) throws Exception {
@@ -798,7 +798,7 @@ public class XAdESSignatureProperties implements XmlSignatureProperties {
protected boolean isAddSignedSignatureProperties() throws Exception {
return isAddSigningTime() || getSigningCertificate() != null
- || (getSigningCertificateChain() != null && getSigningCertificateChain().length > 0) || isAddSignaturePolicy()
+ || getSigningCertificateChain() != null && getSigningCertificateChain().length > 0 || isAddSignaturePolicy()
|| isAddSignatureProductionPlace() || isAddSignerRole();
}
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
index 96a29e7..bde2ec3 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
@@ -575,8 +575,8 @@ public class SignatureAlgorithmTest extends CamelTestSupport {
}
static boolean algEquals(String algURI, String algName) {
- return (algName.equalsIgnoreCase("DSA") && algURI.equalsIgnoreCase(SignatureMethod.DSA_SHA1))
- || (algName.equalsIgnoreCase("RSA") && algURI.equalsIgnoreCase(SignatureMethod.RSA_SHA1));
+ return algName.equalsIgnoreCase("DSA") && algURI.equalsIgnoreCase(SignatureMethod.DSA_SHA1)
+ || algName.equalsIgnoreCase("RSA") && algURI.equalsIgnoreCase(SignatureMethod.RSA_SHA1);
}
}
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
index ac38c05..a2d738c 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
@@ -466,8 +466,8 @@ public class SignatureDigestMethodTest extends CamelTestSupport {
}
static boolean algEquals(String algURI, String algName) {
- return (algName.equalsIgnoreCase("DSA") && algURI.equalsIgnoreCase(SignatureMethod.DSA_SHA1))
- || (algName.equalsIgnoreCase("RSA") && algURI.equalsIgnoreCase(SignatureMethod.RSA_SHA1));
+ return algName.equalsIgnoreCase("DSA") && algURI.equalsIgnoreCase(SignatureMethod.DSA_SHA1)
+ || algName.equalsIgnoreCase("RSA") && algURI.equalsIgnoreCase(SignatureMethod.RSA_SHA1);
}
}
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
index 5ab1348..13272f1 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
@@ -1595,8 +1595,8 @@ public class XmlSignatureTest extends CamelTestSupport {
}
static boolean algEquals(String algURI, String algName) {
- return (algName.equalsIgnoreCase("DSA") && algURI.equalsIgnoreCase(SignatureMethod.DSA_SHA1))
- || (algName.equalsIgnoreCase("RSA") && algURI.equalsIgnoreCase(SignatureMethod.RSA_SHA1));
+ return algName.equalsIgnoreCase("DSA") && algURI.equalsIgnoreCase(SignatureMethod.DSA_SHA1)
+ || algName.equalsIgnoreCase("RSA") && algURI.equalsIgnoreCase(SignatureMethod.RSA_SHA1);
}
}
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/SameDocumentUriDereferencer.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/SameDocumentUriDereferencer.java
index f0cdd01..753646a 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/SameDocumentUriDereferencer.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/util/SameDocumentUriDereferencer.java
@@ -63,7 +63,7 @@ public final class SameDocumentUriDereferencer implements URIDereferencer {
throw new URIReferenceException("Cannot resolve a URI of value 'null'.");
}
- if (uriString != null && ((uriString.length() != 0 && uriString.charAt(0) == '#') || uriString.isEmpty())) {
+ if (uriString != null && (uriString.length() != 0 && uriString.charAt(0) == '#' || uriString.isEmpty())) {
// same document uri
XMLSignatureFactory fac = XMLSignatureFactory.getInstance("DOM");
return fac.getURIDereferencer().dereference(uriReference, context);
diff --git a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
index a1a396e..73ffb11 100644
--- a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
+++ b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/AbstractZendeskTestSupport.java
@@ -94,8 +94,8 @@ public class AbstractZendeskTestSupport extends CamelTestSupport {
configuration.setToken(System.getProperty(SYSPROP_ZENDESK_TOKEN, configuration.getToken()));
configuration.setOauthToken(System.getProperty(SYSPROP_ZENDESK_OAUTH_TOKEN, configuration.getOauthToken()));
if (configuration.getServerUrl() == null || configuration.getUsername() == null
- || (configuration.getPassword() == null && configuration.getToken() == null
- && configuration.getOauthToken() == null)) {
+ || configuration.getPassword() == null && configuration.getToken() == null
+ && configuration.getOauthToken() == null) {
throw new IllegalArgumentException("Zendesk configuration is missing");
}
diff --git a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
index 08f9545..911cac5 100644
--- a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
+++ b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
@@ -559,7 +559,7 @@ public class ZooKeeperGroup<T extends NodeState> implements Group<T> {
for (String name : children) {
String fullPath = ZKPaths.makePath(path, name);
- if ((mode == RefreshMode.FORCE_GET_DATA_AND_STAT) || !currentData.containsKey(fullPath)) {
+ if (mode == RefreshMode.FORCE_GET_DATA_AND_STAT || !currentData.containsKey(fullPath)) {
try {
getDataAndStat(fullPath);
} catch (KeeperException.NoNodeException ignore) {
diff --git a/parent/pom.xml b/parent/pom.xml
index d1b9b2c..4cede58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -368,7 +368,7 @@
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
<maven-checkstyle-plugin-version>3.1.2</maven-checkstyle-plugin-version>
- <maven-checkstyle-version>8.40</maven-checkstyle-version>
+ <maven-checkstyle-version>8.43</maven-checkstyle-version>
<maven-owasp-plugin-version>6.2.2</maven-owasp-plugin-version>
<maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
index 69f93e4..97d383e 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
@@ -103,7 +103,7 @@ public class JavaSourceParser {
// should not be constructor and must not be private
boolean isInterface = clazz instanceof JavaInterfaceSource;
- boolean accept = isInterface || (!ms.isConstructor() && ms.isPublic());
+ boolean accept = isInterface || !ms.isConstructor() && ms.isPublic();
if (!accept) {
continue;
}
@@ -211,7 +211,7 @@ public class JavaSourceParser {
// what base class that is
answer = resolveTypeVariable(ms, clazz, answer);
}
- if ((ps != null && ps.isVarArgs()) || type.isArray()) {
+ if (ps != null && ps.isVarArgs() || type.isArray()) {
// the old way with javadoc did not use varargs in the signature, so lets transform this to an array style
answer = answer + "[]";
}