Skip to content

Commit 626ed0c

Browse files
committed
GLSP-1509: Fix maven build (#255)
- Use correct qualified snapshot version - Add explicit TypeAdapter for ELists to Graph JSON configurator (required due to a breaking change in GSON 2.13) Fixes eclipse-glsp/glsp/issues/1509
1 parent cad18dd commit 626ed0c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GraphGsonConfigurator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.util.List;
2222
import java.util.Map;
2323

24+
import org.eclipse.emf.common.util.BasicEList;
25+
import org.eclipse.emf.common.util.EList;
2426
import org.eclipse.emf.ecore.EClass;
2527
import org.eclipse.emf.ecore.EClassifier;
2628
import org.eclipse.emf.ecore.EObject;
@@ -29,6 +31,7 @@
2931
import org.eclipse.glsp.graph.GraphPackage;
3032

3133
import com.google.gson.GsonBuilder;
34+
import com.google.gson.InstanceCreator;
3235

3336
public class GraphGsonConfigurator {
3437

@@ -58,6 +61,7 @@ public GraphGsonConfigurator withEPackages(final EPackage... packages) {
5861
public GsonBuilder configureGsonBuilder(final GsonBuilder gsonBuilder) {
5962
gsonBuilder.registerTypeAdapterFactory(new EMapTypeAdapter.Factory());
6063
gsonBuilder.registerTypeAdapterFactory(new GModelElementTypeAdapter.Factory(DEFAULT_TYPE_ATT, typeMap));
64+
gsonBuilder.registerTypeAdapter(EList.class, (InstanceCreator<EList<?>>) type -> new BasicEList<>());
6165
configureClassesOfPackages(gsonBuilder);
6266
gsonBuilder.addSerializationExclusionStrategy(new EObjectExclusionStrategy());
6367
return gsonBuilder;

releng/org.eclipse.glsp.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<feature
33
id="org.eclipse.glsp.feature"
4-
label="GLSP SDK"
4+
label="GLSP SDK (Core)"
55
version="2.4.0.javax"
66
provider-name="Eclipse GLSP">
77

0 commit comments

Comments
 (0)