Fix review comments

Author: pieterbos

aom/src/main/java/com/nedap/archie/aom/utils/ArchetypeParsePostProcesser.java

@@ -62,10 +62,10 @@ private static void setParents(Archetype archetype) {
                     }
                     for(CPrimitiveTuple primitiveTuple:tuple.getTuples()) {
                         int index = 0;
-                        for(CPrimitiveObject object:primitiveTuple.getMembers()) {
+                        for(CPrimitiveObject<?, ?> object:primitiveTuple.getMembers()) {
                             if(index < tuple.getMembers().size()) {
                                 CAttribute attribute = tuple.getMember(index);
-                                object.setSocParent(tuple);
+                                object.setSocParent(primitiveTuple);
                                 object.setParent(attribute);
                                 index++;
                             }

openehr-rm/src/main/java/com/nedap/archie/rminfo/ArchieRMInfoLookup.java

@@ -288,7 +288,7 @@ public void processCreatedObject(Object createdObject, CObject constraint) {
             Locatable locatable = (Locatable) createdObject;
             locatable.setArchetypeNodeId(constraint.getNodeId());
             locatable.setNameAsString(constraint.getMeaning());
-            if(constraint != null && constraint instanceof CArchetypeRoot) {
+            if(constraint instanceof CArchetypeRoot) {
                 CArchetypeRoot root = (CArchetypeRoot) constraint;
                 if(root.getArchetypeRef() != null) {
                     Archetyped details = new Archetyped();

openehr-rm/src/main/java/com/nedap/archie/rminfo/UpdatedValueHandler.java

@@ -107,7 +107,7 @@ private static Map<String, Object> fixDvCodedText(Object rmObject, Archetype arc
             OperationalTemplate template = (OperationalTemplate) archetype;
 
             String archetypePath = convertRMObjectPathToArchetypePath(pathOfParent);
-            result.putAll(setTerminologyFromArchetype(archetype, codedText, archetypePath, path));
+            //result.putAll(setTerminologyFromArchetype(archetype, codedText, archetypePath, path));
 
             ArchetypeTerm termDefinition = getTermDefinition(template, details, codedText);
             result.putAll(setDvCodedTextValue(codedText, termDefinition, path));

tools/src/test/java/com/nedap/archie/rules/evaluation/FixableAssertionsCheckerTest.java

@@ -97,7 +97,7 @@ public void andExpression() throws Exception {
 
         Locatable root = (Locatable) testUtil.constructEmptyRMObject(archetype.getDefinition());
         EvaluationResult evaluate = ruleEvaluation.evaluate(root, archetype.getRules().getRules());
-        assertEquals("There are five values that must be set", 7, evaluate.getSetPathValues().size());
+        assertEquals("There are seven values that must be set", 7, evaluate.getSetPathValues().size());
 
         //assert that paths must be set to specific values
         assertEquals("test string", evaluate.getSetPathValues().get("/data[id2]/events[id3]/data[id4]/items[id5]/value/value").getValue());