Efficient Kotlin metadata detection

Issue: SPR-15673
2017-08-21 01:33:20 +02:00
parent f6e7fef236
commit 3991ab4a23
4 changed files with 33 additions and 22 deletions
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -772,7 +772,7 @@ public class Jackson2ObjectMapperBuilder {
 		}

 		// Kotlin present?
-		if (ClassUtils.isPresent("kotlin.Unit", this.moduleClassLoader)) {
+		if (ClassUtils.isPresent("kotlin.Metadata", this.moduleClassLoader)) {
 			try {
 				Class<? extends Module> kotlinModule = (Class<? extends Module>)
 						ClassUtils.forName("com.fasterxml.jackson.module.kotlin.KotlinModule", this.moduleClassLoader);