This is an automated email from the ASF dual-hosted git repository. acosentino 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 8a4f06710c6 Regen for commit 9abb9596e7e85c430e2a0654afc2bde28ffff877 8a4f06710c6 is described below commit 8a4f06710c6ff6838019d2589b87586417349ac2 Author: orpiske <orpi...@users.noreply.github.com> AuthorDate: Wed Mar 29 10:54:34 2023 +0000 Regen for commit 9abb9596e7e85c430e2a0654afc2bde28ffff877 Signed-off-by: GitHub <nore...@github.com> --- ...xConsumerObserveAttributeMatchStringDifferTest.java | 3 ++- ...amelJmxConsumerObserveAttributeMatchStringTest.java | 3 ++- .../jmx/CamelJmxConsumerObserveAttributeTest.java | 3 ++- .../camel/component/jmx/CamelJmxConsumerTest.java | 3 ++- .../faulttolerance/FaultToleranceReifier.java | 6 ++++-- .../component/resilience4j/ResilienceReifier.java | 3 ++- .../apache/camel/test/CamelRouteCoverageDumper.java | 6 ++++-- .../org/apache/camel/test/junit5/CamelTestSupport.java | 3 ++- .../camel/test/main/junit5/CamelMainExtension.java | 3 ++- .../undertow/rest/RestUndertowHttpPojoTypeTest.java | 3 ++- .../java/org/apache/camel/ExtendedCamelContext.java | 1 + .../apache/camel/impl/engine/AbstractCamelContext.java | 2 -- .../camel/impl/cloud/ServiceCallProcessorFactory.java | 6 ++++-- .../java/org/apache/camel/builder/RouteBuilder.java | 18 ++++++++++++------ .../java/org/apache/camel/main/BaseMainSupport.java | 3 ++- .../camel/main/DefaultConfigurationConfigurer.java | 3 ++- .../camel/main/MainHealthCheckExcludedPatternTest.java | 9 ++++++--- .../camel/management/ManagedCamelContextImpl.java | 6 ++++-- .../camel/management/mbean/ManagedCamelContext.java | 3 ++- .../camel/management/mbean/RouteCoverageXmlParser.java | 9 ++++++--- .../camel/management/ManagedCamelContextTest.java | 3 ++- .../camel/management/ManagedHealthCheckTest.java | 15 ++++++++------- .../camel/management/ManagedInlinedProcessorTest.java | 3 ++- .../management/ManagedRouteSuspendAndResumeTest.java | 3 ++- .../apache/camel/cli/connector/LocalCliConnector.java | 15 ++++++++++----- 25 files changed, 87 insertions(+), 48 deletions(-) diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java index e83d6c424c5..3a948899000 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringDifferTest.java @@ -38,7 +38,8 @@ public class CamelJmxConsumerObserveAttributeMatchStringDifferTest extends Camel getMockEndpoint("mock:result").message(0).body().contains("<attributeName>Tracing</attributeName>"); // change the attribute so JMX triggers but should be filtered - ManagedRouteMBean mr = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo"); + ManagedRouteMBean mr + = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo"); mr.setStatisticsEnabled(true); // change the attribute so JMX triggers diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java index fd7876f501b..90b69382b12 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeMatchStringTest.java @@ -38,7 +38,8 @@ public class CamelJmxConsumerObserveAttributeMatchStringTest extends CamelTestSu getMockEndpoint("mock:result").message(0).body().contains("<attributeName>Tracing</attributeName>"); // change the attribute so JMX triggers but should be filtered - ManagedRouteMBean mr = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo"); + ManagedRouteMBean mr + = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo"); mr.setStatisticsEnabled(true); // change the attribute so JMX triggers diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java index 158d2f109d8..956b14bd6be 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerObserveAttributeTest.java @@ -38,7 +38,8 @@ public class CamelJmxConsumerObserveAttributeTest extends CamelTestSupport { getMockEndpoint("mock:result").message(0).body().contains("<attributeName>Tracing</attributeName>"); // change the attribute so JMX triggers but should be filtered - ManagedRouteMBean mr = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo"); + ManagedRouteMBean mr + = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo"); mr.setStatisticsEnabled(true); // change the attribute so JMX triggers diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java index d74bef663af..1bf7cba82cc 100644 --- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java +++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/CamelJmxConsumerTest.java @@ -37,7 +37,8 @@ public class CamelJmxConsumerTest extends CamelTestSupport { getMockEndpoint("mock:result").message(0).body().contains("<newValue>true</newValue>"); // change the attribute so JMX triggers - ManagedRouteMBean mr = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo"); + ManagedRouteMBean mr + = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo"); mr.setTracing(true); MockEndpoint.assertIsSatisfied(context); diff --git a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java index 156b9ef8001..a23a8dfa127 100644 --- a/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java +++ b/components/camel-microprofile/camel-microprofile-fault-tolerance/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceReifier.java @@ -139,7 +139,8 @@ public class FaultToleranceReifier extends ProcessorReifier<CircuitBreakerDefini // Extract properties from default configuration, the one configured on // camel context takes the precedence over those in the registry loadProperties(properties, Suppliers.firstNotNull( - () -> camelContext.getCamelContextExtension().getContextPlugin(Model.class).getFaultToleranceConfiguration(null), + () -> camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .getFaultToleranceConfiguration(null), () -> lookupByNameAndType(FaultToleranceConstants.DEFAULT_FAULT_TOLERANCE_CONFIGURATION_ID, FaultToleranceConfigurationDefinition.class)), configurer); @@ -150,7 +151,8 @@ public class FaultToleranceReifier extends ProcessorReifier<CircuitBreakerDefini final String ref = parseString(definition.getConfiguration()); loadProperties(properties, Suppliers.firstNotNull( - () -> camelContext.getCamelContextExtension().getContextPlugin(Model.class).getFaultToleranceConfiguration(ref), + () -> camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .getFaultToleranceConfiguration(ref), () -> mandatoryLookup(ref, FaultToleranceConfigurationDefinition.class)), configurer); } diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java index 03657e0f036..e05a396a949 100644 --- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java +++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java @@ -194,7 +194,8 @@ public class ResilienceReifier extends ProcessorReifier<CircuitBreakerDefinition final String ref = parseString(definition.getConfiguration()); loadProperties(properties, Suppliers.firstNotNull( - () -> camelContext.getCamelContextExtension().getContextPlugin(Model.class).getResilience4jConfiguration(ref), + () -> camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .getResilience4jConfiguration(ref), () -> mandatoryLookup(ref, Resilience4jConfigurationDefinition.class)), configurer); } diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java index 14b2d03d4a9..9849935cd83 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java @@ -97,7 +97,8 @@ public class CamelRouteCoverageDumper { String name = objectName.getKeyProperty("name"); name = ObjectName.unquote(name); - ManagedProcessorMBean managedProcessor = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedProcessor(name); + ManagedProcessorMBean managedProcessor + = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedProcessor(name); if (managedProcessor != null) { if (processorsForRoute.get(routeId) == null) { @@ -154,7 +155,8 @@ public class CamelRouteCoverageDumper { // log processor coverage for each route for (Route route : context.getRoutes()) { - ManagedRouteMBean managedRoute = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute(route.getId()); + ManagedRouteMBean managedRoute = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class) + .getManagedRoute(route.getId()); if (managedRoute.getExchangesTotal() == 0) { uncoveredRoutes.add(route.getId()); } diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java index 8c6d6345977..d71ef6221e0 100644 --- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java +++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java @@ -576,7 +576,8 @@ public abstract class CamelTestSupport String dir = "target/camel-route-coverage"; String name = className + "-" + StringHelper.before(currentTestName, "(") + ".xml"; - ManagedCamelContext mc = context != null ? context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class) : null; + ManagedCamelContext mc + = context != null ? context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class) : null; ManagedCamelContextMBean managedCamelContext = mc != null ? mc.getManagedCamelContext() : null; if (managedCamelContext == null) { LOG.warn("Cannot dump route coverage to file as JMX is not enabled. " diff --git a/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java b/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java index 4175566cfd6..838da726604 100644 --- a/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java +++ b/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java @@ -145,7 +145,8 @@ final class CamelMainExtension String name = String.format("%s-%s.xml", className, StringHelper.before(currentTestName, "(")); final ModelCamelContext camelContext = getContextStore(context).get(CONTEXT, CamelMainContext.class).context(); - ManagedCamelContext mc = camelContext == null ? null : camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class); + ManagedCamelContext mc = camelContext == null + ? null : camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class); ManagedCamelContextMBean managedCamelContext = mc == null ? null : mc.getManagedCamelContext(); if (managedCamelContext == null) { LOG.warn("Cannot dump route coverage to file as JMX is not enabled. " diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java index d508720d808..c48cfabeea5 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java @@ -43,7 +43,8 @@ public class RestUndertowHttpPojoTypeTest extends BaseUndertowTest { // Wasn't clear if there's a way to put this test into camel-core just to test the model // perhaps without starting the Camel Context? - List<RestDefinition> restDefinitions = context().getCamelContextExtension().getContextPlugin(Model.class).getRestDefinitions(); + List<RestDefinition> restDefinitions + = context().getCamelContextExtension().getContextPlugin(Model.class).getRestDefinitions(); assertNotNull(restDefinitions); assertTrue(restDefinitions.size() > 0); 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 641a0bac7fc..719975da430 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 @@ -913,6 +913,7 @@ public interface ExtendedCamelContext { /** * Gets access to the internal plugin manager + * * @return the internal plugin manager */ @Deprecated 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 712da26b7cb..d607909f17b 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 @@ -41,7 +41,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import java.util.function.Supplier; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; @@ -134,7 +133,6 @@ 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.PluginManager; import org.apache.camel.spi.ProcessorExchangeFactory; import org.apache.camel.spi.ProcessorFactory; import org.apache.camel.spi.PropertiesComponent; diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java index ed724ae93d4..9e3b033f7df 100644 --- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java +++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java @@ -146,7 +146,8 @@ public class ServiceCallProcessorFactory extends TypedProcessorFactory<ServiceCa private ServiceCallConfigurationDefinition retrieveDefaultConfig(CamelContext camelContext) { // check if a default configuration is bound to the registry - ServiceCallConfigurationDefinition config = camelContext.getCamelContextExtension().getContextPlugin(Model.class).getServiceCallConfiguration(null); + ServiceCallConfigurationDefinition config + = camelContext.getCamelContextExtension().getContextPlugin(Model.class).getServiceCallConfiguration(null); if (config == null) { // Or if it is in the registry @@ -171,7 +172,8 @@ public class ServiceCallProcessorFactory extends TypedProcessorFactory<ServiceCa config = lookup(camelContext, definition.getConfigurationRef(), ServiceCallConfigurationDefinition.class); if (config == null) { // and fallback as service configuration - config = camelContext.getCamelContextExtension().getContextPlugin(Model.class).getServiceCallConfiguration(definition.getConfigurationRef()); + config = camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .getServiceCallConfiguration(definition.getConfigurationRef()); } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java index b3648977d9e..aef44851022 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java @@ -742,7 +742,8 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild private void populateTemplatedRoutes(CamelContext camelContext) throws Exception { getTemplatedRouteCollection().setCamelContext(camelContext); - camelContext.getCamelContextExtension().getContextPlugin(Model.class).addRouteFromTemplatedRoutes(getTemplatedRouteCollection().getTemplatedRoutes()); + camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .addRouteFromTemplatedRoutes(getTemplatedRouteCollection().getTemplatedRoutes()); } /** @@ -760,7 +761,8 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild protected void populateRouteTemplates() throws Exception { CamelContext camelContext = notNullCamelContext(); getRouteTemplateCollection().setCamelContext(camelContext); - camelContext.getCamelContextExtension().getContextPlugin(Model.class).addRouteTemplateDefinitions(getRouteTemplateCollection().getRouteTemplates()); + camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .addRouteTemplateDefinitions(getRouteTemplateCollection().getRouteTemplates()); } protected void populateRoutes() throws Exception { @@ -769,7 +771,8 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild if (resource != null) { getRouteCollection().setResource(resource); } - camelContext.getCamelContextExtension().getContextPlugin(Model.class).addRouteDefinitions(getRouteCollection().getRoutes()); + camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .addRouteDefinitions(getRouteCollection().getRoutes()); } protected void populateOrUpdateRoutes() throws Exception { @@ -783,7 +786,8 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild camelContext.getRouteController().stopRoute(route.getRouteId()); camelContext.removeRoute(route.getRouteId()); } - camelContext.getCamelContextExtension().getContextPlugin(Model.class).addRouteDefinitions(getRouteCollection().getRoutes()); + camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .addRouteDefinitions(getRouteCollection().getRoutes()); } protected void populateRests() throws Exception { @@ -797,7 +801,8 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild // cannot add rests as routes yet as we need to initialize this // specially - camelContext.getCamelContextExtension().getContextPlugin(Model.class).addRestDefinitions(getRestCollection().getRests(), false); + camelContext.getCamelContextExtension().getContextPlugin(Model.class).addRestDefinitions(getRestCollection().getRests(), + false); // convert rests api-doc into routes so they are routes for runtime RestConfiguration config = camelContext.getRestConfiguration(); @@ -809,7 +814,8 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild // so we check all existing routes if they have rest-api route // already added boolean hasRestApi = false; - for (RouteDefinition route : camelContext.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions()) { + for (RouteDefinition route : camelContext.getCamelContextExtension().getContextPlugin(Model.class) + .getRouteDefinitions()) { FromDefinition from = route.getInput(); if (from.getEndpointUri() != null && from.getEndpointUri().startsWith("rest-api:")) { hasRestApi = true; diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index 4a407cb64b2..af36f96e99b 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -1316,7 +1316,8 @@ public abstract class BaseMainSupport extends BaseService { // set properties per console for (String key : keys) { String name = StringHelper.before(key, "."); - DevConsole console = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class).resolveById(name); + DevConsole console + = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class).resolveById(name); if (console == null) { throw new IllegalArgumentException( "Cannot resolve DevConsole with id: " + name); 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 0e7b9ac1903..48f4caf2d93 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 @@ -310,7 +310,8 @@ public final class DefaultConfigurationConfigurer { } if (config.getRouteFilterIncludePattern() != null || config.getRouteFilterExcludePattern() != null) { - camelContext.getCamelContextExtension().getContextPlugin(Model.class).setRouteFilterPattern(config.getRouteFilterIncludePattern(), + camelContext.getCamelContextExtension().getContextPlugin(Model.class).setRouteFilterPattern( + config.getRouteFilterIncludePattern(), config.getRouteFilterExcludePattern()); } diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainHealthCheckExcludedPatternTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainHealthCheckExcludedPatternTest.java index debb0f589e6..496a09682ac 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainHealthCheckExcludedPatternTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainHealthCheckExcludedPatternTest.java @@ -53,7 +53,8 @@ public class MainHealthCheckExcludedPatternTest { CamelContext camelContext = main.getCamelContext(); assertNotNull(camelContext); - HealthCheckRegistry healthCheckRegistry = camelContext.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class); + HealthCheckRegistry healthCheckRegistry + = camelContext.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class); assertNotNull(healthCheckRegistry); Optional<HealthCheckRepository> routes = healthCheckRegistry.getRepository("routes"); @@ -96,7 +97,8 @@ public class MainHealthCheckExcludedPatternTest { // register custom health check camelContext.getRegistry().bind("custom", healthCheck); - HealthCheckRegistry healthCheckRegistry = camelContext.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class); + HealthCheckRegistry healthCheckRegistry + = camelContext.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class); assertNotNull(healthCheckRegistry); Optional<HealthCheckRepository> repository = healthCheckRegistry.getRepository("registry-health-check-repository"); @@ -137,7 +139,8 @@ public class MainHealthCheckExcludedPatternTest { } }; - HealthCheckRegistry healthCheckRegistry = camelContext.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class); + HealthCheckRegistry healthCheckRegistry + = camelContext.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class); assertNotNull(healthCheckRegistry); List<HealthCheck> healthChecks = healthCheckRegistry.stream().collect(Collectors.toList()); diff --git a/core/camel-management/src/main/java/org/apache/camel/management/ManagedCamelContextImpl.java b/core/camel-management/src/main/java/org/apache/camel/management/ManagedCamelContextImpl.java index f27f79e37ac..b3b1ddd0115 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/ManagedCamelContextImpl.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/ManagedCamelContextImpl.java @@ -55,7 +55,8 @@ public class ManagedCamelContextImpl implements ManagedCamelContext { } Processor processor = camelContext.getProcessor(id); - ProcessorDefinition def = camelContext.getCamelContextExtension().getContextPlugin(Model.class).getProcessorDefinition(id); + ProcessorDefinition def + = camelContext.getCamelContextExtension().getContextPlugin(Model.class).getProcessorDefinition(id); // processor may be null if its anonymous inner class or as lambda if (def != null) { @@ -79,7 +80,8 @@ public class ManagedCamelContextImpl implements ManagedCamelContext { } Processor processor = camelContext.getProcessor(id); - ProcessorDefinition def = camelContext.getCamelContextExtension().getContextPlugin(Model.class).getProcessorDefinition(id); + ProcessorDefinition def + = camelContext.getCamelContextExtension().getContextPlugin(Model.class).getProcessorDefinition(id); // processor may be null if its anonymous inner class or as lambda if (def != null) { 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 cf1cddc1c30..6452ec986f3 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 @@ -496,7 +496,8 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti @Override public String dumpRouteTemplatesAsXml() throws Exception { - List<RouteTemplateDefinition> templates = context.getCamelContextExtension().getContextPlugin(Model.class).getRouteTemplateDefinitions(); + List<RouteTemplateDefinition> templates + = context.getCamelContextExtension().getContextPlugin(Model.class).getRouteTemplateDefinitions(); if (templates.isEmpty()) { return null; } diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java index e3e3e908af2..6b5fde04442 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java @@ -113,7 +113,8 @@ public final class RouteCoverageXmlParser { if (id != null) { try { if ("route".equals(qName)) { - ManagedRouteMBean route = camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute(id); + ManagedRouteMBean route = camelContext.getCamelContextExtension() + .getContextPlugin(ManagedCamelContext.class).getManagedRoute(id); if (route != null) { long total = route.getExchangesTotal(); el.setAttribute("exchangesTotal", "" + total); @@ -126,7 +127,8 @@ public final class RouteCoverageXmlParser { if (parent != null) { String routeId = parent.getAttribute("id"); ManagedRouteMBean route - = camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute(routeId); + = camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class) + .getManagedRoute(routeId); if (route != null) { long total = route.getExchangesTotal(); el.setAttribute("exchangesTotal", "" + total); @@ -138,7 +140,8 @@ public final class RouteCoverageXmlParser { } } else { ManagedProcessorMBean processor - = camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedProcessor(id); + = camelContext.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class) + .getManagedProcessor(id); if (processor != null) { long total = processor.getExchangesTotal(); el.setAttribute("exchangesTotal", "" + total); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java index 40a7b0cde56..abf66c1dcbd 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java @@ -60,7 +60,8 @@ public class ManagedCamelContextTest extends ManagementTestSupport { @Test public void testManagedCamelContextClient() throws Exception { - ManagedCamelContextMBean client = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedCamelContext(); + ManagedCamelContextMBean client + = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedCamelContext(); assertNotNull(client); assertEquals("my-camel-context", client.getCamelId()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedHealthCheckTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedHealthCheckTest.java index aacb0c8d65f..c09c347a0e5 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedHealthCheckTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedHealthCheckTest.java @@ -87,13 +87,14 @@ public class ManagedHealthCheckTest extends ManagementTestSupport { template.sendBody("direct:start", "Hello World"); assertMockEndpointsSatisfied(); - context.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class).register(new AbstractHealthCheck("custom", "myCheck") { - @Override - protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) { - // make it always down - builder.down(); - } - }); + context.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class) + .register(new AbstractHealthCheck("custom", "myCheck") { + @Override + protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) { + // make it always down + builder.down(); + } + }); MBeanServer mbeanServer = getMBeanServer(); ObjectName on = getCamelObjectName(TYPE_HEALTH, "DefaultHealthCheck"); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java index c926d920c9e..5e0d869365f 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java @@ -45,7 +45,8 @@ public class ManagedInlinedProcessorTest extends ManagementTestSupport { Long counter = (Long) mbeanServer.getAttribute(on, "ExchangesCompleted"); assertEquals(1L, counter.longValue()); - ManagedProcessorMBean mb = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedProcessor("custom"); + ManagedProcessorMBean mb + = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedProcessor("custom"); assertNotNull(mb); assertEquals(1L, mb.getExchangesCompleted()); } diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java index b74e812cbe3..01374891b5b 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java @@ -83,7 +83,8 @@ public class ManagedRouteSuspendAndResumeTest extends ManagementTestSupport { mock.assertIsSatisfied(); ManagedSuspendableRouteMBean route - = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo", ManagedSuspendableRouteMBean.class); + = context.getCamelContextExtension().getContextPlugin(ManagedCamelContext.class).getManagedRoute("foo", + ManagedSuspendableRouteMBean.class); assertNotNull(route); assertEquals(2, route.getExchangesCompleted()); 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 96b5d76add9..580d704d625 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 @@ -260,21 +260,24 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C mcc.getManagedCamelContext().reset(true); } } else if ("thread-dump".equals(action)) { - DevConsole dc = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class).resolveById("thread"); + DevConsole dc = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class) + .resolveById("thread"); if (dc != null) { JsonObject json = (JsonObject) dc.call(DevConsole.MediaType.JSON, Map.of("stackTrace", "true")); LOG.trace("Updating output file: {}", outputFile); IOHelper.writeText(json.toJson(), outputFile); } } else if ("top-processors".equals(action)) { - DevConsole dc = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class).resolveById("top"); + DevConsole dc + = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class).resolveById("top"); if (dc != null) { JsonObject json = (JsonObject) dc.call(DevConsole.MediaType.JSON, Map.of(Exchange.HTTP_PATH, "/*")); LOG.trace("Updating output file: {}", outputFile); IOHelper.writeText(json.toJson(), outputFile); } } else if ("source".equals(action)) { - DevConsole dc = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class).resolveById("source"); + DevConsole dc = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class) + .resolveById("source"); if (dc != null) { String filter = root.getString("filter"); JsonObject json = (JsonObject) dc.call(DevConsole.MediaType.JSON, Map.of("filter", filter)); @@ -282,7 +285,8 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C IOHelper.writeText(json.toJson(), outputFile); } } else if ("route-controller".equals(action)) { - DevConsole dc = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class).resolveById("route-controller"); + DevConsole dc = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class) + .resolveById("route-controller"); if (dc != null) { String stacktrace = root.getString("stacktrace"); JsonObject json = (JsonObject) dc.call(DevConsole.MediaType.JSON, Map.of("stacktrace", stacktrace)); @@ -421,7 +425,8 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C root.put("fault-tolerance", json); } } - DevConsole dc12 = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class).resolveById("trace"); + DevConsole dc12 = camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class) + .resolveById("trace"); if (dc12 != null) { JsonObject json = (JsonObject) dc12.call(DevConsole.MediaType.JSON); JsonArray arr = json.getCollection("traces");