This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new deee532 CAMEL-14354: camel-core optimize
deee532 is described below
commit deee5322a28112413fcb3113271ab40114d6535c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jan 31 06:46:51 2020 +0100
CAMEL-14354: camel-core optimize
---
core/camel-api/src/main/java/org/apache/camel/CamelContext.java | 6 ------
.../src/main/java/org/apache/camel/ExtendedCamelContext.java | 6 ++++++
.../java/org/apache/camel/impl/engine/DefaultProducerCache.java | 5 +++--
.../main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 5 +++--
.../src/main/java/org/apache/camel/processor/SendProcessor.java | 5 +++--
.../apache/camel/processor/errorhandler/RedeliveryErrorHandler.java | 4 ++--
6 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index 230dc2c..eb9dd95 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -215,12 +215,6 @@ public interface CamelContext extends StatefulService,
RuntimeConfiguration {
*/
Date getStartDate();
- /**
- * Whether event notification is applicable (possible).
- * This API is used internally in Camel as optimization.
- */
- boolean isEventNotificationApplicable();
-
// Service Methods
//-----------------------------------------------------------------------
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 6428d17..b5711c9 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -382,6 +382,12 @@ public interface ExtendedCamelContext extends CamelContext
{
void setReactiveExecutor(ReactiveExecutor reactiveExecutor);
/**
+ * Whether event notification is applicable (possible).
+ * This API is used internally in Camel as optimization.
+ */
+ boolean isEventNotificationApplicable();
+
+ /**
* Used as internal optimization in Camel to flag whether event
notification is applicable or not.
*/
void setEventNotificationApplicable(boolean eventNotificationApplicable);
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
index d0c1798..e381e10 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
@@ -26,6 +26,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -50,7 +51,7 @@ public class DefaultProducerCache extends ServiceSupport
implements ProducerCach
private static final Logger LOG =
LoggerFactory.getLogger(DefaultProducerCache.class);
private static final long ACQUIRE_WAIT_TIME = 30000;
- private final CamelContext camelContext;
+ private final ExtendedCamelContext camelContext;
private final ProducerServicePool producers;
private final Object source;
private final SharedCamelInternalProcessor internalProcessor;
@@ -62,7 +63,7 @@ public class DefaultProducerCache extends ServiceSupport
implements ProducerCach
public DefaultProducerCache(Object source, CamelContext camelContext, int
cacheSize) {
this.source = source;
- this.camelContext = camelContext;
+ this.camelContext = (ExtendedCamelContext) camelContext;
this.maxCacheSize = cacheSize <= 0 ?
CamelContextHelper.getMaximumCachePoolSize(camelContext) : cacheSize;
this.producers = createServicePool(camelContext, maxCacheSize);
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index 792a80e..5564ec0 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -26,6 +26,7 @@ import java.util.function.Predicate;
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.ExtendedExchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -57,7 +58,7 @@ public class DefaultUnitOfWork implements UnitOfWork, Service
{
// requires API changes and thus is best kept for future Camel work
private final Exchange exchange;
- private final CamelContext context;
+ private final ExtendedCamelContext context;
final InflightRepository inflightRepository;
final boolean allowUseOriginalMessage;
final boolean useBreadcrumb;
@@ -83,7 +84,7 @@ public class DefaultUnitOfWork implements UnitOfWork, Service
{
this.log = LOG;
this.allowUseOriginalMessage = allowUseOriginalMessage;
this.useBreadcrumb = useBreadcrumb;
- this.context = exchange.getContext();
+ this.context = (ExtendedCamelContext) exchange.getContext();
this.inflightRepository = inflightRepository;
if (allowUseOriginalMessage) {
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
index ab7e5bb..9c5d26e 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -25,6 +25,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.EndpointAware;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.Traceable;
import org.apache.camel.impl.engine.DefaultProducerCache;
@@ -51,7 +52,7 @@ public class SendProcessor extends AsyncProcessorSupport
implements Traceable, E
private static final Logger LOG =
LoggerFactory.getLogger(SendProcessor.class);
protected transient String traceLabelToString;
- protected final CamelContext camelContext;
+ protected final ExtendedCamelContext camelContext;
protected final ExchangePattern pattern;
protected ProducerCache producerCache;
protected AsyncProducer producer;
@@ -68,7 +69,7 @@ public class SendProcessor extends AsyncProcessorSupport
implements Traceable, E
public SendProcessor(Endpoint destination, ExchangePattern pattern) {
ObjectHelper.notNull(destination, "destination");
this.destination = destination;
- this.camelContext = destination.getCamelContext();
+ this.camelContext = (ExtendedCamelContext)
destination.getCamelContext();
this.pattern = pattern;
try {
this.destinationExchangePattern = null;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index 340222b..fdcbf29 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -72,7 +72,7 @@ public abstract class RedeliveryErrorHandler extends
ErrorHandlerSupport impleme
protected final AtomicInteger redeliverySleepCounter = new AtomicInteger();
protected ScheduledExecutorService executorService;
- protected final CamelContext camelContext;
+ protected final ExtendedCamelContext camelContext;
protected final ReactiveExecutor reactiveExecutor;
protected final AsyncProcessorAwaitManager awaitManager;
protected final ShutdownStrategy shutdownStrategy;
@@ -102,7 +102,7 @@ public abstract class RedeliveryErrorHandler extends
ErrorHandlerSupport impleme
ObjectHelper.notNull(camelContext, "CamelContext", this);
ObjectHelper.notNull(redeliveryPolicy, "RedeliveryPolicy", this);
- this.camelContext = camelContext;
+ this.camelContext = (ExtendedCamelContext) camelContext;
this.reactiveExecutor =
camelContext.adapt(ExtendedCamelContext.class).getReactiveExecutor();
this.awaitManager =
camelContext.adapt(ExtendedCamelContext.class).getAsyncProcessorAwaitManager();
this.shutdownStrategy = camelContext.getShutdownStrategy();
