"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java" between
spring-framework-5.3.7.tar.gz and spring-framework-5.3.8.tar.gz

About: Spring Framework is an application framework for the Java platform and .NET Framework. Community edition.

Jackson2ObjectMapperBuilder.java  (spring-framework-5.3.7):Jackson2ObjectMapperBuilder.java  (spring-framework-5.3.8)
skipping to change at line 108 skipping to change at line 108
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Tadaya Tsuyukubo * @author Tadaya Tsuyukubo
* @author Eddú Meléndez * @author Eddú Meléndez
* @since 4.1.1 * @since 4.1.1
* @see #build() * @see #build()
* @see #configure(ObjectMapper) * @see #configure(ObjectMapper)
* @see Jackson2ObjectMapperFactoryBean * @see Jackson2ObjectMapperFactoryBean
*/ */
public class Jackson2ObjectMapperBuilder { public class Jackson2ObjectMapperBuilder {
private static volatile boolean kotlinWarningLogged;
private final Log logger = HttpLogging.forLogName(getClass()); private final Log logger = HttpLogging.forLogName(getClass());
private final Map<Class<?>, Class<?>> mixIns = new LinkedHashMap<>(); private final Map<Class<?>, Class<?>> mixIns = new LinkedHashMap<>();
private final Map<Class<?>, JsonSerializer<?>> serializers = new LinkedHa shMap<>(); private final Map<Class<?>, JsonSerializer<?>> serializers = new LinkedHa shMap<>();
private final Map<Class<?>, JsonDeserializer<?>> deserializers = new Link edHashMap<>(); private final Map<Class<?>, JsonDeserializer<?>> deserializers = new Link edHashMap<>();
private final Map<PropertyAccessor, JsonAutoDetect.Visibility> visibiliti es = new LinkedHashMap<>(); private final Map<PropertyAccessor, JsonAutoDetect.Visibility> visibiliti es = new LinkedHashMap<>();
skipping to change at line 863 skipping to change at line 861
// Kotlin present? // Kotlin present?
if (KotlinDetector.isKotlinPresent()) { if (KotlinDetector.isKotlinPresent()) {
try { try {
Class<? extends Module> kotlinModuleClass = (Clas s<? extends Module>) Class<? extends Module> kotlinModuleClass = (Clas s<? extends Module>)
ClassUtils.forName("com.fasterxml .jackson.module.kotlin.KotlinModule", this.moduleClassLoader); ClassUtils.forName("com.fasterxml .jackson.module.kotlin.KotlinModule", this.moduleClassLoader);
Module kotlinModule = BeanUtils.instantiateClass( kotlinModuleClass); Module kotlinModule = BeanUtils.instantiateClass( kotlinModuleClass);
modulesToRegister.set(kotlinModule.getTypeId(), k otlinModule); modulesToRegister.set(kotlinModule.getTypeId(), k otlinModule);
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
if (!kotlinWarningLogged) { // jackson-module-kotlin not available
kotlinWarningLogged = true;
logger.warn("For Jackson Kotlin classes s
upport please add " +
"\"com.fasterxml.jackson.
module:jackson-module-kotlin\" to the classpath");
}
} }
} }
} }
// Convenience factory methods // Convenience factory methods
/** /**
* Obtain a {@link Jackson2ObjectMapperBuilder} instance in order to * Obtain a {@link Jackson2ObjectMapperBuilder} instance in order to
* build a regular JSON {@link ObjectMapper} instance. * build a regular JSON {@link ObjectMapper} instance.
*/ */
 End of changes. 2 change blocks. 
9 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)