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
The following commit(s) were added to refs/heads/main by this push:
new 7d1a829719e (chores) camel-support: removed unused parameters
7d1a829719e is described below
commit 7d1a829719e814a27099a09d9fd659dde7423c1c
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Fri Jun 24 06:50:36 2022 +0200
(chores) camel-support: removed unused parameters
Also updates camel-corda, camel-infinispan and camel-web3j to adjust the
calls to the affected methods.
---
.../camel/component/corda/CordaProducer.java | 2 +-
.../component/infinispan/InfinispanProducer.java | 2 +-
.../apache/camel/component/seda/SedaProducer.java | 3 +-
.../camel/component/web3j/Web3jProducer.java | 2 +-
.../camel/support/EventDrivenPollingConsumer.java | 3 +-
.../org/apache/camel/support/ExchangeHelper.java | 18 ----------
.../camel/support/HeaderSelectorProducer.java | 40 ----------------------
.../builder/TokenPairExpressionIterator.java | 10 ++----
8 files changed, 8 insertions(+), 72 deletions(-)
diff --git
a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
index 1e095a63850..501983de6d8 100644
---
a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
+++
b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
@@ -55,7 +55,7 @@ public class CordaProducer extends HeaderSelectorProducer {
private CordaRPCOps cordaRPCOps;
public CordaProducer(CordaEndpoint endpoint, final CordaConfiguration
configuration, CordaRPCOps cordaRPCOps) {
- super(endpoint, CordaConstants.OPERATION, () ->
configuration.getOperation(), false);
+ super(endpoint, CordaConstants.OPERATION, () ->
configuration.getOperation());
//this.configuration = configuration;
this.cordaRPCOps = cordaRPCOps;
}
diff --git
a/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
b/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
index 27131dba73f..1dd15ecc741 100644
---
a/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
+++
b/components/camel-infinispan/camel-infinispan-common/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
@@ -34,7 +34,7 @@ public abstract class InfinispanProducer<M extends
InfinispanManager, C extends
private final M manager;
protected InfinispanProducer(InfinispanEndpoint endpoint, String
cacheName, M manager, C configuration) {
- super(endpoint, InfinispanConstants.OPERATION,
configuration.getOperationOrDefault()::name, false);
+ super(endpoint, InfinispanConstants.OPERATION,
configuration.getOperationOrDefault()::name);
this.cacheName = cacheName;
this.configuration = configuration;
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 f37d859a448..0a204f0c36e 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
@@ -164,8 +164,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,
- synchronization ->
!synchronization.getClass().getName().contains("RestBindingMarshalOnCompletion"));
+ Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange,
handover, true);
return copy;
}
diff --git
a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
index ae399824d78..86b16274d86 100644
---
a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
+++
b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
@@ -101,7 +101,7 @@ public class Web3jProducer extends HeaderSelectorProducer {
private Web3jConfiguration configuration;
public Web3jProducer(Web3jEndpoint endpoint, final Web3jConfiguration
configuration) {
- super(endpoint, Web3jConstants.OPERATION, () ->
configuration.getOperationOrDefault(), false);
+ super(endpoint, Web3jConstants.OPERATION, () ->
configuration.getOperationOrDefault());
web3j = endpoint.getWeb3j();
this.configuration = configuration;
if (web3j instanceof Quorum) {
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
index bd15b3b0222..620b98fbe52 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
@@ -208,8 +208,7 @@ public class EventDrivenPollingConsumer extends
PollingConsumerSupport implement
// if handover we need to do special handover to avoid handing over
// RestBindingMarshalOnCompletion as it should not be handed over
- Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange,
handover, true,
- synchronization ->
!synchronization.getClass().getName().contains("RestBindingMarshalOnCompletion"));
+ Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange,
handover, true);
// we want the copy to have an uow
UnitOfWork uow =
getEndpoint().getCamelContext().adapt(ExtendedCamelContext.class).getUnitOfWorkFactory()
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
index 00f13cfe320..dc348d88348 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
@@ -30,7 +30,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import java.util.function.Predicate;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
@@ -51,7 +50,6 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.TypeConversionException;
import org.apache.camel.WrappedFile;
import org.apache.camel.spi.NormalizedEndpointUri;
-import org.apache.camel.spi.Synchronization;
import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.spi.annotations.EagerClassloaded;
import org.apache.camel.util.IOHelper;
@@ -289,22 +287,6 @@ public final class ExchangeHelper {
* @param useSameMessageId whether to use same message id on the copy
message.
*/
public static Exchange createCorrelatedCopy(Exchange exchange, boolean
handover, boolean useSameMessageId) {
- return createCorrelatedCopy(exchange, handover, useSameMessageId,
null);
- }
-
- /**
- * Creates a new instance and copies from the current message exchange so
that it can be forwarded to another
- * destination as a new instance. Unlike regular copy this operation will
not share the same
- * {@link org.apache.camel.spi.UnitOfWork} so its should be used for async
messaging, where the original and copied
- * exchange are independent.
- *
- * @param exchange original copy of the exchange
- * @param handover whether the on completion callbacks should be
handed over to the new copy.
- * @param useSameMessageId whether to use same message id on the copy
message.
- * @param filter whether to handover the on completion
- */
- public static Exchange createCorrelatedCopy(
- Exchange exchange, boolean handover, boolean useSameMessageId,
Predicate<Synchronization> filter) {
String id = exchange.getExchangeId();
// make sure to do a safe copy as the correlated copy can be routed
independently of the source.
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/HeaderSelectorProducer.java
b/core/camel-support/src/main/java/org/apache/camel/support/HeaderSelectorProducer.java
index f7bfea2f4f9..a3d0aa2f6b9 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/HeaderSelectorProducer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/HeaderSelectorProducer.java
@@ -53,77 +53,37 @@ public abstract class HeaderSelectorProducer extends
DefaultAsyncProducer implem
this(endpoint, headerSupplier, () -> null, null);
}
- public HeaderSelectorProducer(Endpoint endpoint, Supplier<String>
headerSupplier, boolean caseSensitive) {
- this(endpoint, headerSupplier, () -> null, null, caseSensitive);
- }
-
public HeaderSelectorProducer(Endpoint endpoint, String header) {
this(endpoint, () -> header, () -> null, null);
}
- public HeaderSelectorProducer(Endpoint endpoint, String header, boolean
caseSensitive) {
- this(endpoint, () -> header, () -> null, null, caseSensitive);
- }
-
public HeaderSelectorProducer(Endpoint endpoint, String header, Object
target) {
this(endpoint, () -> header, () -> null, target);
}
- public HeaderSelectorProducer(Endpoint endpoint, String header, Object
target, boolean caseSensitive) {
- this(endpoint, () -> header, () -> null, target, caseSensitive);
- }
-
public HeaderSelectorProducer(Endpoint endpoint, Supplier<String>
headerSupplier, Object target) {
this(endpoint, headerSupplier, () -> null, target);
}
- public HeaderSelectorProducer(Endpoint endpoint, Supplier<String>
headerSupplier, Object target, boolean caseSensitive) {
- this(endpoint, headerSupplier, () -> null, target, caseSensitive);
- }
-
public HeaderSelectorProducer(Endpoint endpoint, String header, String
defaultHeaderValue) {
this(endpoint, () -> header, () -> defaultHeaderValue, null);
}
- public HeaderSelectorProducer(Endpoint endpoint, String header, String
defaultHeaderValue, boolean caseSensitive) {
- this(endpoint, () -> header, () -> defaultHeaderValue, null,
caseSensitive);
- }
-
public HeaderSelectorProducer(Endpoint endpoint, String header,
Supplier<String> defaultHeaderValueSupplier) {
this(endpoint, () -> header, defaultHeaderValueSupplier, null);
}
- public HeaderSelectorProducer(Endpoint endpoint, String header,
Supplier<String> defaultHeaderValueSupplier,
- boolean caseSensitive) {
- this(endpoint, () -> header, defaultHeaderValueSupplier, null,
caseSensitive);
- }
-
public HeaderSelectorProducer(Endpoint endpoint, Supplier<String>
headerSupplier,
Supplier<String> defaultHeaderValueSupplier)
{
this(endpoint, headerSupplier, defaultHeaderValueSupplier, null);
}
- public HeaderSelectorProducer(Endpoint endpoint, Supplier<String>
headerSupplier,
- Supplier<String> defaultHeaderValueSupplier,
boolean caseSensitive) {
- this(endpoint, headerSupplier, defaultHeaderValueSupplier, null,
caseSensitive);
- }
-
public HeaderSelectorProducer(Endpoint endpoint, String header, String
defaultHeaderValue, Object target) {
this(endpoint, () -> header, () -> defaultHeaderValue, target);
}
- public HeaderSelectorProducer(Endpoint endpoint, String header, String
defaultHeaderValue, Object target,
- boolean caseSensitive) {
- this(endpoint, () -> header, () -> defaultHeaderValue, target,
caseSensitive);
- }
-
public HeaderSelectorProducer(Endpoint endpoint, Supplier<String>
headerSupplier,
Supplier<String> defaultHeaderValueSupplier,
Object target) {
- this(endpoint, headerSupplier, defaultHeaderValueSupplier, target,
true);
- }
-
- public HeaderSelectorProducer(Endpoint endpoint, Supplier<String>
headerSupplier,
- Supplier<String> defaultHeaderValueSupplier,
Object target, boolean caseSensitive) {
super(endpoint);
this.headerSupplier = ObjectHelper.notNull(headerSupplier,
"headerSupplier");
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenPairExpressionIterator.java
b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenPairExpressionIterator.java
index 510d3c4178c..ea81975a0d8 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenPairExpressionIterator.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenPairExpressionIterator.java
@@ -183,7 +183,7 @@ public class TokenPairExpressionIterator extends
ExpressionAdapter {
// this iterator will do look ahead as we may have data
// after the last end token, which the scanner would find
// so we need to be one step ahead of the scanner
- this.image = scanner.hasNext() ? next(true) : null;
+ this.image = scanner.hasNext() ? next() : null;
}
@Override
@@ -193,14 +193,10 @@ public class TokenPairExpressionIterator extends
ExpressionAdapter {
@Override
public Object next() {
- return next(false);
- }
-
- Object next(boolean first) {
Object answer = image;
// calculate next
if (scanner.hasNext()) {
- image = getNext(first);
+ image = getNext();
} else {
image = null;
}
@@ -212,7 +208,7 @@ public class TokenPairExpressionIterator extends
ExpressionAdapter {
return answer;
}
- Object getNext(boolean first) {
+ Object getNext() {
String next = scanner.next();
// only grab text after the start token
