Small rm changes

src/main/java/com/nedap/archie/adlparser/modelconstraints/ReflectionConstraintImposer.java

@@ -10,7 +10,6 @@
 import com.nedap.archie.rminfo.RMAttributeInfo;
 import com.nedap.archie.rminfo.RMTypeInfo;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -61,7 +60,7 @@ public ReflectionConstraintImposer(ModelInfoLookup classLookup) {
                     attribute.setCardinality(new Cardinality(0,1));
                 }
 
-                if(attributeInfo.getType() instanceof Class && Collection.class.isAssignableFrom(attributeInfo.getType())) {
+                if(attributeInfo.isMultipleValued()) {
                     attribute.setCardinality(Cardinality.unbounded());
                     attribute.setMultiple(true);
                 }

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

@@ -29,7 +29,7 @@
  */
 @XmlType(name="AUTHORED_RESOURCE")
 @XmlAccessorType(XmlAccessType.PROPERTY)
-public class AuthoredResource extends ArchetypeModelObject {
+public abstract class AuthoredResource extends ArchetypeModelObject {
 
     private Boolean controlled;
     private String uid;

src/main/java/com/nedap/archie/creation/RMObjectCreator.java

@@ -60,7 +60,7 @@ public void set(Object object, String rmAttributeName, List<Object> values) {
             Type type = attributeInfo.getType();
             if(type instanceof Class) {
                 Class clazz = (Class) type;
-                if(Collection.class.isAssignableFrom(clazz)) {
+                if(attributeInfo.isMultipleValued()) {
                     Collection collection = (Collection) newInstance(attributeInfo);
                     if(values != null) {
                         collection.addAll(values);

src/main/java/com/nedap/archie/rm/archetyped/Locatable.java

@@ -25,7 +25,7 @@
         "archetypeDetails",
         "feederAudit"
 })
-public class Locatable extends Pathable {
+public abstract class Locatable extends Pathable {
 
     @XmlElement
     private DvText name;

src/main/java/com/nedap/archie/rm/archetyped/Pathable.java

@@ -20,7 +20,7 @@
  * Created by pieter.bos on 04/11/15.
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-public class Pathable extends RMObject {
+public abstract class Pathable extends RMObject {
     //TODO: implement according to spec: pathExists(path), pathUnique(path), pathOfItem(pathable)
 
     @JsonIgnore

src/main/java/com/nedap/archie/rm/composition/CareEntry.java

@@ -17,7 +17,7 @@
         "protocol",
         "guidelineId"
 })
-public class CareEntry extends Entry {
+public abstract class CareEntry extends Entry {
 
     @Nullable
     private ItemStructure protocol;

src/main/java/com/nedap/archie/rm/composition/ContentItem.java

@@ -12,6 +12,6 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "CONTENT_ITEM")
-public class ContentItem extends Locatable {
+public abstract class ContentItem extends Locatable {
 
 }

src/main/java/com/nedap/archie/rm/composition/Entry.java

@@ -24,7 +24,7 @@
         "otherParticipations",
         "workFlowId"
 })
-public class Entry extends ContentItem {
+public abstract class Entry extends ContentItem {
 
     private CodePhrase language;
     private CodePhrase encoding;

src/main/java/com/nedap/archie/rm/datastructures/DataStructure.java

@@ -5,5 +5,5 @@
 /**
  * Created by pieter.bos on 04/11/15.
  */
-public class DataStructure extends Locatable {
+public abstract class DataStructure extends Locatable {
 }

src/main/java/com/nedap/archie/rm/datastructures/Item.java

@@ -11,5 +11,5 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ITEM")
-public class Item extends Locatable {
+public abstract class Item extends Locatable {
 }

src/main/java/com/nedap/archie/rm/demographic/Actor.java

@@ -14,7 +14,7 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name="ACTOR")
-public class Actor extends Party {
+public abstract class Actor extends Party {
 
     private List<DvText> languages = new ArrayList<>();
     private List<PartyRef> roles = new ArrayList();

src/main/java/com/nedap/archie/rm/generic/PartyProxy.java

@@ -17,7 +17,7 @@
 @XmlType(name = "PARTY_PROXY", propOrder = {
         "externalRef"
 })
-public class PartyProxy extends RMObject {
+public abstract class PartyProxy extends RMObject {
 
     @Nullable
     @XmlElement(name = "external_ref")

src/main/java/com/nedap/archie/rm/support/identification/ObjectId.java

@@ -13,7 +13,7 @@
 @XmlType(name = "OBJECT_ID", propOrder = {
         "value"
 })
-public class ObjectId extends RMObject {
+public abstract class ObjectId extends RMObject {
 
     private String value;
 

src/main/java/com/nedap/archie/rm/support/identification/UID.java

@@ -5,7 +5,7 @@
 /**
  * Created by pieter.bos on 08/07/16.
  */
-public class UID extends RMObject {
+public abstract class UID extends RMObject {
 
     String value;
 

src/main/java/com/nedap/archie/rm/support/identification/UIDBasedId.java

@@ -10,7 +10,7 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "UID_BASED_ID")
-public class UIDBasedId extends ObjectId {
+public abstract class UIDBasedId extends ObjectId {
 
     private UID root;
     @Nullable

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

@@ -116,22 +116,22 @@ private void addAttributeInfo(Class clazz, RMTypeInfo typeInfo) {
             String javaFieldNameUpperCased = upperCaseFirstChar(javaFieldName);
             Method getMethod = getMethod(clazz, "get" + javaFieldNameUpperCased);
             Method setMethod = null, addMethod = null;
-            if(getMethod == null) {
+            if (getMethod == null) {
                 getMethod = getMethod(clazz, "is" + javaFieldNameUpperCased);
             }
-            if(getMethod != null) {
+            if (getMethod != null) {
                 setMethod = getMethod(clazz, "set" + javaFieldNameUpperCased, getMethod.getReturnType());
-                if(Collection.class.isAssignableFrom(getMethod.getReturnType())) {
+                if (Collection.class.isAssignableFrom(getMethod.getReturnType())) {
                     Type[] typeArguments = ((ParameterizedType) getMethod.getGenericReturnType()).getActualTypeArguments();
-                    if(typeArguments.length == 1) {
+                    if (typeArguments.length == 1) {
                         TypeToken singularParameter = typeToken.resolveType(typeArguments[0]);
                         //TODO: does this work or should we use the typeArguments[0].getSomething?
                         String addMethodName = "add" + toSingular(javaFieldNameUpperCased);
                         addMethod = getMethod(clazz, addMethodName, singularParameter.getRawType());
-                        if(addMethod == null) {
+                        if (addMethod == null) {
                             //Due to generics, this does not always work
                             Set<Method> allAddMethods = ReflectionUtils.getAllMethods(clazz, ReflectionUtils.withName(addMethodName));
-                            if(allAddMethods.size() == 1) {
+                            if (allAddMethods.size() == 1) {
                                 addMethod = allAddMethods.iterator().next();
                             } else {
                                 logger.warn("strange number of add methods for field {} on class {}", field.getName(), clazz.getSimpleName());
@@ -144,26 +144,39 @@ private void addAttributeInfo(Class clazz, RMTypeInfo typeInfo) {
             }
 
             TypeToken fieldType = null;
-            if(getMethod != null) {
+            if (getMethod != null) {
                 fieldType = typeToken.resolveType(getMethod.getGenericReturnType());
             } else {
                 fieldType = typeToken.resolveType(field.getGenericType());
             }
 
+            Class rawFieldType = fieldType.getRawType();
+            Class typeInCollection = rawFieldType;
+            if (Collection.class.isAssignableFrom(rawFieldType)) {
+                Type[] actualTypeArguments = ((ParameterizedType) fieldType.getType()).getActualTypeArguments();
+                if (actualTypeArguments.length == 1) {
+                    if (actualTypeArguments[0] instanceof Class) {
+                        typeInCollection = (Class) actualTypeArguments[0];
+                    }
+                }
+            }
 
-
-            RMAttributeInfo attributeInfo = new RMAttributeInfo(
-                    attributeName,
-                    field,
-                    fieldType.getRawType(),
-                    field.getAnnotation(Nullable.class) != null,
-                    getMethod,
-                    setMethod,
-                    addMethod
-            );
-            typeInfo.addAttribute(attributeInfo);
+            if (setMethod != null) {
+                RMAttributeInfo attributeInfo = new RMAttributeInfo(
+                        attributeName,
+                        field,
+                        rawFieldType,
+                        typeInCollection,
+                        field.getAnnotation(Nullable.class) != null,
+                        getMethod,
+                        setMethod,
+                        addMethod
+                );
+                typeInfo.addAttribute(attributeInfo);
+            } else {
+                logger.info("property without a set method ignored for field {} on class {}", field.getName(), clazz.getSimpleName());
+            }
         }
-
     }
 
     private String toSingular(String javaFieldNameUpperCased) {

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

@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.Collection;
 
 /**
  * Created by pieter.bos on 25/03/16.
@@ -10,19 +11,23 @@ public class RMAttributeInfo {
     private final String name;
     private final Field field;
     private final Class type;
+    private final Class typeInCollection;
+    private final boolean isMultipleValued;
     private final Method getMethod;
     private final Method setMethod;
     private final Method addMethod;
     private final boolean nullable;
 
-    public RMAttributeInfo(String name, Field field, Class type, boolean nullable, Method getMethod, Method setMethod, Method addMethod) {
+    public RMAttributeInfo(String name, Field field, Class type, Class typeInCollection, boolean nullable, Method getMethod, Method setMethod, Method addMethod) {
         this.name = name;
         this.field = field;
         this.type = type;
         this.nullable = nullable;
         this.getMethod = getMethod;
         this.setMethod = setMethod;
         this.addMethod = addMethod;
+        this.isMultipleValued = type instanceof Class && Collection.class.isAssignableFrom(type);
+        this.typeInCollection = typeInCollection;
     }
 
     public String getRmName() {
@@ -45,6 +50,10 @@ public Field getField() {
         return field;
     }
 
+    public boolean isMultipleValued() {
+        return isMultipleValued;
+    }
+
     public Class getType() {
         return type;
     }
@@ -53,4 +62,11 @@ public boolean isNullable() {
         return nullable;
     }
 
+    /**
+     * If isMultipleValued == true, this will return the type used in the collection, eg if the the collection is List<String>, this will return String.class
+     * @return
+     */
+    public Class getTypeInCollection() {
+        return typeInCollection;
+    }
 }