SP-70 / BIS-35: JSON-RPC - detect subtypes automatically (first implementation)

SP-67 / BIS-35: Add Jackson annotations to all classes used in JSON-RPC interfaces (change @JsonTypeName to @JsonObject to make the annotation visible in JavaDoc)

SVN: 25391

common/source/java/ch/systemsx/cisd/common/json/JsonObject.java

@@ -23,6 +23,11 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
+ * Annotation all JSON transfered classes should be marked with. It was originally created to
+ * replace @JsonTypeName annotation which was not visible in the documentation. With @JsonTypeName
+ * annotation it would be impossible for our users to find a logical type name of a class to be sent
+ * to JSON-RPC services.
+ * 
  * @author pkupczyk
  */
 @Target(

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericObjectMapper.java

@@ -22,6 +22,8 @@ import ch.systemsx.cisd.common.api.server.json.JsonReflectionsSubTypeResolver;
 import ch.systemsx.cisd.common.api.server.json.JsonTypeAndClassAnnotationIntrospector;
 
 /**
+ * Jackson library object mapper used in generic OpenBIS.
+ * 
  * @author pkupczyk
  */
 public class GenericObjectMapper extends ObjectMapper
@@ -31,7 +33,7 @@ public class GenericObjectMapper extends ObjectMapper
     {
         setAnnotationIntrospector(new JsonTypeAndClassAnnotationIntrospector(
                 new GenericJsonClassValueToClassObjectsMapping()));
-        setSubtypeResolver(new JsonReflectionsSubTypeResolver());
+        setSubtypeResolver(JsonReflectionsSubTypeResolver.getDefaultInstance());
     }
 
 }

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningObjectMapper.java

@@ -22,6 +22,8 @@ import ch.systemsx.cisd.common.api.server.json.JsonReflectionsSubTypeResolver;
 import ch.systemsx.cisd.common.api.server.json.JsonTypeAndClassAnnotationIntrospector;
 
 /**
+ * Jackson library object mapper used in screening OpenBIS.
+ * 
  * @author pkupczyk
  */
 public class ScreeningObjectMapper extends ObjectMapper
@@ -31,7 +33,7 @@ public class ScreeningObjectMapper extends ObjectMapper
     {
         setAnnotationIntrospector(new JsonTypeAndClassAnnotationIntrospector(
                 new ScreeningJsonClassValueToClassObjectsMapping()));
-        setSubtypeResolver(new JsonReflectionsSubTypeResolver());
+        setSubtypeResolver(JsonReflectionsSubTypeResolver.getDefaultInstance());
     }
 
 }