Fix ClassCastException during deserialisation (#577)

* DSL 9.73.4

* Fixed deserialisation class cast exception

* DSL update

* DSL update

* Renamed annotations

Author: SimonCockx

common/src/main/java/com/regnosys/rosetta/common/serialisation/mixin/RosettaJSONAnnotationIntrospector.java

@@ -23,16 +23,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.PropertyName;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.databind.cfg.MapperConfig;
 import com.fasterxml.jackson.databind.introspect.*;
 import com.fasterxml.jackson.module.blackbird.util.CheckedFunction;
 import com.regnosys.rosetta.common.serialisation.BackwardsCompatibleAnnotationIntrospector;
 import com.regnosys.rosetta.common.serialisation.BeanUtil;
 import com.regnosys.rosetta.common.serialisation.mixin.legacy.LegacyRosettaBuilderIntrospector;
 import com.rosetta.model.lib.RosettaModelObject;
-import com.rosetta.model.lib.annotations.RosettaAttribute;
-import com.rosetta.model.lib.annotations.RosettaDataType;
-import com.rosetta.model.lib.annotations.RosettaIgnore;
+import com.rosetta.model.lib.annotations.*;
 
 import java.lang.reflect.Method;
 import java.util.*;
@@ -68,6 +67,14 @@ public Class<?> findPOJOBuilder(AnnotatedClass ac) {
                 .orElse(super.findPOJOBuilder(ac));
     }
 
+    @Override
+    public JsonPOJOBuilder.Value findPOJOBuilderConfig(AnnotatedClass ac) {
+        if (ac.hasAnnotation(RosettaDataType.class)) {
+            return new JsonPOJOBuilder.Value("build", "set");
+        }
+        return super.findPOJOBuilderConfig(ac);
+    }
+
     @Override
     public PropertyName findNameForSerialization(Annotated a) {
         if (a.hasAnnotation(RosettaAttribute.class)) {
@@ -116,15 +123,23 @@ public JsonIgnoreProperties.Value findPropertyIgnoralByName(MapperConfig<?> conf
     public JsonIgnoreProperties.Value findPropertyIgnorals(Annotated ac) {
         if (ac instanceof AnnotatedClass && ac.hasAnnotation(RosettaDataType.class)) {
             AnnotatedClass acc = (AnnotatedClass) ac;
-            Set<String> includes = getPropertyNames(acc, x -> x.hasAnnotation(RosettaAttribute.class));
-            Set<String> ignored = getPropertyNames(acc, x -> !x.hasAnnotation(RosettaAttribute.class));
+            Set<String> includes = getPropertyNames(acc, x -> shouldIncludeMethod(x));
+            Set<String> ignored = getPropertyNames(acc, x -> !shouldIncludeMethod(x));
             ignored.removeAll(includes);
             return JsonIgnoreProperties.Value.forIgnoredProperties(ignored).withAllowSetters();
         }
 
         return legacyRosettaBuilderIntrospector.findPropertyIgnorals(ac)
                 .orElse(JsonIgnoreProperties.Value.empty());
     }
+    
+    private boolean shouldIncludeMethod(AnnotatedMethod m) {
+        return m.hasAnnotation(RosettaAttribute.class) && getAccessorType(m) != AccessorType.ADDER;
+    }
+    private AccessorType getAccessorType(Annotated m) {
+        Accessor acc = m.getAnnotation(Accessor.class);
+        return acc != null ? acc.value() : null;
+    }
 
     private static Set<String> getPropertyNames(AnnotatedClass acc, Predicate<AnnotatedMethod> filter) {
         return StreamSupport.stream(acc.memberMethods().spliterator(), false)

common/src/main/java/com/regnosys/rosetta/common/serialisation/xml/RosettaXMLAnnotationIntrospector.java

@@ -389,22 +389,30 @@ protected boolean _isIgnorable(Annotated a) {
         // except for constructors, which are necessary for deserialisation.
         // Additionally, the `getType` method needs to be ignored explicitly, otherwise it interferes with
         // xml elements named `type`, which are then always ordered on top, instead of the actual place they occur.
-        return a.hasAnnotation(RosettaIgnore.class) && !(a instanceof AnnotatedConstructor) || a.getName().equals("getType");
+        return (a.hasAnnotation(RosettaIgnore.class) || !shouldIncludeMember(a)) && !(a instanceof AnnotatedConstructor);
     }
 
     @Override
     public JsonIgnoreProperties.Value findPropertyIgnoralByName(MapperConfig<?> config, Annotated ac) {
         if (ac instanceof AnnotatedClass && ac.hasAnnotation(RosettaDataType.class)) {
             AnnotatedClass acc = (AnnotatedClass) ac;
-            Set<String> includes = getPropertyNames(config, acc, x -> x.hasAnnotation(RosettaAttribute.class));
-            Set<String> ignored = getPropertyNames(config, acc, x -> !x.hasAnnotation(RosettaAttribute.class));
+            Set<String> includes = getPropertyNames(config, acc, x -> shouldIncludeMember(x));
+            Set<String> ignored = getPropertyNames(config, acc, x -> !shouldIncludeMember(x));
             ignored.removeAll(includes);
             return JsonIgnoreProperties.Value.forIgnoredProperties(ignored).withAllowSetters();
         }
 
         return super.findPropertyIgnoralByName(config, ac);
     }
 
+    private boolean shouldIncludeMember(Annotated m) {
+        return m.hasAnnotation(RosettaAttribute.class) && (!m.hasAnnotation(Multi.class) || getAccessorType(m) != AccessorType.SETTER);
+    }
+    private AccessorType getAccessorType(Annotated m) {
+        Accessor acc = m.getAnnotation(Accessor.class);
+        return acc != null ? acc.value() : null;
+    }
+
     private Set<String> getPropertyNames(MapperConfig<?> config, AnnotatedClass acc, Predicate<AnnotatedMethod> filter) {
         return StreamSupport.stream(acc.memberMethods().spliterator(), false)
                 .filter(filter)

common/src/test/java/com/regnosys/rosetta/common/serialisation/json/RosettaSerialisationTest.java

@@ -212,7 +212,6 @@ void overridingMultiCardinalityToSingleTypesCanDeserialize() throws JsonProcessi
     }
 
     @Test
-    @Disabled // TODO
     void overridingMultiCardinalityTypesCanDeserialize() throws JsonProcessingException {
         ObjectMapper mapper = RosettaObjectMapper.getNewRosettaObjectMapper();
         String rosetta =

pom.xml

@@ -91,7 +91,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.enforced.version>[21,22)</java.enforced.version>
         <maven.compiler.release>8</maven.compiler.release>
-        <rosetta.dsl.version>9.73.4</rosetta.dsl.version>
+        <rosetta.dsl.version>9.76.1</rosetta.dsl.version>
 
         <!-- Release -->
         <gpg.keyname>configured-by-release-profile</gpg.keyname>