From d5f753d110b260bdc68568da71b000cd249940c5 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 8 Sep 2022 21:39:00 +1200 Subject: [PATCH 1/6] Extract ebean-jackson-mapper module - initial step --- .../io/ebean/core/type/ScalarJsonManager.java | 24 +++++++ .../io/ebean/core/type/ScalarJsonMapper.java | 4 ++ .../io/ebean/core/type/ScalarJsonRequest.java | 67 +++++++++++++++++++ .../deploy/meta/DeployBeanDescriptor.java | 11 --- .../deploy/meta/DeployBeanProperty.java | 14 ---- .../server/type/DefaultTypeManager.java | 24 +++++-- .../DeployBeanObtainJackson.java | 13 ++-- .../type/ScalarTypeJsonObjectMapper.java | 52 ++++++++------ .../server/type/TypeJsonManager.java | 33 ++++----- 9 files changed, 163 insertions(+), 79 deletions(-) create mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java create mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java create mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java rename ebean-core/src/main/java/io/ebeaninternal/server/{deploy/meta => type}/DeployBeanObtainJackson.java (69%) diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java new file mode 100644 index 000000000..f0e645d1d --- /dev/null +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java @@ -0,0 +1,24 @@ +package io.ebean.core.type; + +import io.ebean.annotation.MutationDetection; + +/** + * Holds the configured mapper and default mutation detection mode to be used. + */ +public interface ScalarJsonManager { + + /** + * Return the default mutation detection mode. + */ + MutationDetection mutationDetection(); + + /** + * Return the object mapper supplied in DatabaseConfig. + */ + Object mapper(); + + /** + * Return the Postgres type given the jdbc type. + */ + String postgresType(int dbType); +} diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java new file mode 100644 index 000000000..de38bd942 --- /dev/null +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java @@ -0,0 +1,4 @@ +package io.ebean.core.type; + +public interface ScalarJsonMapper { +} diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java new file mode 100644 index 000000000..c47681fd1 --- /dev/null +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java @@ -0,0 +1,67 @@ +package io.ebean.core.type; + +import io.ebean.annotation.MutationDetection; + +/** + * A request to create a ScalarType for a bean property (typically annotated with {@code @DbJson}). + */ +public final class ScalarJsonRequest { + + private final ScalarJsonManager manager; + private final int dbType; + private final DocPropertyType docType; + private final Class beanType; + private final MutationDetection mode; + private final String name; + + public ScalarJsonRequest(ScalarJsonManager manager, int dbType, DocPropertyType docType, Class beanType, MutationDetection mode, String name) { + this.manager = manager; + this.dbType = dbType; + this.docType = docType; + this.beanType = beanType; + this.mode = mode; + this.name = name; + } + + /** + * Return the manager. + */ + public ScalarJsonManager manager() { + return manager; + } + + /** + * Return the jdbc type this property maps to (e.g. JSON, JSONB etc). + */ + public int dbType() { + return dbType; + } + + /** + * Return the document store docType. + */ + public DocPropertyType docType() { + return docType; + } + + /** + * Return the type of the bean that this property belongs to. + */ + public Class beanType() { + return beanType; + } + + /** + * Return the mutation detection mode the property should use. + */ + public MutationDetection mode() { + return mode; + } + + /** + * Return the property name. + */ + public String name() { + return name; + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 49767439f..dfeacbd83 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -152,7 +152,6 @@ public class DeployBeanDescriptor { private DocStoreMode docStoreDelete; private DeployBeanProperty idProperty; private TableJoin primaryKeyJoin; - private Object jacksonAnnotatedClass; /** * Construct the BeanDescriptor. @@ -1130,14 +1129,4 @@ public class DeployBeanDescriptor { } } - /** - * Returns the jackson annotated class, if jackson is present. - */ - @SuppressWarnings("unchecked") - Object /*AnnotatedClass*/ getJacksonAnnotatedClass() { - if (jacksonAnnotatedClass == null) { - jacksonAnnotatedClass = new DeployBeanObtainJackson(config, beanType).obtain(); - } - return jacksonAnnotatedClass; - } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 847401b1c..2507387ab 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -1042,20 +1042,6 @@ public class DeployBeanProperty { this.elementProperty = true; } - /** - * Returns the jackson annotated field, if jackson is present. - */ - public Object /*AnnotatedField*/ getJacksonField() { - com.fasterxml.jackson.databind.introspect.AnnotatedClass jac = - (com.fasterxml.jackson.databind.introspect.AnnotatedClass) getDesc().getJacksonAnnotatedClass(); - for (com.fasterxml.jackson.databind.introspect.AnnotatedField candidate : jac.fields()) { - if (candidate.getName().equals(getName())) { - return candidate; - } - } - return null; - } - public void initMetaAnnotations(Set> metaAnnotationsFilter) { metaAnnotations = AnnotationUtil.metaFindAllFor(field, metaAnnotationsFilter); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index 29685ea99..e4df81962 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -65,7 +65,7 @@ public final class DefaultTypeManager implements TypeManager { private final Object objectMapper; private final boolean objectMapperPresent; private final boolean postgres; - private final TypeJsonManager jsonManager; + private final ScalarJsonManager jsonManager; private final boolean offlineMigrationGeneration; private final EnumType defaultEnumType; private final DatabasePlatform databasePlatform; @@ -302,7 +302,7 @@ public final class DefaultTypeManager implements TypeManager { if (type.equals(List.class)) { DocPropertyType docType = docType(genericType); if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) { - return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), jsonManager.keepSource(prop)); + return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource(prop)); } else { return createJsonObjectMapperType(prop, dbType, docType); } @@ -310,14 +310,14 @@ public final class DefaultTypeManager implements TypeManager { if (type.equals(Set.class)) { DocPropertyType docType = docType(genericType); if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) { - return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), jsonManager.keepSource(prop)); + return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource(prop)); } else { return createJsonObjectMapperType(prop, dbType, docType); } } if (type.equals(Map.class)) { if (!hasJacksonAnnotations && isMapValueTypeObject(genericType)) { - return ScalarTypeJsonMap.typeFor(postgres, dbType, jsonManager.keepSource(prop)); + return ScalarTypeJsonMap.typeFor(postgres, dbType, keepSource(prop)); } else { return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT); } @@ -331,6 +331,13 @@ public final class DefaultTypeManager implements TypeManager { return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT); } + private boolean keepSource(DeployBeanProperty prop) { + if (prop.getMutationDetection() == MutationDetection.DEFAULT) { + prop.setMutationDetection(jsonManager.mutationDetection()); + } + return prop.getMutationDetection() == MutationDetection.SOURCE; + } + /** * Returns TRUE, if there is any jackson annotation on that property. All jackson annotations * are annotated with the @JacksonAnnotation meta annotation. So detection is easy. @@ -370,11 +377,14 @@ public final class DefaultTypeManager implements TypeManager { } private ScalarType createJsonObjectMapperType(DeployBeanProperty prop, int dbType, DocPropertyType docType) { - Class type = prop.getPropertyType(); if (objectMapper == null) { - throw new IllegalArgumentException("Type [" + type + "] unsupported for @DbJson mapping - Jackson ObjectMapper not present"); + throw new IllegalArgumentException("Unsupported @DbJson mapping - Jackson ObjectMapper not present for " + prop); } - return ScalarTypeJsonObjectMapper.createTypeFor(jsonManager, prop, dbType, docType); + if (MutationDetection.DEFAULT == prop.getMutationDetection()) { + prop.setMutationDetection(jsonManager.mutationDetection()); + } + var req = new ScalarJsonRequest(jsonManager, dbType, docType, prop.getDesc().getBeanType(), prop.getMutationDetection(), prop.getName()); + return ScalarTypeJsonObjectMapper.createTypeFor(req); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java similarity index 69% rename from ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java rename to ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java index 9bbfb6007..943422aa3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java @@ -1,28 +1,27 @@ -package io.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.type; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.introspect.AnnotatedClass; import com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver; -import io.ebean.config.DatabaseConfig; /** * Used to obtain the Jackson AnnotatedClass for a given bean type utlimately to obtain field level Jackson annotations. */ final class DeployBeanObtainJackson { - private final DatabaseConfig config; + private final ObjectMapper objectMapper; private final Class beanType; - DeployBeanObtainJackson(DatabaseConfig config, Class beanType) { - this.config = config; + DeployBeanObtainJackson(ObjectMapper objectMapper, Class beanType) { + this.objectMapper = objectMapper; this.beanType = beanType; } /** * Return the Jackson AnnotatedClass for the given bean type. */ - Object obtain() { - ObjectMapper objectMapper = (ObjectMapper) config.getObjectMapper(); + AnnotatedClass obtain() { JavaType javaType = objectMapper.getTypeFactory().constructType(beanType); return AnnotatedClassResolver.resolve(objectMapper.getDeserializationConfig(), javaType, objectMapper.getDeserializationConfig()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java index 2615e5e28..86f5d9c82 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java @@ -6,11 +6,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; +import com.fasterxml.jackson.databind.introspect.AnnotatedClass; import com.fasterxml.jackson.databind.introspect.AnnotatedField; import io.ebean.annotation.MutationDetection; import io.ebean.core.type.*; import io.ebean.text.TextException; -import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import javax.persistence.PersistenceException; import java.io.DataInput; @@ -18,30 +18,43 @@ import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** * Supports @DbJson properties using Jackson ObjectMapper. */ final class ScalarTypeJsonObjectMapper { + static final Map, AnnotatedClass> jacksonClasses = new ConcurrentHashMap<>(); + /** * Create and return the appropriate ScalarType. */ - static ScalarType createTypeFor(TypeJsonManager jsonManager, DeployBeanProperty prop, int dbType, DocPropertyType docType) { - AnnotatedField field = (AnnotatedField) prop.getJacksonField(); - MutationDetection mode = prop.getMutationDetection(); - if (mode == MutationDetection.NONE) { - return new NoMutationDetection(jsonManager, field, dbType, docType); - } else if (mode != MutationDetection.DEFAULT) { - return new GenericObject(jsonManager, field, dbType, docType); + static ScalarType createTypeFor(ScalarJsonRequest req) { + AnnotatedClass annotatedClass = annotatedClass(req); + AnnotatedField field = annotatedField(annotatedClass, req); + if (req.mode() == MutationDetection.NONE) { + return new NoMutationDetection(req.manager(), field, req.dbType(), req.docType()); + } else { + return new GenericObject(req.manager(), field, req.dbType(), req.docType()); } - // using the global default MutationDetection mode (defaults to HASH) - final MutationDetection defaultMode = jsonManager.mutationDetection(); - prop.setMutationDetection(defaultMode); - if (MutationDetection.NONE == defaultMode) { - return new NoMutationDetection(jsonManager, field, dbType, docType); + } + + private static AnnotatedField annotatedField(AnnotatedClass annotatedClass, ScalarJsonRequest req) { + for (AnnotatedField field : annotatedClass.fields()) { + if (field.getName().equals(req.name())) { + return field; + } } - return new GenericObject(jsonManager, field, dbType, docType); + throw new IllegalStateException("AnnotatedField not found to match " + req.name()); + } + + private static AnnotatedClass annotatedClass(ScalarJsonRequest req) { + return jacksonClasses.computeIfAbsent(req.beanType(), key -> { + ObjectMapper mapper = (ObjectMapper) req.manager().mapper(); + return new DeployBeanObtainJackson(mapper, req.beanType()).obtain(); + }); } /** @@ -49,7 +62,7 @@ final class ScalarTypeJsonObjectMapper { */ private static final class NoMutationDetection extends Base { - NoMutationDetection(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) { + NoMutationDetection(ScalarJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) { super(Object.class, jsonManager, field, dbType, docType); } } @@ -61,7 +74,7 @@ final class ScalarTypeJsonObjectMapper { private final boolean jsonb; - GenericObject(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) { + GenericObject(ScalarJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) { super(Object.class, jsonManager, field, dbType, docType); this.jsonb = "jsonb".equals(pgType); } @@ -126,9 +139,9 @@ final class ScalarTypeJsonObjectMapper { protected final String pgType; private final DocPropertyType docType; - Base(Class cls, TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) { + Base(Class cls, ScalarJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) { super(cls, false, dbType); - this.objectReader = jsonManager.objectMapper(); + this.objectReader = (ObjectMapper)jsonManager.mapper(); this.pgType = jsonManager.postgresType(dbType); this.docType = docType; final JacksonTypeHelper helper = new JacksonTypeHelper(field, objectReader); @@ -223,7 +236,8 @@ final class ScalarTypeJsonObjectMapper { if (value == null) { dataOutput.writeBoolean(false); } else { - ScalarHelp.writeUTF(dataOutput, format(value)); + dataOutput.writeBoolean(true); + dataOutput.writeUTF(format(value)); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java index 84ceac12b..2b5a61432 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java @@ -1,44 +1,35 @@ package io.ebeaninternal.server.type; -import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.ModifyAwareType; import io.ebean.annotation.MutationDetection; import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.core.type.PostgresHelper; -import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebean.core.type.ScalarJsonManager; -final class TypeJsonManager { +final class TypeJsonManager implements ScalarJsonManager { private final boolean postgres; - private final ObjectMapper objectMapper; + private final Object mapper; private final MutationDetection mutationDetection; - TypeJsonManager(boolean postgres, Object objectMapper, MutationDetection mutationDetection) { + TypeJsonManager(boolean postgres, Object mapper, MutationDetection mutationDetection) { this.postgres = postgres; - this.objectMapper = (ObjectMapper) objectMapper; + this.mapper = mapper; this.mutationDetection = mutationDetection; } - MutationDetection mutationDetection() { + @Override + public MutationDetection mutationDetection() { return mutationDetection; } - ObjectMapper objectMapper() { - return objectMapper; + @Override + public Object mapper() { + return mapper; } - boolean keepSource(DeployBeanProperty prop) { - if (prop.getMutationDetection() == MutationDetection.SOURCE) { - return true; - } else if (prop.getMutationDetection() == MutationDetection.DEFAULT) { - prop.setMutationDetection(mutationDetection); - return mutationDetection == MutationDetection.SOURCE; - } else { - return false; - } - } - - String postgresType(int dbType) { + @Override + public String postgresType(int dbType) { if (postgres) { switch (dbType) { case DbPlatformType.JSON: From e74e4ba5328960db3ae7e3f556bc175b02f0041d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 8 Sep 2022 22:09:10 +1200 Subject: [PATCH 2/6] Extract ebean-jackson-mapper module - rename ScalarTypeJsonObjectMapper to ScalarJsonJacksonMapper and move --- composites/ebean/pom.xml | 6 +++ ebean-bom/pom.xml | 6 +++ .../io/ebean/core/type/ScalarJsonMapper.java | 9 ++++ .../server/type/DefaultTypeManager.java | 8 +++- ebean-core/src/main/java/module-info.java | 1 + ebean-jackson-mapper/pom.xml | 46 +++++++++++++++++++ .../mapper}/DeployBeanObtainJackson.java | 2 +- .../jackson/mapper}/JacksonTypeHelper.java | 2 +- .../io/ebean/jackson/mapper}/JsonTrim.java | 2 +- .../mapper/ScalarJsonJacksonMapper.java | 13 +++--- .../src/main/java/module-info.java | 9 ++++ .../io.ebean.core.type.ScalarJsonMapper | 1 + .../ebean/jackson/mapper}/JsonTrimTest.java | 2 +- ebean-test/pom.xml | 7 +++ pom.xml | 1 + 15 files changed, 103 insertions(+), 12 deletions(-) create mode 100644 ebean-jackson-mapper/pom.xml rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper}/DeployBeanObtainJackson.java (96%) rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper}/JacksonTypeHelper.java (97%) rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper}/JsonTrim.java (95%) rename ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java => ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java (94%) create mode 100644 ebean-jackson-mapper/src/main/java/module-info.java create mode 100644 ebean-jackson-mapper/src/main/resources/META-INF/services/io.ebean.core.type.ScalarJsonMapper rename {ebean-core/src/test/java/io/ebeaninternal/server/type => ebean-jackson-mapper/src/test/java/io/ebean/jackson/mapper}/JsonTrimTest.java (98%) diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index d6ef2cb13..57f45f13b 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -37,6 +37,12 @@ 13.9.3-SNAPSHOT + + io.ebean + ebean-jackson-mapper + 13.9.3-SNAPSHOT + + io.ebean ebean-datasource diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index eb1e958e3..46e47c2c7 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -122,6 +122,12 @@ 13.9.3-SNAPSHOT + + io.ebean + ebean-jackson-mapper + 13.9.3-SNAPSHOT + + io.ebean ebean-ddl-generator diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java index de38bd942..2cbd964a4 100644 --- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java @@ -1,4 +1,13 @@ package io.ebean.core.type; +/** + * Supports JSON bean properties that use something like Jackson ObjectMapper to convert between + * JSON content and the logical bean property value. + */ public interface ScalarJsonMapper { + + /** + * Return a ScalarType for the given JSON property. + */ + ScalarType createType(ScalarJsonRequest request); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index e4df81962..be3a25609 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -72,6 +72,7 @@ public final class DefaultTypeManager implements TypeManager { private final PlatformArrayTypeFactory arrayTypeListFactory; private final PlatformArrayTypeFactory arrayTypeSetFactory; + private final ScalarJsonMapper jsonMapper; private GeoTypeBinder geoTypeBinder; /** @@ -94,6 +95,9 @@ public final class DefaultTypeManager implements TypeManager { this.offlineMigrationGeneration = DbOffline.isGenerateMigration(); this.defaultEnumType = config.getDefaultEnumType(); + ServiceLoader mappers = ServiceLoader.load(ScalarJsonMapper.class); + jsonMapper = mappers.findFirst().orElse(null); + initialiseStandard(config); initialiseJavaTimeTypes(config); loadTypesFromProviders(config, objectMapper); @@ -377,14 +381,14 @@ public final class DefaultTypeManager implements TypeManager { } private ScalarType createJsonObjectMapperType(DeployBeanProperty prop, int dbType, DocPropertyType docType) { - if (objectMapper == null) { + if (jsonMapper == null) { throw new IllegalArgumentException("Unsupported @DbJson mapping - Jackson ObjectMapper not present for " + prop); } if (MutationDetection.DEFAULT == prop.getMutationDetection()) { prop.setMutationDetection(jsonManager.mutationDetection()); } var req = new ScalarJsonRequest(jsonManager, dbType, docType, prop.getDesc().getBeanType(), prop.getMutationDetection(), prop.getName()); - return ScalarTypeJsonObjectMapper.createTypeFor(req); + return jsonMapper.createType(req); } /** diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java index 58a3438c9..d09920dd5 100644 --- a/ebean-core/src/main/java/module-info.java +++ b/ebean-core/src/main/java/module-info.java @@ -9,6 +9,7 @@ module io.ebean.core { uses io.ebean.datasource.DataSourceAlertFactory; uses io.ebean.core.type.ExtraTypeFactory; uses io.ebean.core.type.ScalarTypeSetFactory; + uses io.ebean.core.type.ScalarJsonMapper; uses io.ebeanservice.docstore.api.DocStoreFactory; uses io.ebean.migration.auto.AutoMigrationRunner; uses io.avaje.classpath.scanner.ClassPathScannerFactory; diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml new file mode 100644 index 000000000..9371f4a86 --- /dev/null +++ b/ebean-jackson-mapper/pom.xml @@ -0,0 +1,46 @@ + + + + ebean-parent + io.ebean + 13.9.3-SNAPSHOT + + 4.0.0 + + ebean-jackson-mapper + + + + + io.ebean + ebean-core-type + 13.9.3-SNAPSHOT + provided + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + provided + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + provided + + + + io.avaje + junit + 1.1 + test + + + + + diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java similarity index 96% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java index 943422aa3..747d66394 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type; +package io.ebean.jackson.mapper; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JacksonTypeHelper.java similarity index 97% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JacksonTypeHelper.java index 7d2d5b3e1..11f8cc0a8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JacksonTypeHelper.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type; +package io.ebean.jackson.mapper; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.introspect.AnnotatedField; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JsonTrim.java similarity index 95% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JsonTrim.java index ec0808f14..855978681 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JsonTrim.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type; +package io.ebean.jackson.mapper; /** * Helper that removes whitespace from JSON. Used to normalise Postgres JSONB content. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java similarity index 94% rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java index 86f5d9c82..9193d86d2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type; +package io.ebean.jackson.mapper; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -24,14 +24,15 @@ import java.util.concurrent.ConcurrentHashMap; /** * Supports @DbJson properties using Jackson ObjectMapper. */ -final class ScalarTypeJsonObjectMapper { +public final class ScalarJsonJacksonMapper implements ScalarJsonMapper { - static final Map, AnnotatedClass> jacksonClasses = new ConcurrentHashMap<>(); + private final Map, AnnotatedClass> jacksonClasses = new ConcurrentHashMap<>(); /** * Create and return the appropriate ScalarType. */ - static ScalarType createTypeFor(ScalarJsonRequest req) { + @Override + public ScalarType createType(ScalarJsonRequest req) { AnnotatedClass annotatedClass = annotatedClass(req); AnnotatedField field = annotatedField(annotatedClass, req); if (req.mode() == MutationDetection.NONE) { @@ -41,7 +42,7 @@ final class ScalarTypeJsonObjectMapper { } } - private static AnnotatedField annotatedField(AnnotatedClass annotatedClass, ScalarJsonRequest req) { + private AnnotatedField annotatedField(AnnotatedClass annotatedClass, ScalarJsonRequest req) { for (AnnotatedField field : annotatedClass.fields()) { if (field.getName().equals(req.name())) { return field; @@ -50,7 +51,7 @@ final class ScalarTypeJsonObjectMapper { throw new IllegalStateException("AnnotatedField not found to match " + req.name()); } - private static AnnotatedClass annotatedClass(ScalarJsonRequest req) { + private AnnotatedClass annotatedClass(ScalarJsonRequest req) { return jacksonClasses.computeIfAbsent(req.beanType(), key -> { ObjectMapper mapper = (ObjectMapper) req.manager().mapper(); return new DeployBeanObtainJackson(mapper, req.beanType()).obtain(); diff --git a/ebean-jackson-mapper/src/main/java/module-info.java b/ebean-jackson-mapper/src/main/java/module-info.java new file mode 100644 index 000000000..f43b84144 --- /dev/null +++ b/ebean-jackson-mapper/src/main/java/module-info.java @@ -0,0 +1,9 @@ +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; + + provides io.ebean.core.type.ScalarJsonMapper with ScalarJsonJacksonMapper; +} diff --git a/ebean-jackson-mapper/src/main/resources/META-INF/services/io.ebean.core.type.ScalarJsonMapper b/ebean-jackson-mapper/src/main/resources/META-INF/services/io.ebean.core.type.ScalarJsonMapper new file mode 100644 index 000000000..e85a66aaa --- /dev/null +++ b/ebean-jackson-mapper/src/main/resources/META-INF/services/io.ebean.core.type.ScalarJsonMapper @@ -0,0 +1 @@ +io.ebean.jackson.mapper.ScalarJsonJacksonMapper diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java b/ebean-jackson-mapper/src/test/java/io/ebean/jackson/mapper/JsonTrimTest.java similarity index 98% rename from ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java rename to ebean-jackson-mapper/src/test/java/io/ebean/jackson/mapper/JsonTrimTest.java index 27d1ad8f9..f5b78b147 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java +++ b/ebean-jackson-mapper/src/test/java/io/ebean/jackson/mapper/JsonTrimTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.type; +package io.ebean.jackson.mapper; import org.junit.jupiter.api.Test; diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 4a71e45cf..ea8996a56 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -116,6 +116,13 @@ test + + io.ebean + ebean-jackson-mapper + 13.9.3-SNAPSHOT + test + + io.ebean ebean-platform-all diff --git a/pom.xml b/pom.xml index de0c4f3b7..d1217fb8d 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,7 @@ ebean-joda-time ebean-csv-reader ebean-jackson-jsonnode + ebean-jackson-mapper From 7a887d219f13ba145da2aad121da08e7caf81ba1 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 8 Sep 2022 22:14:16 +1200 Subject: [PATCH 3/6] Extract ebean-jackson-mapper module - rename DeployBeanObtainJackson -> AnnotatedClassUtil and convert to static method --- ...eanObtainJackson.java => AnnotatedClassUtil.java} | 12 ++---------- .../jackson/mapper/ScalarJsonJacksonMapper.java | 2 +- ebean-jackson-mapper/src/main/java/module-info.java | 1 + 3 files changed, 4 insertions(+), 11 deletions(-) rename ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/{DeployBeanObtainJackson.java => AnnotatedClassUtil.java} (70%) 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; From 610b3f7dc895cd535fe0a5351e0b2587268ae1e8 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 8 Sep 2022 22:38:10 +1200 Subject: [PATCH 4/6] Extract ebean-jackson-mapper module - Change checkJacksonAnnotations() to instead use ScalarJsonMapper.markerAnnotation() --- .../io/ebean/core/type/ScalarJsonMapper.java | 10 ++++++++++ .../server/type/DefaultTypeManager.java | 19 ++++++++----------- .../mapper/ScalarJsonJacksonMapper.java | 7 +++++++ 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java index 2cbd964a4..5a027ff96 100644 --- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java @@ -1,5 +1,9 @@ package io.ebean.core.type; +import io.avaje.lang.Nullable; + +import java.lang.annotation.Annotation; + /** * Supports JSON bean properties that use something like Jackson ObjectMapper to convert between * JSON content and the logical bean property value. @@ -10,4 +14,10 @@ public interface ScalarJsonMapper { * Return a ScalarType for the given JSON property. */ ScalarType createType(ScalarJsonRequest request); + + /** + * Return a marker annotation to detect when the JSON mapper should be used explicitly. + */ + @Nullable + Class markerAnnotation(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index be3a25609..d122ebd06 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -297,12 +297,17 @@ public final class DefaultTypeManager implements TypeManager { @Override public ScalarType dbJsonType(DeployBeanProperty prop, int dbType, int dbLength) { Class type = prop.getPropertyType(); - Type genericType = prop.getGenericType(); - boolean hasJacksonAnnotations = objectMapperPresent && checkJacksonAnnotations(prop); - if (type.equals(String.class)) { return ScalarTypeJsonString.typeFor(postgres, dbType); } + boolean hasJacksonAnnotations = false; + if (jsonMapper != null) { + var markerAnnotation = jsonMapper.markerAnnotation(); + if (markerAnnotation != null) { + hasJacksonAnnotations = !prop.getMetaAnnotations(markerAnnotation).isEmpty(); + } + } + Type genericType = prop.getGenericType(); if (type.equals(List.class)) { DocPropertyType docType = docType(genericType); if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) { @@ -342,14 +347,6 @@ public final class DefaultTypeManager implements TypeManager { return prop.getMutationDetection() == MutationDetection.SOURCE; } - /** - * Returns TRUE, if there is any jackson annotation on that property. All jackson annotations - * are annotated with the @JacksonAnnotation meta annotation. So detection is easy. - */ - private boolean checkJacksonAnnotations(DeployBeanProperty prop) { - return prop.getMetaAnnotation(com.fasterxml.jackson.annotation.JacksonAnnotation.class) != null; - } - private DocPropertyType docType(Type genericType) { if (genericType instanceof Class) { ScalarType found = type((Class) genericType); 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 a005c5e2d..a4dfbac9a 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 @@ -16,6 +16,7 @@ import javax.persistence.PersistenceException; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import java.lang.annotation.Annotation; import java.sql.SQLException; import java.sql.Types; import java.util.Map; @@ -28,6 +29,12 @@ public final class ScalarJsonJacksonMapper implements ScalarJsonMapper { private final Map, AnnotatedClass> jacksonClasses = new ConcurrentHashMap<>(); + @SuppressWarnings("unchecked") + @Override + public Class markerAnnotation() { + return (Class)com.fasterxml.jackson.annotation.JacksonAnnotation.class; + } + /** * Create and return the appropriate ScalarType. */ From 318b22448cca8ebb2e87a103079c707448cc193b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 8 Sep 2022 23:01:05 +1200 Subject: [PATCH 5/6] Extract ebean-jackson-mapper module - refactor DefaultTypeManager.dbJsonType() - When detected markerAnnotation (e.g. Jackson annotation) then go directly to createJsonObjectMapperType() - Simplify for the simple List, Set and Map of Object cases. --- .../server/type/DefaultTypeManager.java | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index d122ebd06..c60386f30 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -300,36 +300,21 @@ public final class DefaultTypeManager implements TypeManager { if (type.equals(String.class)) { return ScalarTypeJsonString.typeFor(postgres, dbType); } - boolean hasJacksonAnnotations = false; if (jsonMapper != null) { var markerAnnotation = jsonMapper.markerAnnotation(); - if (markerAnnotation != null) { - hasJacksonAnnotations = !prop.getMetaAnnotations(markerAnnotation).isEmpty(); + if (markerAnnotation != null && !prop.getMetaAnnotations(markerAnnotation).isEmpty()) { + return createJsonObjectMapperType(prop, dbType, docPropertyType(prop, type)); } } Type genericType = prop.getGenericType(); - if (type.equals(List.class)) { - DocPropertyType docType = docType(genericType); - if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) { - return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource(prop)); - } else { - return createJsonObjectMapperType(prop, dbType, docType); - } + if (type.equals(List.class) && isValueTypeSimple(genericType)) { + return ScalarTypeJsonList.typeFor(postgres, dbType, docType(genericType), prop.isNullable(), keepSource(prop)); } - if (type.equals(Set.class)) { - DocPropertyType docType = docType(genericType); - if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) { - return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource(prop)); - } else { - return createJsonObjectMapperType(prop, dbType, docType); - } + if (type.equals(Set.class) && isValueTypeSimple(genericType)) { + return ScalarTypeJsonSet.typeFor(postgres, dbType, docType(genericType), prop.isNullable(), keepSource(prop)); } - if (type.equals(Map.class)) { - if (!hasJacksonAnnotations && isMapValueTypeObject(genericType)) { - return ScalarTypeJsonMap.typeFor(postgres, dbType, keepSource(prop)); - } else { - return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT); - } + if (type.equals(Map.class) && isMapValueTypeObject(genericType)) { + return ScalarTypeJsonMap.typeFor(postgres, dbType, keepSource(prop)); } if (objectMapperPresent && prop.getMutationDetection() == MutationDetection.DEFAULT) { ScalarTypeSet typeSet = typeSets.get(type); @@ -347,6 +332,10 @@ public final class DefaultTypeManager implements TypeManager { return prop.getMutationDetection() == MutationDetection.SOURCE; } + private DocPropertyType docPropertyType(DeployBeanProperty prop, Class type) { + return type.equals(List.class) || type.equals(Set.class) ? docType(prop.getGenericType()) : DocPropertyType.OBJECT; + } + private DocPropertyType docType(Type genericType) { if (genericType instanceof Class) { ScalarType found = type((Class) genericType); From 7f5f0f6b8e8585eb47540559dcbb513ce41ee42e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 8 Sep 2022 23:05:16 +1200 Subject: [PATCH 6/6] Extract ebean-jackson-mapper module - fix module-info with requires com.fasterxml.jackson.annotation; --- ebean-jackson-mapper/src/main/java/module-info.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ebean-jackson-mapper/src/main/java/module-info.java b/ebean-jackson-mapper/src/main/java/module-info.java index a1fde9779..7adf6352a 100644 --- a/ebean-jackson-mapper/src/main/java/module-info.java +++ b/ebean-jackson-mapper/src/main/java/module-info.java @@ -3,6 +3,7 @@ import io.ebean.jackson.mapper.ScalarJsonJacksonMapper; module io.ebean.jackson.mapper { requires io.ebean.core.type; + requires com.fasterxml.jackson.annotation; requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind;