You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/10 13:48:12 UTC
[camel] branch main updated: Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for components (#9836)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d2c6776451f Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for components (#9836)
d2c6776451f is described below
commit d2c6776451f9e1b0a4f3dedf6658a08a52bf28f2
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Mon Apr 10 16:48:03 2023 +0300
Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for components (#9836)
Co-authored-by: dk2k <dk...@ya.ru>
---
.../component/as2/api/entity/EntityParser.java | 5 ++-
.../component/as2/api/util/AS2HeaderUtils.java | 3 +-
.../camel/component/as2/api/util/AS2Utils.java | 6 ++--
.../camel/component/as2/api/util/EntityUtils.java | 3 +-
.../camel/dataformat/asn1/ASN1GenericIterator.java | 3 +-
.../component/asterisk/AsteriskConnection.java | 3 +-
.../atmosphere/websocket/WebsocketEndpoint.java | 3 +-
.../camel/component/avro/AvroConfiguration.java | 3 +-
.../camel/dataformat/avro/AvroDataFormat.java | 3 +-
.../camel/utils/cassandra/CassandraUtils.java | 3 +-
.../camel/component/cometd/CometdEndpoint.java | 3 +-
.../processor/DigitalSignatureProcessor.java | 3 +-
.../component/cxf/converter/CxfConverter.java | 3 +-
.../camel/component/cxf/jaxrs/CxfConverter.java | 3 +-
.../transport/message/DefaultCxfMessageMapper.java | 12 +++----
.../language/datasonnet/DatasonnetExpression.java | 3 +-
.../djl/model/CustomObjectDetectionPredictor.java | 3 +-
.../camel/component/drill/DrillEndpoint.java | 3 +-
.../exec/impl/DefaultExecCommandExecutor.java | 6 ++--
.../camel/component/file/FileOperations.java | 6 ++--
.../calendar/BatchGoogleCalendarClientFactory.java | 3 +-
.../GoogleCloudStorageConnectionFactory.java | 6 ++--
.../camel/component/grpc/auth/jwt/JwtHelper.java | 3 +-
.../ringbuffer/HazelcastRingbufferComponent.java | 3 +-
.../hazelcast/set/HazelcastSetComponent.java | 3 +-
.../camel/http/common/DefaultHttpRegistry.java | 5 ++-
.../apache/camel/component/http/HttpProducer.java | 4 +--
.../component/aries/HyperledgerAriesComponent.java | 3 +-
.../component/aries/HyperledgerAriesProducer.java | 3 +-
.../ignite/messaging/IgniteMessagingEndpoint.java | 3 +-
.../component/infinispan/InfinispanManager.java | 3 +-
.../camel/component/jcache/JCacheComponent.java | 3 +-
.../apache/camel/component/jcr/JcrConsumer.java | 3 +-
.../camel/component/jetty/JettyHttpComponent.java | 3 +-
.../apache/camel/component/jooq/JooqConsumer.java | 3 +-
.../knative/ce/AbstractCloudEventProcessor.java | 3 +-
.../cluster/lock/KubernetesLockConfiguration.java | 3 +-
.../apache/camel/component/mock/TimeClause.java | 6 ++--
.../mongodb/MongoDbChangeStreamsThread.java | 3 +-
.../component/mongodb/MongoDbTailingThread.java | 3 +-
.../component/netty/http/NettyHttpHelper.java | 7 ++--
.../camel/component/olingo2/Olingo2Consumer.java | 3 +-
.../camel/component/olingo4/Olingo4Consumer.java | 3 +-
.../component/pulsar/PulsarConfiguration.java | 3 +-
.../rest/openapi/RestOpenApiEndpoint.java | 3 +-
.../salesforce/codegen/GenerateExecution.java | 3 +-
.../salesforce/SalesforceEndpointConfig.java | 3 +-
.../apache/camel/component/seda/SedaProducer.java | 3 +-
.../camel/component/slack/SlackEndpoint.java | 3 +-
.../apache/camel/component/smpp/SmppBinding.java | 3 +-
.../apache/camel/component/smpp/SmppMessage.java | 3 +-
.../apache/camel/component/snmp/SnmpEndpoint.java | 3 +-
.../dataformat/soap/Soap11DataFormatAdapter.java | 3 +-
.../dataformat/soap/Soap12DataFormatAdapter.java | 3 +-
.../camel/component/splunk/event/SplunkEvent.java | 3 +-
.../SpringSecurityAuthorizationPolicy.java | 7 ++--
.../apache/camel/language/spel/SpelExpression.java | 3 +-
.../camel/component/sql/DefaultSqlEndpoint.java | 6 ++--
.../apache/camel/component/sql/SqlConsumer.java | 3 +-
.../jdbc/ClusteredJdbcAggregationRepository.java | 7 ++--
.../aggregate/jdbc/JdbcAggregationRepository.java | 39 ++++++++++------------
.../component/ssh/ResourceBasedSSHKeyVerifier.java | 3 +-
.../stitch/client/models/StitchResponse.java | 4 +--
.../camel/component/stomp/StompConfiguration.java | 3 +-
.../component/stream/FileWatcherStrategy.java | 3 +-
.../undertow/DefaultUndertowHttpBinding.java | 3 +-
.../apache/camel/component/weka/WekaProducer.java | 6 ++--
.../workday/producer/WorkdayCommonAPIProducer.java | 4 +--
.../workday/producer/WorkdayReportProducer.java | 5 ++-
.../apache/camel/component/xmpp/XmppComponent.java | 3 +-
.../apache/camel/component/xmpp/XmppMessage.java | 3 +-
.../language/xpath/MessageVariableResolver.java | 5 ++-
.../apache/camel/language/xpath/XPathBuilder.java | 6 ++--
.../camel/component/zeebe/model/JobRequest.java | 3 +-
.../component/zeebe/model/MessageRequest.java | 3 +-
.../component/zeebe/model/MessageResponse.java | 3 +-
.../component/zeebe/model/ProcessResponse.java | 3 +-
.../component/zookeepermaster/MasterComponent.java | 3 +-
.../group/internal/ZooKeeperGroup.java | 3 +-
79 files changed, 115 insertions(+), 214 deletions(-)
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index 842596e5430..768c80a71e3 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -885,10 +885,9 @@ public final class EntityParser {
if (contentTransferEncoding != null) {
ediMessageBodyPartContent = EntityUtils.decode(ediMessageBodyPartContent, charset, contentTransferEncoding);
}
- ApplicationEDIEntity applicationEDIEntity = EntityUtils.createEDIEntity(ediMessageBodyPartContent,
- ediMessageContentType, contentTransferEncoding, false, filename);
- return applicationEDIEntity;
+ return EntityUtils.createEDIEntity(ediMessageBodyPartContent,
+ ediMessageContentType, contentTransferEncoding, false, filename);
} catch (Exception e) {
ParseException parseException = new ParseException("failed to parse EDI entity");
parseException.initCause(e);
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
index bfbcd7abda0..49d5b92e6b0 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
@@ -102,8 +102,7 @@ public final class AS2HeaderUtils {
sb.append(NAME_VALUE_DELIMITER + element[1]);
}
}
- BasicHeader header = new BasicHeader(headerName, sb.toString());
- return header;
+ return new BasicHeader(headerName, sb.toString());
}
public static Parameter parseParameter(final CharArrayBuffer buffer, final ParserCursor cursor) {
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 67454e94634..249c7302cb1 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
@@ -107,8 +107,7 @@ public final class AS2Utils {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos, true, "utf-8")) {
printRequest(ps, request);
- String content = baos.toString(StandardCharsets.UTF_8.name());
- return content;
+ return baos.toString(StandardCharsets.UTF_8.name());
}
}
@@ -116,8 +115,7 @@ public final class AS2Utils {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos, true, "utf-8")) {
printMessage(ps, message);
- String content = baos.toString(StandardCharsets.UTF_8.name());
- return content;
+ return baos.toString(StandardCharsets.UTF_8.name());
}
}
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EntityUtils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EntityUtils.java
index 2274c3f81fb..02df108a54e 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EntityUtils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/EntityUtils.java
@@ -277,8 +277,7 @@ public final class EntityUtils {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos, true, "utf-8")) {
printEntity(ps, entity);
- String content = baos.toString(StandardCharsets.UTF_8.name());
- return content;
+ return baos.toString(StandardCharsets.UTF_8.name());
}
}
diff --git a/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1GenericIterator.java b/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1GenericIterator.java
index 9b20ce2c61a..63de800ed72 100644
--- a/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1GenericIterator.java
+++ b/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1GenericIterator.java
@@ -81,8 +81,7 @@ public class ASN1GenericIterator<T> implements Iterator<T>, Closeable {
ASN1Primitive current = getNextEntry();
if (current != null) {
- T instance = ObjectHelper.cast(clazz, createGenericTypeObject(current));
- return instance;
+ return ObjectHelper.cast(clazz, createGenericTypeObject(current));
} else {
LOGGER.trace("close asn1InputStream");
return null;
diff --git a/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskConnection.java b/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskConnection.java
index 192d805b1ff..81a57513e12 100644
--- a/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskConnection.java
+++ b/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskConnection.java
@@ -101,8 +101,7 @@ public final class AsteriskConnection {
public ManagerResponse sendAction(ManagerAction action)
throws IllegalArgumentException, IllegalStateException, IOException, TimeoutException {
- ManagerResponse response = managerConnection.sendAction(action);
- return response;
+ return managerConnection.sendAction(action);
}
}
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
index 2ec631602ef..98ca181ffc1 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
@@ -58,9 +58,8 @@ public class WebsocketEndpoint extends ServletEndpoint {
//TODO find a better way of assigning the store
int idx = endPointURI.indexOf('?');
- String name = idx > -1 ? endPointURI.substring(0, idx) : endPointURI;
- this.servicePath = name;
+ this.servicePath = idx > -1 ? endPointURI.substring(0, idx) : endPointURI;
this.store = component.getWebSocketStore(servicePath);
}
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
index b9054b1a4de..36d8cc40275 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/main/java/org/apache/camel/component/avro/AvroConfiguration.java
@@ -57,8 +57,7 @@ public class AvroConfiguration implements Cloneable {
public AvroConfiguration copy() {
try {
- AvroConfiguration answer = (AvroConfiguration) clone();
- return answer;
+ return (AvroConfiguration) clone();
} catch (CloneNotSupportedException e) {
throw new RuntimeCamelException(e);
}
diff --git a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
index f089edaa80f..944235ca324 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
@@ -158,8 +158,7 @@ public class AvroDataFormat extends ServiceSupport implements DataFormat, DataFo
DatumReader<GenericRecord> reader = new SpecificDatumReader<>(null, null, specificData);
reader.setSchema(actualSchema);
Decoder decoder = DecoderFactory.get().binaryDecoder(inputStream, null);
- Object result = reader.read(null, decoder);
- return result;
+ return reader.read(null, decoder);
}
}
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java
index 953a65427f0..3e8e3e41972 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraUtils.java
@@ -191,8 +191,7 @@ public final class CassandraUtils {
* Generate delete where columns = ? CQL.
*/
public static Truncate generateTruncate(String table) {
- Truncate truncate = QueryBuilder.truncate(table);
- return truncate;
+ return QueryBuilder.truncate(table);
}
/**
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
index 442bf558227..1dc446c7ecc 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
@@ -93,8 +93,7 @@ public class CometdEndpoint extends DefaultEndpoint {
@Override
public Producer createProducer() throws Exception {
ObjectHelper.notNull(component, "component");
- CometdProducer producer = new CometdProducer(this);
- return producer;
+ return new CometdProducer(this);
}
@Override
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/DigitalSignatureProcessor.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/DigitalSignatureProcessor.java
index 8eeed1a4b3a..9ee55da3a39 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/DigitalSignatureProcessor.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/DigitalSignatureProcessor.java
@@ -78,8 +78,7 @@ public abstract class DigitalSignatureProcessor implements Processor {
protected Signature createSignatureService() throws NoSuchAlgorithmException, NoSuchProviderException {
String algorithm = config.getAlgorithm();
String provider = config.getProvider();
- Signature signer = provider == null ? Signature.getInstance(algorithm) : Signature.getInstance(algorithm, provider);
- return signer;
+ return provider == null ? Signature.getInstance(algorithm) : Signature.getInstance(algorithm, provider);
}
protected void clearMessageHeaders(Message in) {
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
index c1caf737487..222b0c6dce8 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
@@ -90,8 +90,7 @@ public final class CxfConverter {
throws SOAPException, IOException {
CachedOutputStream cos = new CachedOutputStream(exchange);
soapMessage.writeTo(cos);
- InputStream in = cos.getInputStream();
- return in;
+ return cos.getInputStream();
}
@Converter
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
index 08bf69d37f5..5493fb7f77e 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
@@ -91,8 +91,7 @@ public final class CxfConverter {
throws SOAPException, IOException {
CachedOutputStream cos = new CachedOutputStream(exchange);
soapMessage.writeTo(cos);
- InputStream in = cos.getInputStream();
- return in;
+ return cos.getInputStream();
}
@Converter
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
index c2ac2a38401..916c46260da 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
+++ b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
@@ -141,13 +141,11 @@ public class DefaultCxfMessageMapper implements CxfMessageMapper {
}
protected String getPath(org.apache.camel.Message camelMessage) {
- String answer = camelMessage.getHeader(Exchange.HTTP_PATH, String.class);
- return answer;
+ return camelMessage.getHeader(Exchange.HTTP_PATH, String.class);
}
protected String getRequestURI(org.apache.camel.Message camelMessage) {
- String answer = camelMessage.getHeader(Exchange.HTTP_URI, String.class);
- return answer;
+ return camelMessage.getHeader(Exchange.HTTP_URI, String.class);
}
protected String getBasePath(Exchange camelExchange) {
@@ -164,13 +162,11 @@ public class DefaultCxfMessageMapper implements CxfMessageMapper {
}
protected String getVerb(org.apache.camel.Message camelMessage) {
- String answer = camelMessage.getHeader(Exchange.HTTP_METHOD, String.class);
- return answer;
+ return camelMessage.getHeader(Exchange.HTTP_METHOD, String.class);
}
protected String getQueryString(org.apache.camel.Message camelMessage) {
- String answer = camelMessage.getHeader(Exchange.HTTP_QUERY, String.class);
- return answer;
+ return camelMessage.getHeader(Exchange.HTTP_QUERY, String.class);
}
protected String getCharacterEncoding(org.apache.camel.Message camelMessage) {
diff --git a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
index b1c72374551..58c18e2197e 100644
--- a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
+++ b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
@@ -64,8 +64,7 @@ public class DatasonnetExpression extends ExpressionAdapter implements Expressio
}
public static DatasonnetExpression builder(String expression) {
- DatasonnetExpression answer = new DatasonnetExpression(expression);
- return answer;
+ return new DatasonnetExpression(expression);
}
public static DatasonnetExpression builder(String expression, Class<?> resultType) {
diff --git a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomObjectDetectionPredictor.java b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomObjectDetectionPredictor.java
index e990b921e22..1a4877c641f 100644
--- a/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomObjectDetectionPredictor.java
+++ b/components/camel-djl/src/main/java/org/apache/camel/component/djl/model/CustomObjectDetectionPredictor.java
@@ -64,8 +64,7 @@ public class CustomObjectDetectionPredictor extends AbstractPredictor {
public DetectedObjects classify(Model model, Translator translator, Image image) {
try (Predictor<Image, DetectedObjects> predictor = model.newPredictor(translator)) {
- DetectedObjects detectedObjects = predictor.predict(image);
- return detectedObjects;
+ return predictor.predict(image);
} catch (TranslateException e) {
LOG.error("Could not process input or output", e);
throw new RuntimeCamelException("Could not process input or output", e);
diff --git a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
index 4e3b2fc958f..8ae847eb196 100644
--- a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
+++ b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
@@ -91,8 +91,7 @@ public class DrillEndpoint extends DefaultPollingEndpoint {
public List<?> queryForList(ResultSet rs) throws SQLException {
ColumnMapRowMapper rowMapper = new ColumnMapRowMapper();
RowMapperResultSetExtractor<Map<String, Object>> mapper = new RowMapperResultSetExtractor<>(rowMapper);
- List<Map<String, Object>> data = mapper.extractData(rs);
- return data;
+ return mapper.extractData(rs);
}
public String getHost() {
diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java
index a12b5c6ca85..de029d98a8f 100644
--- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java
+++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java
@@ -72,8 +72,7 @@ public class DefaultExecCommandExecutor implements ExecCommandExecutor {
// with null (required by ExecResult)
InputStream stdout = out.size() == 0 ? null : new ByteArrayInputStream(out.toByteArray());
InputStream stderr = err.size() == 0 ? null : new ByteArrayInputStream(err.toByteArray());
- ExecResult result = new ExecResult(command, stdout, stderr, exitValue);
- return result;
+ return new ExecResult(command, stdout, stderr, exitValue);
} catch (ExecuteException ee) {
LOG.error("ExecException while executing command: {} - {}", command, ee.getMessage());
@@ -99,8 +98,7 @@ public class DefaultExecCommandExecutor implements ExecCommandExecutor {
if (msg != null && "stream closed".equals(msg.toLowerCase(Locale.ENGLISH))) {
LOG.debug("Ignoring Stream closed IOException", ioe);
- ExecResult result = new ExecResult(command, stdout, stderr, exitValue);
- return result;
+ return new ExecResult(command, stdout, stderr, exitValue);
}
// invalid working dir
LOG.error("IOException while executing command: {} - {}", command, ioe.getMessage());
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/FileOperations.java b/components/camel-file/src/main/java/org/apache/camel/component/file/FileOperations.java
index 15232be6b27..cfc7ce6e16a 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/FileOperations.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/FileOperations.java
@@ -463,12 +463,10 @@ public class FileOperations implements GenericFileOperations<File> {
int bytesRead;
while ((bytesRead = in.read(buffer)) != -1) {
if (bytesRead < size) {
- Buffer buf = byteBuffer;
- buf.limit(bytesRead);
+ ((Buffer) byteBuffer).limit(bytesRead);
}
out.write(byteBuffer);
- Buffer buf = byteBuffer;
- buf.clear();
+ ((Buffer) byteBuffer).clear();
}
boolean append = endpoint.getFileExist() == GenericFileExist.Append;
diff --git a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
index dd2f5056862..d815b9a5584 100644
--- a/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
+++ b/components/camel-google/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/BatchGoogleCalendarClientFactory.java
@@ -88,7 +88,7 @@ public class BatchGoogleCalendarClientFactory implements GoogleCalendarClientFac
throws Exception {
HttpTransport httpTransport = GoogleNetHttpTransport.newTrustedTransport();
// set the service account user when provided
- GoogleCredential credential = new GoogleCredential.Builder()
+ return new GoogleCredential.Builder()
.setTransport(httpTransport)
.setJsonFactory(jsonFactory)
.setServiceAccountId(emailAddress)
@@ -96,7 +96,6 @@ public class BatchGoogleCalendarClientFactory implements GoogleCalendarClientFac
.setServiceAccountScopes(scopes)
.setServiceAccountUser(user)
.build();
- return credential;
}
@Override
diff --git a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConnectionFactory.java b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConnectionFactory.java
index 8965b85bf3a..b26829ad586 100644
--- a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConnectionFactory.java
+++ b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConnectionFactory.java
@@ -37,14 +37,12 @@ public final class GoogleCloudStorageConnectionFactory {
if (!Strings.isNullOrEmpty(configuration.getServiceAccountKey())) {
InputStream resolveMandatoryResourceAsInputStream
= ResourceHelper.resolveMandatoryResourceAsInputStream(context, configuration.getServiceAccountKey());
- Storage storage = StorageOptions.newBuilder()
+ return StorageOptions.newBuilder()
.setCredentials(
ServiceAccountCredentials.fromStream(resolveMandatoryResourceAsInputStream))
.build().getService();
- return storage;
} else {
- Storage storage = StorageOptions.getDefaultInstance().getService();
- return storage;
+ return StorageOptions.getDefaultInstance().getService();
}
}
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtHelper.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtHelper.java
index 74f26cccfea..4074da23412 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtHelper.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtHelper.java
@@ -30,8 +30,7 @@ public final class JwtHelper {
public static String createJwtToken(JwtAlgorithm algorithmName, String secret, String issuer, String subject) {
try {
Algorithm algorithm = selectAlgorithm(algorithmName, secret);
- String token = JWT.create().withIssuer(issuer).withSubject(subject).sign(algorithm);
- return token;
+ return JWT.create().withIssuer(issuer).withSubject(subject).sign(algorithm);
} catch (JWTCreationException e) {
throw new IllegalArgumentException("Unable to create JWT token", e);
}
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferComponent.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferComponent.java
index 5f33fc163ae..12c323537c7 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferComponent.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferComponent.java
@@ -38,8 +38,7 @@ public class HazelcastRingbufferComponent extends HazelcastDefaultComponent {
protected HazelcastDefaultEndpoint doCreateEndpoint(
String uri, String remaining, Map<String, Object> parameters, HazelcastInstance hzInstance)
throws Exception {
- HazelcastRingbufferEndpoint answer = new HazelcastRingbufferEndpoint(hzInstance, uri, this, remaining);
- return answer;
+ return new HazelcastRingbufferEndpoint(hzInstance, uri, this, remaining);
}
}
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetComponent.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetComponent.java
index d1d01d4a45b..55cff1aa0ec 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetComponent.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetComponent.java
@@ -38,8 +38,7 @@ public class HazelcastSetComponent extends HazelcastDefaultComponent {
protected HazelcastDefaultEndpoint doCreateEndpoint(
String uri, String remaining, Map<String, Object> parameters, HazelcastInstance hzInstance)
throws Exception {
- HazelcastSetEndpoint answer = new HazelcastSetEndpoint(hzInstance, uri, this, remaining);
- return answer;
+ return new HazelcastSetEndpoint(hzInstance, uri, this, remaining);
}
}
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
index 73958f8034e..fc1ec8d083c 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
@@ -84,9 +84,8 @@ public class DefaultHttpRegistry implements HttpRegistry {
@SuppressWarnings("rawtypes")
public void register(CamelServlet provider, Map properties) {
- CamelServlet camelServlet = provider;
- camelServlet.setServletName((String) properties.get("servlet-name"));
- register(camelServlet);
+ provider.setServletName((String) properties.get("servlet-name"));
+ register(provider);
}
@Override
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 a1a0c3e1f5f..ba92e6e8c63 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
@@ -788,9 +788,7 @@ public class HttpProducer extends DefaultProducer {
// force the body as an input stream since this is the fallback
InputStream is = in.getMandatoryBody(InputStream.class);
- InputStreamEntity entity = new InputStreamEntity(is, -1, contentType);
-
- answer = entity;
+ answer = new InputStreamEntity(is, -1, contentType);
}
}
} catch (UnsupportedEncodingException e) {
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
index ab24bde9cc0..ce255f966a8 100644
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
+++ b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesComponent.java
@@ -103,8 +103,7 @@ public class HyperledgerAriesComponent extends DefaultComponent {
}
public NessusWallet getWallet(String walletName) {
- NessusWallet wallet = walletRegistry.getWalletByName(walletName);
- return wallet;
+ return walletRegistry.getWalletByName(walletName);
}
public NessusWallet assertWallet(String walletName) {
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesProducer.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesProducer.java
index b313cf9dcfd..583cb8c0f90 100644
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesProducer.java
+++ b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesProducer.java
@@ -94,8 +94,7 @@ public class HyperledgerAriesProducer extends DefaultProducer {
}
protected String getWalletName() {
- String walletName = getEndpoint().getWalletName();
- return walletName;
+ return getEndpoint().getWalletName();
}
private String getService(Exchange exchange) {
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
index b89c226d522..8104b925757 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
@@ -95,9 +95,8 @@ public class IgniteMessagingEndpoint extends AbstractIgniteEndpoint {
private IgniteMessaging createIgniteMessaging() {
Ignite ignite = ignite();
- IgniteMessaging messaging = clusterGroupExpression == null
+ return clusterGroupExpression == null
? ignite.message() : ignite.message(clusterGroupExpression.getClusterGroup(ignite));
- return messaging;
}
/**
diff --git a/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java b/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java
index 3201b7204f5..6a2f90ab700 100644
--- a/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java
+++ b/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java
@@ -32,9 +32,8 @@ public interface InfinispanManager<C extends BasicCacheContainer> extends BasicC
default <K, V> BasicCache<K, V> getCache(Message message, String defaultCache) {
final String cacheName = message.getHeader(InfinispanConstants.CACHE_NAME, defaultCache, String.class);
- final BasicCache<K, V> cache = getCache(cacheName);
- return cache;
+ return getCache(cacheName);
}
default <K, V, CacheType extends BasicCache<K, V>> CacheType getCache(
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheComponent.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheComponent.java
index 299edc8b8a4..30edc77d0a3 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheComponent.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheComponent.java
@@ -53,8 +53,7 @@ public class JCacheComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- String cacheName = remaining;
- JCacheConfiguration configuration = new JCacheConfiguration(getCamelContext(), cacheName);
+ JCacheConfiguration configuration = new JCacheConfiguration(getCamelContext(), remaining);
configuration.setCachingProvider(cachingProvider);
configuration.setCacheConfiguration(cacheConfiguration);
diff --git a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java
index 4e778d8dc8e..2723004465e 100644
--- a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java
+++ b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrConsumer.java
@@ -60,8 +60,7 @@ public class JcrConsumer extends DefaultConsumer {
}
protected JcrEndpoint getJcrEndpoint() {
- JcrEndpoint endpoint = (JcrEndpoint) getEndpoint();
- return endpoint;
+ return (JcrEndpoint) getEndpoint();
}
private synchronized void createSessionAndRegisterListener() throws RepositoryException {
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index d2d8eb98ff6..b88365ed1e3 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -189,8 +189,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
// extract filterInit. parameters
Map filterInitParameters = PropertiesHelper.extractProperties(parameters, "filterInit.");
- String address = remaining;
- URI addressUri = new URI(UnsafeUriCharactersEncoder.encodeHttpURI(address));
+ URI addressUri = new URI(UnsafeUriCharactersEncoder.encodeHttpURI(remaining));
URI endpointUri = URISupport.createRemainingURI(addressUri, parameters);
// need to keep the httpMethodRestrict parameter for the endpointUri
String httpMethodRestrict = getAndRemoveParameter(parameters, "httpMethodRestrict", String.class);
diff --git a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqConsumer.java b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqConsumer.java
index b7ac8e266ab..25e1659f623 100644
--- a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqConsumer.java
+++ b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqConsumer.java
@@ -85,8 +85,7 @@ public class JooqConsumer extends ScheduledBatchPollingConsumer {
private Table getTable(Class<?> entityType) {
UpdatableRecord object = (UpdatableRecord) ObjectHelper.newInstance(entityType);
- Table table = object.getTable();
- return table;
+ return object.getTable();
}
@Override
diff --git a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java
index 9b8778d99db..63813d236c0 100644
--- a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java
+++ b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java
@@ -124,9 +124,8 @@ abstract class AbstractCloudEventProcessor implements CloudEventProcessor {
setCloudEventHeader(headers, CloudEvent.CAMEL_CLOUD_EVENT_TIME, () -> {
final ZonedDateTime created
= ZonedDateTime.ofInstant(Instant.ofEpochMilli(exchange.getCreated()), ZoneId.systemDefault());
- final String eventTime = DateTimeFormatter.ISO_INSTANT.format(created);
- return eventTime;
+ return DateTimeFormatter.ISO_INSTANT.format(created);
});
headers.putAll(service.getCeOverrides());
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLockConfiguration.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLockConfiguration.java
index 70c52f8304b..47f5364c550 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLockConfiguration.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLockConfiguration.java
@@ -208,8 +208,7 @@ public class KubernetesLockConfiguration implements Cloneable {
public KubernetesLockConfiguration copy() {
try {
- KubernetesLockConfiguration copy = (KubernetesLockConfiguration) this.clone();
- return copy;
+ return (KubernetesLockConfiguration) this.clone();
} catch (CloneNotSupportedException e) {
throw new IllegalStateException("Cannot clone", e);
}
diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/TimeClause.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/TimeClause.java
index 8d8d295b703..2328e39cdc4 100644
--- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/TimeClause.java
+++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/TimeClause.java
@@ -93,13 +93,11 @@ public class TimeClause implements BinaryPredicate {
// -------------------------------------------------------------------------
public TimeClassUnit noLaterThan(int period) {
- TimeClassUnit unit = new TimeClassUnit(this, period);
- return unit;
+ return new TimeClassUnit(this, period);
}
public TimeClassUnit between(int from, int to) {
- TimeClassUnit unit = new TimeClassUnit(this, from, to);
- return unit;
+ return new TimeClassUnit(this, from, to);
}
public void beforeNext() {
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbChangeStreamsThread.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbChangeStreamsThread.java
index 71847976047..a772bfee11f 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbChangeStreamsThread.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbChangeStreamsThread.java
@@ -55,8 +55,7 @@ class MongoDbChangeStreamsThread extends MongoAbstractConsumerThread {
iterable = iterable.resumeAfter(resumeToken);
}
- MongoCursor<ChangeStreamDocument<Document>> cursor = iterable.iterator();
- return cursor;
+ return iterable.iterator();
}
@Override
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingThread.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingThread.java
index 4e2c9bebd08..e578575846f 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingThread.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingThread.java
@@ -85,10 +85,9 @@ class MongoDbTailingThread extends MongoAbstractConsumerThread {
if (lastVal == null) {
answer = dbCol.find().cursorType(CursorType.TailableAwait).iterator();
} else {
- MongoCursor<Document> iterator = dbCol.find(gt(tailTracking.getIncreasingFieldName(), lastVal))
+ answer = dbCol.find(gt(tailTracking.getIncreasingFieldName(), lastVal))
.cursorType(CursorType.TailableAwait)
.iterator();
- answer = iterator;
}
return answer;
}
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
index c5523bf57b6..d7d2ed2e8b0 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
@@ -126,16 +126,15 @@ public final class NettyHttpHelper {
public static Exception populateNettyHttpOperationFailedException(
Exchange exchange, String url, FullHttpResponse response, int responseCode, boolean transferException) {
- String uri = url;
String statusText = response.status().reasonPhrase();
if (responseCode >= 300 && responseCode < 400) {
String redirectLocation = response.headers().get("location");
if (redirectLocation != null) {
- return new NettyHttpOperationFailedException(uri, responseCode, statusText, redirectLocation, response);
+ return new NettyHttpOperationFailedException(url, responseCode, statusText, redirectLocation, response);
} else {
// no redirect location
- return new NettyHttpOperationFailedException(uri, responseCode, statusText, null, response);
+ return new NettyHttpOperationFailedException(url, responseCode, statusText, null, response);
}
}
@@ -160,7 +159,7 @@ public final class NettyHttpHelper {
}
// internal server error (error code 500)
- return new NettyHttpOperationFailedException(uri, responseCode, statusText, null, response);
+ return new NettyHttpOperationFailedException(url, responseCode, statusText, null, response);
}
public static Object deserializeJavaObjectFromStream(InputStream is) throws ClassNotFoundException, IOException {
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 10b583acbd1..d51de916759 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
@@ -99,8 +99,7 @@ public class Olingo2Consumer extends AbstractApiConsumer<Olingo2ApiName, Olingo2
if (result[0] == null || result[0] instanceof ODataFeed && (((ODataFeed) result[0]).getEntries().isEmpty())) {
return 0;
} else {
- int processed = ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
- return processed;
+ return ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
}
} catch (Throwable t) {
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 9abc417d75e..1f44e43dab1 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
@@ -104,8 +104,7 @@ public class Olingo4Consumer extends AbstractApiConsumer<Olingo4ApiName, Olingo4
|| result[0] instanceof ClientEntitySet && (((ClientEntitySet) result[0]).getEntities().isEmpty())) {
return 0;
} else {
- int processed = ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
- return processed;
+ return ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
}
} catch (Exception e) {
diff --git a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConfiguration.java b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConfiguration.java
index d1ae8dc7f93..4951eff39c1 100644
--- a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConfiguration.java
+++ b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConfiguration.java
@@ -133,8 +133,7 @@ public class PulsarConfiguration implements Cloneable {
*/
public PulsarConfiguration copy() {
try {
- PulsarConfiguration copy = (PulsarConfiguration) clone();
- return copy;
+ return (PulsarConfiguration) clone();
} catch (CloneNotSupportedException e) {
throw new RuntimeCamelException(e);
}
diff --git a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
index a9018a03d98..e209c71f772 100644
--- a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
+++ b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
@@ -635,9 +635,8 @@ public final class RestOpenApiEndpoint extends DefaultEndpoint {
final String name = parameter.getName();
final String valueStr = String.valueOf(parameters.get(name));
- final String encoded = UnsafeUriCharactersEncoder.encode(valueStr);
- return encoded;
+ return UnsafeUriCharactersEncoder.encode(valueStr);
}
String literalQueryParameterValue(final OasParameter parameter) {
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/GenerateExecution.java b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/GenerateExecution.java
index 811c1589933..394fc420665 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/GenerateExecution.java
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/GenerateExecution.java
@@ -544,9 +544,8 @@ public class GenerateExecution extends AbstractSalesforceExecution {
velocityProperties.setProperty(RuntimeConstants.RESOURCE_LOADERS, "cloader");
velocityProperties.setProperty("resource.loader.cloader.class", ClasspathResourceLoader.class.getName());
velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_NAME, LOG.getName());
- final VelocityEngine engine = new VelocityEngine(velocityProperties);
- return engine;
+ return new VelocityEngine(velocityProperties);
}
private static Set<String> defineBaseFields() {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
index d2262f44544..cf05df142b1 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpointConfig.java
@@ -278,10 +278,9 @@ public class SalesforceEndpointConfig implements Cloneable {
public SalesforceEndpointConfig copy() {
try {
- final SalesforceEndpointConfig copy = (SalesforceEndpointConfig) super.clone();
// nothing to deep copy, getApexQueryParams() is readonly, so no
// need to deep copy
- return copy;
+ return (SalesforceEndpointConfig) super.clone();
} catch (CloneNotSupportedException ex) {
throw new RuntimeCamelException(ex);
}
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 f75b47b7c09..7d6761e7dc7 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
@@ -163,8 +163,7 @@ public class SedaProducer extends DefaultAsyncProducer {
// use a new copy of the exchange to route async (and use same message id)
// if handover we need to do special handover to avoid handing over
// RestBindingMarshalOnCompletion as it should not be handed over with SEDA
- Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, handover, true);
- return copy;
+ return ExchangeHelper.createCorrelatedCopy(exchange, handover, true);
}
@Override
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
index ac89f4b696e..b86ab50605e 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
@@ -83,8 +83,7 @@ public class SlackEndpoint extends ScheduledPollEndpoint {
throw new RuntimeCamelException(
"Missing required endpoint configuration: token or webhookUrl must be defined for Slack producer");
}
- SlackProducer producer = new SlackProducer(this);
- return producer;
+ return new SlackProducer(this);
}
@Override
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
index 79889bd5169..95ea80e74c2 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
@@ -63,9 +63,8 @@ public class SmppBinding {
*/
public SmppCommand createSmppCommand(SMPPSession session, Exchange exchange) {
SmppCommandType commandType = SmppCommandType.fromExchange(exchange);
- SmppCommand command = commandType.createCommand(session, configuration);
- return command;
+ return commandType.createCommand(session, configuration);
}
/**
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
index 72125d4b835..dde75b0ef09 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
@@ -48,8 +48,7 @@ public class SmppMessage extends DefaultMessage {
@Override
public SmppMessage newInstance() {
- SmppMessage answer = new SmppMessage(getCamelContext(), null, this.configuration);
- return answer;
+ return new SmppMessage(getCamelContext(), null, this.configuration);
}
public boolean isAlertNotification() {
diff --git a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
index 69303b413af..a4eb17058dd 100644
--- a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
+++ b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
@@ -104,9 +104,8 @@ public class SnmpEndpoint extends DefaultPollingEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
if (this.type == SnmpActionType.TRAP) {
- SnmpTrapConsumer answer = new SnmpTrapConsumer(this, processor);
// As the SnmpTrapConsumer is not a polling consumer we don't need to call the configureConsumer here.
- return answer;
+ return new SnmpTrapConsumer(this, processor);
} else if (this.type == SnmpActionType.POLL) {
SnmpOIDPoller answer = new SnmpOIDPoller(this, processor);
configureConsumer(answer);
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java
index 7bb0b9ff81d..b7712428618 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java
@@ -103,8 +103,7 @@ public class Soap11DataFormatAdapter implements SoapDataFormatAdapter {
envelope.setHeader(header);
}
envelope.setBody(body);
- JAXBElement<Envelope> envelopeEl = objectFactory.createEnvelope(envelope);
- return envelopeEl;
+ return objectFactory.createEnvelope(envelope);
}
/**
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java
index 55804cc12de..4031205e992 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java
@@ -106,8 +106,7 @@ public class Soap12DataFormatAdapter implements SoapDataFormatAdapter {
envelope.setHeader(header);
}
envelope.setBody(body);
- JAXBElement<Envelope> envelopeEl = objectFactory.createEnvelope(envelope);
- return envelopeEl;
+ return objectFactory.createEnvelope(envelope);
}
/**
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java
index c92eb656567..72ca59756f1 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/event/SplunkEvent.java
@@ -386,8 +386,7 @@ public class SplunkEvent implements Serializable {
}
}
// trim off trailing pair delim char(s)
- String result = event.substring(0, event.length() - PAIRDELIM.length()) + LINEBREAK;
- return result;
+ return event.substring(0, event.length() - PAIRDELIM.length()) + LINEBREAK;
}
public void setCommonCategory(String commonCategory) {
diff --git a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
index 0dc695a211c..fa961fc9575 100644
--- a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
+++ b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
@@ -72,9 +72,7 @@ public class SpringSecurityAuthorizationPolicy extends IdentifiedType
try {
Authentication authToken = getAuthentication(exchange.getIn());
if (authToken == null) {
- CamelAuthorizationException authorizationException
- = new CamelAuthorizationException("Cannot find the Authentication instance.", exchange);
- throw authorizationException;
+ throw new CamelAuthorizationException("Cannot find the Authentication instance.", exchange);
}
Authentication authenticated = authenticateIfRequired(authToken);
@@ -94,9 +92,8 @@ public class SpringSecurityAuthorizationPolicy extends IdentifiedType
} catch (RuntimeException exception) {
exchange.getIn().setHeader(Exchange.AUTHENTICATION_FAILURE_POLICY_ID, getId());
- CamelAuthorizationException authorizationException = new CamelAuthorizationException(
+ throw new CamelAuthorizationException(
"Cannot access the processor which has been protected.", exchange, exception);
- throw authorizationException;
}
}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java b/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java
index eddd4d663a2..07520cc170e 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java
@@ -97,8 +97,7 @@ public class SpelExpression extends ExpressionSupport {
private Expression parseExpression() {
// Support template parsing with #{ } delimiters
ParserContext parserContext = new TemplateParserContext();
- Expression expression = expressionParser.parseExpression(expressionString, parserContext);
- return expression;
+ return expressionParser.parseExpression(expressionString, parserContext);
}
public Class<?> getType() {
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
index 527eaaea68c..a2f529c5d39 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
@@ -467,13 +467,11 @@ public abstract class DefaultSqlEndpoint extends DefaultPollingEndpoint {
Class<?> outputClazz = getCamelContext().getClassResolver().resolveClass(outputClass);
RowMapper rowMapper = rowMapperFactory.newBeanRowMapper(outputClazz);
RowMapperResultSetExtractor<?> mapper = new RowMapperResultSetExtractor(rowMapper);
- List<?> data = mapper.extractData(rs);
- return data;
+ return mapper.extractData(rs);
} else {
RowMapper rowMapper = rowMapperFactory.newColumnRowMapper();
RowMapperResultSetExtractor<Map<String, Object>> mapper = new RowMapperResultSetExtractor<>(rowMapper);
- List<Map<String, Object>> data = mapper.extractData(rs);
- return data;
+ return mapper.extractData(rs);
}
}
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
index d7e95c3ccdc..81ad935080b 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
@@ -184,8 +184,7 @@ public class SqlConsumer extends ScheduledBatchPollingConsumer {
// no data
return 0;
} else {
- int rows = processBatch(CastUtils.cast(answer));
- return rows;
+ return processBatch(CastUtils.cast(answer));
}
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
diff --git a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregationRepository.java b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregationRepository.java
index 4c8f6dcf7a4..b9bb40b3485 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregationRepository.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClusteredJdbcAggregationRepository.java
@@ -70,19 +70,18 @@ public class ClusteredJdbcAggregationRepository extends JdbcAggregationRepositor
public void remove(final CamelContext camelContext, final String correlationId, final Exchange exchange) {
transactionTemplate.execute(new TransactionCallbackWithoutResult() {
protected void doInTransactionWithoutResult(TransactionStatus status) {
- final String key = correlationId;
final String confirmKey = exchange.getExchangeId();
final long version = exchange.getProperty(VERSION_PROPERTY, Long.class);
try {
- LOG.debug("Removing key {}", key);
+ LOG.debug("Removing key {}", correlationId);
jdbcTemplate.update("DELETE FROM " + getRepositoryName() + " WHERE " + ID + " = ? AND " + VERSION + " = ?",
- key, version);
+ correlationId, version);
insert(camelContext, confirmKey, exchange, getRepositoryNameCompleted(), version, true);
} catch (Exception e) {
- throw new RuntimeException("Error removing key " + key + " from repository " + getRepositoryName(), e);
+ throw new RuntimeException("Error removing key " + correlationId + " from repository " + getRepositoryName(), e);
}
}
});
diff --git a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
index 90d891eda61..db41a7fed26 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
@@ -154,36 +154,35 @@ public class JdbcAggregationRepository extends ServiceSupport
public Exchange doInTransaction(TransactionStatus status) {
Exchange result = null;
- final String key = correlationId;
try {
- LOG.debug("Adding exchange with key {}", key);
+ LOG.debug("Adding exchange with key {}", correlationId);
boolean present = jdbcTemplate.queryForObject(
- "SELECT COUNT(1) FROM " + getRepositoryName() + " WHERE " + ID + " = ?", Integer.class, key) != 0;
+ "SELECT COUNT(1) FROM " + getRepositoryName() + " WHERE " + ID + " = ?", Integer.class, correlationId) != 0;
// Recover existing exchange with that ID
if (isReturnOldExchange() && present) {
- result = get(key, getRepositoryName(), camelContext);
+ result = get(correlationId, getRepositoryName(), camelContext);
}
if (present) {
Long versionLong = exchange.getProperty(VERSION_PROPERTY, Long.class);
if (versionLong == null) {
- LOG.debug("Race while inserting record with key {}", key);
+ LOG.debug("Race while inserting record with key {}", correlationId);
throw new OptimisticLockingException();
} else {
long version = versionLong.longValue();
- LOG.debug("Updating record with key {} and version {}", key, version);
+ LOG.debug("Updating record with key {} and version {}", correlationId, version);
update(camelContext, correlationId, exchange, getRepositoryName(), version);
}
} else {
- LOG.debug("Inserting record with key {}", key);
+ LOG.debug("Inserting record with key {}", correlationId);
insert(camelContext, correlationId, exchange, getRepositoryName(), 1L);
}
} catch (Exception e) {
- throw new RuntimeException("Error adding to repository " + repositoryName + " with key " + key, e);
+ throw new RuntimeException("Error adding to repository " + repositoryName + " with key " + correlationId, e);
}
return result;
@@ -333,9 +332,8 @@ public class JdbcAggregationRepository extends ServiceSupport
@Override
public Exchange get(final CamelContext camelContext, final String correlationId) {
- final String key = correlationId;
- Exchange result = get(key, getRepositoryName(), camelContext);
- LOG.debug("Getting key {} -> {}", key, result);
+ Exchange result = get(correlationId, getRepositoryName(), camelContext);
+ LOG.debug("Getting key {} -> {}", correlationId, result);
return result;
}
@@ -378,20 +376,19 @@ public class JdbcAggregationRepository extends ServiceSupport
public void remove(final CamelContext camelContext, final String correlationId, final Exchange exchange) {
transactionTemplate.execute(new TransactionCallbackWithoutResult() {
protected void doInTransactionWithoutResult(TransactionStatus status) {
- final String key = correlationId;
final String confirmKey = exchange.getExchangeId();
final long version = exchange.getProperty(VERSION_PROPERTY, Long.class);
try {
- LOG.debug("Removing key {}", key);
+ LOG.debug("Removing key {}", correlationId);
jdbcTemplate.update("DELETE FROM " + getRepositoryName() + " WHERE " + ID + " = ? AND " + VERSION + " = ?",
- key, version);
+ correlationId, version);
insert(camelContext, confirmKey, exchange, getRepositoryNameCompleted(), version);
- LOG.debug("Removed key {}", key);
+ LOG.debug("Removed key {}", correlationId);
} catch (Exception e) {
- throw new RuntimeException("Error removing key " + key + " from repository " + repositoryName, e);
+ throw new RuntimeException("Error removing key " + correlationId + " from repository " + repositoryName, e);
}
}
});
@@ -407,12 +404,11 @@ public class JdbcAggregationRepository extends ServiceSupport
return transactionTemplate.execute(new TransactionCallback<Boolean>() {
public Boolean doInTransaction(TransactionStatus status) {
LOG.debug("Confirming exchangeId {}", exchangeId);
- final String confirmKey = exchangeId;
final int mustBeOne = jdbcTemplate
- .update("DELETE FROM " + getRepositoryNameCompleted() + " WHERE " + ID + " = ?", confirmKey);
+ .update("DELETE FROM " + getRepositoryNameCompleted() + " WHERE " + ID + " = ?", exchangeId);
if (mustBeOne != 1) {
LOG.error("problem removing row {} from {} - DELETE statement did not return 1 but {}",
- confirmKey, getRepositoryNameCompleted(), mustBeOne);
+ exchangeId, getRepositoryNameCompleted(), mustBeOne);
return false;
}
return true;
@@ -454,9 +450,8 @@ public class JdbcAggregationRepository extends ServiceSupport
@Override
public Exchange recover(CamelContext camelContext, String exchangeId) {
- final String key = exchangeId;
- Exchange answer = get(key, getRepositoryNameCompleted(), camelContext);
- LOG.debug("Recovering exchangeId {} -> {}", key, answer);
+ Exchange answer = get(exchangeId, getRepositoryNameCompleted(), camelContext);
+ LOG.debug("Recovering exchangeId {} -> {}", exchangeId, answer);
return answer;
}
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java
index 7095dd17e46..1b5556466d7 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java
@@ -71,8 +71,7 @@ public class ResourceBasedSSHKeyVerifier implements ServerKeyVerifier {
PublicKey matchingKey = findKeyForServerToken(knownHostsInputStream, possibleTokens);
if (matchingKey != null) {
log.debug("Found PublicKey match for server");
- boolean match = Arrays.areEqual(matchingKey.getEncoded(), serverKey.getEncoded());
- return match;
+ return Arrays.areEqual(matchingKey.getEncoded(), serverKey.getEncoded());
}
} catch (IOException ioException) {
log.debug(String.format("Could not find known_hosts file %s", knownHostsResource), ioException);
diff --git a/components/camel-stitch/src/main/java/org/apache/camel/component/stitch/client/models/StitchResponse.java b/components/camel-stitch/src/main/java/org/apache/camel/component/stitch/client/models/StitchResponse.java
index da2639f09e2..3262c4105b2 100644
--- a/components/camel-stitch/src/main/java/org/apache/camel/component/stitch/client/models/StitchResponse.java
+++ b/components/camel-stitch/src/main/java/org/apache/camel/component/stitch/client/models/StitchResponse.java
@@ -68,10 +68,8 @@ public class StitchResponse implements StitchModel {
}
public String toString() {
- final String result
- = "HTTP Status Code: " + httpStatusCode + ", Response Status: " + status + ", Response Message: " + message;
- return result;
+ return "HTTP Status Code: " + httpStatusCode + ", Response Status: " + status + ", Response Message: " + message;
}
@Override
diff --git a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
index 65bccfae23b..05a37e7aab8 100644
--- a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
+++ b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
@@ -47,8 +47,7 @@ public class StompConfiguration implements Cloneable {
*/
public StompConfiguration copy() {
try {
- StompConfiguration copy = (StompConfiguration) clone();
- return copy;
+ return (StompConfiguration) clone();
} catch (CloneNotSupportedException e) {
throw new RuntimeCamelException(e);
}
diff --git a/components/camel-stream/src/main/java/org/apache/camel/component/stream/FileWatcherStrategy.java b/components/camel-stream/src/main/java/org/apache/camel/component/stream/FileWatcherStrategy.java
index ee58afc5329..02f8b2b623d 100644
--- a/components/camel-stream/src/main/java/org/apache/camel/component/stream/FileWatcherStrategy.java
+++ b/components/camel-stream/src/main/java/org/apache/camel/component/stream/FileWatcherStrategy.java
@@ -198,12 +198,11 @@ public class FileWatcherStrategy extends ServiceSupport implements CamelContextA
}
if (key != null) {
- Path pathToReload = folder;
for (WatchEvent<?> event : key.pollEvents()) {
WatchEvent<Path> we = (WatchEvent<Path>) event;
Path path = we.context();
- File file = pathToReload.resolve(path).toFile();
+ File file = folder.resolve(path).toFile();
LOG.trace("Modified/Created/Deleted file: {}", file);
changeEvent.onChange(file);
}
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 4177e57bdd4..0e48eb29f4d 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
@@ -466,8 +466,7 @@ public class DefaultUndertowHttpBinding implements UndertowHttpBinding {
cast(buffer).flip();
out.write(buffer.array(), buffer.arrayOffset() + cast(buffer).position(),
buffer.arrayOffset() + cast(buffer).limit());
- Buffer buf = buffer;
- cast(buf).clear();
+ cast((Buffer) buffer).clear();
}
}
}
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java
index 263a08da425..1788333831b 100644
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java
+++ b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaProducer.java
@@ -136,12 +136,10 @@ public class WekaProducer extends DefaultProducer {
String fpath = getConfiguration().getPath();
if (fpath != null) {
- Dataset dataset = Dataset.create(fpath);
- return dataset;
+ return Dataset.create(fpath);
}
- Dataset dataset = assertDatasetBody(exchange);
- return dataset;
+ return assertDatasetBody(exchange);
}
Object handleWriteCmd(Exchange exchange) {
diff --git a/components/camel-workday/src/main/java/org/apache/camel/component/workday/producer/WorkdayCommonAPIProducer.java b/components/camel-workday/src/main/java/org/apache/camel/component/workday/producer/WorkdayCommonAPIProducer.java
index 34fc33b7438..408cec1893f 100644
--- a/components/camel-workday/src/main/java/org/apache/camel/component/workday/producer/WorkdayCommonAPIProducer.java
+++ b/components/camel-workday/src/main/java/org/apache/camel/component/workday/producer/WorkdayCommonAPIProducer.java
@@ -93,10 +93,8 @@ public class WorkdayCommonAPIProducer extends WorkdayDefaultProducer {
String.format("An invalid Workday Common endpoint: '%s' was provided.", genericPath));
}
- String uriString = String.format(WORKDAY_COMMON_API_URL_TEMPLATE, configuration.getHost(), configuration.getTenant(),
+ return String.format(WORKDAY_COMMON_API_URL_TEMPLATE, configuration.getHost(), configuration.getTenant(),
pathString);
-
- return uriString;
}
}
diff --git a/components/camel-workday/src/main/java/org/apache/camel/component/workday/producer/WorkdayReportProducer.java b/components/camel-workday/src/main/java/org/apache/camel/component/workday/producer/WorkdayReportProducer.java
index 402eedffcb1..cf87682531b 100644
--- a/components/camel-workday/src/main/java/org/apache/camel/component/workday/producer/WorkdayReportProducer.java
+++ b/components/camel-workday/src/main/java/org/apache/camel/component/workday/producer/WorkdayReportProducer.java
@@ -46,10 +46,9 @@ public class WorkdayReportProducer extends WorkdayDefaultProducer {
stringBuilder.append("format=");
stringBuilder.append(configuration.getReportFormat());
- String uriString = String.format(WORKDAY_RASS_URL_TEMPLATE, configuration.getHost(), configuration.getTenant(),
- stringBuilder.toString());
- return uriString;
+ return String.format(WORKDAY_RASS_URL_TEMPLATE, configuration.getHost(), configuration.getTenant(),
+ stringBuilder.toString());
}
}
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java
index bd31f5d1daa..ea47ce2a955 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java
@@ -98,7 +98,6 @@ public class XmppComponent extends DefaultComponent {
private String extractCacheKeyFromUri(String uri) throws URISyntaxException {
URI u = new URI(uri);
- String result = u.getScheme() + "://" + u.getHost() + u.getPort() + u.getQuery();
- return result;
+ return u.getScheme() + "://" + u.getHost() + u.getPort() + u.getQuery();
}
}
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java
index ec9baaecabd..9d754ca0452 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java
@@ -74,8 +74,7 @@ public class XmppMessage extends DefaultMessage {
@Override
public XmppMessage newInstance() {
- XmppMessage answer = new XmppMessage(getCamelContext());
- return answer;
+ return new XmppMessage(getCamelContext());
}
@Override
diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
index 2cdb1a7a55e..62789225847 100644
--- a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
+++ b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
@@ -59,9 +59,8 @@ public class MessageVariableResolver implements XPathVariableResolver {
if (uri == null || uri.length() == 0) {
answer = variables.get(localPart);
if (answer == null) {
- Message message = in;
- if (message != null) {
- answer = message.getHeader(localPart);
+ if (in != null) {
+ answer = in.getHeader(localPart);
}
if (answer == null) {
answer = exchange.get().getProperty(localPart);
diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
index 0ba08a0613a..2f8a7721cfb 100644
--- a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
+++ b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
@@ -770,8 +770,7 @@ public class XPathBuilder extends ServiceSupport
try {
// use the property placeholder resolver to lookup
// the property for us
- Object answer = exchange.get().getContext().resolvePropertyPlaceholders("{{" + propertyText + "}}");
- return answer;
+ return exchange.get().getContext().resolvePropertyPlaceholders("{{" + propertyText + "}}");
} catch (Exception e) {
throw new XPathFunctionException(e);
}
@@ -809,8 +808,7 @@ public class XPathBuilder extends ServiceSupport
String exprText = exchange.get().getContext().getTypeConverter().convertTo(String.class, value);
Language simple = exchange.get().getContext().resolveLanguage("simple");
Expression exp = simple.createExpression(exprText);
- Object answer = exp.evaluate(exchange.get(), Object.class);
- return answer;
+ return exp.evaluate(exchange.get(), Object.class);
}
}
return null;
diff --git a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/JobRequest.java b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/JobRequest.java
index 958eb6d6839..ef626d745ee 100644
--- a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/JobRequest.java
+++ b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/JobRequest.java
@@ -113,13 +113,12 @@ public class JobRequest implements ZeebeMessage {
@Override
public String toString() {
- String sb = "JobRequest{" + "jobKey=" + jobKey +
+ return "JobRequest{" + "jobKey=" + jobKey +
", variables=" + variables +
", retries=" + retries +
", failMessage='" + failMessage + '\'' +
", errorMessage='" + errorMessage + '\'' +
", errorCode='" + errorCode + '\'' +
'}';
- return sb;
}
}
diff --git a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/MessageRequest.java b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/MessageRequest.java
index 364498d2117..7a357c2220c 100644
--- a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/MessageRequest.java
+++ b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/MessageRequest.java
@@ -84,13 +84,12 @@ public class MessageRequest implements ZeebeMessage {
@Override
public String toString() {
- String sb = "MessageRequest{" + "name='" + name + '\'' +
+ return "MessageRequest{" + "name='" + name + '\'' +
", correlationKey='" + correlationKey + '\'' +
", timeToLive=" + timeToLive +
", messageId='" + messageId + '\'' +
", variables=" + variables +
'}';
- return sb;
}
@Override
diff --git a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/MessageResponse.java b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/MessageResponse.java
index c86715ff2ca..3c49c82dcf8 100644
--- a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/MessageResponse.java
+++ b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/MessageResponse.java
@@ -48,10 +48,9 @@ public class MessageResponse extends AbstractZeebeResponse {
@Override
public String toString() {
- String sb = "MessageResponse{" + "correlationKey='" + correlationKey + '\'' +
+ return "MessageResponse{" + "correlationKey='" + correlationKey + '\'' +
", messageKey=" + messageKey +
'}';
- return sb;
}
@Override
diff --git a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/ProcessResponse.java b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/ProcessResponse.java
index 82d1f6c4f98..bb5abb37d76 100644
--- a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/ProcessResponse.java
+++ b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/model/ProcessResponse.java
@@ -70,12 +70,11 @@ public class ProcessResponse extends AbstractZeebeResponse {
@Override
public String toString() {
- String sb = "ProcessResponse{" + "processId='" + processId + '\'' +
+ return "ProcessResponse{" + "processId='" + processId + '\'' +
", processInstanceKey=" + processInstanceKey +
", processVersion=" + processVersion +
", processKey=" + processKey +
'}';
- return sb;
}
@Override
diff --git a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java
index 29fb21fed15..1da36b61fb6 100644
--- a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java
+++ b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java
@@ -77,8 +77,7 @@ public class MasterComponent extends ZookeeperComponentSupport {
if (params != null && params.size() > 0) {
childUri = childUri + "?" + uri.substring(uri.indexOf('?') + 1);
}
- MasterEndpoint answer = new MasterEndpoint(uri, this, name, childUri);
- return answer;
+ return new MasterEndpoint(uri, this, name, childUri);
}
protected String getCamelClusterPath(String name) {
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 a9815416151..010e5b0da2a 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
@@ -407,8 +407,7 @@ public class ZooKeeperGroup<T extends NodeState> implements Group<T> {
* @return list of children and data
*/
public List<ChildData> getCurrentData() {
- List<ChildData> answer = new ArrayList<>(currentData.values());
- return answer;
+ return new ArrayList<>(currentData.values());
}
/**