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 2020/01/02 10:21:42 UTC
[camel] branch master updated: CAMEL-14347: camel-core - Remove
default producer/consumer service pool from CamelContext
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 2f11f02 CAMEL-14347: camel-core - Remove default producer/consumer service pool from CamelContext
2f11f02 is described below
commit 2f11f02447097666600a82524d729ae7415570ba
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 2 11:21:14 2020 +0100
CAMEL-14347: camel-core - Remove default producer/consumer service pool from CamelContext
---
.../camel/impl/engine/AbstractCamelContext.java | 41 ++--------------------
.../org/apache/camel/impl/DefaultCamelContext.java | 14 --------
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 9 +++++
3 files changed, 12 insertions(+), 52 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 2237ffe..a732d95 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -239,8 +239,6 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
private volatile ClassResolver classResolver;
private volatile PackageScanClassResolver packageScanClassResolver;
private volatile PackageScanResourceResolver packageScanResourceResolver;
- private volatile ProducerServicePool producerServicePool;
- private volatile PollingConsumerServicePool pollingConsumerServicePool;
private volatile NodeIdFactory nodeIdFactory;
private volatile ProcessorFactory processorFactory;
private volatile MessageHistoryFactory messageHistoryFactory;
@@ -2092,36 +2090,6 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
this.errorHandlerExecutorService = errorHandlerExecutorService;
}
- public void setProducerServicePool(ProducerServicePool producerServicePool) {
- this.producerServicePool = doAddService(producerServicePool);
- }
-
- public ProducerServicePool getProducerServicePool() {
- if (producerServicePool == null) {
- synchronized (lock) {
- if (producerServicePool == null) {
- setProducerServicePool(createProducerServicePool());
- }
- }
- }
- return producerServicePool;
- }
-
- public PollingConsumerServicePool getPollingConsumerServicePool() {
- if (pollingConsumerServicePool == null) {
- synchronized (lock) {
- if (pollingConsumerServicePool == null) {
- setPollingConsumerServicePool(createPollingConsumerServicePool());
- }
- }
- }
- return pollingConsumerServicePool;
- }
-
- public void setPollingConsumerServicePool(PollingConsumerServicePool pollingConsumerServicePool) {
- this.pollingConsumerServicePool = doAddService(pollingConsumerServicePool);
- }
-
@Override
public UnitOfWorkFactory getUnitOfWorkFactory() {
if (unitOfWorkFactory == null) {
@@ -3315,8 +3283,6 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
getAsyncProcessorAwaitManager();
getShutdownStrategy();
getPackageScanClassResolver();
- getProducerServicePool();
- getPollingConsumerServicePool();
getRestRegistryFactory();
getReactiveExecutor();
getBeanIntrospection();
@@ -3357,8 +3323,11 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
protected void forceStopLazyInitialization() {
injector = null;
languageResolver = null;
+ dataFormatResolver = null;
+ componentResolver = null;
typeConverterRegistry = null;
typeConverter = null;
+ reactiveExecutor = null;
}
/**
@@ -4209,10 +4178,6 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
protected abstract ExecutorServiceManager createExecutorServiceManager();
- protected abstract ProducerServicePool createProducerServicePool();
-
- protected abstract PollingConsumerServicePool createPollingConsumerServicePool();
-
protected abstract UnitOfWorkFactory createUnitOfWorkFactory();
protected abstract CamelContextNameStrategy createCamelContextNameStrategy();
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index c69fff2..a4c8817 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -21,9 +21,7 @@ import java.util.Map;
import javax.naming.Context;
import org.apache.camel.CamelContext;
-import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
-import org.apache.camel.Producer;
import org.apache.camel.TypeConverter;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.converter.DefaultTypeConverter;
@@ -55,8 +53,6 @@ import org.apache.camel.impl.engine.DefaultUnitOfWorkFactory;
import org.apache.camel.impl.engine.DefaultUuidGenerator;
import org.apache.camel.impl.engine.EndpointKey;
import org.apache.camel.impl.engine.HeadersMapFactoryResolver;
-import org.apache.camel.impl.engine.PollingConsumerServicePool;
-import org.apache.camel.impl.engine.ProducerServicePool;
import org.apache.camel.impl.engine.PropertiesComponentFactoryResolver;
import org.apache.camel.impl.engine.ReactiveExecutorResolver;
import org.apache.camel.impl.engine.RestRegistryFactoryResolver;
@@ -293,16 +289,6 @@ public class DefaultCamelContext extends AbstractModelCamelContext {
}
@Override
- protected ProducerServicePool createProducerServicePool() {
- return new ProducerServicePool(Endpoint::createAsyncProducer, Producer::getEndpoint, 100);
- }
-
- @Override
- protected PollingConsumerServicePool createPollingConsumerServicePool() {
- return new PollingConsumerServicePool(Endpoint::createPollingConsumer, Consumer::getEndpoint, 100);
- }
-
- @Override
protected UnitOfWorkFactory createUnitOfWorkFactory() {
return new DefaultUnitOfWorkFactory();
}
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index be9d6c9..953970c 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -62,3 +62,12 @@ The Java DSL has been revisited and the following methods have been removed:
* WireTapDefinition::onPrepare(Supplier<Processor>)
This change is motivated by the need to remove method ambiguity for untyped languages such as Groovy and JavaScript, for more info see https://issues.apache.org/jira/browse/CAMEL-14300
+
+=== CamelContext
+
+Some unused methods has been removed from `CamelContext` which was not part of the public API. The following methods has been removed:
+
+* getProducerServicePool
+* setProducerServicePool
+* getPollingConsumerServicePool
+* setPollingConsumerServicePool