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

Added ability to specify a result-factory rather than a result-type on XmlPayloadMarshallingTransformer

Browse Source 
relates to 
INT-310: XML Document Builders Not Namespace Aware
This commit is contained in:
Jonas Partner
2008-09-22 11:09:48 +00:00
parent 4ebacefc94
commit 46a8c311d6
5 changed files with 81 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParser.java
View File

@@ -36,6 +36,10 @@ import org.springframework.util.StringUtils;
*/
public class XmlMarshallingTransformerParser extends AbstractPayloadTransformerParser {
public static final String DOM_RESULT = "DOMResult";
public static final String STRING_RESULT = "StringResult";
@Override
protected Class<? extends AbstractPayloadTransformer<?, ?>> getTransformerClass() {
return XmlPayloadMarshallingTransformer.class;
@@ -45,16 +49,22 @@ public class XmlMarshallingTransformerParser extends AbstractPayloadTransformerP
protected void parsePayloadTransformer(Element element,
ParserContext parserContext, BeanDefinitionBuilder builder) {
String resultFactory = element.getAttribute("result-factory");
String resultType = element.getAttribute("result-type");
String marshaller = element.getAttribute("marshaller");
String resultTransformer = element.getAttribute("result-transformer");
Assert.hasText(marshaller, "the 'marshaller' attribute is required");
Assert.hasText(resultFactory,
"the 'result-factory' attribute is required");
assertResultFactoryAndTypeValid(resultFactory, resultType);
builder.addConstructorArgReference(marshaller);
if(StringUtils.hasText(resultTransformer)){
builder.addConstructorArgReference(resultTransformer);
}
if (resultFactory.equals("DOMResult")) {
if(StringUtils.hasText(resultFactory)){
builder.addPropertyReference("resultFactory", resultFactory);
} else if (resultType.equals(DOM_RESULT) || !StringUtils.hasText(resultType)) {
try {
builder.addPropertyValue("resultFactory", new DomResultFactory());
}
@@ -63,9 +73,22 @@ public class XmlMarshallingTransformerParser extends AbstractPayloadTransformerP
"Exception creating DomResultFactory");
}
}
else if (resultFactory.equals("StringResult")) {
else if (resultType.equals(STRING_RESULT)) {
builder.addPropertyValue("resultFactory", new StringResultFactory());
}
}
protected void assertResultFactoryAndTypeValid(String resultFactory, String resultType){
boolean bothHaveText = StringUtils.hasText(resultFactory) && StringUtils.hasText(resultType);
if(bothHaveText){
System.out.println("bob");
}
Assert.state(!bothHaveText , "Exactly one of result-factory or result-type should be specified");
if(StringUtils.hasText(resultType)){
Assert.state(resultType.equals(DOM_RESULT) || resultType.equals(STRING_RESULT), "Result type must be either DOMResult or StringResult");
}
}
}

3
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
View File

@@ -28,7 +28,7 @@
<xsd:attribute name="id" type="xsd:string" use="required" />
<xsd:attribute name="marshaller" type="xsd:string"
use="required" />
<xsd:attribute name="result-factory" default="DOMResult">
<xsd:attribute name="result-type" use="optional">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="DOMResult" />
@@ -36,6 +36,7 @@
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="result-factory" use="optional" />
<xsd:attribute name="result-transformer" type="xsd:string" use="optional" />
</xsd:complexType>
</xsd:element>