Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3124 JMX Check Mutually Exclusive Attributes

Browse Source 
Only one of query-name and query-name-ref
Only one of query-expression and query-expression-ref
This commit is contained in:
Gary Russell
2013-09-03 18:49:54 -04:00
parent 98b42cbe36
commit 81ac7e56be
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParser.java
View File

@@ -53,6 +53,14 @@ public class MBeanTreePollingChannelAdapterParser extends AbstractPollingInbound
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "query-name", "queryName");
IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "query-expression", "queryExpression");
if (StringUtils.hasText(element.getAttribute("query-name"))
&& StringUtils.hasText(element.getAttribute("query-name-ref"))) {
parserContext.getReaderContext().error("Cannot have both `query-name' and 'query-name-ref'", element);
}
if (StringUtils.hasText(element.getAttribute("query-expression"))
&& StringUtils.hasText(element.getAttribute("query-expression-ref"))) {
parserContext.getReaderContext().error("Cannot have both `query-expression' and 'query-expression-ref'", element);
}
BeanComponentDefinition innerBeanDef = IntegrationNamespaceUtils.parseInnerHandlerDefinition(element, parserContext);
String beanName = element.getAttribute("converter");

12
spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd
View File

@@ -223,14 +223,16 @@
<xsd:attribute name="query-name" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation>
A string to be parsed into an ObjectName object
A string to be parsed into an ObjectName object. If this
attribute is specified you cannot specify `query-name-ref`.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="query-name-ref" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation>
A reference to an ObjectName instance
A reference to an ObjectName instance. If this
attribute is specified you cannot specify `query-name`.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation>
@@ -242,14 +244,16 @@
<xsd:attribute name="query-expression" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation>
A string to be parsed into a QueryExp object
A string to be parsed into a QueryExp object. If this
attribute is specified you cannot specify `query-expression-ref`.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="query-expression-ref" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation>
A reference to a QueryExp instance
A reference to a QueryExp instance. If this
attribute is specified you cannot specify `query-expression`.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation>