+ * When using {@link SpringBootApplication}, the auto-configuration of the context is + * automatically enabled and adding this annotation has therefore no additional effect. + *
* Auto-configuration tries to be as intelligent as possible and will back-away as you * define more of your own configuration. You can always manually {@link #exclude()} any * configuration that you never want to apply (use {@link #excludeName()} if you don't @@ -48,11 +51,12 @@ import org.springframework.core.io.support.SpringFactoriesLoader; * {@code spring.autoconfigure.exclude} property. Auto-configuration is always applied * after user-defined beans have been registered. *
- * The package of the class that is annotated with {@code @EnableAutoConfiguration} has - * specific significance and is often used as a 'default'. For example, it will be used - * when scanning for {@code @Entity} classes. It is generally recommended that you place - * {@code @EnableAutoConfiguration} in a root package so that all sub-packages and classes - * can be searched. + * The package of the class that is annotated with {@code @EnableAutoConfiguration}, + * usually via {@code @SpringBootApplication}, has specific significance and is often used + * as a 'default'. For example, it will be used when scanning for {@code @Entity} classes. + * It is generally recommended that you place {@code @EnableAutoConfiguration} (if you're + * not using {@code @SpringBootApplication}) in a root package so that all sub-packages + * and classes can be searched. *
* Auto-configuration classes are regular Spring {@link Configuration} beans. They are * located using the {@link SpringFactoriesLoader} mechanism (keyed against this class). @@ -66,6 +70,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader; * @see ConditionalOnMissingBean * @see ConditionalOnClass * @see AutoConfigureAfter + * @see SpringBootApplication */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java b/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java index 33f9041ca90..aa2708b9d58 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java +++ b/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package org.springframework.boot.jackson; +import java.lang.reflect.Modifier; import java.util.Map; import javax.annotation.PostConstruct; @@ -78,8 +79,9 @@ public class JsonComponentModule extends SimpleModule implements BeanFactoryAwar addDeserializerWithDeducedType((JsonDeserializer) bean); } for (Class innerClass : bean.getClass().getDeclaredClasses()) { - if (JsonSerializer.class.isAssignableFrom(innerClass) - || JsonDeserializer.class.isAssignableFrom(innerClass)) { + if (!Modifier.isAbstract(innerClass.getModifiers()) && + (JsonSerializer.class.isAssignableFrom(innerClass) + || JsonDeserializer.class.isAssignableFrom(innerClass))) { try { addJsonBean(innerClass.newInstance()); } diff --git a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java index 03d3b78d599..3f65dd9a20c 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ package org.springframework.boot.jackson; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.After; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -31,34 +32,54 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class JsonComponentModuleTests { + private AnnotationConfigApplicationContext context; + + @After + public void closeContext() { + if (this.context != null) { + this.context.close(); + } + } + @Test public void moduleShouldRegisterSerializers() throws Exception { - AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( - JsonComponentModule.class, OnlySerializer.class); - JsonComponentModule module = context.getBean(JsonComponentModule.class); + load(OnlySerializer.class); + JsonComponentModule module = this.context.getBean(JsonComponentModule.class); assertSerialize(module); - context.close(); } @Test public void moduleShouldRegisterDeserializers() throws Exception { - AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( - JsonComponentModule.class, OnlyDeserializer.class); - JsonComponentModule module = context.getBean(JsonComponentModule.class); + load(OnlyDeserializer.class); + JsonComponentModule module = this.context.getBean(JsonComponentModule.class); assertDeserialize(module); - context.close(); } @Test public void moduleShouldRegisterInnerClasses() throws Exception { + load(NameAndAgeJsonComponent.class); + JsonComponentModule module = this.context.getBean(JsonComponentModule.class); + assertSerialize(module); + assertDeserialize(module); + } + + @Test + public void moduleShouldAllowInnerAbstractClasses() throws Exception { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( - JsonComponentModule.class, NameAndAgeJsonComponent.class); + JsonComponentModule.class, ComponentWithInnerAbstractClass.class); JsonComponentModule module = context.getBean(JsonComponentModule.class); assertSerialize(module); - assertDeserialize(module); context.close(); } + private void load(Class... configs) { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); + ctx.register(configs); + ctx.register(JsonComponentModule.class); + ctx.refresh(); + this.context = ctx; + } + private void assertSerialize(Module module) throws Exception { ObjectMapper mapper = new ObjectMapper(); mapper.registerModule(module); @@ -85,4 +106,15 @@ public class JsonComponentModuleTests { } + @JsonComponent + static class ComponentWithInnerAbstractClass { + + private static abstract class AbstractSerializer extends NameAndAgeJsonComponent.Serializer { + + } + + static class ConcreteSerializer extends AbstractSerializer { + + } + } }