From 854a504a95c7ee97f9b2d26a5638423192472e6a Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 25 Apr 2016 14:37:24 -0400 Subject: [PATCH] Revert S-AMQP and SF to the latest Milestones See TODOs in the code of this change --- build.gradle | 2 +- .../http/multipart/SimpleMultipartFileReader.java | 3 ++- .../IntegrationGraphControllerParserTests-context.xml | 7 ++++++- .../http/management/IntegrationGraphControllerTests.java | 8 ++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a754adf84a..7230e09a96 100644 --- a/build.gradle +++ b/build.gradle @@ -135,7 +135,7 @@ subprojects { subproject -> slf4jVersion = "1.7.21" tomcatVersion = "8.0.33" smackVersion = '4.1.6' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.0.BUILD-SNAPSHOT' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.0.M2' // springCloudClusterVersion = '1.0.0.BUILD-SNAPSHOT' springDataJpaVersion = '1.10.1.RELEASE' springDataMongoVersion = '1.9.1.RELEASE' diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/SimpleMultipartFileReader.java b/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/SimpleMultipartFileReader.java index 419e14e950..89c8f9b25d 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/SimpleMultipartFileReader.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/SimpleMultipartFileReader.java @@ -51,7 +51,8 @@ public class SimpleMultipartFileReader implements MultipartFileReader { public Object readMultipartFile(MultipartFile multipartFile) throws IOException { if (multipartFile.getContentType() != null && multipartFile.getContentType().startsWith("text")) { MediaType contentType = MediaType.parseMediaType(multipartFile.getContentType()); - Charset charset = contentType.getCharset(); + // TODO there is no yet in the SF-4.3.RC1 a MediaType.getCharset() method + Charset charset = contentType.getCharSet(); if (charset == null) { charset = this.defaultCharset; } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerParserTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerParserTests-context.xml index 685ee9e609..5899d9f527 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerParserTests-context.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerParserTests-context.xml @@ -4,14 +4,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc" + xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + + diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java index 55ef914316..f56bba77ed 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java @@ -34,8 +34,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.integration.channel.DirectChannel; @@ -145,6 +147,12 @@ public class IntegrationGraphControllerTests { @EnableIntegrationGraphController(path = "/testIntegration") public static class ContextConfiguration { + // TODO SF-4.3.RC1 compatibility. See https://jira.spring.io/browse/SPR-14140 + @Bean + public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + return new PropertySourcesPlaceholderConfigurer(); + } + } }