From d935ed3a47e6b41e976610bc7ec96e88e0247988 Mon Sep 17 00:00:00 2001
From: Tobias Ortmayr
Date: Thu, 16 Sep 2021 11:21:49 +0200
Subject: [PATCH] Address review feedback
---
.../glsp/server/actions/ActionDispatcher.java | 2 +-
.../eclipse/glsp/server/di/DiagramModule.java | 9 ++++-----
.../eclipse/glsp/server/di/ServerModule.java | 6 +++---
.../server/di/scope/DiagramGlobalScope.java | 2 +-
.../di/scope/DiagramGlobalScopeModule.java | 2 +-
...lobal.java => DiagramGlobalSingleton.java} | 4 ++--
.../diagram/BaseDiagramConfiguration.java | 2 +-
.../server/diagram/DiagramConfiguration.java | 1 -
.../disposable/DisposableCollection.java | 4 +---
.../validation/RequestMarkersHandler.java | 2 +-
.../gson/GraphGsonConfigurationFactory.java | 3 +--
.../server/gson/ServerGsonConfigurator.java | 4 ++--
.../actions/DefaultActionDispatcher.java | 1 +
.../di/scope/DefaultDiagramGlobalScope.java | 1 -
.../session/DefaultClientSession.java | 4 +---
.../session/DefaultClientSessionManager.java | 1 +
...her.java => SocketGLSPServerLauncher.java} | 19 ++++++++++---------
.../glsp/server/model/DefaultGModelState.java | 2 +-
.../protocol/ServerConnectionListener.java | 1 -
.../glsp/server/registry/MultiRegistry.java | 2 +-
.../glsp/server/session/ClientSession.java | 4 +---
.../server/session/ClientSessionManager.java | 1 -
.../eclipse/glsp/server/utils/ModuleUtil.java | 4 +---
23 files changed, 35 insertions(+), 46 deletions(-)
rename plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/{DiagramGlobal.java => DiagramGlobalSingleton.java} (89%)
rename plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/launch/{DefaultGLSPServerLauncher.java => SocketGLSPServerLauncher.java} (89%)
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionDispatcher.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionDispatcher.java
index c1e4ac11..2910b6a9 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionDispatcher.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionDispatcher.java
@@ -39,7 +39,7 @@ default CompletableFuture dispatch(final ActionMessage message) {
* Processes the given action, received from the specified clientId, by dispatching it to all registered handlers.
*
*
- * @param clientId The client from which the action was received
+ * @param action The action that should be dispatched.
* @return
* A {@link CompletableFuture} indicating when the action processing is complete
*/
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/DiagramModule.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/DiagramModule.java
index 93b7e39a..76a50073 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/DiagramModule.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/DiagramModule.java
@@ -36,8 +36,8 @@
import org.eclipse.glsp.server.actions.SetViewportAction;
import org.eclipse.glsp.server.actions.TriggerEdgeCreationAction;
import org.eclipse.glsp.server.actions.TriggerNodeCreationAction;
-import org.eclipse.glsp.server.di.scope.DiagramGlobal;
import org.eclipse.glsp.server.di.scope.DiagramGlobalScope;
+import org.eclipse.glsp.server.di.scope.DiagramGlobalSingleton;
import org.eclipse.glsp.server.diagram.DiagramConfiguration;
import org.eclipse.glsp.server.diagram.RequestTypeHintsActionHandler;
import org.eclipse.glsp.server.diagram.ServerConfigurationContribution;
@@ -117,7 +117,7 @@
*
* - {@link String} annotated with @{@link DiagramType}
*
- {@link String} annotated with @{@link ClientId}
- *
- {@link DiagramGlobal} bound as Scope
+ *
- {@link DiagramGlobalSingleton} bound as Scope
*
- {@link DiagramConfiguration}
*
- {@link ServerConfigurationContribution}
*
- {@link GModelState}
@@ -163,7 +163,7 @@ protected void configureBase() {
bindClientId();
bindDiagramGobalScope();
// Configurations
- bind(DiagramConfiguration.class).to(bindDiagramConfiguration()).in(DiagramGlobal.class);
+ bind(DiagramConfiguration.class).to(bindDiagramConfiguration()).in(DiagramGlobalSingleton.class);
bind(ServerConfigurationContribution.class).to(bindServerConfigurationContribution()).in(Singleton.class);
// Model-related bindings
bind(GModelState.class).to(bindGModelState()).in(Singleton.class);
@@ -205,7 +205,6 @@ protected void configureBase() {
bindOptionally(PopupModelFactory.class, bindPopupModelFactory());
bindOptionally(LayoutEngine.class, bindLayoutEngine());
bindOptionally(GraphExtension.class, bindGraphExtension());
-
}
protected void bindDiagramType() {
@@ -217,7 +216,7 @@ protected void bindClientId() {
}
protected void bindDiagramGobalScope() {
- bindScope(DiagramGlobal.class, new DiagramGlobalScope.NullImpl());
+ bindScope(DiagramGlobalSingleton.class, new DiagramGlobalScope.NullImpl());
}
protected abstract Class extends DiagramConfiguration> bindDiagramConfiguration();
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/ServerModule.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/ServerModule.java
index 46852f35..9c9bdbc1 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/ServerModule.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/ServerModule.java
@@ -44,12 +44,12 @@
* The server module is the central configuration artifact for configuring the server injector (i.e. main injector). For
* each application connecting to the server process a new server injector is created. The server module provides the
* base bindings necessary for setting up the base {@link GLSPServer} infrastructure. In addition, it is used to
- * configure the set of {@link DiagramModule}s. Diagram modules are used to create the diagram session specific child
+ * configure the set of {@link DiagramModule}s. Diagram modules are used to create the diagram-session-specific child
* injector when the
* {@link GLSPServer#initializeClientSession(org.eclipse.glsp.server.protocol.InitializeClientSessionParameters)}
* method is called.
*
- * All bindings inside of the {@link ServerModule#configure()} method are encapsulated into submethods which makes it
+ * All bindings inside of the {@link ServerModule#configure()} method are delegated to separate methods which makes it
* easy to override a specific binding in subclasses.
*
* p>The following bindings are provided:
@@ -71,7 +71,7 @@ public class ServerModule extends GLSPModule {
/**
* Configure a new {@link DiagramModule} for this server. A diagram module represents the base configuration artifact
- * for configuring a diagram-language specific client session injector. The diagram type provided
+ * for configuring a diagram-language-specific client session injector. The diagram type provided
* {@link DiagramModule#getDiagramType()} is used to retrieve the correct diagram module when the {@link GLSPServer}
* initialises a new client session.
* The given diagram module and all (optional) additional modules will be combined to one merged module. If bindings
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalScope.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalScope.java
index bf973e9b..051a3b38 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalScope.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalScope.java
@@ -24,7 +24,7 @@
/**
* A {@link Scope} implementation that is used in GLSP for sharing instances across multiple diagram injectors of the
* same diagram type. A diagram injector is an injector with an installed {@link DiagramModule}. The
- * {@link DiagramGlobal} annotation is used to annotated bindings that should be made available to all injectors with
+ * {@link DiagramGlobalSingleton} annotation is used to annotated bindings that should be made available to all injectors with
* the same diagram type as Singleton.
*
* Use this scope with care. If its used on classes that inject session specific values (e.g. the clientId) it can cause
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalScopeModule.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalScopeModule.java
index d95ea55b..f6d2e2b1 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalScopeModule.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalScopeModule.java
@@ -38,6 +38,6 @@ public DiagramGlobalScopeModule(final DiagramGlobalScope scope) {
@Override
protected void configure() {
- bindScope(DiagramGlobal.class, scope);
+ bindScope(DiagramGlobalSingleton.class, scope);
}
}
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobal.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalSingleton.java
similarity index 89%
rename from plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobal.java
rename to plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalSingleton.java
index 94be2eea..f5dfeab5 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobal.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/di/scope/DiagramGlobalSingleton.java
@@ -26,7 +26,7 @@
/**
*
- * Custom scope annotation that is used to declare bindings as diagram global. Diagram global means that one instance of
+ * Scope annotation to declare bindings as diagram global singleton. Diagram global singleton means that one instance of
* this class is shared across all related injectors of the same diagram type. This is used to declare diagram type
* specific singletons across all diagram session injectors (i.e. child injectors) of one GLSP server (injector).
*
@@ -34,4 +34,4 @@
@Target({ TYPE, METHOD })
@Retention(RUNTIME)
@ScopeAnnotation
-public @interface DiagramGlobal {}
+public @interface DiagramGlobalSingleton {}
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/BaseDiagramConfiguration.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/BaseDiagramConfiguration.java
index ba41daf5..dde6ac78 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/BaseDiagramConfiguration.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/BaseDiagramConfiguration.java
@@ -26,7 +26,7 @@
import com.google.inject.Inject;
/**
- * A base reusable implementation of {@link DiagramConfiguration} that used DI to provide
+ * A reusable base implementation of {@link DiagramConfiguration} that used DI to provide
* the diagram type and the graph extension. In addition, default type mappings are configured.
*/
public abstract class BaseDiagramConfiguration implements DiagramConfiguration {
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/DiagramConfiguration.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/DiagramConfiguration.java
index ca4ed774..0fffbc20 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/DiagramConfiguration.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/DiagramConfiguration.java
@@ -28,7 +28,6 @@
/**
* Provides configuration constants for a specific diagram implementation (i.e. diagram language),
* The corresponding configuration for a diagram implementation is identified via its diagram type.
- *
*/
public interface DiagramConfiguration {
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/disposable/DisposableCollection.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/disposable/DisposableCollection.java
index e49ed253..b062cb0d 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/disposable/DisposableCollection.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/disposable/DisposableCollection.java
@@ -19,9 +19,7 @@
import java.util.List;
/**
- * Helper class to collect multiple {@link IDisposable}s and dispose them
- * all at once.
- *
+ * A collection of {@link IDisposable}s that can be disposed.
*/
public class DisposableCollection extends Disposable {
private final List disposables = new ArrayList<>();
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/features/validation/RequestMarkersHandler.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/features/validation/RequestMarkersHandler.java
index b6000941..dbccd715 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/features/validation/RequestMarkersHandler.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/features/validation/RequestMarkersHandler.java
@@ -41,7 +41,7 @@ public class RequestMarkersHandler extends BasicActionHandler executeAction(final RequestMarkersAction action, final GModelState modelState) {
List elementsIDs = action.getElementsIDs();
if (validator.isEmpty()) {
- LOG.warn("Cannot compute markers no implementation for: " + ModelValidator.class + " has been bound");
+ LOG.warn("Cannot compute markers! No implementation for " + ModelValidator.class + " has been bound");
return none();
}
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/gson/GraphGsonConfigurationFactory.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/gson/GraphGsonConfigurationFactory.java
index 3ae80bdc..1e280e37 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/gson/GraphGsonConfigurationFactory.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/gson/GraphGsonConfigurationFactory.java
@@ -22,10 +22,9 @@
import com.google.gson.TypeAdapter;
/**
- * This factory is used in client session specific injectors to create
+ * A factory used in the client-session-specific injectors to create
* {@link GsonBuilder}s that can properly (de)serialize all graph elements (i.e. {@link GModelElement}s
* that are used in the diagram model.
- *
*/
public interface GraphGsonConfigurationFactory {
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/gson/ServerGsonConfigurator.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/gson/ServerGsonConfigurator.java
index bdd3da16..17f5e12b 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/gson/ServerGsonConfigurator.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/gson/ServerGsonConfigurator.java
@@ -23,8 +23,8 @@
import com.google.gson.TypeAdapter;
/**
- * Is used to configure the {@link Gson} object used by lsp4J for (de)serialization of json-rpc messages. The server
- * gson configurator configures a given {@link GsonBuilder} to be able do properly handle {@link Action}
+ * Configurator of the {@link Gson} object used by LSP4J for (de)serialization of json-rpc messages. The server
+ * gson configurator configures a given {@link GsonBuilder} to be able to properly handle {@link Action}
* objects and {@link GModelElement}s.
*/
public interface ServerGsonConfigurator {
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/actions/DefaultActionDispatcher.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/actions/DefaultActionDispatcher.java
index 866f07c2..8c47b53e 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/actions/DefaultActionDispatcher.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/actions/DefaultActionDispatcher.java
@@ -59,6 +59,7 @@ public class DefaultActionDispatcher extends Disposable implements ActionDispatc
@Inject
protected ActionHandlerRegistry actionHandlerRegistry;
+ @Inject
@ClientId
protected String clientId;
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/di/scope/DefaultDiagramGlobalScope.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/di/scope/DefaultDiagramGlobalScope.java
index 12a7dc25..f9f57759 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/di/scope/DefaultDiagramGlobalScope.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/di/scope/DefaultDiagramGlobalScope.java
@@ -86,7 +86,6 @@ protected Optional getInjector(final Provider> unscoped) {
getInjector.setAccessible(true);
Injector injector = (Injector) getInjector.invoke(unscoped);
return Optional.of(injector);
-
} catch (ReflectiveOperationException e) {
return Optional.empty();
}
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/session/DefaultClientSession.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/session/DefaultClientSession.java
index a10a2366..3b2e7c01 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/session/DefaultClientSession.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/session/DefaultClientSession.java
@@ -55,8 +55,6 @@ protected void doDispose() {
}
@Override
- public Injector getInjector() { // TODO Auto-generated method stub
- return null;
- }
+ public Injector getInjector() { return injector; }
}
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/session/DefaultClientSessionManager.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/session/DefaultClientSessionManager.java
index 15255baf..74c54e54 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/session/DefaultClientSessionManager.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/internal/session/DefaultClientSessionManager.java
@@ -33,6 +33,7 @@
public final class DefaultClientSessionManager extends Disposable implements ClientSessionManager {
private static final String ALL_CLIENT_IDS_KEY = "*";
+
@Inject()
protected ClientSessionFactory sessionFactory;
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/launch/DefaultGLSPServerLauncher.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/launch/SocketGLSPServerLauncher.java
similarity index 89%
rename from plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/launch/DefaultGLSPServerLauncher.java
rename to plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/launch/SocketGLSPServerLauncher.java
index 39f54702..7a135b28 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/launch/DefaultGLSPServerLauncher.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/launch/SocketGLSPServerLauncher.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2019-2020 EclipseSource and others.
+ * Copyright (c) 2019-2021 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,8 +32,8 @@
import java.util.function.Function;
import org.apache.log4j.Logger;
-import org.eclipse.glsp.server.di.GLSPModule;
-import org.eclipse.glsp.server.jsonrpc.GsonConfigurator;
+import org.eclipse.glsp.server.di.ServerModule;
+import org.eclipse.glsp.server.gson.ServerGsonConfigurator;
import org.eclipse.glsp.server.protocol.GLSPClient;
import org.eclipse.glsp.server.protocol.GLSPServer;
import org.eclipse.lsp4j.jsonrpc.Launcher;
@@ -41,17 +41,18 @@
import com.google.gson.GsonBuilder;
import com.google.inject.Injector;
+import com.google.inject.Module;
-public class DefaultGLSPServerLauncher extends GLSPServerLauncher {
+public class SocketGLSPServerLauncher extends GLSPServerLauncher {
public static final String START_UP_COMPLETE_MSG = "[GLSP-Server]:Startup completed";
- private static Logger log = Logger.getLogger(DefaultGLSPServerLauncher.class);
+ private static Logger log = Logger.getLogger(SocketGLSPServerLauncher.class);
private ExecutorService threadPool;
private AsynchronousServerSocketChannel serverSocket;
private CompletableFuture onShutdown;
- public DefaultGLSPServerLauncher(final GLSPModule glspModule) {
- super(glspModule);
+ public SocketGLSPServerLauncher(final ServerModule serverModule, final Module... additionalModules) {
+ super(serverModule, additionalModules);
}
@Override
@@ -77,7 +78,7 @@ public Future asyncRun(final String hostname, final int port)
@Override
public void completed(final AsynchronousSocketChannel result, final Void attachment) {
serverSocket.accept(null, this); // Prepare for the next connection
- DefaultGLSPServerLauncher.this.createClientConnection(result);
+ SocketGLSPServerLauncher.this.createClientConnection(result);
}
@Override
@@ -121,7 +122,7 @@ protected void createClientConnection(final AsynchronousSocketChannel socketChan
}
protected Consumer configureGson(final Injector injector) {
- GsonConfigurator gsonConf = injector.getInstance(GsonConfigurator.class);
+ ServerGsonConfigurator gsonConf = injector.getInstance(ServerGsonConfigurator.class);
return (final GsonBuilder builder) -> gsonConf.configureGsonBuilder(builder);
}
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/model/DefaultGModelState.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/model/DefaultGModelState.java
index 53402a08..702ccdca 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/model/DefaultGModelState.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/model/DefaultGModelState.java
@@ -29,7 +29,7 @@
public class DefaultGModelState implements GModelState {
- @Inject()
+ @Inject
@ClientId
protected String clientId;
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/protocol/ServerConnectionListener.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/protocol/ServerConnectionListener.java
index 7f3f194c..e8d4084e 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/protocol/ServerConnectionListener.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/protocol/ServerConnectionListener.java
@@ -18,7 +18,6 @@
/**
* A listener to track the connection status of {@link GLSPClient}s (i.e. client applications).
* Gets notified when a new GLSP client connects or disconnects.
- *
*/
public interface ServerConnectionListener {
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/registry/MultiRegistry.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/registry/MultiRegistry.java
index 2d4f502d..9dea46de 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/registry/MultiRegistry.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/registry/MultiRegistry.java
@@ -21,7 +21,7 @@
import org.eclipse.glsp.server.internal.registry.MapMultiRegistry;
/**
- * Similar to {@link Registry} a multi registry is used to manage a set of key-value pairs. The main difference is that
+ * Multi registry used to manage a set of key-value pairs. The main difference to {@link Registry} is that
* a multi registry doesn't enforce a 1-1 relation between key and value(s).
* One key can be associated with multiple values. The default implementation uses a {@link Map} to manage the key value
* pairs.
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/session/ClientSession.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/session/ClientSession.java
index 6752f37a..d20f0b73 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/session/ClientSession.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/session/ClientSession.java
@@ -45,7 +45,6 @@ public interface ClientSession extends IDisposable {
String getDiagramType();
/*
- * +
* Return the action dispatcher of this diagram type. The action dispatcher is typically created by the session
* specific injector and is basically the entrypoint to the session specific injection context.
* @return
@@ -54,8 +53,7 @@ public interface ClientSession extends IDisposable {
/**
* Retrieve the session specific {@link Injector}. Use this method with care. Normally it should not be necessary to
- * construct
- * additional instances using the session specific injector and this can cause unintended side effects.
+ * construct additional instances using the session specific injector and this can cause unintended side effects.
*
* @return The session specific injector.
*/
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/session/ClientSessionManager.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/session/ClientSessionManager.java
index 9751435f..689dfde6 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/session/ClientSessionManager.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/session/ClientSessionManager.java
@@ -22,7 +22,6 @@
/**
* The central component that manages the lifecycle of client sessions.
- *
*/
public interface ClientSessionManager extends IDisposable {
diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/utils/ModuleUtil.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/utils/ModuleUtil.java
index fb2231ba..05d27bc0 100644
--- a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/utils/ModuleUtil.java
+++ b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/utils/ModuleUtil.java
@@ -23,7 +23,7 @@ public final class ModuleUtil {
private ModuleUtil() {}
/**
- * Mixin additional modules into a base modules. Bindings that are already present in the base module will be
+ * Mix in additional modules into a base modules. Bindings that are already present in the base module will be
* overwritten with the binding of the additional module.
*
* @param baseModule the base module.
@@ -31,11 +31,9 @@ private ModuleUtil() {}
* @return A merged (mixedin) module
*/
public static Module mixin(Module baseModule, final Module... additionalModules) {
-
for (Module additionalModule : additionalModules) {
baseModule = Modules.override(baseModule).with(additionalModule);
}
return baseModule;
}
-
}