[43] Only call getPackageForURI on URI-like paths

This avoids creating thousands of PackageNotFoundError instances when
resolving "normal" inter-document references which do not refer to
EPackages via nsURIs.

PackageNotFoundError are much cheaper to create than the previously
used PackageNotFoundException, but that's still a lot of garbage
instances to create, add into the resource.getErrors() list and never
use (or even clear).

In addition, in the context of Sirius Web, every instance will have
its own duplicate string representation of the failed "package" URI
because we get it from EObjectIDManager.getOrCreateId(EObject) which
invokes UUID.toString() and allocates a new (identical) String each
time.

Bug: #43
Signed-off-by: Pierre-Charles David <[email protected]>

bundles/org.eclipse.sirius.emfjson/src/main/java/org/eclipse/sirius/emfjson/utils/GsonEObjectDeserializer.java

@@ -67,6 +67,8 @@
  */
 public class GsonEObjectDeserializer implements JsonDeserializer<List<EObject>> {
 
+    private static final char SCHEME_SEPARATOR = ':';
+
     /**
      * The JsonHelper.
      */
@@ -540,15 +542,13 @@ private void deserializeSingleNonContainmentEReference(EReference eReference, Js
                     this.helper.setValue(eObject, eReference, object);
                 }
             } else {
-                String resourceURIPath = id.substring(0, index); // The URI of the resource where I can find
-                // the EObject
-                EPackage ePackage = this.getPackageForURI(resourceURIPath); // return an EPackage only if the
-                // URI represent an EPackage
-                Resource packageResource = null;
+                String resourceURIPath = id.substring(0, index);
                 EObject object = null;
-                if (ePackage != null) {
-                    packageResource = ePackage.eResource();
-                    object = packageResource.getEObject(fragmentEMF);
+                if (resourceURIPath.indexOf(SCHEME_SEPARATOR) != -1) {
+                    EPackage ePackage = this.getPackageForURI(resourceURIPath);
+                    if (ePackage != null) {
+                        object = ePackage.eResource().getEObject(fragmentEMF);
+                    }
                 } else {
                     object = this.createProxyEObject(id, qualifiedType, eReference);
                 }
@@ -605,7 +605,7 @@ private EObject createProxyEObject(String id, String qualifiedType, EReference e
     /**
      * Resolves a type from a qualified name (e.g. "flow:System") into the corresponding EClass (or null) using the
      * resource set's package registry.
-     * 
+     *
      * @param qualifiedType
      *            the qualified name of the type to resolve.
      * @return the corresponding EClass, or null.
@@ -701,12 +701,12 @@ private void deserializeMultipleNonContainmentEReference(EReference eReference,
                     }
                 } else {
                     String resourceURIPath = id.substring(0, index);
-                    EPackage ePackage = this.getPackageForURI(resourceURIPath);
-                    Resource packageResource = null;
                     EObject object = null;
-                    if (ePackage != null) {
-                        packageResource = ePackage.eResource();
-                        object = packageResource.getEObject(fragmentEMF);
+                    if (resourceURIPath.indexOf(SCHEME_SEPARATOR) != -1) {
+                        EPackage ePackage = this.getPackageForURI(resourceURIPath);
+                        if (ePackage != null) {
+                            object = ePackage.eResource().getEObject(fragmentEMF);
+                        }
                     } else {
                         object = this.createProxyEObject(id, qualifiedType, eReference);
                     }