Avoid nested iteration when serializing 'many' ref

Fix eclipse-sirius#19
cbrun · Mar 17, 2023 · 052666c · 052666c
1 parent 2238697
commit 052666c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 47 deletions.
diff --git a/....sirius.emfjson/src/main/java/org/eclipse/sirius/emfjson/utils/GsonEObjectSerializer.java b/....sirius.emfjson/src/main/java/org/eclipse/sirius/emfjson/utils/GsonEObjectSerializer.java
@@ -25,7 +25,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -1336,61 +1335,21 @@ private JsonElement serializeMultipleNonContainmentEReference(EObject eObject, E
         JsonArray jsonArray = new JsonArray();
         Object referenceValue = this.helper.getValue(eObject, eReference);
         for (EObject value : (InternalEList<? extends EObject>) referenceValue) {
-            switch (this.docKindMany(eObject, eReference)) {
-            case SAME_DOC:
+            if (!value.eIsProxy() && value.eResource() == this.helper.getResource()) {
                 String id = this.helper.getIDREF(value);
                 id = this.removeFragmentSeparator(id);
                 if (!id.isEmpty()) {
                     jsonArray.add(new JsonPrimitive(id));
                 }
-                break;
-            case CROSS_DOC:
-                if (value != null) {
-                    jsonArray.add(new JsonPrimitive(this.saveHref(value, null)));
-                }
-                break;
-            default:
+            } else {
+                jsonArray.add(new JsonPrimitive(this.saveHref(value, null)));
             }
         }
 
         jsonElement = jsonArray;
         return jsonElement;
     }
 
-    /**
-     * Return where given ERference of the given EObject are. If at least one reference is in an other resource, all
-     * references are treated as references to other resources.
-     *
-     * @param eObject
-     *            the given EObject
-     * @param eReference
-     *            the given ERference
-     * @return where given ERference of the given EObject are
-     */
-    private int docKindMany(EObject eObject, EReference eReference) {
-        int referenceType = GsonEObjectSerializer.SAME_DOC;
-        @SuppressWarnings("unchecked")
-        InternalEList<? extends InternalEObject> internalEList = (InternalEList<? extends InternalEObject>) this.helper.getValue(eObject, eReference);
-
-        if (internalEList.isEmpty()) {
-            referenceType = GsonEObjectSerializer.SKIP;
-        }
-
-        Iterator<? extends InternalEObject> it = internalEList.iterator();
-        while (referenceType != GsonEObjectSerializer.SKIP && referenceType != GsonEObjectSerializer.CROSS_DOC && it.hasNext()) {
-            InternalEObject internalEObject = it.next();
-            if (internalEObject.eIsProxy()) {
-                referenceType = GsonEObjectSerializer.CROSS_DOC;
-            } else {
-                Resource resource = internalEObject.eResource();
-                if (resource != this.helper.getResource() && resource != null) {
-                    referenceType = GsonEObjectSerializer.CROSS_DOC;
-                }
-            }
-        }
-        return referenceType;
-    }
-
     /**
      * Returns a JsonElement representing a single non containment reference value.
      *

diff --git a/...org.eclipse.sirius.emfjson/src/main/java/org/eclipse/sirius/emfjson/utils/JsonHelper.java b/...org.eclipse.sirius.emfjson/src/main/java/org/eclipse/sirius/emfjson/utils/JsonHelper.java
@@ -685,18 +685,21 @@ public String getHREF(EObject obj) {
         InternalEObject o = (InternalEObject) obj;
 
         URI objectURI = o.eProxyURI();
+
         if (objectURI == null) {
             Resource otherResource = obj.eResource();
             if (otherResource == null) {
-                if (this.resource != null) {
-                    objectURI = this.getHREF(otherResource, obj);
-                } else {
+                if (this.resource == null) {
                     this.handleDanglingHREF(obj);
                     return null;
                 }
+                // also check for getID ?
+                objectURI = this.getHREF(this.resource, obj);
+
             } else {
                 objectURI = this.getHREF(otherResource, obj);
             }
+
         }
 
         objectURI = this.deresolve(objectURI);