diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2019-10-11 21:04:54 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2019-10-11 21:04:54 -0700 |
commit | 60b1153a0d834de1154e9e1ed54c3c4ffabba482 (patch) | |
tree | b21101e0903b88c6f923ddfe59977092c1d9b960 /src/main/java/com/fasterxml | |
parent | ddf8cfa8776db96b6cfcfe5b45a296b8cab41e0b (diff) | |
download | jackson-databind-60b1153a0d834de1154e9e1ed54c3c4ffabba482.tar.gz |
minor cleanup
Diffstat (limited to 'src/main/java/com/fasterxml')
-rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/JavaType.java | 1 | ||||
-rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.java | 17 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/JavaType.java b/src/main/java/com/fasterxml/jackson/databind/JavaType.java index 7ad730f5a..f535b54a8 100644 --- a/src/main/java/com/fasterxml/jackson/databind/JavaType.java +++ b/src/main/java/com/fasterxml/jackson/databind/JavaType.java @@ -6,7 +6,6 @@ import java.util.List; import com.fasterxml.jackson.core.type.ResolvedType; import com.fasterxml.jackson.databind.type.TypeBindings; import com.fasterxml.jackson.databind.type.TypeFactory; -import com.fasterxml.jackson.databind.util.ClassUtil; /** * Base class for type token classes used both to contain information diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.java b/src/main/java/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.java index bc29c8e4f..f9d7f7f55 100644 --- a/src/main/java/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.java +++ b/src/main/java/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.java @@ -224,17 +224,12 @@ public class BasicClassIntrospector return false; } Class<?> raw = type.getRawClass(); - String pkgName = ClassUtil.getPackageName(raw); - if (pkgName != null) { - if (pkgName.startsWith("java.lang") - || pkgName.startsWith("java.util")) { - /* 23-Sep-2014, tatu: Should we be conservative here (minimal number - * of matches), or ambitious? Let's do latter for now. - */ - if (Collection.class.isAssignableFrom(raw) - || Map.class.isAssignableFrom(raw)) { - return true; - } + if (ClassUtil.isJDKClass(raw)) { + // 23-Sep-2014, tatu: Should we be conservative here (minimal number + // of matches), or ambitious? Let's do latter for now. + if (Collection.class.isAssignableFrom(raw) + || Map.class.isAssignableFrom(raw)) { + return true; } } return false; |