merge getAnnotated and getParent

ftomassetti · ftomassetti · commit 17adee042bfd · 2023-09-19T17:17:10.000+02:00
diff --git a/core/src/main/java/io/lionweb/lioncore/java/model/AnnotationInstance.java b/core/src/main/java/io/lionweb/lioncore/java/model/AnnotationInstance.java
@@ -10,8 +10,6 @@
 public interface AnnotationInstance extends ClassifierInstance<Annotation> {
   Annotation getAnnotationDefinition();
 
-  ClassifierInstance getAnnotated();
-
   default Classifier<Annotation> getClassifier() {
     return getAnnotationDefinition();
   }
diff --git a/core/src/main/java/io/lionweb/lioncore/java/model/ClassifierInstance.java b/core/src/main/java/io/lionweb/lioncore/java/model/ClassifierInstance.java
@@ -9,4 +9,7 @@ public interface ClassifierInstance<T extends Classifier<T>> extends HasFeatureV
   String getID();
 
   Classifier<T> getClassifier();
+
+  /** The immediate parent of the Node. This should be null only for root nodes. */
+  ClassifierInstance<T> getParent();
 }
diff --git a/core/src/main/java/io/lionweb/lioncore/java/model/Node.java b/core/src/main/java/io/lionweb/lioncore/java/model/Node.java
@@ -39,9 +39,6 @@ public interface Node extends ClassifierInstance<Concept> {
    */
   Node getRoot();
 
-  /** The immediate parent of the Node. This should be null only for root nodes. */
-  Node getParent();
-
   /** The concept of which this Node is an instance. The Concept should not be abstract. */
   Concept getConcept();
 
diff --git a/core/src/main/java/io/lionweb/lioncore/java/model/impl/DynamicAnnotationInstance.java b/core/src/main/java/io/lionweb/lioncore/java/model/impl/DynamicAnnotationInstance.java
@@ -72,7 +72,7 @@ public Annotation getAnnotationDefinition() {
   }
 
   @Override
-  public ClassifierInstance getAnnotated() {
+  public ClassifierInstance getParent() {
     return annotated;
   }
 
diff --git a/core/src/main/java/io/lionweb/lioncore/java/serialization/JsonSerialization.java b/core/src/main/java/io/lionweb/lioncore/java/serialization/JsonSerialization.java
@@ -220,7 +220,7 @@ private SerializedClassifierInstance serializeAnnotationInstance(
     Objects.requireNonNull(annotationInstance, "AnnotationInstance should not be null");
     SerializedAnnotationInstance serializedClassifierInstance = new SerializedAnnotationInstance();
     serializedClassifierInstance.setID(annotationInstance.getID());
-    serializedClassifierInstance.setAnnotated(annotationInstance.getAnnotated().getID());
+    serializedClassifierInstance.setParentNodeID(annotationInstance.getParent().getID());
     serializedClassifierInstance.setClassifier(
         MetaPointer.from(annotationInstance.getAnnotationDefinition()));
     serializeProperties(annotationInstance, serializedClassifierInstance);
@@ -396,12 +396,12 @@ private List<SerializedClassifierInstance> sortLeavesFirst(
         } else if (n instanceof SerializedAnnotationInstance) {
           SerializedAnnotationInstance serializedAnnotationInstance =
               (SerializedAnnotationInstance) n;
-          if (serializedAnnotationInstance.getAnnotated() == null
+          if (serializedAnnotationInstance.getParentNodeID() == null
               || sortedList.stream()
                   .anyMatch(
                       sn ->
                           Objects.equals(
-                              sn.getID(), serializedAnnotationInstance.getAnnotated()))) {
+                              sn.getID(), serializedAnnotationInstance.getParentNodeID()))) {
             sortedList.add(n);
             nodesToSort.remove(i);
             i--;
@@ -478,13 +478,13 @@ private List<ClassifierInstance<?>> unserializeClassifierInstances(
                           + n);
                 }
                 Node annotatedNode =
-                    (Node) unserializedByID.get(serializedAnnotationInstance.getAnnotated());
+                    (Node) unserializedByID.get(serializedAnnotationInstance.getParentNodeID());
                 AnnotationInstance annotationInstance = (AnnotationInstance) classifierInstance;
                 if (annotatedNode != null) {
                   annotatedNode.addAnnotation(annotationInstance);
                 } else {
                   throw new IllegalStateException(
-                      "Cannot resolved annotated node " + annotationInstance.getAnnotated());
+                      "Cannot resolved annotated node " + annotationInstance.getParent());
                 }
               }
             });
