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 2023/04/03 16:15:18 UTC
[camel] 01/02: CAMEL-15105: make the DeferServiceFactory a plugin of the context
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 99408682b3b9c2f06176f62a0dbb3bbd123671d0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 3 16:08:38 2023 +0200
CAMEL-15105: make the DeferServiceFactory a plugin of the context
---
.../org/apache/camel/component/bean/ProxyHelper.java | 3 ++-
.../java/org/apache/camel/ExtendedCamelContext.java | 11 -----------
.../apache/camel/impl/engine/AbstractCamelContext.java | 2 +-
.../camel/impl/engine/CamelPostProcessorHelper.java | 3 +--
.../camel/impl/engine/DefaultCamelContextExtension.java | 17 -----------------
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ------
.../camel/impl/lw/LightweightCamelContextExtension.java | 11 -----------
.../java/org/apache/camel/support/PluginHelper.java | 15 +++++++++++++++
8 files changed, 19 insertions(+), 49 deletions(-)
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/ProxyHelper.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
index c837dc58de0..4b1fc5fd61c 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
@@ -20,6 +20,7 @@ import java.lang.reflect.Proxy;
import org.apache.camel.Endpoint;
import org.apache.camel.Producer;
+import org.apache.camel.support.PluginHelper;
/**
* A helper class for creating proxies which delegate to Camel
@@ -58,7 +59,7 @@ public final class ProxyHelper {
public static <T> T createProxy(
Endpoint endpoint, boolean binding, ClassLoader cl, Class<T>[] interfaceClasses, MethodInfoCache methodCache)
throws Exception {
- Producer producer = endpoint.getCamelContext().getCamelContextExtension().getDeferServiceFactory()
+ Producer producer = PluginHelper.getDeferServiceFactory(endpoint.getCamelContext())
.createProducer(endpoint);
return createProxyObject(endpoint, binding, producer, cl, interfaceClasses, methodCache);
}
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 186e9ace06e..a3940f1f9b6 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
@@ -24,7 +24,6 @@ import java.util.function.Supplier;
import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
import org.apache.camel.spi.BootstrapCloseable;
-import org.apache.camel.spi.DeferServiceFactory;
import org.apache.camel.spi.EndpointStrategy;
import org.apache.camel.spi.EndpointUriFactory;
import org.apache.camel.spi.ExchangeFactory;
@@ -304,16 +303,6 @@ public interface ExtendedCamelContext {
*/
FactoryFinder getFactoryFinder(String path);
- /**
- * Gets the {@link DeferServiceFactory} to use.
- */
- DeferServiceFactory getDeferServiceFactory();
-
- /**
- * Sets a custom {@link DeferServiceFactory} to use.
- */
- void setDeferServiceFactory(DeferServiceFactory deferServiceFactory);
-
/**
* Gets the {@link AnnotationBasedProcessorFactory} to use.
*/
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index a6478540412..abce5f670db 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -204,7 +204,6 @@ public abstract class AbstractCamelContext extends BaseService
final Object lock = new Object();
final RouteController internalRouteController = new InternalRouteController(this);
- volatile DeferServiceFactory deferServiceFactory;
volatile AnnotationBasedProcessorFactory annotationBasedProcessorFactory;
volatile ReactiveExecutor reactiveExecutor;
volatile Registry registry;
@@ -379,6 +378,7 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.lazyAddContextPlugin(ResourceLoader.class, this::createResourceLoader);
camelContextExtension.lazyAddContextPlugin(BeanProcessorFactory.class, this::createBeanProcessorFactory);
camelContextExtension.lazyAddContextPlugin(ModelToXMLDumper.class, this::createModelToXMLDumper);
+ camelContextExtension.lazyAddContextPlugin(DeferServiceFactory.class, this::createDeferServiceFactory);
if (build) {
try {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
index 9a80eac577d..de7fc2125a8 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
@@ -590,8 +590,7 @@ public class CamelPostProcessorHelper implements CamelContextAware {
*/
protected Producer createInjectionProducer(Endpoint endpoint, Object bean, String beanName) {
try {
- return endpoint.getCamelContext().getCamelContextExtension().getDeferServiceFactory()
- .createProducer(endpoint);
+ return PluginHelper.getDeferServiceFactory(endpoint.getCamelContext()).createProducer(endpoint);
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index c9e023ef6ac..013254cf89f 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -39,7 +39,6 @@ import org.apache.camel.spi.AnnotationBasedProcessorFactory;
import org.apache.camel.spi.BootstrapCloseable;
import org.apache.camel.spi.Debugger;
import org.apache.camel.spi.DebuggerFactory;
-import org.apache.camel.spi.DeferServiceFactory;
import org.apache.camel.spi.EndpointStrategy;
import org.apache.camel.spi.EndpointUriFactory;
import org.apache.camel.spi.EventNotifier;
@@ -488,22 +487,6 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
camelContext.reactiveExecutor = camelContext.getInternalServiceManager().addService(reactiveExecutor, false);
}
- @Override
- public DeferServiceFactory getDeferServiceFactory() {
- if (camelContext.deferServiceFactory == null) {
- synchronized (camelContext.lock) {
- if (camelContext.deferServiceFactory == null) {
- setDeferServiceFactory(camelContext.createDeferServiceFactory());
- }
- }
- }
- return camelContext.deferServiceFactory;
- }
-
- public void setDeferServiceFactory(DeferServiceFactory deferServiceFactory) {
- camelContext.deferServiceFactory = deferServiceFactory;
- }
-
@Override
public AnnotationBasedProcessorFactory getAnnotationBasedProcessorFactory() {
if (camelContext.annotationBasedProcessorFactory == null) {
diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
index 0bba3fec553..0f1916a275a 100644
--- a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
+++ b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
@@ -27,8 +27,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "BasePackageScan": target.setBasePackageScan(property(camelContext, java.lang.String.class, value)); return true;
case "bootstrapfactoryfinder":
case "BootstrapFactoryFinder": target.setBootstrapFactoryFinder(property(camelContext, org.apache.camel.spi.FactoryFinder.class, value)); return true;
- case "deferservicefactory":
- case "DeferServiceFactory": target.setDeferServiceFactory(property(camelContext, org.apache.camel.spi.DeferServiceFactory.class, value)); return true;
case "description":
case "Description": target.setDescription(property(camelContext, java.lang.String.class, value)); return true;
case "errorhandlerfactory":
@@ -66,8 +64,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "BasePackageScan": return java.lang.String.class;
case "bootstrapfactoryfinder":
case "BootstrapFactoryFinder": return org.apache.camel.spi.FactoryFinder.class;
- case "deferservicefactory":
- case "DeferServiceFactory": return org.apache.camel.spi.DeferServiceFactory.class;
case "description":
case "Description": return java.lang.String.class;
case "errorhandlerfactory":
@@ -106,8 +102,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "BasePackageScan": return target.getBasePackageScan();
case "bootstrapfactoryfinder":
case "BootstrapFactoryFinder": return target.getBootstrapFactoryFinder();
- case "deferservicefactory":
- case "DeferServiceFactory": return target.getDeferServiceFactory();
case "description":
case "Description": return target.getDescription();
case "errorhandlerfactory":
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java
index 7d64d2a522f..d802ce22560 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java
@@ -38,7 +38,6 @@ import org.apache.camel.Service;
import org.apache.camel.ServiceStatus;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
import org.apache.camel.spi.BootstrapCloseable;
-import org.apache.camel.spi.DeferServiceFactory;
import org.apache.camel.spi.EndpointStrategy;
import org.apache.camel.spi.EndpointUriFactory;
import org.apache.camel.spi.ExchangeFactory;
@@ -229,16 +228,6 @@ class LightweightCamelContextExtension implements ExtendedCamelContext {
throw new UnsupportedOperationException();
}
- @Override
- public DeferServiceFactory getDeferServiceFactory() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void setDeferServiceFactory(DeferServiceFactory deferServiceFactory) {
- throw new UnsupportedOperationException();
- }
-
@Override
public AnnotationBasedProcessorFactory getAnnotationBasedProcessorFactory() {
throw new UnsupportedOperationException();
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/PluginHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/PluginHelper.java
index bf525e42307..e9083557545 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/PluginHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/PluginHelper.java
@@ -34,6 +34,7 @@ import org.apache.camel.spi.ComponentNameResolver;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.ConfigurerResolver;
import org.apache.camel.spi.DataFormatResolver;
+import org.apache.camel.spi.DeferServiceFactory;
import org.apache.camel.spi.FactoryFinderResolver;
import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InternalProcessorFactory;
@@ -576,4 +577,18 @@ public final class PluginHelper {
public static ModelToXMLDumper getModelToXMLDumper(ExtendedCamelContext extendedCamelContext) {
return extendedCamelContext.getContextPlugin(ModelToXMLDumper.class);
}
+
+ /**
+ * Gets the {@link DeferServiceFactory} to use.
+ */
+ public static DeferServiceFactory getDeferServiceFactory(CamelContext camelContext) {
+ return getDeferServiceFactory(camelContext.getCamelContextExtension());
+ }
+
+ /**
+ * Gets the {@link DeferServiceFactory} to use.
+ */
+ public static DeferServiceFactory getDeferServiceFactory(ExtendedCamelContext extendedCamelContext) {
+ return extendedCamelContext.getContextPlugin(DeferServiceFactory.class);
+ }
}