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

INT-3518: Upgrade versions and some cleanup

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3518
This commit is contained in:
Artem Bilan
2014-09-12 17:23:34 +03:00
committed by Gary Russell
parent 30b58836e5
commit 2587ed6bd0
8 changed files with 71 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java
View File

@@ -111,15 +111,9 @@ import org.springframework.web.servlet.HandlerMapping;
public abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewaySupport
implements OrderlyShutdownCapable {
private static final boolean spring41Present = ClassUtils.isPresent("org.springframework.http.RequestEntity",
HttpRequestHandlingEndpointSupport.class.getClassLoader());
private static final boolean jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder",
HttpRequestHandlingEndpointSupport.class.getClassLoader());
private static boolean romePresent = ClassUtils.isPresent("com.sun.syndication.feed.atom.Feed",
HttpRequestHandlingEndpointSupport.class.getClassLoader());
private static boolean romeToolsPresent = ClassUtils.isPresent("com.rometools.rome.feed.atom.Feed",
HttpRequestHandlingEndpointSupport.class.getClassLoader());
@@ -184,9 +178,7 @@ public abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewa
logger.debug("'MappingJackson2HttpMessageConverter' was added to the 'defaultMessageConverters'.");
}
}
//The 'rometools' has been introduced since Spring Framework 4.1, hence we should check the version
// of Spring Framework using the class 'org.springframework.http.RequestEntity' from that version.
if ((spring41Present && romeToolsPresent) || romePresent) {
if (romeToolsPresent) {
this.defaultMessageConverters.add(new AtomFeedHttpMessageConverter());
this.defaultMessageConverters.add(new RssChannelHttpMessageConverter());
if (logger.isDebugEnabled()) {