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

Make spring-ws-core optional for SI-xml

Browse Source 
It turns out that `spring-ws-core` brings too much WS stuff which
triggers and auto-configuration to be enabled in Spring Boot app when
we don't expect it.

* The `UnmarshallingTransformer` is already aware of `MimeMessage` and
`MarshallingUtils` being optional, so just remove redundant `public`
modifier for `maybeUnmarshalMimeMessage()` method
* Load `ServletContextResource` class in the `XsltPayloadTransformer`
on demand making such a dependency as optional
This commit is contained in:
Artem Bilan
2019-05-30 13:06:07 -04:00
committed by Gary Russell
parent a9a2fccf1f
commit e9591c6fdf
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -769,7 +769,7 @@ project('spring-integration-xml') {
compile project(":spring-integration-core")
compile "org.springframework:spring-oxm:$springVersion"
compile ("org.springframework.ws:spring-xml:$springWsVersion")
compile ("org.springframework.ws:spring-ws-core:$springWsVersion")
compile ("org.springframework.ws:spring-ws-core:$springWsVersion", optional)
}
}

2
spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java
View File

@@ -147,7 +147,7 @@ public class UnmarshallingTransformer extends AbstractPayloadTransformer<Object,
this.delegate = unmarshaller;
}
public Object maybeUnmarshalMimeMessage(Object payload) throws IOException {
Object maybeUnmarshalMimeMessage(Object payload) throws IOException {
if (payload instanceof org.springframework.ws.mime.MimeMessage) {
return org.springframework.ws.support.MarshallingUtils.unmarshal(this.delegate,
(org.springframework.ws.mime.MimeMessage) payload);

29
spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java
View File

@@ -53,7 +53,6 @@ import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.PatternMatchUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.ServletContextResource;
import org.springframework.xml.transform.StringResult;
import org.springframework.xml.transform.StringSource;
import org.springframework.xml.transform.TransformerFactoryUtils;
@@ -110,13 +109,30 @@ public class XsltPayloadTransformer extends AbstractXmlTransformer implements Be
private String[] xsltParamHeaders;
private ClassLoader classLoader;
private static final Class<?> SERVLET_CONTEXT_RESOURCE_CLASS;
static {
Class<?> aClass = null;
try {
aClass =
ClassUtils.forName("org.springframework.web.context.support.ServletContextResource",
ClassUtils.getDefaultClassLoader());
}
catch (ClassNotFoundException e) {
// No 'ServletContextResource' class present - ignoring
}
finally {
SERVLET_CONTEXT_RESOURCE_CLASS = aClass;
}
}
public XsltPayloadTransformer(Templates templates) {
this(templates, null);
}
private ClassLoader classLoader;
public XsltPayloadTransformer(Templates templates, ResultTransformer resultTransformer) {
Assert.notNull(templates, "'templates' must not be null.");
this.templates = templates;
@@ -140,8 +156,11 @@ public class XsltPayloadTransformer extends AbstractXmlTransformer implements Be
String transformerFactoryClassName) {
Assert.notNull(xslResource, "'xslResource' must not be null.");
Assert.isTrue(xslResource instanceof ClassPathResource || xslResource instanceof FileSystemResource ||
xslResource instanceof ServletContextResource || xslResource instanceof VfsResource,
Assert.isTrue(xslResource instanceof ClassPathResource || // NOSONAR boolean complexity
xslResource instanceof FileSystemResource ||
xslResource instanceof VfsResource ||
(SERVLET_CONTEXT_RESOURCE_CLASS != null
&& SERVLET_CONTEXT_RESOURCE_CLASS.isInstance(xslResource)),
"Only 'ClassPathResource', 'FileSystemResource', 'ServletContextResource' or 'VfsResource'" +
" are supported directly in this transformer. For any other 'Resource' implementations" +
" consider to use a 'Templates'-based constructor instantiation.");
@@ -227,7 +246,7 @@ public class XsltPayloadTransformer extends AbstractXmlTransformer implements Be
this.evaluationContext = ExpressionUtils.createStandardEvaluationContext(getBeanFactory());
if (this.templates == null) {
try {
TransformerFactory transformerFactory = createTransformerFactory();
TransformerFactory transformerFactory = createTransformerFactory();
this.templates = transformerFactory.newTemplates(createStreamSourceOnResource(this.xslResource));
}
catch (ClassNotFoundException | TransformerConfigurationException | IOException e) {