Split flattener into separate parts

aom/src/main/java/com/nedap/archie/aom/CObject.java

@@ -323,7 +323,7 @@ public MultiplicityInterval effectiveOccurrences(BiFunction<String, String, Mult
                 }
             } else if(parent.getParent() != null) {
                 //TODO: this can be a (differential) path, but we don't support that yet.
-                return referenceModelPropMultiplicity.apply(parent.getParent().getRmTypeName(), parent.getRmAttributeName());
+                return referenceModelPropMultiplicity.apply(parent.getParent().getRmTypeName(), parent.getDifferentialPath() == null ? parent.getRmAttributeName() : parent.getDifferentialPath());
             } else {
                 return MultiplicityInterval.createUpperUnbounded(occurrencesLower);
             }

aom/src/main/java/com/nedap/archie/rminfo/ModelInfoLookup.java

@@ -4,6 +4,8 @@
 import com.nedap.archie.aom.CObject;
 import com.nedap.archie.aom.CPrimitiveObject;
 import com.nedap.archie.base.MultiplicityInterval;
+import com.nedap.archie.paths.PathSegment;
+import com.nedap.archie.query.APathQuery;
 
 import java.lang.reflect.Field;
 import java.util.Collection;
@@ -169,8 +171,19 @@ public interface ModelInfoLookup {
      * @param rmAttributeName
      * @return
      */
-    default MultiplicityInterval referenceModelPropMultiplicity(String rmTypeName, String rmAttributeName) {
-        RMAttributeInfo attributeInfo = getAttributeInfo(rmTypeName, rmAttributeName);
+    default MultiplicityInterval referenceModelPropMultiplicity(String rmTypeName, String rmAttributeNameOrPath) {
+        RMTypeInfo typeInfo = this.getTypeInfo(rmTypeName);
+        String rmAttributeName = rmAttributeNameOrPath;
+        if(rmAttributeNameOrPath.contains("[") || rmAttributeNameOrPath.contains("/")) {
+            APathQuery aPathQuery = new APathQuery(rmAttributeNameOrPath);
+            for(int i = 0; i < aPathQuery.getPathSegments().size()-1; i++) {
+                PathSegment segment = aPathQuery.getPathSegments().get(i);
+                RMAttributeInfo attributeInfo = typeInfo.getAttribute(segment.getNodeName());
+                typeInfo = this.getTypeInfo(attributeInfo.getTypeNameInCollection());
+            }
+            rmAttributeName = aPathQuery.getPathSegments().get(aPathQuery.getPathSegments().size()-1).getNodeName();
+        }
+        RMAttributeInfo attributeInfo = typeInfo.getAttribute(rmAttributeName);
         if(attributeInfo.isMultipleValued()) {
             return MultiplicityInterval.createUpperUnbounded(0);
         } else {

aom/src/main/java/com/nedap/archie/rminfo/RMAttributeInfo.java

@@ -12,14 +12,15 @@ public class RMAttributeInfo {
     private final Field field;
     private final Class type;
     private final Class typeInCollection;
+    private final String typeNameInCollection;
     private final boolean isMultipleValued;
     private final Method getMethod;
     private final Method setMethod;
     private final Method addMethod;
     private final boolean nullable;
     private final boolean computed;
 
-    public RMAttributeInfo(String name, Field field, Class type, Class typeInCollection, boolean nullable, Method getMethod, Method setMethod, Method addMethod) {
+    public RMAttributeInfo(String name, Field field, Class type, Class typeInCollection, String typeNameInCollection, boolean nullable, Method getMethod, Method setMethod, Method addMethod) {
         this.name = name;
         this.field = field;
         this.type = type;
@@ -30,6 +31,7 @@ public RMAttributeInfo(String name, Field field, Class type, Class typeInCollect
         this.computed = this.setMethod == null && this.addMethod == null;
         this.isMultipleValued = type instanceof Class && Collection.class.isAssignableFrom(type);
         this.typeInCollection = typeInCollection;
+        this.typeNameInCollection = typeNameInCollection;
     }
 
     public String getRmName() {
@@ -77,4 +79,7 @@ public boolean isComputed() {
     }
 
 
+    public String getTypeNameInCollection() {
+        return typeNameInCollection;
+    }
 }

aom/src/main/java/com/nedap/archie/rminfo/ReflectionModelInfoLookup.java

@@ -191,6 +191,7 @@ private void addRMAttributeInfo(Class clazz, RMTypeInfo typeInfo, TypeToken type
                     field,
                     rawFieldType,
                     typeInCollection,
+                    this.namingStrategy.getTypeName(typeInCollection),
                     (field != null && field.getAnnotation(Nullable.class) != null) || getMethod.getAnnotation(Nullable.class) != null,
                     getMethod,
                     setMethod,
@@ -236,6 +237,7 @@ private void addRMAttributeInfo(Class clazz, RMTypeInfo typeInfo, TypeToken type
                     field,
                     rawFieldType,
                     typeInCollection,
+                    namingStrategy.getTypeName(typeInCollection),
                     field.getAnnotation(Nullable.class) != null,
                     getMethod,
                     setMethod,

aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CComplexObjectSerializer.java

@@ -85,7 +85,7 @@ private Set<String> getTupleAttributeNames(T cobj) {
 
     private void buildAttribute(CAttribute cattr) {
         builder.tryNewLine();
-        if (cattr.getRmAttributeName() != null) {
+        if (cattr.getDifferentialPath() == null) {
             builder.append(cattr.getRmAttributeName());
         } else {
             builder.append(cattr.getDifferentialPath());

tools/src/main/java/com/nedap/archie/archetypevalidator/ArchetypeValidator.java

@@ -159,6 +159,7 @@ public ValidationResult validate(Archetype archetype, FullArchetypeRepository re
                 messages.addAll(runValidations(lookup, flattened, repository, flatParent, validationsPhase3));
             } catch (Exception e) {
                 messages.add(new ValidationMessage(ErrorType.OTHER, "flattening failed with exception " + e));
+                logger.error("error during validation", e);
             }
         }
         if(archetype instanceof Template) {