diff --git a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/AnnotatedClassUtil.java similarity index 70% rename from ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/AnnotatedClassUtil.java index 747d66394..bd30d88fd 100644 --- a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/AnnotatedClassUtil.java @@ -8,20 +8,12 @@ import com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver; /** * Used to obtain the Jackson AnnotatedClass for a given bean type utlimately to obtain field level Jackson annotations. */ -final class DeployBeanObtainJackson { - - private final ObjectMapper objectMapper; - private final Class beanType; - - DeployBeanObtainJackson(ObjectMapper objectMapper, Class beanType) { - this.objectMapper = objectMapper; - this.beanType = beanType; - } +final class AnnotatedClassUtil { /** * Return the Jackson AnnotatedClass for the given bean type. */ - AnnotatedClass obtain() { + static AnnotatedClass obtain(ObjectMapper objectMapper, Class beanType) { JavaType javaType = objectMapper.getTypeFactory().constructType(beanType); return AnnotatedClassResolver.resolve(objectMapper.getDeserializationConfig(), javaType, objectMapper.getDeserializationConfig()); } diff --git a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java index 9193d86d2..a005c5e2d 100644 --- a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java @@ -54,7 +54,7 @@ public final class ScalarJsonJacksonMapper implements ScalarJsonMapper { private AnnotatedClass annotatedClass(ScalarJsonRequest req) { return jacksonClasses.computeIfAbsent(req.beanType(), key -> { ObjectMapper mapper = (ObjectMapper) req.manager().mapper(); - return new DeployBeanObtainJackson(mapper, req.beanType()).obtain(); + return AnnotatedClassUtil.obtain(mapper, req.beanType()); }); } diff --git a/ebean-jackson-mapper/src/main/java/module-info.java b/ebean-jackson-mapper/src/main/java/module-info.java index f43b84144..a1fde9779 100644 --- a/ebean-jackson-mapper/src/main/java/module-info.java +++ b/ebean-jackson-mapper/src/main/java/module-info.java @@ -1,6 +1,7 @@ import io.ebean.jackson.mapper.ScalarJsonJacksonMapper; module io.ebean.jackson.mapper { + requires io.ebean.core.type; requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind;