more renaming to take into account generalization from node to classifier instance

Author: ftomassetti

core/src/main/java/io/lionweb/lioncore/java/serialization/JsonSerialization.java

@@ -47,11 +47,12 @@ public static void saveLanguageToFile(Language language, File file) throws IOExc
   public static JsonSerialization getStandardSerialization() {
     JsonSerialization jsonSerialization = new JsonSerialization();
     jsonSerialization.classifierResolver.registerLanguage(LionCore.getInstance());
-    jsonSerialization.nodeInstantiator.registerLionCoreCustomUnserializers();
+    jsonSerialization.instantiator.registerLionCoreCustomUnserializers();
     jsonSerialization.primitiveValuesSerialization
         .registerLionBuiltinsPrimitiveSerializersAndUnserializers();
-    jsonSerialization.nodeResolver.addAll(LionCore.getInstance().thisAndAllDescendants());
-    jsonSerialization.nodeResolver.addAll(LionCoreBuiltins.getInstance().thisAndAllDescendants());
+    jsonSerialization.instanceResolver.addAll(LionCore.getInstance().thisAndAllDescendants());
+    jsonSerialization.instanceResolver.addAll(
+        LionCoreBuiltins.getInstance().thisAndAllDescendants());
     return jsonSerialization;
   }
 
@@ -62,17 +63,17 @@ public static JsonSerialization getBasicSerialization() {
   }
 
   private ClassifierResolver classifierResolver;
-  private Instantiator nodeInstantiator;
+  private Instantiator instantiator;
   private PrimitiveValuesSerialization primitiveValuesSerialization;
 
-  private LocalClassifierInstanceResolver nodeResolver;
+  private LocalClassifierInstanceResolver instanceResolver;
 
   private JsonSerialization() {
     // prevent public access
     classifierResolver = new ClassifierResolver();
-    nodeInstantiator = new Instantiator();
+    instantiator = new Instantiator();
     primitiveValuesSerialization = new PrimitiveValuesSerialization();
-    nodeResolver = new LocalClassifierInstanceResolver();
+    instanceResolver = new LocalClassifierInstanceResolver();
   }
 
   //
@@ -83,20 +84,20 @@ public ClassifierResolver getClassifierResolver() {
     return classifierResolver;
   }
 
-  public Instantiator getNodeInstantiator() {
-    return nodeInstantiator;
+  public Instantiator getInstantiator() {
+    return instantiator;
   }
 
   public PrimitiveValuesSerialization getPrimitiveValuesSerialization() {
     return primitiveValuesSerialization;
   }
 
-  public LocalClassifierInstanceResolver getNodeResolver() {
-    return nodeResolver;
+  public LocalClassifierInstanceResolver getInstanceResolver() {
+    return instanceResolver;
   }
 
   public void enableDynamicNodes() {
-    nodeInstantiator.enableDynamicNodes();
+    instantiator.enableDynamicNodes();
     primitiveValuesSerialization.enableDynamicNodes();
   }
 
@@ -460,7 +461,7 @@ private List<ClassifierInstance<?>> unserializeClassifierInstances(
     }
     ClassifierInstanceResolver classifierInstanceResolver =
         new CompositeClassifierInstanceResolver(
-            new MapBasedResolver(unserializedByID), this.nodeResolver);
+            new MapBasedResolver(unserializedByID), this.instanceResolver);
     serializedClassifierInstances.stream()
         .forEach(
             n -> {
@@ -525,7 +526,7 @@ private ClassifierInstance<?> instantiateFromSerialized(
               propertiesValues.put(property, unserializedValue);
             });
     ClassifierInstance<?> classifierInstance =
-        getNodeInstantiator()
+        getInstantiator()
             .instantiate(
                 classifier, serializedClassifierInstance, unserializedByID, propertiesValues);
 

core/src/main/java/io/lionweb/lioncore/java/serialization/LowLevelJsonSerialization.java

@@ -26,7 +26,7 @@ public SerializedChunk unserializeSerializationBlock(JsonElement jsonElement) {
       JsonObject topLevel = jsonElement.getAsJsonObject();
       readSerializationFormatVersion(serializedChunk, topLevel);
       readLanguages(serializedChunk, topLevel);
-      unserializeNodes(serializedChunk, topLevel);
+      unserializeClassifierInstances(serializedChunk, topLevel);
       return serializedChunk;
     } else {
       throw new IllegalArgumentException(
@@ -170,7 +170,8 @@ private void readLanguages(SerializedChunk serializedChunk, JsonObject topLevel)
     }
   }
 
-  private void unserializeNodes(SerializedChunk serializedChunk, JsonObject topLevel) {
+  private void unserializeClassifierInstances(
+      SerializedChunk serializedChunk, JsonObject topLevel) {
     if (!topLevel.has("nodes")) {
       throw new IllegalArgumentException("nodes not specified");
     }
@@ -179,10 +180,11 @@ private void unserializeNodes(SerializedChunk serializedChunk, JsonObject topLev
           .forEach(
               element -> {
                 try {
-                  SerializedClassifierInstance node = unserializeNode(element);
-                  serializedChunk.addClassifierInstance(node);
+                  SerializedClassifierInstance instance = unserializeClassifierInstance(element);
+                  serializedChunk.addClassifierInstance(instance);
                 } catch (UnserializationException e) {
-                  throw new UnserializationException("Issue while unserializing nodes", e);
+                  throw new UnserializationException(
+                      "Issue while unserializing classifier instances", e);
                 } catch (Exception e) {
                   throw new RuntimeException("Issue while unserializing " + element, e);
                 }
@@ -209,7 +211,7 @@ private JsonElement serializeToJsonElement(UsedLanguage languageKeyVersion) {
   }
 
   @Nullable
-  private SerializedClassifierInstance unserializeNode(JsonElement jsonElement) {
+  private SerializedClassifierInstance unserializeClassifierInstance(JsonElement jsonElement) {
     if (!jsonElement.isJsonObject()) {
       throw new IllegalArgumentException(
           "Malformed JSON. Object expected but found " + jsonElement);

core/src/main/java/io/lionweb/lioncore/java/serialization/MapBasedResolver.java

@@ -11,17 +11,17 @@
  * position, so until we place them they could be a temporarily wrong ID.
  */
 class MapBasedResolver implements ClassifierInstanceResolver {
-  private Map<String, ClassifierInstance<?>> nodesByID = new HashMap<>();
+  private Map<String, ClassifierInstance<?>> instancesByID = new HashMap<>();
 
   public MapBasedResolver() {}
 
-  public MapBasedResolver(Map<String, ClassifierInstance<?>> nodesByID) {
-    this.nodesByID.putAll(nodesByID);
+  public MapBasedResolver(Map<String, ClassifierInstance<?>> instancesByID) {
+    this.instancesByID.putAll(instancesByID);
   }
 
   @Nullable
   @Override
-  public ClassifierInstance<?> resolve(String nodeID) {
-    return nodesByID.get(nodeID);
+  public ClassifierInstance<?> resolve(String instanceID) {
+    return instancesByID.get(instanceID);
   }
 }

core/src/main/java/io/lionweb/lioncore/java/serialization/data/SerializedAnnotationValue.java

@@ -28,18 +28,18 @@ public List<SerializedClassifierInstance> getClassifierInstances() {
     return classifierInstances;
   }
 
-  public void addClassifierInstance(SerializedClassifierInstance node) {
-    this.classifierInstancesByID.put(node.getID(), node);
-    classifierInstances.add(node);
+  public void addClassifierInstance(SerializedClassifierInstance instance) {
+    this.classifierInstancesByID.put(instance.getID(), instance);
+    classifierInstances.add(instance);
   }
 
   @Nonnull
-  public SerializedClassifierInstance getNodeByID(String nodeID) {
-    SerializedClassifierInstance node = this.classifierInstancesByID.get(nodeID);
-    if (node == null) {
-      throw new IllegalArgumentException("Cannot find node with ID " + nodeID);
+  public SerializedClassifierInstance getInstanceByID(String instanceID) {
+    SerializedClassifierInstance instance = this.classifierInstancesByID.get(instanceID);
+    if (instance == null) {
+      throw new IllegalArgumentException("Cannot find instance with ID " + instanceID);
     }
-    return node;
+    return instance;
   }
 
   public void addLanguage(UsedLanguage language) {
@@ -62,7 +62,7 @@ public String toString() {
         + '\''
         + ", languages="
         + languages
-        + ", nodes="
+        + ", classifierInstances="
         + classifierInstances
         + '}';
   }

core/src/main/java/io/lionweb/lioncore/java/serialization/data/SerializedChunk.java

@@ -174,7 +174,7 @@ public void unserializeLanguageWithDependencies() {
                 .unserializeToNodes(
                     this.getClass().getResourceAsStream("/properties-example/starlasu.lmm.json"))
                 .get(0);
-    jsonSerialization.getNodeResolver().addTree(starlasu);
+    jsonSerialization.getInstanceResolver().addTree(starlasu);
     Language properties =
         (Language)
             jsonSerialization
@@ -187,14 +187,14 @@ public void unserializeLanguageWithDependencies() {
 
   private void prepareUnserializationOfSimpleMath(JsonSerialization js) {
     js.getClassifierResolver().registerLanguage(SimpleMathLanguage.INSTANCE);
-    js.getNodeInstantiator()
+    js.getInstantiator()
         .registerCustomUnserializer(
             SimpleMathLanguage.INT_LITERAL.getID(),
             (concept, serializedNode, unserializedNodesByID, propertiesValues) ->
                 new IntLiteral(
                     (Integer) propertiesValues.get(concept.getPropertyByName("value")),
                     serializedNode.getID()));
-    js.getNodeInstantiator()
+    js.getInstantiator()
         .registerCustomUnserializer(
             SimpleMathLanguage.SUM.getID(),
             (concept, serializedNode, unserializedNodesByID, propertiesValues) -> {
@@ -294,14 +294,14 @@ public void deserializeChildrenWithNullID() {
 
   private void prepareUnserializationOfRefMM(JsonSerialization js) {
     js.getClassifierResolver().registerLanguage(RefsLanguage.INSTANCE);
-    js.getNodeInstantiator()
+    js.getInstantiator()
         .registerCustomUnserializer(
             RefsLanguage.CONTAINER_NODE.getID(),
             (concept, serializedNode, unserializedNodesByID, propertiesValues) ->
                 new ContainerNode(
                     (ContainerNode) propertiesValues.get(concept.getContainmentByName("contained")),
                     serializedNode.getID()));
-    js.getNodeInstantiator()
+    js.getInstantiator()
         .registerCustomUnserializer(
             RefsLanguage.REF_NODE.getID(),
             (concept, serializedNode, unserializedNodesByID, propertiesValues) -> {
@@ -500,7 +500,7 @@ public void unserializeEnumerationLiterals() {
     n2.setPropertyValue(p, el2);
     JsonSerialization js = JsonSerialization.getStandardSerialization();
     js.registerLanguage(mm);
-    js.getNodeInstantiator().enableDynamicNodes();
+    js.getInstantiator().enableDynamicNodes();
 
     List<Node> unserializedNodes = js.unserializeToNodes(je);
     assertEquals(Arrays.asList(n1, n2), unserializedNodes);

core/src/test/java/io/lionweb/lioncore/java/serialization/JsonSerializationTest.java

@@ -46,11 +46,11 @@ public void unserializeLibraryLanguageToSerializedNodes() {
     JsonElement jsonElement = JsonParser.parseReader(new InputStreamReader(inputStream));
     LowLevelJsonSerialization jsonSerialization = new LowLevelJsonSerialization();
     SerializedChunk serializedChunk = jsonSerialization.unserializeSerializationBlock(jsonElement);
-    SerializedClassifierInstance book = serializedChunk.getNodeByID("library-Book");
+    SerializedClassifierInstance book = serializedChunk.getInstanceByID("library-Book");
     assertEquals("Book", book.getPropertyValue("LIonCore-builtins-INamed-name"));
 
     SerializedClassifierInstance guidedBookWriter =
-        serializedChunk.getNodeByID("library-GuideBookWriter");
+        serializedChunk.getInstanceByID("library-GuideBookWriter");
     assertEquals(
         "GuideBookWriter", guidedBookWriter.getPropertyValue("LIonCore-builtins-INamed-name"));
     assertEquals(

core/src/test/java/io/lionweb/lioncore/java/serialization/LowLevelJsonSerializationTest.java

@@ -107,7 +107,7 @@ public void unserializeLionCoreToSerializedChunk() {
         serializedChunk.getClassifierInstances();
 
     SerializedNodeInstance lioncore =
-        (SerializedNodeInstance) serializedChunk.getNodeByID("-id-LIonCore-M3");
+        (SerializedNodeInstance) serializedChunk.getInstanceByID("-id-LIonCore-M3");
     assertEquals(MetaPointer.from(LionCore.getLanguage()), lioncore.getClassifier());
     assertEquals("-id-LIonCore-M3", lioncore.getID());
     assertEquals("LIonCore.M3", lioncore.getPropertyValue("LIonCore-builtins-INamed-name"));
@@ -135,12 +135,12 @@ public void unserializeLionCoreToDynamicNodes() {
     InputStream inputStream = this.getClass().getResourceAsStream("/serialization/lioncore.json");
     JsonElement jsonElement = JsonParser.parseReader(new InputStreamReader(inputStream));
     JsonSerialization jsonSerialization = JsonSerialization.getBasicSerialization();
-    jsonSerialization.getNodeResolver().addAll(LionCore.getInstance().thisAndAllDescendants());
+    jsonSerialization.getInstanceResolver().addAll(LionCore.getInstance().thisAndAllDescendants());
     jsonSerialization
-        .getNodeResolver()
+        .getInstanceResolver()
         .addAll(LionCoreBuiltins.getInstance().thisAndAllDescendants());
     jsonSerialization.getClassifierResolver().registerLanguage(LionCore.getInstance());
-    jsonSerialization.getNodeInstantiator().enableDynamicNodes();
+    jsonSerialization.getInstantiator().enableDynamicNodes();
     jsonSerialization
         .getPrimitiveValuesSerialization()
         .registerLionBuiltinsPrimitiveSerializersAndUnserializers();

core/src/test/java/io/lionweb/lioncore/java/serialization/SerializationOfLionCoreTest.java

@@ -144,7 +144,7 @@ public void unserializeBoolean() {
     JsonSerialization jsonSerialization = JsonSerialization.getStandardSerialization();
     jsonSerialization.getClassifierResolver().registerLanguage(MyNodeWithProperties.LANGUAGE);
     jsonSerialization
-        .getNodeInstantiator()
+        .getInstantiator()
         .registerCustomUnserializer(
             MyNodeWithProperties.CONCEPT.getID(),
             (concept, serializedNode, unserializedNodesByID, propertiesValue) ->
@@ -280,7 +280,7 @@ public void unserializeString() {
     JsonSerialization jsonSerialization = JsonSerialization.getStandardSerialization();
     jsonSerialization.getClassifierResolver().registerLanguage(MyNodeWithProperties.LANGUAGE);
     jsonSerialization
-        .getNodeInstantiator()
+        .getInstantiator()
         .registerCustomUnserializer(
             MyNodeWithProperties.CONCEPT.getID(),
             (concept, serializedNode, unserializedNodesByID, propertiesValue) ->
@@ -417,7 +417,7 @@ public void unserializeInteger() {
     JsonSerialization jsonSerialization = JsonSerialization.getStandardSerialization();
     jsonSerialization.getClassifierResolver().registerLanguage(MyNodeWithProperties.LANGUAGE);
     jsonSerialization
-        .getNodeInstantiator()
+        .getInstantiator()
         .registerCustomUnserializer(
             MyNodeWithProperties.CONCEPT.getID(),
             (concept, serializedNode, unserializedNodesByID, propertiesValue) ->
@@ -560,7 +560,7 @@ public void unserializeJSON() {
     JsonSerialization jsonSerialization = JsonSerialization.getStandardSerialization();
     jsonSerialization.getClassifierResolver().registerLanguage(MyNodeWithProperties.LANGUAGE);
     jsonSerialization
-        .getNodeInstantiator()
+        .getInstantiator()
         .registerCustomUnserializer(
             MyNodeWithProperties.CONCEPT.getID(),
             (concept, serializedNode, unserializedNodesByID, propertiesValue) ->