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/02 06:26:28 UTC
[camel] branch main updated (3da855d419c -> 0d22038e18e)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 3da855d419c fixed results of inspection "HashSet can be replaced with EnumSet" (#9751)
new 59c57596808 CAMEL-15105: make the DevConsoleResolver a plugin of the context
new 878825560b0 CAMEL-15105: make the ProcessorFactory a plugin of the context
new 525b70ef436 CAMEL-15105: make the InternalProcessorFactory a plugin of the context
new 0d22038e18e CAMEL-15105: make the InterceptEndpointFactory a plugin of the context
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/knative/KnativeEndpoint.java | 7 +-
.../camel/component/knative/KnativeProducer.java | 5 +-
.../apache/camel/component/seda/SedaEndpoint.java | 5 +-
.../org/apache/camel/ExtendedCamelContext.java | 60 -----------------
.../camel/impl/engine/AbstractCamelContext.java | 8 +--
.../impl/engine/DefaultCamelContextExtension.java | 70 --------------------
.../apache/camel/impl/engine/DefaultChannel.java | 3 +-
.../engine/DefaultServiceBootstrapCloseable.java | 3 +-
.../impl/engine/SubscribeMethodProcessor.java | 3 +-
.../impl/cloud/DefaultServiceCallProcessor.java | 3 +-
.../impl/console/DefaultDevConsoleRegistry.java | 3 +-
.../impl/console/DefaultDevConsolesLoader.java | 2 +-
.../camel/impl/console/ContextDevConsoleTest.java | 5 +-
.../camel/impl/ExtendedCamelContextConfigurer.java | 24 -------
.../impl/lw/LightweightCamelContextExtension.java | 44 -------------
.../processor/InterceptSendToEndpointCallback.java | 3 +-
.../apache/camel/processor/MulticastProcessor.java | 3 +-
.../apache/camel/processor/UnitOfWorkProducer.java | 3 +-
.../org/apache/camel/reifier/AggregateReifier.java | 3 +-
.../reifier/InterceptSendToEndpointReifier.java | 3 +-
.../apache/camel/reifier/OnCompletionReifier.java | 3 +-
.../org/apache/camel/reifier/ProcessorReifier.java | 19 ++++--
.../apache/camel/reifier/ResequenceReifier.java | 5 +-
.../org/apache/camel/reifier/RouteReifier.java | 3 +-
.../org/apache/camel/reifier/WireTapReifier.java | 3 +-
.../reifier/errorhandler/ErrorHandlerReifier.java | 3 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 2 +-
.../processor/CustomProcessorFactoryTest.java | 2 +-
.../camel/main/DefaultConfigurationConfigurer.java | 2 +-
.../support/DefaultInterceptSendToEndpoint.java | 2 +-
.../org/apache/camel/support/PluginHelper.java | 76 ++++++++++++++++++++++
.../camel/support/cache/DefaultProducerCache.java | 5 +-
.../camel/cli/connector/LocalCliConnector.java | 22 +++----
33 files changed, 151 insertions(+), 256 deletions(-)
[camel] 01/04: CAMEL-15105: make the DevConsoleResolver a plugin of the context
Posted by or...@apache.org.
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 59c57596808c8d822a993d027aed2b6c378693e5
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sat Apr 1 13:04:27 2023 +0200
CAMEL-15105: make the DevConsoleResolver a plugin of the context
---
.../org/apache/camel/ExtendedCamelContext.java | 15 ---------------
.../camel/impl/engine/AbstractCamelContext.java | 2 +-
.../impl/engine/DefaultCamelContextExtension.java | 15 ---------------
.../impl/console/DefaultDevConsoleRegistry.java | 3 ++-
.../impl/console/DefaultDevConsolesLoader.java | 2 +-
.../camel/impl/console/ContextDevConsoleTest.java | 5 +++--
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ------
.../impl/lw/LightweightCamelContextExtension.java | 10 ----------
.../org/apache/camel/support/PluginHelper.java | 19 +++++++++++++++++++
.../camel/cli/connector/LocalCliConnector.java | 22 ++++++++--------------
10 files changed, 34 insertions(+), 65 deletions(-)
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 e1f660b45f6..d365aceda38 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
@@ -22,7 +22,6 @@ import java.util.Set;
import java.util.function.Supplier;
import org.apache.camel.catalog.RuntimeCamelCatalog;
-import org.apache.camel.console.DevConsoleResolver;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.BeanIntrospection;
@@ -275,20 +274,6 @@ public interface ExtendedCamelContext {
*/
void setErrorHandlerFactory(ErrorHandlerFactory errorHandlerFactory);
- /**
- * Gets the current dev console resolver
- *
- * @return the resolver
- */
- DevConsoleResolver getDevConsoleResolver();
-
- /**
- * Sets a custom dev console resolver
- *
- * @param devConsoleResolver the resolver
- */
- void setDevConsoleResolver(DevConsoleResolver devConsoleResolver);
-
/**
* Gets the default FactoryFinder which will be used for the loading the factory class from META-INF
*
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 e757fe2ce8b..36c172cfab7 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
@@ -211,7 +211,6 @@ public abstract class AbstractCamelContext extends BaseService
volatile ProcessorExchangeFactory processorExchangeFactory;
volatile ReactiveExecutor reactiveExecutor;
volatile Registry registry;
- volatile DevConsoleResolver devConsoleResolver;
volatile ManagementStrategy managementStrategy;
volatile ManagementMBeanAssembler managementMBeanAssembler;
volatile HeadersMapFactory headersMapFactory;
@@ -380,6 +379,7 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.lazyAddContextPlugin(PeriodTaskResolver.class, this::createPeriodTaskResolver);
camelContextExtension.lazyAddContextPlugin(PeriodTaskScheduler.class, this::createPeriodTaskScheduler);
camelContextExtension.lazyAddContextPlugin(HealthCheckResolver.class, this::createHealthCheckResolver);
+ camelContextExtension.lazyAddContextPlugin(DevConsoleResolver.class, this::createDevConsoleResolver);
if (build) {
try {
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 620cc38228c..8423dba0a54 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
@@ -458,21 +458,6 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
this.basePackageScan = basePackageScan;
}
- public DevConsoleResolver getDevConsoleResolver() {
- if (camelContext.devConsoleResolver == null) {
- synchronized (camelContext.lock) {
- if (camelContext.devConsoleResolver == null) {
- setDevConsoleResolver(camelContext.createDevConsoleResolver());
- }
- }
- }
- return camelContext.devConsoleResolver;
- }
-
- public void setDevConsoleResolver(DevConsoleResolver devConsoleResolver) {
- camelContext.devConsoleResolver = camelContext.getInternalServiceManager().addService(devConsoleResolver);
- }
-
@Override
public boolean isLightweight() {
return lightweight;
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsoleRegistry.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsoleRegistry.java
index b352c16269c..ad59c206b3f 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsoleRegistry.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsoleRegistry.java
@@ -28,6 +28,7 @@ import org.apache.camel.DeferredContextBinding;
import org.apache.camel.console.DevConsole;
import org.apache.camel.console.DevConsoleRegistry;
import org.apache.camel.console.DevConsoleResolver;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.StopWatch;
@@ -117,7 +118,7 @@ public class DefaultDevConsoleRegistry extends ServiceSupport implements DevCons
DevConsole answer = consoles.stream().filter(h -> h.getId().equals(id)).findFirst()
.orElse(camelContext.getRegistry().findByTypeWithName(DevConsole.class).get(id));
if (answer == null) {
- DevConsoleResolver resolver = camelContext.getCamelContextExtension().getDevConsoleResolver();
+ DevConsoleResolver resolver = PluginHelper.getDevConsoleResolver(camelContext);
answer = resolver.resolveDevConsole(id);
if (answer != null) {
register(answer);
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsolesLoader.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsolesLoader.java
index 6f60960ddbc..7c640a59894 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsolesLoader.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsolesLoader.java
@@ -44,7 +44,7 @@ public class DefaultDevConsolesLoader {
public DefaultDevConsolesLoader(CamelContext camelContext) {
this.camelContext = camelContext;
this.resolver = PluginHelper.getPackageScanResourceResolver(camelContext);
- this.devConsoleResolver = camelContext.getCamelContextExtension().getDevConsoleResolver();
+ this.devConsoleResolver = PluginHelper.getDevConsoleResolver(camelContext);
}
public Collection<DevConsole> loadDevConsoles() {
diff --git a/core/camel-console/src/test/java/org/apache/camel/impl/console/ContextDevConsoleTest.java b/core/camel-console/src/test/java/org/apache/camel/impl/console/ContextDevConsoleTest.java
index cc8c9379440..79004b13da0 100644
--- a/core/camel-console/src/test/java/org/apache/camel/impl/console/ContextDevConsoleTest.java
+++ b/core/camel-console/src/test/java/org/apache/camel/impl/console/ContextDevConsoleTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.impl.console;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.console.DevConsole;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.json.JsonObject;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -26,7 +27,7 @@ public class ContextDevConsoleTest extends ContextTestSupport {
@Test
public void testContextTest() throws Exception {
- DevConsole con = context.getCamelContextExtension().getDevConsoleResolver().resolveDevConsole("context");
+ DevConsole con = PluginHelper.getDevConsoleResolver(context).resolveDevConsole("context");
Assertions.assertNotNull(con);
Assertions.assertEquals("camel", con.getGroup());
Assertions.assertEquals("context", con.getId());
@@ -39,7 +40,7 @@ public class ContextDevConsoleTest extends ContextTestSupport {
@Test
public void testContextJson() throws Exception {
- DevConsole con = context.getCamelContextExtension().getDevConsoleResolver().resolveDevConsole("context");
+ DevConsole con = PluginHelper.getDevConsoleResolver(context).resolveDevConsole("context");
Assertions.assertNotNull(con);
Assertions.assertEquals("camel", con.getGroup());
Assertions.assertEquals("context", con.getId());
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 982cebd9d75..7c3ea5cc9c2 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
@@ -35,8 +35,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
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 "devconsoleresolver":
- case "DevConsoleResolver": target.setDevConsoleResolver(property(camelContext, org.apache.camel.console.DevConsoleResolver.class, value)); return true;
case "errorhandlerfactory":
case "ErrorHandlerFactory": target.setErrorHandlerFactory(property(camelContext, org.apache.camel.ErrorHandlerFactory.class, value)); return true;
case "eventnotificationapplicable":
@@ -100,8 +98,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "DeferServiceFactory": return org.apache.camel.spi.DeferServiceFactory.class;
case "description":
case "Description": return java.lang.String.class;
- case "devconsoleresolver":
- case "DevConsoleResolver": return org.apache.camel.console.DevConsoleResolver.class;
case "errorhandlerfactory":
case "ErrorHandlerFactory": return org.apache.camel.ErrorHandlerFactory.class;
case "eventnotificationapplicable":
@@ -166,8 +162,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "DeferServiceFactory": return target.getDeferServiceFactory();
case "description":
case "Description": return target.getDescription();
- case "devconsoleresolver":
- case "DevConsoleResolver": return target.getDevConsoleResolver();
case "errorhandlerfactory":
case "ErrorHandlerFactory": return target.getErrorHandlerFactory();
case "eventnotificationapplicable":
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 35da047b4ee..f38d25c1c73 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
@@ -104,16 +104,6 @@ class LightweightCamelContextExtension implements ExtendedCamelContext {
throw new UnsupportedOperationException();
}
- @Override
- public DevConsoleResolver getDevConsoleResolver() {
- return camelContext.getCamelContextExtension().getDevConsoleResolver();
- }
-
- @Override
- public void setDevConsoleResolver(DevConsoleResolver devConsoleResolver) {
- throw new UnsupportedOperationException();
- }
-
@Override
public String getName() {
return camelContext.getCamelContextExtension().getName();
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 9e2c84da612..ebd084d0b00 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
@@ -21,6 +21,7 @@ import java.util.concurrent.ScheduledExecutorService;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.console.DevConsoleResolver;
import org.apache.camel.health.HealthCheckResolver;
import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.CamelDependencyInjectionAnnotationFactory;
@@ -326,4 +327,22 @@ public final class PluginHelper {
public static HealthCheckResolver getHealthCheckResolver(ExtendedCamelContext extendedCamelContext) {
return extendedCamelContext.getContextPlugin(HealthCheckResolver.class);
}
+
+ /**
+ * Gets the current dev console resolver
+ *
+ * @return the resolver
+ */
+ public static DevConsoleResolver getDevConsoleResolver(CamelContext camelContext) {
+ return getDevConsoleResolver(camelContext.getCamelContextExtension());
+ }
+
+ /**
+ * Gets the current dev console resolver
+ *
+ * @return the resolver
+ */
+ public static DevConsoleResolver getDevConsoleResolver(ExtendedCamelContext extendedCamelContext) {
+ return extendedCamelContext.getContextPlugin(DevConsoleResolver.class);
+ }
}
diff --git a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index 580d704d625..b63e17482d9 100644
--- a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++ b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -47,6 +47,7 @@ import org.apache.camel.spi.CliConnectorFactory;
import org.apache.camel.spi.ContextReloadStrategy;
import org.apache.camel.support.DefaultContextReloadStrategy;
import org.apache.camel.support.PatternHelper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.FileUtil;
@@ -539,8 +540,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
private JsonObject collectVaults() {
JsonObject root = new JsonObject();
// aws-secrets is optional
- Optional<DevConsole> dcAws = camelContext.getCamelContextExtension()
- .getDevConsoleResolver().lookupDevConsole("aws-secrets");
+ Optional<DevConsole> dcAws = PluginHelper.getDevConsoleResolver(camelContext).lookupDevConsole("aws-secrets");
if (dcAws.isPresent()) {
JsonObject json = (JsonObject) dcAws.get().call(DevConsole.MediaType.JSON);
if (json != null) {
@@ -548,8 +548,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
}
}
// gcp-secrets is optional
- Optional<DevConsole> dcGcp = camelContext.getCamelContextExtension()
- .getDevConsoleResolver().lookupDevConsole("gcp-secrets");
+ Optional<DevConsole> dcGcp = PluginHelper.getDevConsoleResolver(camelContext).lookupDevConsole("gcp-secrets");
if (dcGcp.isPresent()) {
JsonObject json = (JsonObject) dcGcp.get().call(DevConsole.MediaType.JSON);
if (json != null) {
@@ -557,8 +556,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
}
}
// azure-secrets is optional
- Optional<DevConsole> dcAzure = camelContext.getCamelContextExtension()
- .getDevConsoleResolver().lookupDevConsole("azure-secrets");
+ Optional<DevConsole> dcAzure = PluginHelper.getDevConsoleResolver(camelContext).lookupDevConsole("azure-secrets");
if (dcAzure.isPresent()) {
JsonObject json = (JsonObject) dcAzure.get().call(DevConsole.MediaType.JSON);
if (json != null) {
@@ -573,8 +571,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
// platform-http is optional
if (camelContext.hasComponent("platform-http") != null) {
- Optional<DevConsole> dc = camelContext.getCamelContextExtension()
- .getDevConsoleResolver().lookupDevConsole("platform-http");
+ Optional<DevConsole> dc = PluginHelper.getDevConsoleResolver(camelContext).lookupDevConsole("platform-http");
if (dc.isPresent()) {
JsonObject json = (JsonObject) dc.get().call(DevConsole.MediaType.JSON);
if (json != null) {
@@ -583,8 +580,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
}
}
// netty is optional
- Optional<DevConsole> dc = camelContext.getCamelContextExtension()
- .getDevConsoleResolver().lookupDevConsole("netty");
+ Optional<DevConsole> dc = PluginHelper.getDevConsoleResolver(camelContext).lookupDevConsole("netty");
if (dc.isPresent()) {
JsonObject json = (JsonObject) dc.get().call(DevConsole.MediaType.JSON);
if (json != null) {
@@ -592,8 +588,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
}
}
// mina is optional
- dc = camelContext.getCamelContextExtension()
- .getDevConsoleResolver().lookupDevConsole("mina");
+ dc = PluginHelper.getDevConsoleResolver(camelContext).lookupDevConsole("mina");
if (dc.isPresent()) {
JsonObject json = (JsonObject) dc.get().call(DevConsole.MediaType.JSON);
if (json != null) {
@@ -601,8 +596,7 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
}
}
// mllp is optional
- dc = camelContext.getCamelContextExtension()
- .getDevConsoleResolver().lookupDevConsole("mllp");
+ dc = PluginHelper.getDevConsoleResolver(camelContext).lookupDevConsole("mllp");
if (dc.isPresent()) {
JsonObject json = (JsonObject) dc.get().call(DevConsole.MediaType.JSON);
if (json != null) {
[camel] 03/04: CAMEL-15105: make the InternalProcessorFactory a plugin of the context
Posted by or...@apache.org.
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 525b70ef436fb8adf113d82ad79e1c3527570c17
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sat Apr 1 14:31:47 2023 +0200
CAMEL-15105: make the InternalProcessorFactory a plugin of the context
---
.../java/org/apache/camel/ExtendedCamelContext.java | 15 ---------------
.../apache/camel/impl/engine/AbstractCamelContext.java | 2 +-
.../impl/engine/DefaultCamelContextExtension.java | 18 ------------------
.../org/apache/camel/impl/engine/DefaultChannel.java | 3 ++-
.../camel/impl/engine/SubscribeMethodProcessor.java | 3 ++-
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ------
.../impl/lw/LightweightCamelContextExtension.java | 11 -----------
.../org/apache/camel/processor/MulticastProcessor.java | 3 ++-
.../org/apache/camel/processor/UnitOfWorkProducer.java | 3 ++-
.../org/apache/camel/reifier/AggregateReifier.java | 3 ++-
.../org/apache/camel/reifier/OnCompletionReifier.java | 3 ++-
.../org/apache/camel/reifier/ProcessorReifier.java | 2 +-
.../org/apache/camel/reifier/ResequenceReifier.java | 5 +++--
.../java/org/apache/camel/reifier/RouteReifier.java | 3 ++-
.../java/org/apache/camel/reifier/WireTapReifier.java | 3 ++-
.../reifier/errorhandler/ErrorHandlerReifier.java | 3 ++-
.../camel/support/DefaultInterceptSendToEndpoint.java | 2 +-
.../java/org/apache/camel/support/PluginHelper.java | 18 ++++++++++++++++++
.../camel/support/cache/DefaultProducerCache.java | 5 +++--
19 files changed, 45 insertions(+), 66 deletions(-)
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 50f9a58a498..c1850cfb5c7 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
@@ -37,7 +37,6 @@ import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.HeadersMapFactory;
import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.spi.InternalProcessorFactory;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.ManagementMBeanAssembler;
@@ -316,20 +315,6 @@ public interface ExtendedCamelContext {
*/
FactoryFinder getFactoryFinder(String path);
- /**
- * Gets the current {@link org.apache.camel.spi.InternalProcessorFactory}
- *
- * @return the factory
- */
- InternalProcessorFactory getInternalProcessorFactory();
-
- /**
- * Sets a custom {@link org.apache.camel.spi.InternalProcessorFactory}
- *
- * @param internalProcessorFactory the custom factory
- */
- void setInternalProcessorFactory(InternalProcessorFactory internalProcessorFactory);
-
/**
* Gets the current {@link org.apache.camel.spi.InterceptEndpointFactory}
*
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 47609926f46..2e288f9763c 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
@@ -221,7 +221,6 @@ public abstract class AbstractCamelContext extends BaseService
volatile ModelToXMLDumper modelToXMLDumper;
volatile RestBindingJaxbDataFormatFactory restBindingJaxbDataFormatFactory;
volatile RuntimeCamelCatalog runtimeCamelCatalog;
- volatile InternalProcessorFactory internalProcessorFactory;
volatile InterceptEndpointFactory interceptEndpointFactory;
volatile RouteFactory routeFactory;
volatile AsyncProcessorAwaitManager asyncProcessorAwaitManager;
@@ -380,6 +379,7 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.lazyAddContextPlugin(HealthCheckResolver.class, this::createHealthCheckResolver);
camelContextExtension.lazyAddContextPlugin(DevConsoleResolver.class, this::createDevConsoleResolver);
camelContextExtension.lazyAddContextPlugin(ProcessorFactory.class, this::createProcessorFactory);
+ camelContextExtension.lazyAddContextPlugin(InternalProcessorFactory.class, this::createInternalProcessorFactory);
if (build) {
try {
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 7e5f6e45a66..482ef419e07 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
@@ -54,7 +54,6 @@ import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.HeadersMapFactory;
import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.spi.InternalProcessorFactory;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.ManagementMBeanAssembler;
@@ -466,23 +465,6 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
this.lightweight = lightweight;
}
- @Override
- public InternalProcessorFactory getInternalProcessorFactory() {
- if (camelContext.internalProcessorFactory == null) {
- synchronized (camelContext.lock) {
- if (camelContext.internalProcessorFactory == null) {
- setInternalProcessorFactory(camelContext.createInternalProcessorFactory());
- }
- }
- }
- return camelContext.internalProcessorFactory;
- }
-
- @Override
- public void setInternalProcessorFactory(InternalProcessorFactory internalProcessorFactory) {
- camelContext.internalProcessorFactory = camelContext.getInternalServiceManager().addService(internalProcessorFactory);
- }
-
@Override
public InterceptEndpointFactory getInterceptEndpointFactory() {
if (camelContext.interceptEndpointFactory == null) {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
index f0ab9329db5..50cc9201a28 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
@@ -40,6 +40,7 @@ import org.apache.camel.spi.MessageHistoryFactory;
import org.apache.camel.spi.Tracer;
import org.apache.camel.spi.WrapAwareProcessor;
import org.apache.camel.support.OrderedComparator;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -223,7 +224,7 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel {
}
if (!(wrapped instanceof WrapAwareProcessor)) {
// wrap the target so it becomes a service and we can manage its lifecycle
- wrapped = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ wrapped = PluginHelper.getInternalProcessorFactory(camelContext)
.createWrapProcessor(wrapped, target);
}
target = wrapped;
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java
index 813ccdc85b5..48dcbf336c9 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java
@@ -31,6 +31,7 @@ import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.spi.Language;
import org.apache.camel.support.AsyncProcessorSupport;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.builder.PredicateBuilder;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
@@ -58,7 +59,7 @@ public final class SubscribeMethodProcessor extends AsyncProcessorSupport implem
.getBeanProcessorFactory().createBeanProcessor(endpoint.getCamelContext(), pojo, method);
// must ensure the consumer is being executed in an unit of work so synchronization callbacks etc is invoked
- answer = endpoint.getCamelContext().getCamelContextExtension().getInternalProcessorFactory()
+ answer = PluginHelper.getInternalProcessorFactory(endpoint.getCamelContext())
.addUnitOfWorkProcessorAdvice(endpoint.getCamelContext(), answer, null);
Predicate p;
if (ObjectHelper.isEmpty(predicate)) {
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 244fd82d8c2..d4a7548ee8a 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
@@ -47,8 +47,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "HeadersMapFactory": target.setHeadersMapFactory(property(camelContext, org.apache.camel.spi.HeadersMapFactory.class, value)); return true;
case "interceptendpointfactory":
case "InterceptEndpointFactory": target.setInterceptEndpointFactory(property(camelContext, org.apache.camel.spi.InterceptEndpointFactory.class, value)); return true;
- case "internalprocessorfactory":
- case "InternalProcessorFactory": target.setInternalProcessorFactory(property(camelContext, org.apache.camel.spi.InternalProcessorFactory.class, value)); return true;
case "lightweight":
case "Lightweight": target.setLightweight(property(camelContext, boolean.class, value)); return true;
case "modeltoxmldumper":
@@ -108,8 +106,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "HeadersMapFactory": return org.apache.camel.spi.HeadersMapFactory.class;
case "interceptendpointfactory":
case "InterceptEndpointFactory": return org.apache.camel.spi.InterceptEndpointFactory.class;
- case "internalprocessorfactory":
- case "InternalProcessorFactory": return org.apache.camel.spi.InternalProcessorFactory.class;
case "lightweight":
case "Lightweight": return boolean.class;
case "modeltoxmldumper":
@@ -170,8 +166,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "HeadersMapFactory": return target.getHeadersMapFactory();
case "interceptendpointfactory":
case "InterceptEndpointFactory": return target.getInterceptEndpointFactory();
- case "internalprocessorfactory":
- case "InternalProcessorFactory": return target.getInternalProcessorFactory();
case "lightweight":
case "Lightweight": return target.isLightweight();
case "modeltoxmldumper":
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 e280a82d6dc..14d389a7e31 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
@@ -52,7 +52,6 @@ import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.HeadersMapFactory;
import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.spi.InternalProcessorFactory;
import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.ManagementMBeanAssembler;
import org.apache.camel.spi.ModelToXMLDumper;
@@ -242,16 +241,6 @@ class LightweightCamelContextExtension implements ExtendedCamelContext {
throw new UnsupportedOperationException();
}
- @Override
- public InternalProcessorFactory getInternalProcessorFactory() {
- return camelContext.getCamelContextExtension().getInternalProcessorFactory();
- }
-
- @Override
- public void setInternalProcessorFactory(InternalProcessorFactory internalProcessorFactory) {
- throw new UnsupportedOperationException();
- }
-
@Override
public InterceptEndpointFactory getInterceptEndpointFactory() {
throw new UnsupportedOperationException();
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 efdb733fb50..c0a7fd9df6b 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
@@ -66,6 +66,7 @@ import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.EventHelper;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.PatternHelper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IOHelper;
@@ -186,7 +187,7 @@ public class MulticastProcessor extends AsyncProcessorSupport
boolean parallelAggregate) {
notNull(camelContext, "camelContext");
this.camelContext = camelContext;
- this.internalProcessorFactory = camelContext.getCamelContextExtension().getInternalProcessorFactory();
+ this.internalProcessorFactory = PluginHelper.getInternalProcessorFactory(camelContext);
this.route = route;
this.reactiveExecutor = camelContext.getCamelContextExtension().getReactiveExecutor();
this.processors = processors;
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
index b47529114a0..f3e893a7cca 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
@@ -23,6 +23,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.support.DefaultAsyncProducer;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
/**
@@ -43,7 +44,7 @@ public final class UnitOfWorkProducer extends DefaultAsyncProducer {
this.producer = producer;
// wrap in unit of work
CamelContext ecc = producer.getEndpoint().getCamelContext();
- this.processor = ecc.getCamelContextExtension().getInternalProcessorFactory()
+ this.processor = PluginHelper.getInternalProcessorFactory(ecc)
.addUnitOfWorkProcessorAdvice(ecc, producer, null);
}
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
index 6f1f3117d08..228157e413b 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AggregateReifier.java
@@ -33,6 +33,7 @@ import org.apache.camel.processor.aggregate.AggregateProcessor;
import org.apache.camel.processor.aggregate.OptimisticLockRetryPolicy;
import org.apache.camel.spi.AggregationRepository;
import org.apache.camel.spi.ExecutorServiceManager;
+import org.apache.camel.support.PluginHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +54,7 @@ public class AggregateReifier extends ProcessorReifier<AggregateDefinition> {
Processor childProcessor = this.createChildProcessor(true);
// wrap the aggregate route in a unit of work processor
- AsyncProcessor target = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ AsyncProcessor target = PluginHelper.getInternalProcessorFactory(camelContext)
.addUnitOfWorkProcessorAdvice(camelContext, childProcessor, route);
Expression correlation = createExpression(definition.getExpression());
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
index b3e93f58c65..96753213850 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
@@ -26,6 +26,7 @@ import org.apache.camel.model.OnCompletionDefinition;
import org.apache.camel.model.OnCompletionMode;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.processor.OnCompletionProcessor;
+import org.apache.camel.support.PluginHelper;
public class OnCompletionReifier extends ProcessorReifier<OnCompletionDefinition> {
@@ -52,7 +53,7 @@ public class OnCompletionReifier extends ProcessorReifier<OnCompletionDefinition
Processor childProcessor = this.createChildProcessor(true);
// wrap the on completion route in a unit of work processor
- AsyncProcessor target = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ AsyncProcessor target = PluginHelper.getInternalProcessorFactory(camelContext)
.addUnitOfWorkProcessorAdvice(camelContext, childProcessor, route);
route.setOnCompletion(getId(definition), target);
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index 41096b48c89..7d6209606c9 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -630,7 +630,7 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends
protected Channel wrapChannel(Processor processor, ProcessorDefinition<?> child, Boolean inheritErrorHandler)
throws Exception {
// put a channel in between this and each output to control the route flow logic
- Channel channel = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ Channel channel = PluginHelper.getInternalProcessorFactory(camelContext)
.createChannel(camelContext);
// add interceptor strategies to the channel must be in this order:
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
index 5a2d46068e5..bc85e2c9cf8 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ResequenceReifier.java
@@ -29,6 +29,7 @@ import org.apache.camel.processor.Resequencer;
import org.apache.camel.processor.StreamResequencer;
import org.apache.camel.processor.resequencer.DefaultExchangeComparator;
import org.apache.camel.processor.resequencer.ExpressionResultComparator;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.ObjectHelper;
public class ResequenceReifier extends ProcessorReifier<ResequenceDefinition> {
@@ -73,7 +74,7 @@ public class ResequenceReifier extends ProcessorReifier<ResequenceDefinition> {
Expression expression = createExpression(definition.getExpression());
// and wrap in unit of work
- AsyncProcessor target = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ AsyncProcessor target = PluginHelper.getInternalProcessorFactory(camelContext)
.addUnitOfWorkProcessorAdvice(camelContext, processor, route);
ObjectHelper.notNull(config, "config", this);
@@ -110,7 +111,7 @@ public class ResequenceReifier extends ProcessorReifier<ResequenceDefinition> {
Processor processor = this.createChildProcessor(true);
Expression expression = createExpression(definition.getExpression());
- AsyncProcessor target = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ AsyncProcessor target = PluginHelper.getInternalProcessorFactory(camelContext)
.addUnitOfWorkProcessorAdvice(camelContext, processor, route);
ObjectHelper.notNull(config, "config", this);
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
index e72df220d57..45a0f6584c1 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
@@ -49,6 +49,7 @@ import org.apache.camel.spi.ManagementInterceptStrategy;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.RoutePolicy;
import org.apache.camel.spi.RoutePolicyFactory;
+import org.apache.camel.support.PluginHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -232,7 +233,7 @@ public class RouteReifier extends ProcessorReifier<RouteDefinition> {
target.setRouteId(id);
// and wrap it in a unit of work so the UoW is on the top, so the entire route will be in the same UoW
- InternalProcessor internal = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ InternalProcessor internal = PluginHelper.getInternalProcessorFactory(camelContext)
.addUnitOfWorkProcessorAdvice(camelContext, target, route);
// configure route policy
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WireTapReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WireTapReifier.java
index 34096a72f64..d8562141286 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WireTapReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WireTapReifier.java
@@ -35,6 +35,7 @@ import org.apache.camel.processor.WireTapProcessor;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.LanguageSupport;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.StringHelper;
public class WireTapReifier extends ToDynamicReifier<WireTapDefinition<?>> {
@@ -86,7 +87,7 @@ public class WireTapReifier extends ToDynamicReifier<WireTapDefinition<?>> {
Processor childProcessor = wrapInErrorHandler(producer);
// and wrap in unit of work
- AsyncProcessor target = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ AsyncProcessor target = PluginHelper.getInternalProcessorFactory(camelContext)
.addUnitOfWorkProcessorAdvice(camelContext, childProcessor, route);
// is true by default
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
index 985d2665cab..ec6b3d80297 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
@@ -44,6 +44,7 @@ import org.apache.camel.reifier.AbstractReifier;
import org.apache.camel.spi.ErrorHandler;
import org.apache.camel.spi.Language;
import org.apache.camel.support.CamelContextHelper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.ObjectHelper;
public abstract class ErrorHandlerReifier<T extends ErrorHandlerFactory> extends AbstractReifier {
@@ -477,7 +478,7 @@ public abstract class ErrorHandlerReifier<T extends ErrorHandlerFactory> extends
}
if (processor != null) {
// must wrap the processor in an UoW
- processor = camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ processor = PluginHelper.getInternalProcessorFactory(camelContext)
.addUnitOfWorkProcessorAdvice(camelContext, processor, route);
}
return processor;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultInterceptSendToEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultInterceptSendToEndpoint.java
index 669b066e05a..b35c1ef0893 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultInterceptSendToEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultInterceptSendToEndpoint.java
@@ -134,7 +134,7 @@ public class DefaultInterceptSendToEndpoint implements InterceptSendToEndpoint,
@Override
public AsyncProducer createAsyncProducer() throws Exception {
AsyncProducer producer = delegate.createAsyncProducer();
- return camelContext.getCamelContextExtension().getInternalProcessorFactory()
+ return PluginHelper.getInternalProcessorFactory(camelContext)
.createInterceptSendToEndpointProcessor(this, delegate, producer, skip);
}
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 30ddec8e04e..5396ed47732 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
@@ -30,6 +30,7 @@ import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.ConfigurerResolver;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.FactoryFinderResolver;
+import org.apache.camel.spi.InternalProcessorFactory;
import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.ModelineFactory;
@@ -365,4 +366,21 @@ public final class PluginHelper {
return extendedCamelContext.getContextPlugin(ProcessorFactory.class);
}
+ /**
+ * Gets the current {@link org.apache.camel.spi.InternalProcessorFactory}
+ *
+ * @return the factory
+ */
+ public static InternalProcessorFactory getInternalProcessorFactory(CamelContext camelContext) {
+ return getInternalProcessorFactory(camelContext.getCamelContextExtension());
+ }
+
+ /**
+ * Gets the current {@link org.apache.camel.spi.InternalProcessorFactory}
+ *
+ * @return the factory
+ */
+ public static InternalProcessorFactory getInternalProcessorFactory(ExtendedCamelContext extendedCamelContext) {
+ return extendedCamelContext.getContextPlugin(InternalProcessorFactory.class);
+ }
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
index 17612316e62..16d0a986aa7 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
@@ -36,6 +36,7 @@ import org.apache.camel.spi.SharedInternalProcessor;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultEndpointUtilizationStatistics;
import org.apache.camel.support.EventHelper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.StopWatch;
@@ -79,8 +80,8 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
// internal processor used for sending
sharedInternalProcessor
- = this.camelContext.getCamelContextExtension()
- .getInternalProcessorFactory().createSharedCamelInternalProcessor(camelContext);
+ = PluginHelper.getInternalProcessorFactory(this.camelContext)
+ .createSharedCamelInternalProcessor(camelContext);
}
protected ProducerServicePool createServicePool(CamelContext camelContext, int cacheSize) {
[camel] 02/04: CAMEL-15105: make the ProcessorFactory a plugin of the context
Posted by or...@apache.org.
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 878825560b0a3457a3827d10cee07d657b3e5eba
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sat Apr 1 14:00:08 2023 +0200
CAMEL-15105: make the ProcessorFactory a plugin of the context
---
.../camel/component/knative/KnativeEndpoint.java | 7 ++++---
.../camel/component/knative/KnativeProducer.java | 5 +++--
.../apache/camel/component/seda/SedaEndpoint.java | 5 +++--
.../java/org/apache/camel/ExtendedCamelContext.java | 15 ---------------
.../camel/impl/engine/AbstractCamelContext.java | 2 +-
.../impl/engine/DefaultCamelContextExtension.java | 19 -------------------
.../engine/DefaultServiceBootstrapCloseable.java | 3 +--
.../impl/cloud/DefaultServiceCallProcessor.java | 3 ++-
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ------
.../impl/lw/LightweightCamelContextExtension.java | 12 ------------
.../reifier/InterceptSendToEndpointReifier.java | 3 ++-
.../org/apache/camel/reifier/ProcessorReifier.java | 17 +++++++++++------
.../core/xml/AbstractCamelContextFactoryBean.java | 2 +-
.../camel/processor/CustomProcessorFactoryTest.java | 2 +-
.../camel/main/DefaultConfigurationConfigurer.java | 2 +-
.../java/org/apache/camel/support/PluginHelper.java | 20 ++++++++++++++++++++
16 files changed, 50 insertions(+), 73 deletions(-)
diff --git a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
index 37f78addc13..16728919979 100644
--- a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
+++ b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java
@@ -40,6 +40,7 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -115,15 +116,15 @@ public class KnativeEndpoint extends DefaultEndpoint {
if (replyProcessor != null) {
list.add(replyProcessor);
}
- CamelContext ecc = getCamelContext();
+ CamelContext camelContext = getCamelContext();
Processor pipeline
- = ecc.getCamelContextExtension().getProcessorFactory().createProcessor(ecc, "Pipeline", new Object[] { list });
+ = PluginHelper.getProcessorFactory(camelContext).createProcessor(camelContext, "Pipeline", new Object[] { list });
Consumer consumer = getComponent().getConsumerFactory().createConsumer(this,
createTransportConfiguration(service), service, pipeline);
PropertyBindingSupport.build()
- .withCamelContext(getCamelContext())
+ .withCamelContext(camelContext)
.withProperties(configuration.getTransportOptions())
.withRemoveParameters(false)
.withMandatory(false)
diff --git a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeProducer.java b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeProducer.java
index f94186c3f94..8434f7c0f28 100644
--- a/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeProducer.java
+++ b/components/camel-knative/camel-knative-component/src/main/java/org/apache/camel/component/knative/KnativeProducer.java
@@ -28,6 +28,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.DefaultAsyncProducer;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
public class KnativeProducer extends DefaultAsyncProducer {
@@ -40,8 +41,8 @@ public class KnativeProducer extends DefaultAsyncProducer {
elements.add(processor);
Collections.addAll(elements, processors);
- CamelContext ecc = getEndpoint().getCamelContext();
- Processor pipeline = ecc.getCamelContextExtension().getProcessorFactory().createProcessor(ecc, "Pipeline",
+ CamelContext camelContext = getEndpoint().getCamelContext();
+ Processor pipeline = PluginHelper.getProcessorFactory(camelContext).createProcessor(camelContext, "Pipeline",
new Object[] { elements });
this.processor = AsyncProcessorConverterHelper.convert(pipeline);
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index d3fba484761..d59944d047a 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -44,6 +44,7 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
@@ -267,8 +268,8 @@ public class SedaEndpoint extends DefaultEndpoint implements AsyncEndpoint, Brow
// create multicast processor
multicastStarted = false;
- consumerMulticastProcessor = (AsyncProcessor) getCamelContext().getCamelContextExtension()
- .getProcessorFactory().createProcessor(getCamelContext(), "MulticastProcessor",
+ consumerMulticastProcessor = (AsyncProcessor) PluginHelper.getProcessorFactory(getCamelContext())
+ .createProcessor(getCamelContext(), "MulticastProcessor",
new Object[] { processors, multicastExecutor, false });
}
}
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 d365aceda38..50f9a58a498 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
@@ -45,7 +45,6 @@ import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PluginManager;
import org.apache.camel.spi.ProcessorExchangeFactory;
-import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.ResourceLoader;
@@ -317,20 +316,6 @@ public interface ExtendedCamelContext {
*/
FactoryFinder getFactoryFinder(String path);
- /**
- * Gets the current {@link org.apache.camel.spi.ProcessorFactory}
- *
- * @return the factory, can be <tt>null</tt> if no custom factory has been set
- */
- ProcessorFactory getProcessorFactory();
-
- /**
- * Sets a custom {@link org.apache.camel.spi.ProcessorFactory}
- *
- * @param processorFactory the custom factory
- */
- void setProcessorFactory(ProcessorFactory processorFactory);
-
/**
* Gets the current {@link org.apache.camel.spi.InternalProcessorFactory}
*
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 36c172cfab7..47609926f46 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
@@ -221,7 +221,6 @@ public abstract class AbstractCamelContext extends BaseService
volatile ModelToXMLDumper modelToXMLDumper;
volatile RestBindingJaxbDataFormatFactory restBindingJaxbDataFormatFactory;
volatile RuntimeCamelCatalog runtimeCamelCatalog;
- volatile ProcessorFactory processorFactory;
volatile InternalProcessorFactory internalProcessorFactory;
volatile InterceptEndpointFactory interceptEndpointFactory;
volatile RouteFactory routeFactory;
@@ -380,6 +379,7 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.lazyAddContextPlugin(PeriodTaskScheduler.class, this::createPeriodTaskScheduler);
camelContextExtension.lazyAddContextPlugin(HealthCheckResolver.class, this::createHealthCheckResolver);
camelContextExtension.lazyAddContextPlugin(DevConsoleResolver.class, this::createDevConsoleResolver);
+ camelContextExtension.lazyAddContextPlugin(ProcessorFactory.class, this::createProcessorFactory);
if (build) {
try {
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 8423dba0a54..7e5f6e45a66 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
@@ -36,7 +36,6 @@ import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.Service;
import org.apache.camel.catalog.RuntimeCamelCatalog;
-import org.apache.camel.console.DevConsoleResolver;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.BeanIntrospection;
@@ -65,7 +64,6 @@ import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PluginManager;
import org.apache.camel.spi.ProcessorExchangeFactory;
-import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.Registry;
@@ -468,23 +466,6 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
this.lightweight = lightweight;
}
- @Override
- public ProcessorFactory getProcessorFactory() {
- if (camelContext.processorFactory == null) {
- synchronized (camelContext.lock) {
- if (camelContext.processorFactory == null) {
- setProcessorFactory(camelContext.createProcessorFactory());
- }
- }
- }
- return camelContext.processorFactory;
- }
-
- @Override
- public void setProcessorFactory(ProcessorFactory processorFactory) {
- camelContext.processorFactory = camelContext.getInternalServiceManager().addService(processorFactory);
- }
-
@Override
public InternalProcessorFactory getInternalProcessorFactory() {
if (camelContext.internalProcessorFactory == null) {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
index ff10d2c453c..b85463f9ac1 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultServiceBootstrapCloseable.java
@@ -79,7 +79,7 @@ public class DefaultServiceBootstrapCloseable implements BootstrapCloseable {
}
// clear processor factory
- ProcessorFactory pf = camelContextExtension.getProcessorFactory();
+ ProcessorFactory pf = PluginHelper.getProcessorFactory(camelContextExtension);
if (pf instanceof BootstrapCloseable) {
try {
((BootstrapCloseable) pf).close();
@@ -87,7 +87,6 @@ public class DefaultServiceBootstrapCloseable implements BootstrapCloseable {
LOG.warn("Error during closing bootstrap service. This exception is ignored", e);
}
}
- camelContextExtension.setProcessorFactory(null);
// clear bootstrap factory finder
FactoryFinder ff = camelContextExtension.getBootstrapFactoryFinder();
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
index bb8e5a4bc50..13f34f209ba 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
@@ -33,6 +33,7 @@ import org.apache.camel.spi.Language;
import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
@@ -130,7 +131,7 @@ public class DefaultServiceCallProcessor extends AsyncProcessorSupport {
@Override
protected void doBuild() throws Exception {
ObjectHelper.notNull(camelContext, "camel context");
- processorFactory = camelContext.getCamelContextExtension().getProcessorFactory();
+ processorFactory = PluginHelper.getProcessorFactory(camelContext);
}
@Override
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 7c3ea5cc9c2..244fd82d8c2 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
@@ -57,8 +57,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "Name": target.setName(property(camelContext, java.lang.String.class, value)); return true;
case "processorexchangefactory":
case "ProcessorExchangeFactory": target.setProcessorExchangeFactory(property(camelContext, org.apache.camel.spi.ProcessorExchangeFactory.class, value)); return true;
- case "processorfactory":
- case "ProcessorFactory": target.setProcessorFactory(property(camelContext, org.apache.camel.spi.ProcessorFactory.class, value)); return true;
case "reactiveexecutor":
case "ReactiveExecutor": target.setReactiveExecutor(property(camelContext, org.apache.camel.spi.ReactiveExecutor.class, value)); return true;
case "registry":
@@ -120,8 +118,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "Name": return java.lang.String.class;
case "processorexchangefactory":
case "ProcessorExchangeFactory": return org.apache.camel.spi.ProcessorExchangeFactory.class;
- case "processorfactory":
- case "ProcessorFactory": return org.apache.camel.spi.ProcessorFactory.class;
case "reactiveexecutor":
case "ReactiveExecutor": return org.apache.camel.spi.ReactiveExecutor.class;
case "registry":
@@ -184,8 +180,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "Name": return target.getName();
case "processorexchangefactory":
case "ProcessorExchangeFactory": return target.getProcessorExchangeFactory();
- case "processorfactory":
- case "ProcessorFactory": return target.getProcessorFactory();
case "reactiveexecutor":
case "ReactiveExecutor": return target.getReactiveExecutor();
case "registry":
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 f38d25c1c73..e280a82d6dc 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
@@ -37,7 +37,6 @@ import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.ServiceStatus;
import org.apache.camel.catalog.RuntimeCamelCatalog;
-import org.apache.camel.console.DevConsoleResolver;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.BeanIntrospection;
@@ -60,7 +59,6 @@ import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PluginManager;
import org.apache.camel.spi.ProcessorExchangeFactory;
-import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.Registry;
@@ -244,16 +242,6 @@ class LightweightCamelContextExtension implements ExtendedCamelContext {
throw new UnsupportedOperationException();
}
- @Override
- public ProcessorFactory getProcessorFactory() {
- return camelContext.getCamelContextExtension().getProcessorFactory();
- }
-
- @Override
- public void setProcessorFactory(ProcessorFactory processorFactory) {
- throw new UnsupportedOperationException();
- }
-
@Override
public InternalProcessorFactory getInternalProcessorFactory() {
return camelContext.getCamelContextExtension().getInternalProcessorFactory();
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
index e9bb28cac5d..fc4f53f659d 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
@@ -26,6 +26,7 @@ import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.ToDefinition;
import org.apache.camel.processor.InterceptEndpointProcessor;
import org.apache.camel.processor.InterceptSendToEndpointCallback;
+import org.apache.camel.support.PluginHelper;
public class InterceptSendToEndpointReifier extends ProcessorReifier<InterceptSendToEndpointDefinition> {
@@ -43,7 +44,7 @@ public class InterceptSendToEndpointReifier extends ProcessorReifier<InterceptSe
if (afterUri != null) {
ToDefinition to = new ToDefinition(afterUri);
// at first use custom factory
- afterProcessor = camelContext.getCamelContextExtension().getProcessorFactory().createProcessor(route, to);
+ afterProcessor = PluginHelper.getProcessorFactory(camelContext).createProcessor(route, to);
// fallback to default implementation if factory did not create the processor
if (afterProcessor == null) {
afterProcessor = createProcessor(to);
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index 0d233c8e967..41096b48c89 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -115,9 +115,11 @@ import org.apache.camel.spi.ExecutorServiceManager;
import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.NodeIdFactory;
+import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.spi.ReifierStrategy;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.CamelContextHelper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -572,8 +574,9 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends
protected Processor createChildProcessor(boolean mandatory) throws Exception {
Processor children = null;
// at first use custom factory
- if (camelContext.getCamelContextExtension().getProcessorFactory() != null) {
- children = camelContext.getCamelContextExtension().getProcessorFactory().createChildProcessor(route,
+ final ProcessorFactory processorFactory = PluginHelper.getProcessorFactory(camelContext);
+ if (processorFactory != null) {
+ children = processorFactory.createChildProcessor(route,
definition, mandatory);
}
// fallback to default implementation if factory did not create the
@@ -820,8 +823,9 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends
Processor processor = null;
// at first use custom factory
- if (camelContext.getCamelContextExtension().getProcessorFactory() != null) {
- processor = camelContext.getCamelContextExtension().getProcessorFactory().createProcessor(route, output);
+ final ProcessorFactory processorFactory = PluginHelper.getProcessorFactory(camelContext);
+ if (processorFactory != null) {
+ processor = processorFactory.createProcessor(route, output);
}
// fallback to default implementation if factory did not create the processor
if (processor == null) {
@@ -842,8 +846,9 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends
preCreateProcessor();
// at first use custom factory
- if (camelContext.getCamelContextExtension().getProcessorFactory() != null) {
- processor = camelContext.getCamelContextExtension().getProcessorFactory().createProcessor(route, definition);
+ final ProcessorFactory processorFactory = PluginHelper.getProcessorFactory(camelContext);
+ if (processorFactory != null) {
+ processor = processorFactory.createProcessor(route, definition);
}
// fallback to default implementation if factory did not create the
// processor
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index e09166f34c2..faa44550efd 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -1503,7 +1503,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
ProcessorFactory processorFactory = getBeanForType(ProcessorFactory.class);
if (processorFactory != null) {
LOG.info("Using custom ProcessorFactory: {}", processorFactory);
- getContext().getCamelContextExtension().setProcessorFactory(processorFactory);
+ getContext().getCamelContextExtension().addContextPlugin(ProcessorFactory.class, processorFactory);
}
Debugger debugger = getBeanForType(Debugger.class);
if (debugger != null) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java
index ace4ecf2e98..82dced26ea2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java
@@ -36,7 +36,7 @@ public class CustomProcessorFactoryTest extends ContextTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
// register our custom factory
- context.getCamelContextExtension().setProcessorFactory(new MyFactory());
+ context.getCamelContextExtension().addContextPlugin(ProcessorFactory.class, new MyFactory());
return context;
}
// END SNIPPET: e1
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index 00aed04324e..cfd445143f5 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -435,7 +435,7 @@ public final class DefaultConfigurationConfigurer {
}
ProcessorFactory pf = getSingleBeanOfType(registry, ProcessorFactory.class);
if (pf != null) {
- ecc.getCamelContextExtension().setProcessorFactory(pf);
+ ecc.getCamelContextExtension().addContextPlugin(ProcessorFactory.class, pf);
}
Debugger debugger = getSingleBeanOfType(registry, Debugger.class);
if (debugger != null) {
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 ebd084d0b00..30ddec8e04e 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
@@ -37,6 +37,7 @@ import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.PackageScanResourceResolver;
import org.apache.camel.spi.PeriodTaskResolver;
import org.apache.camel.spi.PeriodTaskScheduler;
+import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.spi.UriFactoryResolver;
public final class PluginHelper {
@@ -345,4 +346,23 @@ public final class PluginHelper {
public static DevConsoleResolver getDevConsoleResolver(ExtendedCamelContext extendedCamelContext) {
return extendedCamelContext.getContextPlugin(DevConsoleResolver.class);
}
+
+ /**
+ * Gets the current {@link org.apache.camel.spi.ProcessorFactory}
+ *
+ * @return the factory, can be <tt>null</tt> if no custom factory has been set
+ */
+ public static ProcessorFactory getProcessorFactory(CamelContext camelContext) {
+ return getProcessorFactory(camelContext.getCamelContextExtension());
+ }
+
+ /**
+ * Gets the current {@link org.apache.camel.spi.ProcessorFactory}
+ *
+ * @return the factory, can be <tt>null</tt> if no custom factory has been set
+ */
+ public static ProcessorFactory getProcessorFactory(ExtendedCamelContext extendedCamelContext) {
+ return extendedCamelContext.getContextPlugin(ProcessorFactory.class);
+ }
+
}
[camel] 04/04: CAMEL-15105: make the InterceptEndpointFactory a plugin of the context
Posted by or...@apache.org.
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 0d22038e18e2fc726bfd7d5269bbd6223c35f45f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sat Apr 1 14:49:33 2023 +0200
CAMEL-15105: make the InterceptEndpointFactory a plugin of the context
---
.../java/org/apache/camel/ExtendedCamelContext.java | 15 ---------------
.../camel/impl/engine/AbstractCamelContext.java | 2 +-
.../impl/engine/DefaultCamelContextExtension.java | 18 ------------------
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ------
.../impl/lw/LightweightCamelContextExtension.java | 11 -----------
.../processor/InterceptSendToEndpointCallback.java | 3 ++-
.../java/org/apache/camel/support/PluginHelper.java | 19 +++++++++++++++++++
7 files changed, 22 insertions(+), 52 deletions(-)
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 c1850cfb5c7..21778d95d9d 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
@@ -35,7 +35,6 @@ import org.apache.camel.spi.ExchangeFactory;
import org.apache.camel.spi.ExchangeFactoryManager;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.HeadersMapFactory;
-import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.LogListener;
@@ -315,20 +314,6 @@ public interface ExtendedCamelContext {
*/
FactoryFinder getFactoryFinder(String path);
- /**
- * Gets the current {@link org.apache.camel.spi.InterceptEndpointFactory}
- *
- * @return the factory
- */
- InterceptEndpointFactory getInterceptEndpointFactory();
-
- /**
- * Sets a custom {@link org.apache.camel.spi.InterceptEndpointFactory}
- *
- * @param interceptEndpointFactory the custom factory
- */
- void setInterceptEndpointFactory(InterceptEndpointFactory interceptEndpointFactory);
-
/**
* Gets the current {@link org.apache.camel.spi.RouteFactory}
*
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 2e288f9763c..1553ed0759a 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
@@ -221,7 +221,6 @@ public abstract class AbstractCamelContext extends BaseService
volatile ModelToXMLDumper modelToXMLDumper;
volatile RestBindingJaxbDataFormatFactory restBindingJaxbDataFormatFactory;
volatile RuntimeCamelCatalog runtimeCamelCatalog;
- volatile InterceptEndpointFactory interceptEndpointFactory;
volatile RouteFactory routeFactory;
volatile AsyncProcessorAwaitManager asyncProcessorAwaitManager;
volatile UnitOfWorkFactory unitOfWorkFactory;
@@ -380,6 +379,7 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.lazyAddContextPlugin(DevConsoleResolver.class, this::createDevConsoleResolver);
camelContextExtension.lazyAddContextPlugin(ProcessorFactory.class, this::createProcessorFactory);
camelContextExtension.lazyAddContextPlugin(InternalProcessorFactory.class, this::createInternalProcessorFactory);
+ camelContextExtension.lazyAddContextPlugin(InterceptEndpointFactory.class, this::createInterceptEndpointFactory);
if (build) {
try {
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 482ef419e07..b4fc2578ce2 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
@@ -52,7 +52,6 @@ import org.apache.camel.spi.ExchangeFactory;
import org.apache.camel.spi.ExchangeFactoryManager;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.HeadersMapFactory;
-import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.LogListener;
@@ -465,23 +464,6 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
this.lightweight = lightweight;
}
- @Override
- public InterceptEndpointFactory getInterceptEndpointFactory() {
- if (camelContext.interceptEndpointFactory == null) {
- synchronized (camelContext.lock) {
- if (camelContext.interceptEndpointFactory == null) {
- setInterceptEndpointFactory(camelContext.createInterceptEndpointFactory());
- }
- }
- }
- return camelContext.interceptEndpointFactory;
- }
-
- @Override
- public void setInterceptEndpointFactory(InterceptEndpointFactory interceptEndpointFactory) {
- camelContext.interceptEndpointFactory = camelContext.getInternalServiceManager().addService(interceptEndpointFactory);
- }
-
@Override
public RouteFactory getRouteFactory() {
if (camelContext.routeFactory == 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 d4a7548ee8a..347ed5bb27d 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
@@ -45,8 +45,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "ExchangeFactoryManager": target.setExchangeFactoryManager(property(camelContext, org.apache.camel.spi.ExchangeFactoryManager.class, value)); return true;
case "headersmapfactory":
case "HeadersMapFactory": target.setHeadersMapFactory(property(camelContext, org.apache.camel.spi.HeadersMapFactory.class, value)); return true;
- case "interceptendpointfactory":
- case "InterceptEndpointFactory": target.setInterceptEndpointFactory(property(camelContext, org.apache.camel.spi.InterceptEndpointFactory.class, value)); return true;
case "lightweight":
case "Lightweight": target.setLightweight(property(camelContext, boolean.class, value)); return true;
case "modeltoxmldumper":
@@ -104,8 +102,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "ExchangeFactoryManager": return org.apache.camel.spi.ExchangeFactoryManager.class;
case "headersmapfactory":
case "HeadersMapFactory": return org.apache.camel.spi.HeadersMapFactory.class;
- case "interceptendpointfactory":
- case "InterceptEndpointFactory": return org.apache.camel.spi.InterceptEndpointFactory.class;
case "lightweight":
case "Lightweight": return boolean.class;
case "modeltoxmldumper":
@@ -164,8 +160,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "ExchangeFactoryManager": return target.getExchangeFactoryManager();
case "headersmapfactory":
case "HeadersMapFactory": return target.getHeadersMapFactory();
- case "interceptendpointfactory":
- case "InterceptEndpointFactory": return target.getInterceptEndpointFactory();
case "lightweight":
case "Lightweight": return target.isLightweight();
case "modeltoxmldumper":
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 14d389a7e31..62449a13059 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
@@ -50,7 +50,6 @@ import org.apache.camel.spi.ExchangeFactory;
import org.apache.camel.spi.ExchangeFactoryManager;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.HeadersMapFactory;
-import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.ManagementMBeanAssembler;
@@ -241,16 +240,6 @@ class LightweightCamelContextExtension implements ExtendedCamelContext {
throw new UnsupportedOperationException();
}
- @Override
- public InterceptEndpointFactory getInterceptEndpointFactory() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void setInterceptEndpointFactory(InterceptEndpointFactory interceptEndpointFactory) {
- throw new UnsupportedOperationException();
- }
-
@Override
public RouteFactory getRouteFactory() {
throw new UnsupportedOperationException();
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointCallback.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointCallback.java
index 93c4828d5f5..a6bca20f705 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointCallback.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointCallback.java
@@ -22,6 +22,7 @@ import org.apache.camel.Processor;
import org.apache.camel.spi.EndpointStrategy;
import org.apache.camel.spi.InterceptSendToEndpoint;
import org.apache.camel.support.EndpointHelper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.URISupport;
/**
@@ -51,7 +52,7 @@ public class InterceptSendToEndpointCallback implements EndpointStrategy {
} else if (matchURI == null || matchPattern(uri, matchURI)) {
// only proxy if the uri is matched decorate endpoint with
// our proxy should be false by default
- return camelContext.getCamelContextExtension().getInterceptEndpointFactory()
+ return PluginHelper.getInterceptEndpointFactory(camelContext)
.createInterceptSendToEndpoint(camelContext, endpoint, skip, before, after);
} else {
// no proxy so return regular endpoint
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 5396ed47732..8ddf5cff349 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
@@ -30,6 +30,7 @@ import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.ConfigurerResolver;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.FactoryFinderResolver;
+import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InternalProcessorFactory;
import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.ModelJAXBContextFactory;
@@ -383,4 +384,22 @@ public final class PluginHelper {
public static InternalProcessorFactory getInternalProcessorFactory(ExtendedCamelContext extendedCamelContext) {
return extendedCamelContext.getContextPlugin(InternalProcessorFactory.class);
}
+
+ /**
+ * Gets the current {@link org.apache.camel.spi.InterceptEndpointFactory}
+ *
+ * @return the factory
+ */
+ public static InterceptEndpointFactory getInterceptEndpointFactory(CamelContext camelContext) {
+ return getInterceptEndpointFactory(camelContext.getCamelContextExtension());
+ }
+
+ /**
+ * Gets the current {@link org.apache.camel.spi.InterceptEndpointFactory}
+ *
+ * @return the factory
+ */
+ public static InterceptEndpointFactory getInterceptEndpointFactory(ExtendedCamelContext extendedCamelContext) {
+ return extendedCamelContext.getContextPlugin(InterceptEndpointFactory.class);
+ }
}