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

Clean up and format code

Browse Source
This commit is contained in:
Andy Wilkinson
2017-06-16 08:58:14 +01:00
parent 5d69318e2d
commit 59122358d3
16 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java
View File

@@ -79,8 +79,8 @@ public class JsonComponentModule extends SimpleModule implements BeanFactoryAwar
addDeserializerWithDeducedType((JsonDeserializer<?>) bean);
}
for (Class<?> innerClass : bean.getClass().getDeclaredClasses()) {
if (!Modifier.isAbstract(innerClass.getModifiers()) &&
(JsonSerializer.class.isAssignableFrom(innerClass)
if (!Modifier.isAbstract(innerClass.getModifiers())
&& (JsonSerializer.class.isAssignableFrom(innerClass)
|| JsonDeserializer.class.isAssignableFrom(innerClass))) {
try {
addJsonBean(innerClass.newInstance());

3
spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java
View File

@@ -109,7 +109,8 @@ public class JsonComponentModuleTests {
@JsonComponent
static class ComponentWithInnerAbstractClass {
private static abstract class AbstractSerializer extends NameAndAgeJsonComponent.Serializer {
private static abstract class AbstractSerializer
extends NameAndAgeJsonComponent.Serializer {
}