Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[50] Fix potential NPE in GsonEObjectDeserializer#resolveType #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[50] Fix potential NPE in GsonEObjectDeserializer#resolveType #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions ...irius.emfjson/src/main/java/org/eclipse/sirius/emfjson/utils/GsonEObjectDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public List<EObject> deserialize(JsonElement jsonElement, Type type, JsonDeseria

EPackage ePackage = this.getEPackage(uri);
if (ePackage != null) {
this.resourceSet.getPackageRegistry().put(ePackage.getNsURI(), ePackage);
this.packageRegistry.put(ePackage.getNsURI(), ePackage);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When the resourceSet is null, this.packageRegistry refers to the global package registry. In that case, I don't know the consequence adding an EPackage to the global registry

}
}
}
Expand Down Expand Up @@ -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.
Expand All @@ -616,7 +616,7 @@ private EClass resolveType(String qualifiedType) {
if (splitType.length == 2) {
String packageName = splitType[0];
String eClassName = splitType[1];
Optional<EPackage> packageOpt = this.resourceSet.getPackageRegistry().values().stream()
Optional<EPackage> packageOpt = this.packageRegistry.values().stream()
.filter(EPackage.class::isInstance)
.map(EPackage.class::cast)
.filter(pkg -> pkg.getName().equals(packageName))
Expand Down Expand Up @@ -864,7 +864,7 @@ private void deserializeMultipleContainmentEReference(EReference eReference, Jso
JsonObject properties = jsonObject.getAsJsonObject(IGsonConstants.DATA);
eReferenceValue = this.loadReferences(EcorePackage.Literals.EPACKAGE, properties);
EPackage ePackage = (EPackage) eReferenceValue;
this.resourceSet.getPackageRegistry().put(ePackage.getNsURI(), ePackage);
this.packageRegistry.put(ePackage.getNsURI(), ePackage);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same wondering here

} else {
eReferenceValue = this.loadObject(jsonObject, false);
}
Expand Down Expand Up @@ -1086,10 +1086,7 @@ private EClassifier getEClass(JsonObject object, JsonElement eClassJsonElement)

String nsUri = this.prefixToNsURi.get(nsPrefix);

EPackage ePackage = null;
if (this.resourceSet != null) {
ePackage = this.resourceSet.getPackageRegistry().getEPackage(nsUri);
}
EPackage ePackage = this.packageRegistry.getEPackage(nsUri);

if (ePackage == null) {
ePackage = this.getPackageForURI(nsUri);
Expand Down
Loading