Repository: camel Updated Branches: refs/heads/master c483de770 -> e55b0e8ce
CAMEL-9016: <jmxAgent> in XML DSL should not output default values when dumped Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4c5ab39 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4c5ab39 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4c5ab39 Branch: refs/heads/master Commit: c4c5ab39b9ae6d344e0f049aaa57a3250ae362bb Parents: 773d8cb Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jul 26 10:36:17 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jul 26 13:34:12 2015 +0200 ---------------------------------------------------------------------- .../xml/AbstractCamelContextFactoryBean.java | 2 +- .../camel/core/xml/CamelJMXAgentDefinition.java | 55 ++++++++++++-------- 2 files changed, 33 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c4c5ab39/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java index 3f10f56..e48b74c 100644 --- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java +++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java @@ -410,7 +410,7 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex boolean disabled = false; if (camelJMXAgent != null) { - disabled = CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getDisabled()); + disabled = camelJMXAgent.getDisabled() != null && CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getDisabled()); } if (disabled) { http://git-wip-us.apache.org/repos/asf/camel/blob/c4c5ab39/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java ---------------------------------------------------------------------- diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java index 0ada40d..1a70fc9 100644 --- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java +++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java @@ -21,8 +21,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.ManagementStatisticsLevel; import org.apache.camel.model.IdentifiedType; +import org.apache.camel.util.CollectionStringBuffer; /** * The JAXB type class for the configuration of jmxAgent @@ -37,13 +37,13 @@ public class CamelJMXAgentDefinition extends IdentifiedType { * Disable JMI (default false) */ @XmlAttribute - private String disabled = "false"; + private String disabled; /** * Only register processor if a custom id was defined for it. */ @XmlAttribute - private String onlyRegisterProcessorWithCustomId = "false"; + private String onlyRegisterProcessorWithCustomId; /** * RMI connector registry port (default 1099) @@ -79,13 +79,13 @@ public class CamelJMXAgentDefinition extends IdentifiedType { * A flag that indicates whether the agent should be created */ @XmlAttribute - private String createConnector = "false"; + private String createConnector; /** * A flag that indicates whether the platform mbean server should be used */ @XmlAttribute - private String usePlatformMBeanServer = "true"; + private String usePlatformMBeanServer; /** * A flag that indicates whether to register mbeans always @@ -97,13 +97,13 @@ public class CamelJMXAgentDefinition extends IdentifiedType { * A flag that indicates whether to register mbeans when starting new routes */ @XmlAttribute - private String registerNewRoutes = "true"; + private String registerNewRoutes; /** * Level of granularity for performance statistics enabled */ @XmlAttribute - private String statisticsLevel = ManagementStatisticsLevel.Default.name(); + private String statisticsLevel; /** * A flag that indicates whether Load statistics is enabled @@ -115,13 +115,13 @@ public class CamelJMXAgentDefinition extends IdentifiedType { * A flag that indicates whether to include hostname in JMX MBean names. */ @XmlAttribute - private String includeHostName = "false"; + private String includeHostName; /** * A flag that indicates whether to remove detected sensitive information (such as passwords) from MBean names and attributes. */ @XmlAttribute - private String mask = "false"; + private String mask; public String getDisabled() { return disabled; @@ -247,46 +247,55 @@ public class CamelJMXAgentDefinition extends IdentifiedType { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("CamelJMXAgent["); - sb.append("usePlatformMBeanServer=").append(usePlatformMBeanServer); + + CollectionStringBuffer csb = new CollectionStringBuffer(); + if (disabled != null) { + csb.append("disabled=" + disabled); + } + if (usePlatformMBeanServer != null) { + csb.append("usePlatformMBeanServer=" + usePlatformMBeanServer); + } if (createConnector != null) { - sb.append(", createConnector=").append(createConnector); + csb.append("createConnector=" + createConnector); } if (connectorPort != null) { - sb.append(", connectorPort=").append(connectorPort); + csb.append("connectorPort=" + connectorPort); } if (registryPort != null) { - sb.append(", registryPort=").append(registryPort); + csb.append("registryPort=" + registryPort); } if (serviceUrlPath != null) { - sb.append(", serviceUrlPath=").append(serviceUrlPath); + csb.append("serviceUrlPath=" + serviceUrlPath); } if (mbeanServerDefaultDomain != null) { - sb.append(", mbeanServerDefaultDomain=").append(mbeanServerDefaultDomain); + csb.append("mbeanServerDefaultDomain=" + mbeanServerDefaultDomain); } if (mbeanObjectDomainName != null) { - sb.append(", mbeanObjectDomainName=").append(mbeanObjectDomainName); + csb.append("mbeanObjectDomainName=" + mbeanObjectDomainName); } if (statisticsLevel != null) { - sb.append(", statisticsLevel=").append(statisticsLevel); + csb.append("statisticsLevel=" + statisticsLevel); } if (loadStatisticsEnabled != null) { - sb.append(", loadStatisticsEnabled=").append(loadStatisticsEnabled); + csb.append("loadStatisticsEnabled=" + loadStatisticsEnabled); } if (onlyRegisterProcessorWithCustomId != null) { - sb.append(", onlyRegisterProcessorWithCustomId=").append(onlyRegisterProcessorWithCustomId); + csb.append("onlyRegisterProcessorWithCustomId=" + onlyRegisterProcessorWithCustomId); } if (registerAlways != null) { - sb.append(", registerAlways=").append(registerAlways); + csb.append("registerAlways=" + registerAlways); } if (registerNewRoutes != null) { - sb.append(", registerNewRoutes=").append(registerNewRoutes); + csb.append("registerNewRoutes=" + registerNewRoutes); } if (includeHostName != null) { - sb.append(", includeHostName=").append(includeHostName); + csb.append("includeHostName=" + includeHostName); } if (mask != null) { - sb.append(", mask=").append(mask); + csb.append("mask=" + mask); } + + sb.append(csb.toString()); sb.append("]"); return sb.toString(); }