diff --git a/core/src/main/java/io/lionweb/lioncore/java/serialization/LowLevelJsonSerialization.java b/core/src/main/java/io/lionweb/lioncore/java/serialization/LowLevelJsonSerialization.java
@@ -103,7 +103,7 @@ public JsonElement serializeToJsonElement(SerializedChunk serializedChunk) {
       } else if (node instanceof SerializedAnnotationInstance) {
         SerializedAnnotationInstance serializedAnnotationInstance =
             (SerializedAnnotationInstance) node;
-        nodeJson.addProperty("annotated", serializedAnnotationInstance.getAnnotated());
+        nodeJson.addProperty("annotated", serializedAnnotationInstance.getParentNodeID());
         nodeJson.add("annotation", serializeToJsonElement(node.getClassifier()));
       } else {
         throw new UnsupportedOperationException();
@@ -232,7 +232,7 @@ private SerializedClassifierInstance unserializeClassifierInstance(JsonElement j
             new SerializedAnnotationInstance();
         serializedAnnotationInstance.setClassifier(
             SerializationUtils.tryToGetMetaPointerProperty(jsonObject, "annotation"));
-        serializedAnnotationInstance.setAnnotated(
+        serializedAnnotationInstance.setParentNodeID(
             SerializationUtils.tryToGetStringProperty(jsonObject, "annotated"));
         serializedClassifierInstance = serializedAnnotationInstance;
       } else {
diff --git a/core/src/main/java/io/lionweb/lioncore/java/serialization/data/SerializedAnnotationInstance.java b/core/src/main/java/io/lionweb/lioncore/java/serialization/data/SerializedAnnotationInstance.java
@@ -3,24 +3,14 @@
 import java.util.Objects;
 
 public class SerializedAnnotationInstance extends SerializedClassifierInstance {
-  private String annotatedID;
-
-  public String getAnnotated() {
-    return annotatedID;
-  }
-
-  public void setAnnotated(String annotatedID) {
-    this.annotatedID = annotatedID;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof SerializedAnnotationInstance)) return false;
     SerializedAnnotationInstance that = (SerializedAnnotationInstance) o;
     return Objects.equals(id, that.id)
         && Objects.equals(classifier, that.classifier)
-        && Objects.equals(annotatedID, that.annotatedID)
+        && Objects.equals(parentNodeID, that.parentNodeID)
         && Objects.equals(properties, that.properties)
         && Objects.equals(containments, that.containments)
         && Objects.equals(annotations, that.annotations)
@@ -29,7 +19,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, classifier, annotatedID, properties, containments, references);
+    return Objects.hash(id, classifier, parentNodeID, properties, containments, references);
   }
 
   @Override
@@ -40,8 +30,8 @@ public String toString() {
         + '\''
         + ", concept="
         + classifier
-        + ", annotatedID='"
-        + annotatedID
+        + ", parentNodeID='"
+        + parentNodeID
         + '\''
         + ", properties="
         + properties
diff --git a/core/src/main/java/io/lionweb/lioncore/java/serialization/data/SerializedClassifierInstance.java b/core/src/main/java/io/lionweb/lioncore/java/serialization/data/SerializedClassifierInstance.java
@@ -16,6 +16,15 @@ public abstract class SerializedClassifierInstance {
   protected List<SerializedContainmentValue> containments = new ArrayList<>();
   protected List<SerializedReferenceValue> references = new ArrayList<>();
   protected List<String> annotations = new ArrayList<>();
+  protected String parentNodeID;
+
+  public String getParentNodeID() {
+    return parentNodeID;
+  }
+
+  public void setParentNodeID(String parentNodeID) {
+    this.parentNodeID = parentNodeID;
+  }
 
   public SerializedClassifierInstance() {}
 
diff --git a/core/src/main/java/io/lionweb/lioncore/java/serialization/data/SerializedNodeInstance.java b/core/src/main/java/io/lionweb/lioncore/java/serialization/data/SerializedNodeInstance.java
@@ -3,15 +3,6 @@
 import java.util.Objects;
 
 public class SerializedNodeInstance extends SerializedClassifierInstance {
-  private String parentNodeID;
-
-  public String getParentNodeID() {
-    return parentNodeID;
-  }
-
-  public void setParentNodeID(String parentNodeID) {
-    this.parentNodeID = parentNodeID;
-  }
 
   @Override
   public boolean equals(Object o) {
diff --git a/core/src/main/java/io/lionweb/lioncore/java/utils/ModelComparator.java b/core/src/main/java/io/lionweb/lioncore/java/utils/ModelComparator.java
@@ -295,7 +295,7 @@ private void compare(
       if (Objects.equals(
           nodeA.getAnnotationDefinition().getID(), nodeB.getAnnotationDefinition().getID())) {
         Annotation concept = nodeA.getAnnotationDefinition();
-        if (!Objects.equals(nodeA.getAnnotated().getID(), nodeB.getAnnotated().getID())) {
+        if (!Objects.equals(nodeA.getParent().getID(), nodeB.getParent().getID())) {
           comparisonResult.markDifferentAnnotated(context, nodeA.getID(), nodeB.getID());
         }
         compareProperties(concept, nodeA, nodeB, comparisonResult, context);
diff --git a/core/src/test/java/io/lionweb/lioncore/java/model/impl/DynamicNodeTest.java b/core/src/test/java/io/lionweb/lioncore/java/model/impl/DynamicNodeTest.java
@@ -129,7 +129,7 @@ public void addAnnotations() {
     assertEquals(Arrays.asList(a2_3, a2_4), n1.getAnnotations(a2));
 
     n1.removeAnnotation(a2_3);
-    assertEquals(null, a2_3.getAnnotated());
+    assertEquals(null, a2_3.getParent());
     assertEquals(Arrays.asList(a1_1, a1_2, a2_4), n1.getAnnotations());
     assertEquals(Arrays.asList(a1_1, a1_2), n1.getAnnotations(a1));
     assertEquals(Arrays.asList(a2_4), n1.getAnnotations(a2));
diff --git a/core/src/test/java/io/lionweb/lioncore/java/serialization/JsonSerializationTest.java b/core/src/test/java/io/lionweb/lioncore/java/serialization/JsonSerializationTest.java
@@ -555,16 +555,16 @@ public void serializeAnnotations() {
     assertEquals(Arrays.asList("a1_1", "a1_2", "a2_3"), serializedN1.getAnnotations());
     SerializedAnnotationInstance serializedA1_1 =
         (SerializedAnnotationInstance) serializedChunk.getClassifierInstances().get(1);
-    assertEquals("n1", serializedA1_1.getAnnotated());
+    assertEquals("n1", serializedA1_1.getParentNodeID());
 
     List<ClassifierInstance<?>> unserialized = hjs.unserializeSerializationBlock(serializedChunk);
     assertEquals(4, unserialized.size());
     assertInstancesAreEquals(a1_1, unserialized.get(1));
-    assertEquals(unserialized.get(0), ((AnnotationInstance) unserialized.get(1)).getAnnotated());
+    assertEquals(unserialized.get(0), unserialized.get(1).getParent());
     assertInstancesAreEquals(a1_2, unserialized.get(2));
-    assertEquals(unserialized.get(0), ((AnnotationInstance) unserialized.get(2)).getAnnotated());
+    assertEquals(unserialized.get(0), unserialized.get(2).getParent());
     assertInstancesAreEquals(a2_3, unserialized.get(3));
-    assertEquals(unserialized.get(0), ((AnnotationInstance) unserialized.get(3)).getAnnotated());
+    assertEquals(unserialized.get(0), unserialized.get(3).getParent());
     assertInstancesAreEquals(n1, unserialized.get(0));
     assertEquals(
         Arrays.asList(unserialized.get(1), unserialized.get(2), unserialized.get(3)),

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`public interface AnnotationInstance extends ClassifierInstance<Annotation> {`
`11`	`11`	`Annotation getAnnotationDefinition();`
`12`	`12`
`13`		`- ClassifierInstance getAnnotated();`
`14`		`-`
`15`	`13`	`default Classifier<Annotation> getClassifier() {`
`16`	`14`	`return getAnnotationDefinition();`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,7 @@ public interface ClassifierInstance<T extends Classifier<T>> extends HasFeatureV`
`9`	`9`	`String getID();`
`10`	`10`
`11`	`11`	`Classifier<T> getClassifier();`
	`12`	`+`
	`13`	`+ /** The immediate parent of the Node. This should be null only for root nodes. */`
	`14`	`+ ClassifierInstance<T> getParent();`
`12`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public Annotation getAnnotationDefinition() {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
`75`		`- public ClassifierInstance getAnnotated() {`
	`75`	`+ public ClassifierInstance getParent() {`
`76`	`76`	`return annotated;`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ private void compare(`
`295`	`295`	`if (Objects.equals(`
`296`	`296`	`nodeA.getAnnotationDefinition().getID(), nodeB.getAnnotationDefinition().getID())) {`
`297`	`297`	`Annotation concept = nodeA.getAnnotationDefinition();`
`298`		`- if (!Objects.equals(nodeA.getAnnotated().getID(), nodeB.getAnnotated().getID())) {`
	`298`	`+ if (!Objects.equals(nodeA.getParent().getID(), nodeB.getParent().getID())) {`
`299`	`299`	`comparisonResult.markDifferentAnnotated(context, nodeA.getID(), nodeB.getID());`
`300`	`300`	`}`
`301`	`301`	`compareProperties(concept, nodeA, nodeB, comparisonResult, context);`