From 318b22448cca8ebb2e87a103079c707448cc193b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 8 Sep 2022 23:01:05 +1200 Subject: [PATCH] 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);