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

Upgrade build to Spring 5.0.0-BUILD-SNAPSHOT

Browse Source 
* update bean validation API version
* MethodParameter now validates indices, see 39e3f2ebf6
* `getCharSet()` is now `getCharset()`
This commit is contained in:
Brian Clozel
2016-07-07 18:11:04 +02:00
parent 9cc01fc185
commit 4c3c54463c
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web-reactive/build.gradle
View File

@@ -27,7 +27,7 @@ repositories {
} }
ext { ext {
springVersion = '4.3.0.RELEASE' springVersion = '5.0.0.BUILD-SNAPSHOT'
reactorVersion = '2.5.0.BUILD-SNAPSHOT' reactorVersion = '2.5.0.BUILD-SNAPSHOT'
reactorNettyVersion = '2.5.0.BUILD-SNAPSHOT' reactorNettyVersion = '2.5.0.BUILD-SNAPSHOT'
rxJavaVersion = '1.1.6' rxJavaVersion = '1.1.6'
@@ -112,7 +112,7 @@ dependencies {
optional "org.eclipse.jetty:jetty-servlet:${jettyVersion}" optional "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
optional("org.freemarker:freemarker:2.3.23") optional("org.freemarker:freemarker:2.3.23")
optional("com.fasterxml:aalto-xml:1.0.0") optional("com.fasterxml:aalto-xml:1.0.0")
optional("javax.validation:validation-api:1.0.0.GA") optional("javax.validation:validation-api:1.1.0.Final")
provided "javax.servlet:javax.servlet-api:3.1.0" provided "javax.servlet:javax.servlet-api:3.1.0"

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
View File

@@ -94,7 +94,7 @@ public class ServletServerHttpRequest extends AbstractServerHttpRequest {
headers.setContentType(contentType); headers.setContentType(contentType);
} }
} }
if (contentType != null && contentType.getCharSet() == null) { if (contentType != null && contentType.getCharset() == null) {
String encoding = getServletRequest().getCharacterEncoding(); String encoding = getServletRequest().getCharacterEncoding();
if (StringUtils.hasLength(encoding)) { if (StringUtils.hasLength(encoding)) {
Charset charset = Charset.forName(encoding); Charset charset = Charset.forName(encoding);

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
View File

@@ -86,7 +86,7 @@ public class ServletServerHttpResponse extends AbstractServerHttpResponse {
if (this.response.getContentType() == null && contentType != null) { if (this.response.getContentType() == null && contentType != null) {
this.response.setContentType(contentType.toString()); this.response.setContentType(contentType.toString());
} }
Charset charset = (contentType != null ? contentType.getCharSet() : null); Charset charset = (contentType != null ? contentType.getCharset() : null);
if (this.response.getCharacterEncoding() == null && charset != null) { if (this.response.getCharacterEncoding() == null && charset != null) {
this.response.setCharacterEncoding(charset.name()); this.response.setCharacterEncoding(charset.name());
} }

3
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java
View File

@@ -154,7 +154,8 @@ public class RequestAttributeMethodArgumentResolverTests {
@RequestAttribute Foo foo, @RequestAttribute Foo foo,
@RequestAttribute("specialFoo") Foo namedFoo, @RequestAttribute("specialFoo") Foo namedFoo,
@RequestAttribute(name="foo", required = false) Foo notRequiredFoo, @RequestAttribute(name="foo", required = false) Foo notRequiredFoo,
@RequestAttribute(name="foo") Optional<Foo> optionalFoo) { @RequestAttribute(name="foo") Optional<Foo> optionalFoo,
String notSupported) {
} }
private static class Foo { private static class Foo {

3
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
View File

@@ -161,7 +161,8 @@ public class SessionAttributeMethodArgumentResolverTests {
@SessionAttribute Foo foo, @SessionAttribute Foo foo,
@SessionAttribute("specialFoo") Foo namedFoo, @SessionAttribute("specialFoo") Foo namedFoo,
@SessionAttribute(name="foo", required = false) Foo notRequiredFoo, @SessionAttribute(name="foo", required = false) Foo notRequiredFoo,
@SessionAttribute(name="foo") Optional<Foo> optionalFoo) { @SessionAttribute(name="foo") Optional<Foo> optionalFoo,
String notSupported) {
} }
private static class Foo { private static class Foo {