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 bebc62676546422909be55e1f24a104effca2ba8 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Thu Feb 22 17:59:57 2024 +0100 CAMEL-20014: move the managementMBeanAssembler to the extension --- .../src/main/java/org/apache/camel/spring/SpringCamelContext.java | 2 +- .../src/main/java/org/apache/camel/ExtendedCamelContext.java | 6 ++++++ .../org/apache/camel/impl/engine/DefaultCamelContextExtension.java | 3 ++- .../java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java | 6 ++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java index 65a2ea5689e..d1550f9d7aa 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java @@ -70,7 +70,7 @@ public class SpringCamelContext extends DefaultCamelContext public SpringCamelContext() { super(false); - setManagementMBeanAssembler(new SpringManagementMBeanAssembler(this)); + getCamelContextExtension().setManagementMBeanAssembler(new SpringManagementMBeanAssembler(this)); } public SpringCamelContext(ApplicationContext applicationContext) { 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 e14101b4f23..386d4491acb 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 @@ -80,6 +80,12 @@ public interface ExtendedCamelContext { */ void setRegistry(Registry registry); + /** + * Sets the assembler to assemble a {@link javax.management.modelmbean.RequiredModelMBean} + * @param managementMBeanAssembler the assembler to use + */ + void setManagementMBeanAssembler(ManagementMBeanAssembler managementMBeanAssembler); + default Registry getRegistry() { return null; } 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 a5efe918e62..7708db01495 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 @@ -338,7 +338,8 @@ class DefaultCamelContextExtension implements ExtendedCamelContext { return managementMBeanAssembler; } - void setManagementMBeanAssembler(ManagementMBeanAssembler managementMBeanAssembler) { + @Override + public void setManagementMBeanAssembler(ManagementMBeanAssembler managementMBeanAssembler) { this.managementMBeanAssembler = camelContext.getInternalServiceManager().addService(camelContext, managementMBeanAssembler, false); } 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 e383a105ae6..73ef6d47d7e 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 @@ -39,6 +39,8 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com case "ExchangeFactoryManager": target.setExchangeFactoryManager(property(camelContext, org.apache.camel.spi.ExchangeFactoryManager.class, value)); return true; case "headersmapfactory": case "HeadersMapFactory": target.setHeadersMapFactory(property(camelContext, org.apache.camel.spi.HeadersMapFactory.class, value)); return true; + case "managementmbeanassembler": + case "ManagementMBeanAssembler": target.setManagementMBeanAssembler(property(camelContext, org.apache.camel.spi.ManagementMBeanAssembler.class, value)); return true; case "name": case "Name": target.setName(property(camelContext, java.lang.String.class, value)); return true; case "processorexchangefactory": @@ -74,6 +76,8 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com case "ExchangeFactoryManager": return org.apache.camel.spi.ExchangeFactoryManager.class; case "headersmapfactory": case "HeadersMapFactory": return org.apache.camel.spi.HeadersMapFactory.class; + case "managementmbeanassembler": + case "ManagementMBeanAssembler": return org.apache.camel.spi.ManagementMBeanAssembler.class; case "name": case "Name": return java.lang.String.class; case "processorexchangefactory": @@ -110,6 +114,8 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com case "ExchangeFactoryManager": return target.getExchangeFactoryManager(); case "headersmapfactory": case "HeadersMapFactory": return target.getHeadersMapFactory(); + case "managementmbeanassembler": + case "ManagementMBeanAssembler": return target.getManagementMBeanAssembler(); case "name": case "Name": return target.getName(); case "processorexchangefactory":
