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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2015-10-14 12:18:23 -07:00
parent 81f876aac5
commit 143536f72d
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConverters.java
View File

@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
import org.springframework.http.converter.xml.AbstractXmlHttpMessageConverter;
@@ -155,15 +156,14 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
formConverter.setPartConverters(combinedConverters);
}
@SuppressWarnings("unchecked")
private List<HttpMessageConverter<?>> extractPartConverters(
AllEncompassingFormHttpMessageConverter formConverter) {
Field field = ReflectionUtils.findField(
AllEncompassingFormHttpMessageConverter.class, "partConverters");
FormHttpMessageConverter formConverter) {
Field field = ReflectionUtils.findField(FormHttpMessageConverter.class,
"partConverters");
ReflectionUtils.makeAccessible(field);
@SuppressWarnings("unchecked")
List<HttpMessageConverter<?>> partConverters = (List<HttpMessageConverter<?>>) ReflectionUtils
.getField(field, formConverter);
return partConverters;
return (List<HttpMessageConverter<?>>) ReflectionUtils.getField(field,
formConverter);
}
/**

9
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
View File

@@ -172,14 +172,16 @@ public class BasicErrorControllerIntegrationTests {
@SuppressWarnings("rawtypes")
public void testRequestBodyValidationForMachineClient() throws Exception {
load();
RequestEntity request = RequestEntity.post(URI.create(createUrl("/bodyValidation")))
RequestEntity request = RequestEntity
.post(URI.create(createUrl("/bodyValidation")))
.contentType(MediaType.APPLICATION_JSON).body("{}");
ResponseEntity<Map> entity = new TestRestTemplate().exchange(request, Map.class);
String resp = entity.getBody().toString();
assertThat(resp, containsString("Error count: 1"));
assertThat(resp, containsString("errors=[{"));
assertThat(resp, containsString("codes=["));
assertThat(resp, containsString("org.springframework.web.bind.MethodArgumentNotValidException"));
assertThat(resp, containsString(
"org.springframework.web.bind.MethodArgumentNotValidException"));
}
private void assertErrorAttributes(Map<?, ?> content, String status, String error,
@@ -278,7 +280,7 @@ public class BasicErrorControllerIntegrationTests {
}
private static class DummyBody {
static class DummyBody {
@NotNull
private String content;
@@ -290,6 +292,7 @@ public class BasicErrorControllerIntegrationTests {
public void setContent(String content) {
this.content = content;
}
}
}

3
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorAttributesTests.java
View File

@@ -168,7 +168,8 @@ public class DefaultErrorAttributesTests {
}
@Test
public void extractMethodArgumentNotValidExceptionBindingResultErrors() throws Exception {
public void extractMethodArgumentNotValidExceptionBindingResultErrors()
throws Exception {
BindingResult bindingResult = new MapBindingResult(
Collections.singletonMap("a", "b"), "objectName");
bindingResult.addError(new ObjectError("c", "d"));