|
|
@ -36,7 +36,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
|
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
|
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
|
|
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
|
|
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
|
|
|
import org.springframework.context.ApplicationContext;
|
|
|
|
import org.springframework.context.ApplicationContext;
|
|
|
|
import org.springframework.context.ApplicationContextAware;
|
|
|
|
|
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
import org.springframework.context.annotation.Primary;
|
|
|
|
import org.springframework.context.annotation.Primary;
|
|
|
@ -72,9 +71,6 @@ import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer;
|
|
|
|
@ConditionalOnClass(ObjectMapper.class)
|
|
|
|
@ConditionalOnClass(ObjectMapper.class)
|
|
|
|
public class JacksonAutoConfiguration {
|
|
|
|
public class JacksonAutoConfiguration {
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private ListableBeanFactory beanFactory;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Configuration
|
|
|
|
@Configuration
|
|
|
|
@ConditionalOnClass({ ObjectMapper.class, Jackson2ObjectMapperBuilder.class })
|
|
|
|
@ConditionalOnClass({ ObjectMapper.class, Jackson2ObjectMapperBuilder.class })
|
|
|
|
static class JacksonObjectMapperConfiguration {
|
|
|
|
static class JacksonObjectMapperConfiguration {
|
|
|
@ -136,9 +132,9 @@ public class JacksonAutoConfiguration {
|
|
|
|
@Configuration
|
|
|
|
@Configuration
|
|
|
|
@ConditionalOnClass({ ObjectMapper.class, Jackson2ObjectMapperBuilder.class })
|
|
|
|
@ConditionalOnClass({ ObjectMapper.class, Jackson2ObjectMapperBuilder.class })
|
|
|
|
@EnableConfigurationProperties(JacksonProperties.class)
|
|
|
|
@EnableConfigurationProperties(JacksonProperties.class)
|
|
|
|
static class JacksonObjectMapperBuilderConfiguration implements
|
|
|
|
static class JacksonObjectMapperBuilderConfiguration {
|
|
|
|
ApplicationContextAware {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
private ApplicationContext applicationContext;
|
|
|
|
private ApplicationContext applicationContext;
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
@ -253,10 +249,6 @@ public class JacksonAutoConfiguration {
|
|
|
|
.values();
|
|
|
|
.values();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void setApplicationContext(ApplicationContext applicationContext) {
|
|
|
|
|
|
|
|
this.applicationContext = applicationContext;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|