You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/04/03 13:31:23 UTC
[camel] branch main updated (30f02935727 -> 68864776ccb)
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 30f02935727 (chores) ci: upgrade to Maven Daemon 0.9.0
new f3b0343b26d CAMEL-15105: fixed import order
new d74f22294c4 CAMEL-15105: make the ModelToXMLDumper a plugin of the context
new 68864776ccb CAMEL-15105: removed unused variable in AbstractCamelContext
The 3 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/spring/DumpModelAsXmlPlaceholdersTest.java | 5 ++---
.../spring/routebuilder/SpringRouteTemplateTest.java | 8 +++-----
.../java/org/apache/camel/ExtendedCamelContext.java | 11 -----------
.../apache/camel/impl/engine/AbstractCamelContext.java | 7 +------
.../camel/impl/engine/DefaultCamelContextExtension.java | 16 ----------------
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ------
.../java/org/apache/camel/impl/DefaultCamelContext.java | 3 ++-
.../camel/impl/lw/LightweightCamelContextExtension.java | 11 -----------
.../main/java/org/apache/camel/builder/AdviceWith.java | 7 +++++--
.../component/properties/PropertiesRouteFromTest.java | 5 ++---
.../issues/TwoDoTryAndThrowInInnerCatchIssueTest.java | 5 ++---
.../camel/util/DumpModelAsXmlAggregateRouteTest.java | 5 ++---
...elAsXmlChoiceFilterRoutePropertyPlaceholderTest.java | 8 +++-----
.../camel/util/DumpModelAsXmlChoiceFilterRouteTest.java | 11 ++++-------
.../camel/util/DumpModelAsXmlDanishCharactersTest.java | 5 ++---
.../camel/util/DumpModelAsXmlFromRouteTemplateTest.java | 12 ++++++------
.../apache/camel/util/DumpModelAsXmlNamespaceTest.java | 5 ++---
.../camel/util/DumpModelAsXmlPlaceholdersTest.java | 5 ++---
.../camel/util/DumpModelAsXmlRouteExpressionTest.java | 17 ++++++++---------
.../camel/util/DumpModelAsXmlRoutePredicateTest.java | 17 ++++++++---------
.../camel/util/DumpModelAsXmlRouteTemplateTest.java | 6 +++---
.../camel/util/DumpModelAsXmlSourceLocationTest.java | 8 +++-----
.../camel/util/DumpModelAsXmlSplitBodyRouteTest.java | 5 ++---
.../DumpModelAsXmlSplitNestedChoiceEndRouteTest.java | 5 ++---
.../util/DumpModelAsXmlTransformRouteConstantTest.java | 5 ++---
.../util/DumpModelAsXmlTransformRouteLanguageTest.java | 5 ++---
.../camel/util/DumpModelAsXmlTransformRouteTest.java | 5 ++---
.../camel/management/mbean/ManagedCamelContext.java | 11 ++++-------
.../apache/camel/management/mbean/ManagedProcessor.java | 5 ++---
.../org/apache/camel/management/mbean/ManagedRoute.java | 6 +++---
.../java/org/apache/camel/support/PluginHelper.java | 15 +++++++++++++++
.../org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java | 5 ++---
.../apache/camel/builder/endpoint/DumpRoutesTest.java | 5 ++---
.../camel/generator/openapi/RestDslXmlGenerator.java | 5 ++---
.../camel/generator/openapi/RestDslYamlGenerator.java | 5 ++---
35 files changed, 102 insertions(+), 163 deletions(-)
[camel] 03/03: CAMEL-15105: removed unused variable in AbstractCamelContext
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 68864776ccb9ed75e4b8ff978da2fb42db705a23
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 3 12:04:56 2023 +0200
CAMEL-15105: removed unused variable in AbstractCamelContext
---
.../src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 1 -
1 file changed, 1 deletion(-)
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 be91e7c7331..2799a4eb83a 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
@@ -214,7 +214,6 @@ public abstract class AbstractCamelContext extends BaseService
volatile ManagementStrategy managementStrategy;
volatile ManagementMBeanAssembler managementMBeanAssembler;
volatile HeadersMapFactory headersMapFactory;
- volatile ResourceLoader resourceLoader;
volatile BeanIntrospection beanIntrospection;
volatile boolean eventNotificationApplicable;
volatile StartupStepRecorder startupStepRecorder = new DefaultStartupStepRecorder();
[camel] 02/03: CAMEL-15105: make the ModelToXMLDumper 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 d74f22294c453683086eca27d96ab08c11777766
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 3 11:50:01 2023 +0200
CAMEL-15105: make the ModelToXMLDumper a plugin of the context
---
.../camel/spring/DumpModelAsXmlPlaceholdersTest.java | 5 ++---
.../spring/routebuilder/SpringRouteTemplateTest.java | 8 +++-----
.../java/org/apache/camel/ExtendedCamelContext.java | 11 -----------
.../apache/camel/impl/engine/AbstractCamelContext.java | 6 +-----
.../camel/impl/engine/DefaultCamelContextExtension.java | 16 ----------------
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ------
.../java/org/apache/camel/impl/DefaultCamelContext.java | 3 ++-
.../camel/impl/lw/LightweightCamelContextExtension.java | 11 -----------
.../main/java/org/apache/camel/builder/AdviceWith.java | 7 +++++--
.../component/properties/PropertiesRouteFromTest.java | 5 ++---
.../issues/TwoDoTryAndThrowInInnerCatchIssueTest.java | 5 ++---
.../camel/util/DumpModelAsXmlAggregateRouteTest.java | 5 ++---
...elAsXmlChoiceFilterRoutePropertyPlaceholderTest.java | 8 +++-----
.../camel/util/DumpModelAsXmlChoiceFilterRouteTest.java | 11 ++++-------
.../camel/util/DumpModelAsXmlDanishCharactersTest.java | 5 ++---
.../camel/util/DumpModelAsXmlFromRouteTemplateTest.java | 12 ++++++------
.../apache/camel/util/DumpModelAsXmlNamespaceTest.java | 5 ++---
.../camel/util/DumpModelAsXmlPlaceholdersTest.java | 5 ++---
.../camel/util/DumpModelAsXmlRouteExpressionTest.java | 17 ++++++++---------
.../camel/util/DumpModelAsXmlRoutePredicateTest.java | 17 ++++++++---------
.../camel/util/DumpModelAsXmlRouteTemplateTest.java | 6 +++---
.../camel/util/DumpModelAsXmlSourceLocationTest.java | 8 +++-----
.../camel/util/DumpModelAsXmlSplitBodyRouteTest.java | 5 ++---
.../DumpModelAsXmlSplitNestedChoiceEndRouteTest.java | 5 ++---
.../util/DumpModelAsXmlTransformRouteConstantTest.java | 5 ++---
.../util/DumpModelAsXmlTransformRouteLanguageTest.java | 5 ++---
.../camel/util/DumpModelAsXmlTransformRouteTest.java | 5 ++---
.../camel/management/mbean/ManagedCamelContext.java | 11 ++++-------
.../apache/camel/management/mbean/ManagedProcessor.java | 5 ++---
.../org/apache/camel/management/mbean/ManagedRoute.java | 6 +++---
.../java/org/apache/camel/support/PluginHelper.java | 16 +++++++++++++++-
.../org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java | 5 ++---
.../apache/camel/builder/endpoint/DumpRoutesTest.java | 5 ++---
.../camel/generator/openapi/RestDslXmlGenerator.java | 5 ++---
.../camel/generator/openapi/RestDslYamlGenerator.java | 5 ++---
35 files changed, 102 insertions(+), 163 deletions(-)
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
index ba210bc8362..2d8aad7d51b 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/DumpModelAsXmlPlaceholdersTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.spring;
-import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -38,8 +38,7 @@ public class DumpModelAsXmlPlaceholdersTest extends SpringTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
assertEquals("Gouda", context.getRoutes().get(0).getId());
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("Gouda"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("Gouda"));
assertNotNull(xml);
log.info(xml);
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.java
index 365138d4c31..82dd0f8d412 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/routebuilder/SpringRouteTemplateTest.java
@@ -19,13 +19,13 @@ package org.apache.camel.spring.routebuilder;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RouteTemplateDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -155,8 +155,7 @@ public class SpringRouteTemplateTest extends SpringTestSupport {
RouteDefinition def = context.getRouteDefinition("first");
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, def, true, true);
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, def, true, true);
assertNotNull(xml);
Assertions.assertTrue(xml.contains("<from uri=\"direct:one\"/>"));
@@ -172,8 +171,7 @@ public class SpringRouteTemplateTest extends SpringTestSupport {
RoutesDefinition def = new RoutesDefinition();
def.setRoutes(context.getRouteDefinitions());
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, def, true, true);
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, def, true, true);
assertNotNull(xml);
Assertions.assertTrue(xml.contains("<from uri=\"direct:one\"/>"));
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 5dea6438d61..186e9ace06e 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.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.ManagementMBeanAssembler;
-import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PluginManager;
import org.apache.camel.spi.ProcessorExchangeFactory;
@@ -393,16 +392,6 @@ public interface ExtendedCamelContext {
*/
void setEventNotificationApplicable(boolean eventNotificationApplicable);
- /**
- * Gets the {@link ModelToXMLDumper} to be used.
- */
- ModelToXMLDumper getModelToXMLDumper();
-
- /**
- * Sets a custom {@link ModelToXMLDumper} to be used.
- */
- void setModelToXMLDumper(ModelToXMLDumper modelToXMLDumper);
-
/**
* Internal {@link RouteController} that are only used internally by Camel to perform basic route operations. Do not
* use this as end user.
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 c300f2d8d3f..be91e7c7331 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
@@ -215,7 +215,6 @@ public abstract class AbstractCamelContext extends BaseService
volatile ManagementMBeanAssembler managementMBeanAssembler;
volatile HeadersMapFactory headersMapFactory;
volatile ResourceLoader resourceLoader;
- volatile ModelToXMLDumper modelToXMLDumper;
volatile BeanIntrospection beanIntrospection;
volatile boolean eventNotificationApplicable;
volatile StartupStepRecorder startupStepRecorder = new DefaultStartupStepRecorder();
@@ -383,6 +382,7 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.lazyAddContextPlugin(BeanIntrospection.class, this::createBeanIntrospection);
camelContextExtension.lazyAddContextPlugin(ResourceLoader.class, this::createResourceLoader);
camelContextExtension.lazyAddContextPlugin(BeanProcessorFactory.class, this::createBeanProcessorFactory);
+ camelContextExtension.lazyAddContextPlugin(ModelToXMLDumper.class, this::createModelToXMLDumper);
if (build) {
try {
@@ -4173,10 +4173,6 @@ public abstract class AbstractCamelContext extends BaseService
camelContextExtension.setReactiveExecutor(reactiveExecutor);
}
- public ModelToXMLDumper getModelToXMLDumper() {
- return camelContextExtension.getModelToXMLDumper();
- }
-
public EndpointUriFactory getEndpointUriFactory(String scheme) {
return camelContextExtension.getEndpointUriFactory(scheme);
}
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 26caa1dac5b..4d2dad49bcc 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
@@ -53,7 +53,6 @@ import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.ManagementMBeanAssembler;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.ManagementStrategyFactory;
-import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PluginManager;
import org.apache.camel.spi.ProcessorExchangeFactory;
@@ -412,21 +411,6 @@ class DefaultCamelContextExtension implements ExtendedCamelContext {
camelContext.headersMapFactory = camelContext.getInternalServiceManager().addService(headersMapFactory);
}
- public ModelToXMLDumper getModelToXMLDumper() {
- if (camelContext.modelToXMLDumper == null) {
- synchronized (camelContext.lock) {
- if (camelContext.modelToXMLDumper == null) {
- setModelToXMLDumper(camelContext.createModelToXMLDumper());
- }
- }
- }
- return camelContext.modelToXMLDumper;
- }
-
- public void setModelToXMLDumper(ModelToXMLDumper modelToXMLDumper) {
- camelContext.modelToXMLDumper = camelContext.getInternalServiceManager().addService(modelToXMLDumper);
- }
-
@Override
public ExchangeFactory getExchangeFactory() {
if (camelContext.exchangeFactory == 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 8c542c09014..0bba3fec553 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
@@ -43,8 +43,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 "lightweight":
case "Lightweight": target.setLightweight(property(camelContext, boolean.class, value)); return true;
- case "modeltoxmldumper":
- case "ModelToXMLDumper": target.setModelToXMLDumper(property(camelContext, org.apache.camel.spi.ModelToXMLDumper.class, value)); return true;
case "name":
case "Name": target.setName(property(camelContext, java.lang.String.class, value)); return true;
case "processorexchangefactory":
@@ -84,8 +82,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "HeadersMapFactory": return org.apache.camel.spi.HeadersMapFactory.class;
case "lightweight":
case "Lightweight": return boolean.class;
- case "modeltoxmldumper":
- case "ModelToXMLDumper": return org.apache.camel.spi.ModelToXMLDumper.class;
case "name":
case "Name": return java.lang.String.class;
case "processorexchangefactory":
@@ -126,8 +122,6 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
case "HeadersMapFactory": return target.getHeadersMapFactory();
case "lightweight":
case "Lightweight": return target.isLightweight();
- case "modeltoxmldumper":
- case "ModelToXMLDumper": return target.getModelToXMLDumper();
case "name":
case "Name": return target.getName();
case "processorexchangefactory":
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index a800b7557f7..2b996d072fe 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -81,6 +81,7 @@ import org.apache.camel.spi.Validator;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultRegistry;
import org.apache.camel.support.LocalBeanRegistry;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.SimpleUuidGenerator;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OrderedLocationProperties;
@@ -152,7 +153,7 @@ public class DefaultCamelContext extends SimpleCamelContext implements ModelCame
@Override
protected void doDumpRoutes() {
- ModelToXMLDumper dumper = getModelToXMLDumper();
+ final ModelToXMLDumper dumper = PluginHelper.getModelToXMLDumper(this);
int size = getRouteDefinitions().size();
if (size > 0) {
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 4a3fc3ec543..7d64d2a522f 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
@@ -48,7 +48,6 @@ import org.apache.camel.spi.HeadersMapFactory;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.ManagementMBeanAssembler;
-import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PluginManager;
import org.apache.camel.spi.ProcessorExchangeFactory;
@@ -320,16 +319,6 @@ class LightweightCamelContextExtension implements ExtendedCamelContext {
throw new UnsupportedOperationException();
}
- @Override
- public ModelToXMLDumper getModelToXMLDumper() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void setModelToXMLDumper(ModelToXMLDumper modelToXMLDumper) {
- throw new UnsupportedOperationException();
- }
-
@Override
public void addRoute(Route route) {
throw new UnsupportedOperationException();
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
index e12fff7a3c9..8ec466c11e1 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/AdviceWith.java
@@ -24,6 +24,8 @@ import org.apache.camel.model.Model;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
+import org.apache.camel.spi.ModelToXMLDumper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.function.ThrowingConsumer;
import org.slf4j.Logger;
@@ -237,9 +239,10 @@ public final class AdviceWith {
}
String beforeAsXml = null;
+ final ModelToXMLDumper modelToXMLDumper = PluginHelper.getModelToXMLDumper(ecc);
if (logRoutesAsXml && LOG.isInfoEnabled()) {
try {
- beforeAsXml = ecc.getModelToXMLDumper().dumpModelAsXml(camelContext, definition);
+ beforeAsXml = modelToXMLDumper.dumpModelAsXml(camelContext, definition);
} catch (Throwable e) {
// ignore, it may be due jaxb is not on classpath etc
}
@@ -275,7 +278,7 @@ public final class AdviceWith {
if (beforeAsXml != null && logRoutesAsXml && LOG.isInfoEnabled()) {
try {
- String afterAsXml = ecc.getModelToXMLDumper().dumpModelAsXml(camelContext, merged);
+ String afterAsXml = modelToXMLDumper.dumpModelAsXml(camelContext, merged);
LOG.info("Adviced route before/after as XML:\n{}\n\n{}", beforeAsXml, afterAsXml);
} catch (Throwable e) {
// ignore, it may be due jaxb is not on classpath etc
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteFromTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteFromTest.java
index 4dd22a368ff..5aa77ca5c50 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteFromTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesRouteFromTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.properties;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SendDefinition;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -42,8 +42,7 @@ public class PropertiesRouteFromTest extends ContextTestSupport {
assertEquals("{{cool.start}}", uri);
// use a routes definition to dump the routes
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("foo"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("foo"));
assertTrue(xml.contains("<from uri=\"{{cool.start}}\"/>"));
assertThat(xml).containsPattern("\\Q<to id=\"\\Eto[0-9]+\\Q\" uri=\"{{cool.end}}\"/>\\E");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/TwoDoTryAndThrowInInnerCatchIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/TwoDoTryAndThrowInInnerCatchIssueTest.java
index cace2a06ebb..e4a238d1374 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/TwoDoTryAndThrowInInnerCatchIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/TwoDoTryAndThrowInInnerCatchIssueTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.net.MalformedURLException;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.fail;
@@ -33,8 +33,7 @@ public class TwoDoTryAndThrowInInnerCatchIssueTest extends ContextTestSupport {
@Test
public void testSendThatIsCaught() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myroute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myroute"));
log.info(xml);
getMockEndpoint("mock:catch1").expectedMessageCount(0);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
index a452fcdb499..1f0e16905dd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java
@@ -17,9 +17,9 @@
package org.apache.camel.util;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -32,8 +32,7 @@ public class DumpModelAsXmlAggregateRouteTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest.java
index 13dc3ecc0e3..1ecd1dd6715 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.util;
import java.util.Properties;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -33,8 +33,7 @@ public class DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest extends Cont
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
@@ -46,8 +45,7 @@ public class DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest extends Cont
@Test
public void testDumpModelAsXmAl() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("a"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("a"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
index 6fe0f42b1ae..81918fdbcb6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.util;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -32,8 +32,7 @@ public class DumpModelAsXmlChoiceFilterRouteTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmlNoEmptyLines() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
@@ -46,8 +45,7 @@ public class DumpModelAsXmlChoiceFilterRouteTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
@@ -59,8 +57,7 @@ public class DumpModelAsXmlChoiceFilterRouteTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmAl() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("a"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("a"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlDanishCharactersTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlDanishCharactersTest.java
index 60ac53f1df4..c3eea200a85 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlDanishCharactersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlDanishCharactersTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.util;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.MyBarSingleton;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Registry;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -40,8 +40,7 @@ public class DumpModelAsXmlDanishCharactersTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlFromRouteTemplateTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlFromRouteTemplateTest.java
index 36d30a0693b..e86e4443165 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlFromRouteTemplateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlFromRouteTemplateTest.java
@@ -24,9 +24,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -45,8 +45,7 @@ public class DumpModelAsXmlFromRouteTemplateTest extends ContextTestSupport {
map.put("whereto", "Moes");
context.addRouteFromTemplate("foo", "myTemplate", map);
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("foo"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("foo"));
assertNotNull(xml);
log.info(xml);
@@ -82,8 +81,8 @@ public class DumpModelAsXmlFromRouteTemplateTest extends ContextTestSupport {
map.put("whereto", "Jacks");
context.addRouteFromTemplate("bar2", "myTemplate", map);
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("bar"), true, false);
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("bar"), true,
+ false);
assertNotNull(xml);
log.info(xml);
@@ -105,7 +104,8 @@ public class DumpModelAsXmlFromRouteTemplateTest extends ContextTestSupport {
node = (Element) nodes.item(0);
assertEquals("bar", node.getAttribute("id"));
- xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("bar2"), true, false);
+ xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("bar2"), true,
+ false);
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
index 57d8f351f33..3007fd1897c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
@@ -20,8 +20,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.builder.Namespaces;
import org.junit.jupiter.api.Test;
@@ -35,8 +35,7 @@ public class DumpModelAsXmlNamespaceTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
Document dom = context.getTypeConverter().convertTo(Document.class, xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java
index 2326e052420..f2d9e6deb3c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.util;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
@@ -29,8 +29,7 @@ public class DumpModelAsXmlPlaceholdersTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
assertEquals("Gouda", context.getRoutes().get(0).getId());
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("Gouda"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("Gouda"));
assertNotNull(xml);
log.info(xml);
assertTrue(xml.contains("<route xmlns=\"http://camel.apache.org/schema/spring\" customId=\"true\" id=\"Gouda\">"));
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
index 652ddef6c4a..127c2b4e808 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.util;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.MyBarSingleton;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Registry;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -41,8 +41,7 @@ public class DumpModelAsXmlRouteExpressionTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
@@ -51,8 +50,8 @@ public class DumpModelAsXmlRouteExpressionTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmlXPath() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myOtherRoute"));
+ String xml
+ = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myOtherRoute"));
assertNotNull(xml);
log.info(xml);
@@ -61,8 +60,8 @@ public class DumpModelAsXmlRouteExpressionTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmlHeader() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myFooRoute"));
+ String xml
+ = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myFooRoute"));
assertNotNull(xml);
log.info(xml);
@@ -71,8 +70,8 @@ public class DumpModelAsXmlRouteExpressionTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmlBean() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myBeanRoute"));
+ String xml
+ = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myBeanRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRoutePredicateTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRoutePredicateTest.java
index 1c77db5adc8..37b99181a9f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRoutePredicateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRoutePredicateTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.util;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.MyBarSingleton;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Registry;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -40,8 +40,7 @@ public class DumpModelAsXmlRoutePredicateTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
@@ -50,8 +49,8 @@ public class DumpModelAsXmlRoutePredicateTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmlXPath() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myOtherRoute"));
+ String xml
+ = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myOtherRoute"));
assertNotNull(xml);
log.info(xml);
@@ -60,8 +59,8 @@ public class DumpModelAsXmlRoutePredicateTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmlHeader() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myFooRoute"));
+ String xml
+ = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myFooRoute"));
assertNotNull(xml);
log.info(xml);
@@ -70,8 +69,8 @@ public class DumpModelAsXmlRoutePredicateTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmlBean() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myBeanRoute"));
+ String xml
+ = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myBeanRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteTemplateTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteTemplateTest.java
index 8e74d21f422..ddb942bc11a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteTemplateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteTemplateTest.java
@@ -21,9 +21,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,8 +36,8 @@ public class DumpModelAsXmlRouteTemplateTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteTemplateDefinition("myTemplate"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context,
+ context.getRouteTemplateDefinition("myTemplate"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSourceLocationTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSourceLocationTest.java
index c43c4aac6fc..8412447d96b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSourceLocationTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSourceLocationTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.util;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -36,8 +36,7 @@ public class DumpModelAsXmlSourceLocationTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
@@ -47,8 +46,7 @@ public class DumpModelAsXmlSourceLocationTest extends ContextTestSupport {
@Test
public void testDumpModelAsXmlExternal() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("cool"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("cool"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitBodyRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitBodyRouteTest.java
index bd2f84ad3e2..dec9c19d241 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitBodyRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitBodyRouteTest.java
@@ -21,9 +21,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,8 +36,7 @@ public class DumpModelAsXmlSplitBodyRouteTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitNestedChoiceEndRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitNestedChoiceEndRouteTest.java
index d743164a412..bf732568019 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitNestedChoiceEndRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitNestedChoiceEndRouteTest.java
@@ -21,9 +21,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,8 +36,7 @@ public class DumpModelAsXmlSplitNestedChoiceEndRouteTest extends ContextTestSupp
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteConstantTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteConstantTest.java
index b9d6c45be8d..fb04e447e95 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteConstantTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteConstantTest.java
@@ -21,9 +21,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,8 +36,7 @@ public class DumpModelAsXmlTransformRouteConstantTest extends ContextTestSupport
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteLanguageTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteLanguageTest.java
index c0c1426d745..5c30a125b6a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteLanguageTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteLanguageTest.java
@@ -21,9 +21,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.apache.camel.builder.Builder.language;
@@ -37,8 +37,7 @@ public class DumpModelAsXmlTransformRouteLanguageTest extends ContextTestSupport
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
index 5350c765f35..3e3b17cb8df 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
@@ -21,9 +21,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,8 +36,7 @@ public class DumpModelAsXmlTransformRouteTest extends ContextTestSupport {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
log.info(xml);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index 0bf5c293644..aed7adf4875 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -33,7 +33,6 @@ import org.w3c.dom.Document;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.ManagementStatisticsLevel;
import org.apache.camel.Producer;
import org.apache.camel.ProducerTemplate;
@@ -466,8 +465,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
RestsDefinition def = new RestsDefinition();
def.setRests(rests);
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- return ecc.getModelToXMLDumper().dumpModelAsXml(context, def, resolvePlaceholders, false);
+ return PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, def, resolvePlaceholders, false);
}
@Override
@@ -491,8 +489,8 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
RoutesDefinition def = new RoutesDefinition();
def.setRoutes(routes);
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- return ecc.getModelToXMLDumper().dumpModelAsXml(context, def, resolvePlaceholders, resolveDelegateEndpoints);
+ return PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, def, resolvePlaceholders,
+ resolveDelegateEndpoints);
}
@Override
@@ -507,8 +505,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
RouteTemplatesDefinition def = new RouteTemplatesDefinition();
def.setRouteTemplates(templates);
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- return ecc.getModelToXMLDumper().dumpModelAsXml(context, def);
+ return PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, def);
}
@Override
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
index 8c6d42b6671..3143214dd6d 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
@@ -17,7 +17,6 @@
package org.apache.camel.management.mbean;
import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.ServiceStatus;
@@ -32,6 +31,7 @@ import org.apache.camel.model.StepDefinition;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.RouteIdAware;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
@ManagedResource(description = "Managed Processor")
@@ -194,7 +194,6 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
@Override
public String dumpProcessorAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- return ecc.getModelToXMLDumper().dumpModelAsXml(context, definition);
+ return PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, definition);
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
index 0d4d696dab4..4b914e79d71 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
@@ -41,7 +41,6 @@ import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.ManagementStatisticsLevel;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
@@ -59,6 +58,7 @@ import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.InflightRepository;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.RoutePolicy;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -396,8 +396,8 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList
String id = route.getId();
RouteDefinition def = context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinition(id);
if (def != null) {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- return ecc.getModelToXMLDumper().dumpModelAsXml(context, def, resolvePlaceholders, resolveDelegateEndpoints);
+ return PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, def, resolvePlaceholders,
+ resolveDelegateEndpoints);
}
return 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 d981a30be92..bf525e42307 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
@@ -28,7 +28,6 @@ import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.BeanProxyFactory;
-import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.CamelDependencyInjectionAnnotationFactory;
import org.apache.camel.spi.ComponentNameResolver;
@@ -40,6 +39,7 @@ import org.apache.camel.spi.InterceptEndpointFactory;
import org.apache.camel.spi.InternalProcessorFactory;
import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.ModelJAXBContextFactory;
+import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.ModelineFactory;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.PackageScanResourceResolver;
@@ -562,4 +562,18 @@ public final class PluginHelper {
public static BeanProcessorFactory getBeanProcessorFactory(ExtendedCamelContext extendedCamelContext) {
return extendedCamelContext.getContextPlugin(BeanProcessorFactory.class);
}
+
+ /**
+ * Gets the {@link ModelToXMLDumper} to be used.
+ */
+ public static ModelToXMLDumper getModelToXMLDumper(CamelContext camelContext) {
+ return getModelToXMLDumper(camelContext.getCamelContextExtension());
+ }
+
+ /**
+ * Gets the {@link ModelToXMLDumper} to be used.
+ */
+ public static ModelToXMLDumper getModelToXMLDumper(ExtendedCamelContext extendedCamelContext) {
+ return extendedCamelContext.getContextPlugin(ModelToXMLDumper.class);
+ }
}
diff --git a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
index 0ccf2ef590a..bc82155839e 100644
--- a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
+++ b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
@@ -42,7 +42,6 @@ import org.w3c.dom.Node;
import org.apache.camel.CamelContext;
import org.apache.camel.DelegateEndpoint;
import org.apache.camel.Endpoint;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NamedNode;
import org.apache.camel.TypeConversionException;
import org.apache.camel.converter.jaxp.XmlConverter;
@@ -54,6 +53,7 @@ import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.annotations.JdkService;
import org.apache.camel.support.ObjectHelper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.KeyValueHolder;
import org.apache.camel.util.xml.XmlLineNumberParser;
@@ -228,9 +228,8 @@ public class JaxbModelToXMLDumper implements ModelToXMLDumper {
// replaced so re-create the model
if (changed.get()) {
xml = context.getTypeConverter().mandatoryConvertTo(String.class, dom);
- ExtendedCamelContext ecc = context.getCamelContextExtension();
NamedNode copy = modelToXml(context, xml, NamedNode.class);
- xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, copy);
+ xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, copy);
}
}
diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/DumpRoutesTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/DumpRoutesTest.java
index eaf584e7e4a..3745770743a 100644
--- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/DumpRoutesTest.java
+++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/DumpRoutesTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.builder.endpoint;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,8 +33,7 @@ public class DumpRoutesTest extends BaseEndpointDslTest {
@Test
public void testDumpModelAsXml() throws Exception {
- ExtendedCamelContext ecc = context.getCamelContextExtension();
- String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
assertNotNull(xml);
LOG.info(xml);
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
index d05952921d2..4aa129b1e38 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
@@ -35,8 +35,8 @@ import org.xml.sax.InputSource;
import io.apicurio.datamodels.openapi.models.OasDocument;
import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.model.rest.RestsDefinition;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.ObjectHelper;
public class RestDslXmlGenerator extends RestDslGenerator<RestDslXmlGenerator> {
@@ -57,8 +57,7 @@ public class RestDslXmlGenerator extends RestDslGenerator<RestDslXmlGenerator> {
document.paths.getPathItems().forEach(restDslStatement::visit);
final RestsDefinition rests = emitter.result();
- final ExtendedCamelContext ecc = context.getCamelContextExtension();
- final String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, rests);
+ final String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, rests);
final DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
index 8fc85609c8f..b5c9bcb74a1 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
@@ -50,8 +50,8 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
import io.apicurio.datamodels.openapi.models.OasDocument;
import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.model.rest.RestsDefinition;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.util.ObjectHelper;
public class RestDslYamlGenerator extends RestDslGenerator<RestDslYamlGenerator> {
@@ -78,8 +78,7 @@ public class RestDslYamlGenerator extends RestDslGenerator<RestDslYamlGenerator>
document.paths.getPathItems().forEach(restDslStatement::visit);
final RestsDefinition rests = emitter.result();
- final ExtendedCamelContext ecc = context.getCamelContextExtension();
- final String xml = ecc.getModelToXMLDumper().dumpModelAsXml(context, rests);
+ final String xml = PluginHelper.getModelToXMLDumper(context).dumpModelAsXml(context, rests);
final DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
[camel] 01/03: CAMEL-15105: fixed import order
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 f3b0343b26d8af94e0daa9e81267b01174f8da00
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sun Apr 2 11:36:45 2023 +0200
CAMEL-15105: fixed import order
---
.../src/main/java/org/apache/camel/support/PluginHelper.java | 1 +
1 file changed, 1 insertion(+)
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 256f942be38..d981a30be92 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
@@ -28,6 +28,7 @@ import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.BeanProxyFactory;
+import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.CamelDependencyInjectionAnnotationFactory;
import org.apache.camel.spi.ComponentNameResolver;