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

Jump to bottom

[38] Cache resolved types during deserialization #39

Merged
merged 2 commits into from
Jun 5, 2024
Merged

[38] Cache resolved types during deserialization #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
785ad7f
[38] Cache resolved types during deserialization
pcdavid Jun 4, 2024
b7c7542
[releng] Bump version to 2.3.10
sbegaudeau Jun 5, 2024
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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.sirius.emfjson.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.sirius.emfjson.ide;singleton:=true
Bundle-Version: 2.3.9.qualifier
Bundle-Version: 2.3.10.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: bundle
Require-Bundle: org.eclipse.sirius.emfjson;bundle-version="2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.sirius.emfjson.ide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson.ide</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<name>Sirius EMF JSON - IDE Integration</name>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.sirius.emfjson/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.sirius.emfjson
Bundle-Version: 2.3.9.qualifier
Bundle-Version: 2.3.10.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: bundle
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.sirius.emfjson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<name>Sirius EMF JSON</name>
Expand Down
65 changes: 41 additions & 24 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 @@ -139,6 +139,8 @@ public class GsonEObjectDeserializer implements JsonDeserializer<List<EObject>>

private IJsonResourceProcessor jsonResourceProcessor;

private final Map<String, EClass> typeCache = new HashMap<>();

/**
* The constructor.
*
Expand Down Expand Up @@ -579,44 +581,59 @@ private EObject createProxyEObject(String id, String qualifiedType, EReference e
EObject proxyEObject = null;

URI toResolveURI = URI.createURI(id);

if (qualifiedType != null) {
EClass eType = this.typeCache.computeIfAbsent(qualifiedType, this::resolveType);
if (eType != null) {
proxyEObject = eType.getEPackage().getEFactoryInstance().create(eType);
URI resolvedURI = toResolveURI.resolve(this.resourceURI);
((InternalEObject) proxyEObject).eSetProxyURI(resolvedURI);
}
} else {
EClass eType = eReference.getEReferenceType();
if (!eType.isAbstract()) {
proxyEObject = eType.getEPackage().getEFactoryInstance().create(eType);
if (proxyEObject != null) {
URI resolvedURI = toResolveURI.resolve(this.resourceURI);
((InternalEObject) proxyEObject).eSetProxyURI(resolvedURI);
}
}
}
return proxyEObject;
}

/**
* 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.
*/
private EClass resolveType(String qualifiedType) {
if (qualifiedType != null) {
String[] splitType = qualifiedType.split(":"); //$NON-NLS-1$
if (splitType.length == 2) {
String packageName = splitType[0];
String eClassName = splitType[1];
// @formatter:off
Optional<EPackage> packageOpt = this.resourceSet.getPackageRegistry().values().stream()
.filter(EPackage.class::isInstance)
.map(EPackage.class::cast)
.filter(pkg-> pkg.getName().equals(packageName))
.filter(pkg -> pkg.getName().equals(packageName))
.findFirst();
if (packageOpt.isPresent()) {
Optional<EObject> eObject = packageOpt.get().getEClassifiers().stream()
.filter(clazz-> eClassName.equals(clazz.getName()))
.filter(EClass.class::isInstance)
.map(EClass.class::cast)
.map(eClass -> eClass.getEPackage().getEFactoryInstance().create(eClass))
.findFirst();
if (eObject.isPresent()) {
proxyEObject = eObject.get();
URI resolvedURI = toResolveURI;
resolvedURI = toResolveURI.resolve(this.resourceURI);
((InternalEObject) proxyEObject).eSetProxyURI(resolvedURI);
Optional<EClass> eClass = packageOpt.get().getEClassifiers().stream()
.filter(clazz -> eClassName.equals(clazz.getName()))
.filter(EClass.class::isInstance)
.map(EClass.class::cast)
.findFirst();
if (eClass.isPresent()) {
return eClass.get();
}
// @formatter:on
}
}
} else {
EClass eType = eReference.getEReferenceType();
if (!eType.isAbstract()) {
proxyEObject = eType.getEPackage().getEFactoryInstance().create(eType);
if (proxyEObject != null) {
URI resolvedURI = toResolveURI.resolve(this.resourceURI);
((InternalEObject) proxyEObject).eSetProxyURI(resolvedURI);
}
}
}
return proxyEObject;
return null;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.sirius.emfjson.feature.ide/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.sirius.emfjson.feature.ide"
label="%Feature-name"
version="2.3.9.qualifier"
version="2.3.10.qualifier"
provider-name="%Feature-vendor">

<description url="">
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.sirius.emfjson.feature.ide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson.feature.ide</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<name>Sirius EMF JSON - IDE Integration Feature</name>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.sirius.emfjson.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.sirius.emfjson.feature"
label="%Feature-name"
version="2.3.9.qualifier"
version="2.3.10.qualifier"
provider-name="%Feature-vendor">

<description url="">
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.sirius.emfjson.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson.feature</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<name>Sirius EMF JSON Feature</name>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.sirius.emfjson.releng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Sirius EMF JSON</name>
Expand Down
4 changes: 2 additions & 2 deletions releng/org.eclipse.sirius.emfjson.targetplatforms/2019-06/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<relativePath>../../org.eclipse.sirius.emfjson.releng</relativePath>
</parent>

<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>emfjson-2019-06</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>

</project>
4 changes: 2 additions & 2 deletions releng/org.eclipse.sirius.emfjson.targetplatforms/luna/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<relativePath>../../org.eclipse.sirius.emfjson.releng</relativePath>
</parent>

<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>emfjson-luna</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>

</project>
2 changes: 1 addition & 1 deletion repositories/org.eclipse.sirius.emfjson.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.sirius.emfjson.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.sirius.emfjson.tests
Bundle-Version: 2.3.9.qualifier
Bundle-Version: 2.3.10.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: bundle
Expand Down
4 changes: 2 additions & 2 deletions tests/org.eclipse.sirius.emfjson.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<parent>
<groupId>org.eclipse.sirius.emfjson</groupId>
<artifactId>org.eclipse.sirius.emfjson.releng</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.sirius.emfjson.releng</relativePath>
</parent>


<artifactId>org.eclipse.sirius.emfjson.tests</artifactId>
<version>2.3.9-SNAPSHOT</version>
<version>2.3.10-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>

<name>Sirius EMF JSON - Tests</name>
Expand Down
Loading