You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/06/17 10:31:55 UTC
[camel] branch main updated (4634171a465 -> 0a60f9e565e)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 4634171a465 Polished
new cb724a1ba90 (chores) camel-as2: removed placeholder code that was never implemented
new 9dc7d860059 (chores) camel-aws-xray: document a deliberate case of unused method parameter
new fa88895f4b8 (chores) camel-bindy: removed unused method parameters
new 41065bd47a2 (chores) camel-cometd: removed unused method parameters
new a3c6081b1e3 (chores) camel-cxf: removed unused method parameters
new 9ed7fe6bad7 (chores) camel-google-pubsub: removed unused method parameters
new ce0dab61d64 (chores) camel-google-storage: removed unused method parameters
new d3331d7cbf2 (chores) camel-google-gora: removed unused method parameters
new 3269c28e1b4 (chores) camel-hashicorp-vault: removed unused method parameters
new 1552f980dff (chores) camel-iec60870: removed unused method parameters
new fea262c14ce (chores) camel-influxdb: removed unused codes
new 169d9fa90fd (chores) camel-irc: removed unused parameters
new 83808d30cfa (chores) camel-leveldb: removed unused method parameters
new 0a60f9e565e CAMEL-18202: fix incorrectly setting the initial delay
The 14 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.
Summary of changes:
.../component/as2/api/entity/MultipartMimeEntity.java | 2 +-
.../camel/component/as2/api/util/EntityUtils.java | 4 ----
.../messaging/AbstractMessagingSegmentDecorator.java | 17 +++++++++++++++--
.../dataformat/bindy/BindyKeyValuePairFactory.java | 4 ++--
.../bindy/kvp/BindyKeyValuePairDataFormat.java | 2 +-
.../apache/camel/component/cometd/CometdComponent.java | 6 +++---
.../apache/camel/component/cometd/CometdEndpoint.java | 3 +--
.../apache/camel/component/cxf/DefaultCxfBinding.java | 7 +++----
.../cxf/interceptors/RawMessageWSDLGetInterceptor.java | 7 ++-----
.../apache/camel/component/cxf/jaxrs/CxfRsInvoker.java | 8 ++++----
.../apache/camel/component/cxf/jaxrs/CxfRsProducer.java | 4 ++--
.../component/google/pubsub/GooglePubsubComponent.java | 2 +-
.../component/google/pubsub/GooglePubsubEndpoint.java | 2 +-
.../google/storage/GoogleCloudStorageProducer.java | 16 ++++++++--------
.../org/apache/camel/component/gora/GoraProducer.java | 6 +++---
.../apache/camel/component/gora/utils/GoraUtils.java | 5 ++---
.../hashicorp/vault/HashicorpVaultProducer.java | 4 ++--
.../camel/component/iec60870/AbstractIecComponent.java | 4 ++--
.../camel/component/influxdb/InfluxDbProducer.java | 6 ++----
.../java/org/apache/camel/component/irc/IrcBinding.java | 4 +---
.../org/apache/camel/component/irc/IrcComponent.java | 6 +++---
.../java/org/apache/camel/component/irc/IrcMessage.java | 2 +-
.../org/apache/camel/component/irc/IrcProducer.java | 2 +-
.../leveldb/serializer/AbstractLevelDBSerializer.java | 2 +-
.../leveldb/serializer/DefaultLevelDBSerializer.java | 2 +-
.../camel/component/mongodb/gridfs/GridFsEndpoint.java | 2 +-
26 files changed, 64 insertions(+), 65 deletions(-)
[camel] 01/14: (chores) camel-as2: removed placeholder code that was never implemented
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cb724a1ba90d44476c84736f99a32aea4b5f27e6
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 09:42:30 2022 +0200
(chores) camel-as2: removed placeholder code that was never implemented
---
.../apache/camel/component/as2/api/entity/MultipartMimeEntity.java | 2 +-
.../java/org/apache/camel/component/as2/api/util/EntityUtils.java | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartMimeEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartMimeEntity.java
index 30f736ddf09..e475377ebb2 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartMimeEntity.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartMimeEntity.java
@@ -45,7 +45,7 @@ public abstract class MultipartMimeEntity extends MimeEntity {
setContentType(contentType);
setMainBody(isMainBody);
- if (boundary != null && EntityUtils.validateBoundaryValue(boundary)) {
+ if (boundary != null) {
this.boundary = boundary;
} else {
this.boundary = EntityUtils.createBoundaryValue();
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 2cc858b78c8..a60cfae820d 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
@@ -75,10 +75,6 @@ public final class EntityUtils {
return s.toString();
}
- public static boolean validateBoundaryValue(String boundaryValue) {
- return true; // TODO: add validation logic.
- }
-
public static String appendParameter(String headerString, String parameterName, String parameterValue) {
return headerString + "; " + parameterName + "=" + parameterValue;
}
[camel] 05/14: (chores) camel-cxf: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a3c6081b1e33372ebc02c9986a092fbd695d2ceb
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:17:00 2022 +0200
(chores) camel-cxf: removed unused method parameters
---
.../java/org/apache/camel/component/cxf/DefaultCxfBinding.java | 7 +++----
.../component/cxf/interceptors/RawMessageWSDLGetInterceptor.java | 7 ++-----
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java | 8 ++++----
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java | 4 ++--
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 09006a9ff5f..f92db1c4f3d 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -118,7 +118,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
requestContext, CxfConstants.REQUEST_CONTEXT);
// propagate headers
- propagateHeadersFromCamelToCxf(camelExchange, camelHeaders, cxfExchange,
+ propagateHeadersFromCamelToCxf(camelExchange, camelHeaders,
requestContext);
String overrideAddress = camelExchange.getIn().getHeader(CxfConstants.DESTINATION_OVERRIDE_URL, String.class);
@@ -391,7 +391,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
extractInvocationContextFromCamel(camelExchange, camelHeaders,
responseContext, CxfConstants.RESPONSE_CONTEXT);
- propagateHeadersFromCamelToCxf(camelExchange, camelHeaders, cxfExchange,
+ propagateHeadersFromCamelToCxf(camelExchange, camelHeaders,
responseContext);
if (cxfExchange.getOutMessage() != null) {
cxfExchange.getOutMessage().put(CxfConstants.PROTOCOL_HEADERS, responseContext.get(CxfConstants.PROTOCOL_HEADERS));
@@ -432,7 +432,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
extractInvocationContextFromCamel(camelExchange, camelHeaders,
responseContext, CxfConstants.RESPONSE_CONTEXT);
- propagateHeadersFromCamelToCxf(camelExchange, camelHeaders, cxfExchange,
+ propagateHeadersFromCamelToCxf(camelExchange, camelHeaders,
responseContext);
// create out message
Endpoint ep = cxfExchange.get(Endpoint.class);
@@ -750,7 +750,6 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
protected void propagateHeadersFromCamelToCxf(
Exchange camelExchange,
Map<String, Object> camelHeaders,
- org.apache.cxf.message.Exchange cxfExchange,
Map<String, Object> cxfContext) {
// get cxf transport headers (if any) from camel exchange
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
index d57b11891a6..e3107f5aff8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageWSDLGetInterceptor.java
@@ -33,7 +33,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.EndpointInfo;
/**
* Just copy the from WSDLGetInterceptor to provide backward compatible support for 2.7.x
@@ -60,7 +59,7 @@ public class RawMessageWSDLGetInterceptor extends AbstractPhaseInterceptor<Messa
String ctx = (String) message.get(Message.PATH_INFO);
Map<String, String> map = UrlUtils.parseQueryString(query);
- if (isRecognizedQuery(map, baseUri, ctx, message.getExchange().getEndpoint().getEndpointInfo())) {
+ if (isRecognizedQuery(map)) {
Document doc = getDocument(message, baseUri, map, ctx);
Endpoint e = message.getExchange().get(Endpoint.class);
@@ -109,9 +108,7 @@ public class RawMessageWSDLGetInterceptor extends AbstractPhaseInterceptor<Messa
}
}
- private boolean isRecognizedQuery(
- Map<String, String> map, String baseUri, String ctx,
- EndpointInfo endpointInfo) {
+ private boolean isRecognizedQuery(Map<String, String> map) {
if (map.containsKey("wsdl") || map.containsKey("xsd")) {
return true;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 8e8a2d8d321..0c18bfe4a9c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -69,10 +69,10 @@ public class CxfRsInvoker extends JAXRSInvoker {
Continuation continuation;
if (!endpoint.isSynchronous() && (continuation = getContinuation(cxfExchange)) != null) {
LOG.trace("Calling the Camel async processors.");
- return asyncInvoke(cxfExchange, serviceObject, method, paramArray, continuation, response);
+ return asyncInvoke(cxfExchange, method, paramArray, continuation, response);
} else {
LOG.trace("Calling the Camel sync processors.");
- return syncInvoke(cxfExchange, serviceObject, method, paramArray, response);
+ return syncInvoke(cxfExchange, method, paramArray, response);
}
}
@@ -83,7 +83,7 @@ public class CxfRsInvoker extends JAXRSInvoker {
}
private Object asyncInvoke(
- Exchange cxfExchange, final Object serviceObject, Method method,
+ Exchange cxfExchange, Method method,
Object[] paramArray, final Continuation continuation, Object response)
throws Exception {
synchronized (continuation) {
@@ -136,7 +136,7 @@ public class CxfRsInvoker extends JAXRSInvoker {
}
private Object syncInvoke(
- Exchange cxfExchange, final Object serviceObject, Method method,
+ Exchange cxfExchange, Method method,
Object[] paramArray,
Object response)
throws Exception {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index ec80fc864d0..82e0da8efa0 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -587,7 +587,7 @@ public class CxfRsProducer extends DefaultAsyncProducer {
CxfOperationException exception;
String uri = exchange.getFromEndpoint().getEndpointUri();
String statusText = statusTextFromResponseCode(responseCode);
- Map<String, String> headers = parseResponseHeaders(response, exchange);
+ Map<String, String> headers = parseResponseHeaders(response);
//Get the response detail string
String copy = exchange.getContext().getTypeConverter().convertTo(String.class, response.getEntity());
if (responseCode >= 300 && responseCode < 400) {
@@ -632,7 +632,7 @@ public class CxfRsProducer extends DefaultAsyncProducer {
return Response.Status.Family.familyOf(responseCode).name();
}
- protected Map<String, String> parseResponseHeaders(Object response, Exchange camelExchange) {
+ protected Map<String, String> parseResponseHeaders(Object response) {
Map<String, String> answer = new HashMap<>();
if (response instanceof Response) {
[camel] 02/14: (chores) camel-aws-xray: document a deliberate case of unused method parameter
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9dc7d860059bd28b216ff10d6294daf41bffdf11
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 09:58:56 2022 +0200
(chores) camel-aws-xray: document a deliberate case of unused method parameter
---
.../messaging/AbstractMessagingSegmentDecorator.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/messaging/AbstractMessagingSegmentDecorator.java b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/messaging/AbstractMessagingSegmentDecorator.java
index d67a02f77d8..c998ab0c806 100644
--- a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/messaging/AbstractMessagingSegmentDecorator.java
+++ b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/messaging/AbstractMessagingSegmentDecorator.java
@@ -42,11 +42,24 @@ public abstract class AbstractMessagingSegmentDecorator extends AbstractSegmentD
}
}
- protected String getDestination(Exchange exchange, Endpoint endpoint) {
+ /**
+ * Gets the (component-specific) destination
+ *
+ * @param exchange the exchange to extract the destination info from
+ * @param endpoint the endpoint being used
+ * @return A String with the destination
+ */
+ protected String getDestination(@SuppressWarnings("unused") Exchange exchange, Endpoint endpoint) {
return stripSchemeAndOptions(endpoint);
}
- protected String getMessageId(Exchange exchange) {
+ /**
+ * Gets the message ID from the exchange
+ *
+ * @param exchange the exchange from which to extract the message ID
+ * @return A String with the message ID or null if not applicable
+ */
+ protected String getMessageId(@SuppressWarnings("unused") Exchange exchange) {
return null;
}
}
[camel] 03/14: (chores) camel-bindy: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fa88895f4b80220c92450ef183dc665aeb5cd2cd
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:04:07 2022 +0200
(chores) camel-bindy: removed unused method parameters
---
.../org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java | 4 ++--
.../camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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 35e1f3263c1..874719ef23f 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
@@ -120,11 +120,11 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
// Map to hold the model @OneToMany classes while binding
Map<String, List<Object>> lists = new HashMap<>();
- bind(camelContext, data, model, line, lists);
+ bind(data, model, line, lists);
}
public void bind(
- CamelContext camelContext, List<String> data, Map<String, Object> model, int line, Map<String, List<Object>> lists)
+ List<String> data, Map<String, Object> model, int line, Map<String, List<Object>> lists)
throws Exception {
Map<Integer, List<String>> results = new HashMap<>();
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
index b79c0dc17bb..58fbc24d5c2 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
@@ -165,7 +165,7 @@ public class BindyKeyValuePairDataFormat extends BindyAbstractDataFormat {
// Bind data from message with model classes
// Counter is used to detect line where error occurs
- factory.bind(getCamelContext(), result, model, count.get(), lists);
+ factory.bind(result, model, count.get(), lists);
// Link objects together
factory.link(model);
[camel] 09/14: (chores) camel-hashicorp-vault: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3269c28e1b4f69fc0afe4fc3d51aa9399f78588e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:24:55 2022 +0200
(chores) camel-hashicorp-vault: removed unused method parameters
---
.../camel/component/hashicorp/vault/HashicorpVaultProducer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java b/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
index 9c54918f19b..f4743bd7dc7 100644
--- a/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
+++ b/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
@@ -56,7 +56,7 @@ public class HashicorpVaultProducer extends DefaultProducer {
getSecret(exchange);
break;
case deleteSecret:
- deleteSecret(exchange);
+ deleteSecret();
break;
default:
throw new IllegalArgumentException("Unsupported operation");
@@ -82,7 +82,7 @@ public class HashicorpVaultProducer extends DefaultProducer {
exchange.getMessage().setBody(rawSecret.getData());
}
- private void deleteSecret(Exchange exchange) {
+ private void deleteSecret() {
VaultKeyValueOperations keyValue
= getEndpoint().getVaultTemplate().opsForKeyValue(getEndpoint().getConfiguration().getSecretsEngine(),
VaultKeyValueOperationsSupport.KeyValueBackend.versioned());
[camel] 14/14: CAMEL-18202: fix incorrectly setting the initial delay
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0a60f9e565e5b6e4e6a0c6c3680a7055eb0badfb
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:44:05 2022 +0200
CAMEL-18202: fix incorrectly setting the initial delay
---
.../java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java
index 517ec63e920..45ea9f4f86d 100644
--- a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java
+++ b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java
@@ -232,7 +232,7 @@ public class GridFsEndpoint extends DefaultEndpoint {
* Sets the initialDelay before the consumer will start polling. Default is 1000ms
*/
public void setInitialDelay(long initialDelay) {
- this.initialDelay = delay;
+ this.initialDelay = initialDelay;
}
/**
[camel] 12/14: (chores) camel-irc: removed unused parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 169d9fa90fd1f362fe9fd94ecf8a561a9e8318d0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:29:07 2022 +0200
(chores) camel-irc: removed unused parameters
---
.../src/main/java/org/apache/camel/component/irc/IrcBinding.java | 4 +---
.../src/main/java/org/apache/camel/component/irc/IrcComponent.java | 6 +++---
.../src/main/java/org/apache/camel/component/irc/IrcMessage.java | 2 +-
.../src/main/java/org/apache/camel/component/irc/IrcProducer.java | 2 +-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java
index 4d19a5a52c8..9f04ec872fa 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java
@@ -16,10 +16,8 @@
*/
package org.apache.camel.component.irc;
-import org.apache.camel.Exchange;
-
public class IrcBinding {
- public Object extractBodyFromIrc(Exchange exchange, IrcMessage message) {
+ public Object extractBodyFromIrc(IrcMessage message) {
String type = message.getMessageType();
String text = message.getMessage();
if (text != null) {
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
index 69aaa61428e..3e07f097df8 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
@@ -75,7 +75,7 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
public synchronized void closeIRCConnection(IrcConfiguration configuration) {
IRCConnection connection = connectionCache.get(configuration.getCacheKey());
if (connection != null) {
- closeConnection(configuration.getCacheKey(), connection);
+ closeConnection(connection);
connectionCache.remove(configuration.getCacheKey());
}
}
@@ -139,7 +139,7 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
return conn;
}
- public void closeConnection(String key, IRCConnection connection) {
+ public void closeConnection(IRCConnection connection) {
try {
connection.doQuit();
connection.close();
@@ -154,7 +154,7 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
Map<String, IRCConnection> map = new HashMap<>(connectionCache);
connectionCache.clear();
for (Map.Entry<String, IRCConnection> entry : map.entrySet()) {
- closeConnection(entry.getKey(), entry.getValue());
+ closeConnection(entry.getValue());
}
super.doStop();
}
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
index 49d98f7ed7d..078c56257d3 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
@@ -125,7 +125,7 @@ public class IrcMessage extends DefaultMessage {
protected Object createBody() {
Exchange exchange = getExchange();
IrcBinding binding = ExchangeHelper.getBinding(getExchange(), IrcBinding.class);
- return binding != null ? binding.extractBodyFromIrc(exchange, this) : null;
+ return binding != null ? binding.extractBodyFromIrc(this) : null;
}
@Override
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
index c78519060c4..e96cc1e1c0d 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
@@ -89,7 +89,7 @@ public class IrcProducer extends DefaultProducer {
LOG.debug("Reconnecting to {}:{}", getEndpoint().getConfiguration().getHostname(),
getEndpoint().getConfiguration().getNickname());
}
- getEndpoint().getComponent().closeConnection(getEndpoint().getConfiguration().getCacheKey(), connection);
+ getEndpoint().getComponent().closeConnection(connection);
connection = getEndpoint().getComponent().getIRCConnection(getEndpoint().getConfiguration());
}
connection.addIRCEventListener(listener);
[camel] 04/14: (chores) camel-cometd: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 41065bd47a20e53f4e2e67280499b8fd34454d5e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:08:08 2022 +0200
(chores) camel-cometd: removed unused method parameters
---
.../java/org/apache/camel/component/cometd/CometdComponent.java | 6 +++---
.../main/java/org/apache/camel/component/cometd/CometdEndpoint.java | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 6aa614855b4..e256d623515 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -102,7 +102,7 @@ public class CometdComponent extends DefaultComponent implements SSLContextParam
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- CometdEndpoint endpoint = new CometdEndpoint(this, uri, remaining, parameters);
+ CometdEndpoint endpoint = new CometdEndpoint(this, uri, remaining);
setProperties(endpoint, parameters);
return endpoint;
}
@@ -135,7 +135,7 @@ public class CometdComponent extends DefaultComponent implements SSLContextParam
server.addConnector(connector);
- CometDServlet servlet = createServletForConnector(server, connector, endpoint);
+ CometDServlet servlet = createServletForConnector(server, endpoint);
connectorRef = new ConnectorRef(connector, servlet, server);
server.start();
@@ -184,7 +184,7 @@ public class CometdComponent extends DefaultComponent implements SSLContextParam
}
}
- protected CometDServlet createServletForConnector(Server server, Connector connector, CometdEndpoint endpoint)
+ protected CometDServlet createServletForConnector(Server server, CometdEndpoint endpoint)
throws Exception {
CometDServlet servlet = new CometDServlet();
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 573339c994c..442bf558227 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
@@ -18,7 +18,6 @@ package org.apache.camel.component.cometd;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Map;
import org.apache.camel.Category;
import org.apache.camel.Consumer;
@@ -78,7 +77,7 @@ public class CometdEndpoint extends DefaultEndpoint {
@UriParam(label = "producer")
private boolean disconnectLocalSession;
- public CometdEndpoint(CometdComponent component, String uri, String remaining, Map<String, Object> parameters) {
+ public CometdEndpoint(CometdComponent component, String uri, String remaining) {
super(uri, component);
this.component = component;
try {
[camel] 11/14: (chores) camel-influxdb: removed unused codes
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fea262c14ce3b9bc30244ce397b21fb8fbf251f0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:27:17 2022 +0200
(chores) camel-influxdb: removed unused codes
---
.../java/org/apache/camel/component/influxdb/InfluxDbProducer.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
index 69cf754df60..de98bff06ee 100644
--- a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
+++ b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
@@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
public class InfluxDbProducer extends DefaultProducer {
private static final Logger LOG = LoggerFactory.getLogger(InfluxDbProducer.class);
- private static final String CREATE_DATABASE = "CREATE DATABASE ";
- private static final String SHOW_DATABASES = "SHOW DATABASES";
InfluxDbEndpoint endpoint;
InfluxDB connection;
@@ -63,7 +61,7 @@ public class InfluxDbProducer extends DefaultProducer {
doInsert(exchange, dataBaseName, retentionPolicy);
break;
case InfluxDbOperations.QUERY:
- doQuery(exchange, dataBaseName, retentionPolicy);
+ doQuery(exchange, dataBaseName);
break;
case InfluxDbOperations.PING:
doPing(exchange);
@@ -97,7 +95,7 @@ public class InfluxDbProducer extends DefaultProducer {
}
}
- private void doQuery(Exchange exchange, String dataBaseName, String retentionPolicy) {
+ private void doQuery(Exchange exchange, String dataBaseName) {
String query = calculateQuery(exchange);
Query influxdbQuery = new Query(query, dataBaseName);
QueryResult resultSet = connection.query(influxdbQuery);
[camel] 08/14: (chores) camel-google-gora: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d3331d7cbf2ac7e88a25f735b534235fb397110f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:22:32 2022 +0200
(chores) camel-google-gora: removed unused method parameters
---
.../src/main/java/org/apache/camel/component/gora/GoraProducer.java | 6 +++---
.../main/java/org/apache/camel/component/gora/utils/GoraUtils.java | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraProducer.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraProducer.java
index e8a12fb5caa..f3579d40ac3 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraProducer.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraProducer.java
@@ -24,7 +24,7 @@ import org.apache.camel.support.DefaultProducer;
import org.apache.gora.persistency.Persistent;
import org.apache.gora.store.DataStore;
-import static org.apache.camel.component.gora.utils.GoraUtils.constractQueryFromPropertiesMap;
+import static org.apache.camel.component.gora.utils.GoraUtils.constructQueryFromPropertiesMap;
import static org.apache.camel.component.gora.utils.GoraUtils.getKeyFromExchange;
import static org.apache.camel.component.gora.utils.GoraUtils.getValueFromExchange;
@@ -77,10 +77,10 @@ public class GoraProducer extends DefaultProducer {
result = dataStore.delete(getKeyFromExchange(exchange));
} else if (GoraOperation.QUERY.value.equalsIgnoreCase(operation)) {
final Map<String, Object> props = exchange.getIn().getHeaders();
- result = constractQueryFromPropertiesMap(props, dataStore, this.configuration).execute();
+ result = constructQueryFromPropertiesMap(props, dataStore).execute();
} else if (GoraOperation.DELETE_BY_QUERY.value.equalsIgnoreCase(operation)) {
final Map<String, Object> props = exchange.getIn().getHeaders();
- result = dataStore.deleteByQuery(constractQueryFromPropertiesMap(props, dataStore, this.configuration));
+ result = dataStore.deleteByQuery(constructQueryFromPropertiesMap(props, dataStore));
} else if (GoraOperation.GET_SCHEMA_NAME.value.equalsIgnoreCase(operation)) {
result = dataStore.getSchemaName();
} else if (GoraOperation.DELETE_SCHEMA.value.equalsIgnoreCase(operation)) {
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/utils/GoraUtils.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/utils/GoraUtils.java
index d0b960fa6d9..0b11d4437c8 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/utils/GoraUtils.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/utils/GoraUtils.java
@@ -96,10 +96,9 @@ public final class GoraUtils {
*
* <b>NOTE:</b> values used in order construct the query should be stored in the "in" message headers.
*/
- public static Query<Object, Persistent> constractQueryFromPropertiesMap(
+ public static Query<Object, Persistent> constructQueryFromPropertiesMap(
final Map<String, ?> propertiesMap,
- final DataStore<Object, Persistent> dataStore,
- final GoraConfiguration conf) {
+ final DataStore<Object, Persistent> dataStore) {
final Query<Object, Persistent> query = dataStore.newQuery();
[camel] 07/14: (chores) camel-google-storage: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ce0dab61d6418b1fb47f569cdb7f7616cafbb5b7
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:18:44 2022 +0200
(chores) camel-google-storage: removed unused method parameters
---
.../google/storage/GoogleCloudStorageProducer.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageProducer.java b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageProducer.java
index a678cca951e..845e9ec1079 100644
--- a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageProducer.java
+++ b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageProducer.java
@@ -94,7 +94,7 @@ public class GoogleCloudStorageProducer extends DefaultProducer {
}
private void processFile(Storage storage, Exchange exchange) throws IOException, InvalidPayloadException {
- final String bucketName = determineBucketName(exchange);
+ final String bucketName = determineBucketName();
final String objectName = determineObjectName(exchange);
Map<String, String> objectMetadata = determineMetadata(exchange);
@@ -200,7 +200,7 @@ public class GoogleCloudStorageProducer extends DefaultProducer {
}
private void createDownloadLink(Storage storage, Exchange exchange) {
- final String bucketName = determineBucketName(exchange);
+ final String bucketName = determineBucketName();
final String objectName = determineObjectName(exchange);
Long expirationMillis
= exchange.getIn().getHeader(GoogleCloudStorageConstants.DOWNLOAD_LINK_EXPIRATION_TIME, 300000L, Long.class);
@@ -221,7 +221,7 @@ public class GoogleCloudStorageProducer extends DefaultProducer {
}
private void copyObject(Storage storage, Exchange exchange) {
- final String bucketName = determineBucketName(exchange);
+ final String bucketName = determineBucketName();
final String objectName = determineObjectName(exchange);
final String destinationObjectName = exchange.getIn()
.getHeader(GoogleCloudStorageConstants.DESTINATION_OBJECT_NAME, String.class);
@@ -259,7 +259,7 @@ public class GoogleCloudStorageProducer extends DefaultProducer {
}
private void deleteObject(Storage storage, Exchange exchange) {
- final String bucketName = determineBucketName(exchange);
+ final String bucketName = determineBucketName();
final String objectName = determineObjectName(exchange);
BlobId blobId = BlobId.of(bucketName, objectName);
@@ -270,7 +270,7 @@ public class GoogleCloudStorageProducer extends DefaultProducer {
}
private void deleteBucket(Storage storage, Exchange exchange) {
- final String bucketName = determineBucketName(exchange);
+ final String bucketName = determineBucketName();
for (Blob blob : storage.list(bucketName).iterateAll()) {
storage.delete(blob.getBlobId());
@@ -293,7 +293,7 @@ public class GoogleCloudStorageProducer extends DefaultProducer {
}
private void getObject(Storage storage, Exchange exchange) {
- final String bucketName = determineBucketName(exchange);
+ final String bucketName = determineBucketName();
final String objectName = determineObjectName(exchange);
Blob blob = storage.get(BlobId.of(bucketName, objectName));
@@ -303,7 +303,7 @@ public class GoogleCloudStorageProducer extends DefaultProducer {
}
private void listObjects(Storage storage, Exchange exchange) {
- final String bucketName = determineBucketName(exchange);
+ final String bucketName = determineBucketName();
List<Blob> bloblist = new LinkedList<>();
for (Blob blob : storage.list(bucketName).iterateAll()) {
@@ -326,7 +326,7 @@ public class GoogleCloudStorageProducer extends DefaultProducer {
return key;
}
- private String determineBucketName(Exchange exchange) {
+ private String determineBucketName() {
String bucketName = getConfiguration().getBucketName();
if (bucketName == null) {
throw new IllegalArgumentException("Bucket name is missing or not configured.");
[camel] 13/14: (chores) camel-leveldb: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 83808d30cfac92ea73caeea0a01778428225664c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:37:39 2022 +0200
(chores) camel-leveldb: removed unused method parameters
---
.../camel/component/leveldb/serializer/AbstractLevelDBSerializer.java | 2 +-
.../camel/component/leveldb/serializer/DefaultLevelDBSerializer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/serializer/AbstractLevelDBSerializer.java b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/serializer/AbstractLevelDBSerializer.java
index 89f203c9b6a..102d9e67fff 100644
--- a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/serializer/AbstractLevelDBSerializer.java
+++ b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/serializer/AbstractLevelDBSerializer.java
@@ -28,7 +28,7 @@ import org.apache.camel.support.DefaultExchangeHolder;
public abstract class AbstractLevelDBSerializer implements LevelDBSerializer {
protected byte[] serializeExchange(
- CamelContext camelContext, Exchange exchange, boolean allowSerializedHeaders, Serializer serializer)
+ Exchange exchange, boolean allowSerializedHeaders, Serializer serializer)
throws IOException {
DefaultExchangeHolder pe = createExchangeHolder(exchange, allowSerializedHeaders);
return serializer.serialize(pe);
diff --git a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/serializer/DefaultLevelDBSerializer.java b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/serializer/DefaultLevelDBSerializer.java
index 6bd83463a0b..1bf22752721 100644
--- a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/serializer/DefaultLevelDBSerializer.java
+++ b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/serializer/DefaultLevelDBSerializer.java
@@ -50,7 +50,7 @@ public class DefaultLevelDBSerializer extends AbstractLevelDBSerializer {
@Override
public byte[] serializeExchange(CamelContext camelContext, Exchange exchange, boolean allowSerializedHeaders)
throws IOException {
- return serializeExchange(camelContext, exchange, allowSerializedHeaders, h -> {
+ return serializeExchange(exchange, allowSerializedHeaders, h -> {
try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos)) {
oos.writeObject(h);
[camel] 06/14: (chores) camel-google-pubsub: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9ed7fe6bad7e8cff4e118e29139bd0e6f8da4bba
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:18:23 2022 +0200
(chores) camel-google-pubsub: removed unused method parameters
---
.../org/apache/camel/component/google/pubsub/GooglePubsubComponent.java | 2 +-
.../org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
index f6cb6b8d115..f2051b1ad6a 100644
--- a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
+++ b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
@@ -130,7 +130,7 @@ public class GooglePubsubComponent extends DefaultComponent {
"Google PubSub Endpoint format \"projectId:destinationName[:subscriptionName]\"");
}
- GooglePubsubEndpoint pubsubEndpoint = new GooglePubsubEndpoint(uri, this, remaining);
+ GooglePubsubEndpoint pubsubEndpoint = new GooglePubsubEndpoint(uri, this);
pubsubEndpoint.setProjectId(parts[0]);
pubsubEndpoint.setDestinationName(parts[1]);
pubsubEndpoint.setServiceAccountKey(serviceAccountKey);
diff --git a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index ac8154c9247..bbf39aeef53 100644
--- a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++ b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -101,7 +101,7 @@ public class GooglePubsubEndpoint extends DefaultEndpoint {
@Metadata(autowired = true)
private GooglePubsubSerializer serializer;
- public GooglePubsubEndpoint(String uri, Component component, String remaining) {
+ public GooglePubsubEndpoint(String uri, Component component) {
super(uri, component);
if (!(component instanceof GooglePubsubComponent)) {
[camel] 10/14: (chores) camel-iec60870: removed unused method parameters
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1552f980dff2444ba0ca473c6682fc861a42435e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 17 10:26:19 2022 +0200
(chores) camel-iec60870: removed unused method parameters
---
.../org/apache/camel/component/iec60870/AbstractIecComponent.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
index 79b9e3f3994..048ec8836e6 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
@@ -80,7 +80,7 @@ public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>> exten
protected abstract Endpoint createEndpoint(String uri, T1 connection, ObjectAddress address);
- protected T2 parseOptions(final ConnectionId id, final Map<String, Object> parameters) throws Exception {
+ protected T2 parseOptions(final Map<String, Object> parameters) throws Exception {
// test for provided connection options
@@ -141,7 +141,7 @@ public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>> exten
LOG.debug("Result - {} -> {}", id, connection);
if (connection == null) {
- final T2 options = parseOptions(id, parameters);
+ final T2 options = parseOptions(parameters);
LOG.debug("Creating new connection: {}", options);
connection = createConnection(id, options);