Merge pull request #91 from sailingKieler/master

Fixes of #89 & #90, and a bit of simplification in the example project
eclipse-sprotty · Feb 29, 2024 · 9654b98 · 9654b98
2 parents 6e3ab67 + f17ff50
commit 9654b98
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 108 deletions.
diff --git a/examples/runner/src/main/java/org/eclipse/sprotty/examples/ExampleEndpointConfigurator.java b/examples/runner/src/main/java/org/eclipse/sprotty/examples/ExampleEndpointConfigurator.java
diff --git a/examples/runner/src/main/java/org/eclipse/sprotty/examples/ExampleLauncher.java b/examples/runner/src/main/java/org/eclipse/sprotty/examples/ExampleLauncher.java
@@ -23,17 +23,23 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
+import org.eclipse.sprotty.IDiagramServer;
 import org.eclipse.sprotty.examples.circlegraph.CircleGraphModule;
+import org.eclipse.sprotty.examples.circlegraph.LayoutSelectionAction;
 import org.eclipse.sprotty.layout.ElkLayoutEngine;
+import org.eclipse.sprotty.server.json.ActionTypeAdapter;
+import org.eclipse.sprotty.server.websocket.DiagramServerEndpoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
 public class ExampleLauncher {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ExampleLauncher.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ExampleLauncher.class);
 
 	public static void main(String[] args) {
 		try {
@@ -56,15 +62,33 @@ public void launch() throws Exception {
 		webAppContext.setWelcomeFiles(new String[] { "index.html" });
 		server.setHandler(webAppContext);
 
+		final ServerEndpointConfig.Configurator configurator = new ServerEndpointConfig.Configurator() {
+
+			@SuppressWarnings("unchecked")
+			@Override
+			public <T extends Object> T getEndpointInstance(Class<T> endpointClass) throws InstantiationException {
+				DiagramServerEndpoint endpoint = ((LoggingServerEndpoint) super.getEndpointInstance(endpointClass));
+				endpoint.setGson(getGson());
+				endpoint.setDiagramServerProvider(circleGraphInjector.getInstance(IDiagramServer.Provider.class));
+				return (T) endpoint;
+			}
+		};
+
 		JakartaWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, serverContainer) -> {
 			serverContainer.addEndpoint(ServerEndpointConfig.Builder
 					.create(LoggingServerEndpoint.class, "/circlegraph")
-					.configurator(new ExampleEndpointConfigurator(circleGraphInjector))
+					.configurator(configurator)
 					.build());
 		});
 
 		server.start();
 		server.join();
 	}
-
+
+	private Gson getGson() {
+		final ActionTypeAdapter.Factory factory = new ActionTypeAdapter.Factory();
+		factory.addActionKind(LayoutSelectionAction.KIND, LayoutSelectionAction.class);
+
+		return new GsonBuilder().registerTypeAdapterFactory(factory).create();
+	}
 }
diff --git a/gradle/manifest-gen.gradle b/gradle/manifest-gen.gradle
@@ -23,6 +23,7 @@ jar.bundle.bnd (
 	'Bundle-Vendor': 'Eclipse Sprotty',
 	'Bundle-RequiredExecutionEnvironment': 'JavaSE-11',
 	'Import-Package': "com.google.common.*;version=\"$versions.guava\", *",
+	'-exportcontents': 'org.eclipse.sprotty*',
 	"-savemanifest": "build/tmp/bnd/MANIFEST.MF",
 )
 

diff --git a/...protty.server/src/main/java/org/eclipse/sprotty/server/json/PropertyBasedTypeAdapter.java b/...protty.server/src/main/java/org/eclipse/sprotty/server/json/PropertyBasedTypeAdapter.java
@@ -25,10 +25,9 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import com.google.gson.TypeAdapter;
-import com.google.gson.internal.bind.JsonTreeWriter;
 import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 /**
@@ -116,57 +115,9 @@ protected Field findField(Class<?> type, String propertyName) throws NoSuchField
 	}
 
 	protected JsonElement toTree(JsonReader in) throws IOException {
-		JsonTreeWriter writer = new JsonTreeWriter();
-		transfer(in, writer);
-		return writer.get();
+		return JsonParser.parseReader(in);
 	}
 
-	protected void transfer(JsonReader in, JsonWriter out) throws IOException {
-		JsonToken token = in.peek();
-		switch (token) {
-		case BEGIN_ARRAY:
-			in.beginArray();
-			out.beginArray();
-			while (in.hasNext()) {
-				transfer(in, out);
-			}
-			out.endArray();
-			in.endArray();
-			break;
-
-		case BEGIN_OBJECT:
-			in.beginObject();
-			out.beginObject();
-			while (in.hasNext()) {
-				out.name(in.nextName());
-				transfer(in, out);
-			}
-			out.endObject();
-			in.endObject();
-			break;
-
-		case STRING:
-			out.value(in.nextString());
-			break;
-
-		case NUMBER:
-			out.value(in.nextDouble());
-			break;
-
-		case BOOLEAN:
-			out.value(in.nextBoolean());
-			break;
-
-		case NULL:
-			in.nextNull();
-			out.nullValue();
-			break;
-
-		default:
-			throw new IllegalStateException();
-		}
-	}
-
 	@Override
 	public void write(JsonWriter out, T value) throws IOException {
 		if (value == null) {