From 202a9f9733e0ec73db193f01323cc37b77a9663c Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Tue, 13 Nov 2018 11:04:02 +0100
Subject: [PATCH] SSDM-6958: Revert Jackson changes
---
.../introspector/JsonTypeAndClassAnnotationIntrospector.java | 3 ++-
.../api/server/json/serializer/JsonSerializerFactory.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/introspector/JsonTypeAndClassAnnotationIntrospector.java b/openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/introspector/JsonTypeAndClassAnnotationIntrospector.java
index fb76746dade..b27735b9dda 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/introspector/JsonTypeAndClassAnnotationIntrospector.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/introspector/JsonTypeAndClassAnnotationIntrospector.java
@@ -87,7 +87,8 @@ public class JsonTypeAndClassAnnotationIntrospector extends JacksonAnnotationInt
private boolean useCustomResolver(JavaType type)
{
- return type.getRawClass().isAnnotationPresent(JsonObject.class) && false == type.getRawClass().isEnum();
+ return type.getRawClass().equals(Object.class)
+ || (type.getRawClass().isAnnotationPresent(JsonObject.class) && false == type.getRawClass().isEnum());
}
}
diff --git a/openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/serializer/JsonSerializerFactory.java b/openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/serializer/JsonSerializerFactory.java
index d1d5518bb20..f561dcca0a3 100644
--- a/openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/serializer/JsonSerializerFactory.java
+++ b/openbis-common/source/java/ch/systemsx/cisd/openbis/common/api/server/json/serializer/JsonSerializerFactory.java
@@ -102,7 +102,7 @@ public class JsonSerializerFactory extends BeanSerializerFactory
Class<?> contentClass = contentType.getRawClass();
- if (contentClass.isAnnotationPresent(JsonObject.class) && false == contentClass.isEnum())
+ if (contentClass.equals(Object.class) || (contentClass.isAnnotationPresent(JsonObject.class) && false == contentClass.isEnum()))
{
BeanDescription bean = config.introspectClassAnnotations(contentType.getRawClass());
AnnotatedClass ac = bean.getClassInfo();
--
GitLab