This is an automated email from the ASF dual-hosted git repository.
acosentino 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 ce55044c520 Regen for commit a91ba7e68ed3d11638b45e3570a7adc899dd55c3
ce55044c520 is described below
commit ce55044c52043088f9272911eda04bd479eb31f9
Author: orpiske <orpi...@users.noreply.github.com>
AuthorDate: Tue Feb 14 13:34:30 2023 +0000
Regen for commit a91ba7e68ed3d11638b45e3570a7adc899dd55c3
Signed-off-by: GitHub <nore...@github.com>
---
.../main/java/org/apache/camel/component/xslt/XsltBuilder.java | 1 -
.../src/main/java/org/apache/camel/ExchangeExtension.java | 10 +++++-----
.../java/org/apache/camel/processor/MulticastProcessor.java | 3 ++-
.../main/java/org/apache/camel/processor/PipelineHelper.java | 6 ++++--
.../aggregate/ShareUnitOfWorkAggregationStrategy.java | 3 ++-
.../processor/aggregate/UseLatestAggregationStrategy.java | 3 ++-
.../main/java/org/apache/camel/support/AbstractExchange.java | 2 --
7 files changed, 15 insertions(+), 13 deletions(-)
diff --git
a/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
index dbe4c8f669f..234951ba71e 100644
---
a/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
+++
b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
@@ -50,7 +50,6 @@ import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import static org.apache.camel.util.ObjectHelper.notNull;
/**
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
b/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
index 999ad17979d..9443b435b37 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
@@ -32,8 +32,8 @@ public interface ExchangeExtension {
/**
* If there is an existing inbound message of the given type then return
it as-is, otherwise return null.
*
- * @param type the given type
- * @return the message if exists with the given type, otherwise null.
+ * @param type the given type
+ * @return the message if exists with the given type, otherwise null.
*/
<T> T getInOrNull(Class<T> type);
@@ -125,9 +125,9 @@ public interface ExchangeExtension {
/**
* Checks if the passed {@link Synchronization} instance is already
contained on this exchange.
*
- * @param onCompletion the callback instance that is being checked for
- * @return <tt>true</tt>, if callback instance is already contained on
this exchange, else
- * <tt>false</tt>
+ * @param onCompletion the callback instance that is being checked for
+ * @return <tt>true</tt>, if callback instance is already
contained on this exchange, else
+ * <tt>false</tt>
*/
boolean containsOnCompletion(Synchronization onCompletion);
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 8816113e1ab..776dff7312d 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -785,7 +785,8 @@ public class MulticastProcessor extends
AsyncProcessorSupport
// also we would need to know if any error handler has attempted
redelivery and exhausted
boolean stoppedOnException = false;
boolean exception = false;
- boolean exhaust = forceExhaust || subExchange != null &&
(subExchange.getException() != null ||
subExchange.getExchangeExtension().isRedeliveryExhausted());
+ boolean exhaust = forceExhaust || subExchange != null
+ && (subExchange.getException() != null ||
subExchange.getExchangeExtension().isRedeliveryExhausted());
if (original.getException() != null || subExchange != null &&
subExchange.getException() != null) {
// there was an exception and we stopped
stoppedOnException = isStopOnException();
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PipelineHelper.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PipelineHelper.java
index 89e15098dca..dd42eb27656 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/PipelineHelper.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/PipelineHelper.java
@@ -39,7 +39,8 @@ public final class PipelineHelper {
*/
public static boolean continueProcessing(Exchange exchange, String
message, Logger log) {
boolean stop = exchange.isFailed() || exchange.isRollbackOnly() ||
exchange.isRollbackOnlyLast()
- || exchange.getExchangeExtension().isErrorHandlerHandledSet()
&& exchange.getExchangeExtension().isErrorHandlerHandled();
+ || exchange.getExchangeExtension().isErrorHandlerHandledSet()
+ &&
exchange.getExchangeExtension().isErrorHandlerHandled();
if (stop) {
// The errorErrorHandler is only set if satisfactory handling was
done
// by the error handler. It's still an exception, the exchange
still failed.
@@ -52,7 +53,8 @@ public final class PipelineHelper {
if (exchange.getException() != null) {
sb.append(" Exception: ").append(exchange.getException());
}
- if (exchange.getExchangeExtension().isErrorHandlerHandledSet()
&& exchange.getExchangeExtension().isErrorHandlerHandled()) {
+ if (exchange.getExchangeExtension().isErrorHandlerHandledSet()
+ &&
exchange.getExchangeExtension().isErrorHandlerHandled()) {
sb.append(" Handled by the error handler.");
}
log.debug(sb.toString());
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
index 6127301e754..889184749c7 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
@@ -109,7 +109,8 @@ public final class ShareUnitOfWorkAggregationStrategy
extends ServiceSupport imp
protected void propagateFailure(Exchange answer, Exchange newExchange) {
// if new exchange failed then propagate all the error related
properties to the answer
if (newExchange.isFailed() || newExchange.isRollbackOnly() ||
newExchange.isRollbackOnlyLast()
- ||
newExchange.getExchangeExtension().isErrorHandlerHandledSet() &&
newExchange.getExchangeExtension().isErrorHandlerHandled()) {
+ ||
newExchange.getExchangeExtension().isErrorHandlerHandledSet()
+ &&
newExchange.getExchangeExtension().isErrorHandlerHandled()) {
if (newExchange.getException() != null) {
answer.setException(newExchange.getException());
}
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
index 62af6531d8e..d43a6a7fa76 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
@@ -72,7 +72,8 @@ public class UseLatestAggregationStrategy implements
AggregationStrategy {
// propagate exception from old exchange if there isn't already an
exception
if (oldExchange.isFailed() || oldExchange.isRollbackOnly() ||
oldExchange.isRollbackOnlyLast()
- ||
oldExchange.getExchangeExtension().isErrorHandlerHandledSet() &&
oldExchange.getExchangeExtension().isErrorHandlerHandled()) {
+ ||
oldExchange.getExchangeExtension().isErrorHandlerHandledSet()
+ &&
oldExchange.getExchangeExtension().isErrorHandlerHandled()) {
// propagate failure by using old exchange as the answer
return oldExchange;
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 89883da2690..6c735bfcea2 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -90,7 +90,6 @@ class AbstractExchange implements Exchange {
Map<String, SafeCopyProperty> safeCopyProperties;
private final ExtendedExchangeExtension privateExtension;
-
public AbstractExchange(CamelContext context) {
this(context, ExchangePattern.InOnly);
}
@@ -861,7 +860,6 @@ class AbstractExchange implements Exchange {
return ExchangeHelper.convertToType(this, type, value);
}
-
public ExtendedExchangeExtension getExchangeExtension() {
return privateExtension;
}
