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/01 09:31:22 UTC
[camel] branch main updated: CAMEL-15105: make the DataFormatResolver 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
The following commit(s) were added to refs/heads/main by this push:
new c352cf3f2a7 CAMEL-15105: make the DataFormatResolver a plugin of the context
c352cf3f2a7 is described below
commit c352cf3f2a719a5e1e5cbc2ab557e62a1e8135ea
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sat Apr 1 09:23:58 2023 +0200
CAMEL-15105: make the DataFormatResolver a plugin of the context
---
.../java/org/apache/camel/ExtendedCamelContext.java | 15 ---------------
.../camel/impl/engine/AbstractCamelContext.java | 13 ++++---------
.../impl/engine/DefaultCamelContextExtension.java | 19 -------------------
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ------
.../impl/lw/LightweightCamelContextExtension.java | 11 -----------
.../java/org/apache/camel/support/PluginHelper.java | 18 ++++++++++++++++++
.../main/java/org/apache/camel/main/KameletMain.java | 3 ++-
7 files changed, 24 insertions(+), 61 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 466d114b60b..9f6b387c643 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
@@ -30,7 +30,6 @@ import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.BeanProxyFactory;
import org.apache.camel.spi.BootstrapCloseable;
-import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.DeferServiceFactory;
import org.apache.camel.spi.EndpointStrategy;
import org.apache.camel.spi.EndpointUriFactory;
@@ -279,20 +278,6 @@ public interface ExtendedCamelContext {
*/
void setErrorHandlerFactory(ErrorHandlerFactory errorHandlerFactory);
- /**
- * Gets the current data format resolver
- *
- * @return the resolver
- */
- DataFormatResolver getDataFormatResolver();
-
- /**
- * Sets a custom data format resolver
- *
- * @param dataFormatResolver the resolver
- */
- void setDataFormatResolver(DataFormatResolver dataFormatResolver);
-
/**
* Gets the current health check resolver
*
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 986b9c3a233..974bdc9e9ff 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 DataFormatResolver dataFormatResolver;
volatile HealthCheckResolver healthCheckResolver;
volatile DevConsoleResolver devConsoleResolver;
volatile ManagementStrategy managementStrategy;
@@ -380,6 +379,7 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.addContextPlugin(PackageScanResourceResolver.class, createPackageScanResourceResolver());
camelContextExtension.lazyAddContextPlugin(ModelineFactory.class, this::createModelineFactory);
camelContextExtension.lazyAddContextPlugin(ModelJAXBContextFactory.class, this::createModelJAXBContextFactory);
+ camelContextExtension.addContextPlugin(DataFormatResolver.class, createDataFormatResolver());
if (build) {
try {
@@ -3263,7 +3263,6 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.getDefaultFactoryFinder();
getPropertiesComponent();
- camelContextExtension.getDataFormatResolver();
camelContextExtension.getHealthCheckResolver();
getExecutorServiceManager();
@@ -3285,7 +3284,6 @@ public abstract class AbstractCamelContext extends BaseService
*/
protected void forceStopLazyInitialization() {
injector = null;
- dataFormatResolver = null;
typeConverterRegistry = null;
typeConverter = null;
reactiveExecutor = null;
@@ -3585,7 +3583,7 @@ public abstract class AbstractCamelContext extends BaseService
final DataFormat df = Optional
.ofNullable(ResolverHelper.lookupDataFormatInRegistryWithFallback(getCamelContextReference(), name))
- .orElseGet(() -> camelContextExtension.getDataFormatResolver().createDataFormat(name,
+ .orElseGet(() -> PluginHelper.getDataFormatResolver(camelContextExtension).createDataFormat(name,
getCamelContextReference()));
if (df != null) {
@@ -3617,7 +3615,8 @@ public abstract class AbstractCamelContext extends BaseService
step = startupStepRecorder.beginStep(DataFormat.class, name, "Create DataFormat");
}
- DataFormat answer = camelContextExtension.getDataFormatResolver().createDataFormat(name, getCamelContextReference());
+ DataFormat answer
+ = PluginHelper.getDataFormatResolver(camelContextExtension).createDataFormat(name, getCamelContextReference());
// inject CamelContext if aware
CamelContextAware.trySetCamelContext(answer, getCamelContextReference());
@@ -4161,10 +4160,6 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.setProcessorExchangeFactory(processorExchangeFactory);
}
- public void setDataFormatResolver(DataFormatResolver dataFormatResolver) {
- camelContextExtension.setDataFormatResolver(dataFormatResolver);
- }
-
public FactoryFinder getBootstrapFactoryFinder() {
return camelContextExtension.getBootstrapFactoryFinder();
}
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 d7df27f3cc2..cb23b93b38f 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
@@ -44,7 +44,6 @@ import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.BeanProxyFactory;
import org.apache.camel.spi.BootstrapCloseable;
-import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.Debugger;
import org.apache.camel.spi.DebuggerFactory;
import org.apache.camel.spi.DeferServiceFactory;
@@ -494,24 +493,6 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
this.basePackageScan = basePackageScan;
}
- @Override
- public DataFormatResolver getDataFormatResolver() {
- if (camelContext.dataFormatResolver == null) {
- synchronized (camelContext.lock) {
- if (camelContext.dataFormatResolver == null) {
- setDataFormatResolver(camelContext.createDataFormatResolver());
- }
- }
- }
- return camelContext.dataFormatResolver;
- }
-
- @Override
- public void setDataFormatResolver(DataFormatResolver dataFormatResolver) {
- camelContext.dataFormatResolver = camelContext.getInternalServiceManager().addService(dataFormatResolver);
- }
-
- @Override
public HealthCheckResolver getHealthCheckResolver() {
if (camelContext.healthCheckResolver == null) {
synchronized (camelContext.lock) {
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 43a98f6e428..4d704f4dae6 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
@@ -31,8 +31,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "BeanIntrospection": target.setBeanIntrospection(property(camelContext, org.apache.camel.spi.BeanIntrospection.class, value)); return true;
case "bootstrapfactoryfinder":
case "BootstrapFactoryFinder": target.setBootstrapFactoryFinder(property(camelContext, org.apache.camel.spi.FactoryFinder.class, value)); return true;
- case "dataformatresolver":
- case "DataFormatResolver": target.setDataFormatResolver(property(camelContext, org.apache.camel.spi.DataFormatResolver.class, value)); return true;
case "deferservicefactory":
case "DeferServiceFactory": target.setDeferServiceFactory(property(camelContext, org.apache.camel.spi.DeferServiceFactory.class, value)); return true;
case "description":
@@ -104,8 +102,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "BeanIntrospection": return org.apache.camel.spi.BeanIntrospection.class;
case "bootstrapfactoryfinder":
case "BootstrapFactoryFinder": return org.apache.camel.spi.FactoryFinder.class;
- case "dataformatresolver":
- case "DataFormatResolver": return org.apache.camel.spi.DataFormatResolver.class;
case "deferservicefactory":
case "DeferServiceFactory": return org.apache.camel.spi.DeferServiceFactory.class;
case "description":
@@ -178,8 +174,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "BeanIntrospection": return target.getBeanIntrospection();
case "bootstrapfactoryfinder":
case "BootstrapFactoryFinder": return target.getBootstrapFactoryFinder();
- case "dataformatresolver":
- case "DataFormatResolver": return target.getDataFormatResolver();
case "deferservicefactory":
case "DeferServiceFactory": return target.getDeferServiceFactory();
case "description":
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 715acbd1100..c8602079b6f 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
@@ -45,7 +45,6 @@ import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.BeanProxyFactory;
import org.apache.camel.spi.BootstrapCloseable;
-import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.DeferServiceFactory;
import org.apache.camel.spi.EndpointStrategy;
import org.apache.camel.spi.EndpointUriFactory;
@@ -108,16 +107,6 @@ class LightweightCamelContextExtension implements ExtendedCamelContext {
throw new UnsupportedOperationException();
}
- @Override
- public DataFormatResolver getDataFormatResolver() {
- return camelContext.getCamelContextExtension().getDataFormatResolver();
- }
-
- @Override
- public void setDataFormatResolver(DataFormatResolver dataFormatResolver) {
- throw new UnsupportedOperationException();
- }
-
@Override
public HealthCheckResolver getHealthCheckResolver() {
return camelContext.getCamelContextExtension().getHealthCheckResolver();
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 ba022f4546e..550440266b0 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
@@ -26,6 +26,7 @@ import org.apache.camel.spi.CamelDependencyInjectionAnnotationFactory;
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.FactoryFinderResolver;
import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.ModelJAXBContextFactory;
@@ -259,4 +260,21 @@ public final class PluginHelper {
return extendedCamelContext.getContextPlugin(ModelineFactory.class);
}
+ /**
+ * Gets the current data format resolver
+ *
+ * @return the resolver
+ */
+ public static DataFormatResolver getDataFormatResolver(CamelContext camelContext) {
+ return getDataFormatResolver(camelContext.getCamelContextExtension());
+ }
+
+ /**
+ * Gets the current data format resolver
+ *
+ * @return the resolver
+ */
+ public static DataFormatResolver getDataFormatResolver(ExtendedCamelContext extendedCamelContext) {
+ return extendedCamelContext.getContextPlugin(DataFormatResolver.class);
+ }
}
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index 0dc8f84c024..f657454d089 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -57,6 +57,7 @@ import org.apache.camel.main.util.ExtraFilesClassLoader;
import org.apache.camel.spi.CliConnector;
import org.apache.camel.spi.CliConnectorFactory;
import org.apache.camel.spi.ComponentResolver;
+import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.UriFactoryResolver;
@@ -449,7 +450,7 @@ public class KameletMain extends MainCommandLineSupport {
new DependencyDownloaderComponentResolver(answer, stub));
answer.getCamelContextExtension().addContextPlugin(UriFactoryResolver.class,
new DependencyDownloaderUriFactoryResolver(answer));
- answer.setDataFormatResolver(new DependencyDownloaderDataFormatResolver(answer));
+ answer.getCamelContextExtension().addContextPlugin(DataFormatResolver.class, new DependencyDownloaderDataFormatResolver(answer));
answer.getCamelContextExtension().addContextPlugin(LanguageResolver.class,
new DependencyDownloaderLanguageResolver(answer));
answer.setResourceLoader(new DependencyDownloaderResourceLoader(answer));