mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
Extract ebean-jackson-mapper module - Change checkJacksonAnnotations() to instead use ScalarJsonMapper.markerAnnotation()
This commit is contained in:
1 parent
7a887d219f
commit
610b3f7dc8
3 files changed
+25
-11
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user