eclipse-glsp#132 Further clean up server API (eclipse-glsp#89)

- Move classes from root package into a matching subpackage - Create "org.eclipse.glsp.server.features.core.model" package that contains all actions and related classes that are needed for model loading - Create a dedicated feature subpackage for undo/redo Resolves eclipse-glsp/glsp/issues/132
MatthiasHofstaetter · Nov 19, 2020 · 3ce80ce · 3ce80ce
1 parent e565e25
commit 3ce80ce
Show file tree

Hide file tree

Showing 49 changed files with 85 additions and 68 deletions.
diff --git a/...lipse.glsp.example.workflow/src/org/eclipse/glsp/example/workflow/WorkflowGLSPModule.java b/...lipse.glsp.example.workflow/src/org/eclipse/glsp/example/workflow/WorkflowGLSPModule.java
@@ -40,21 +40,21 @@
 import org.eclipse.glsp.example.workflow.taskedit.TaskEditContextActionProvider;
 import org.eclipse.glsp.example.workflow.taskedit.TaskEditValidator;
 import org.eclipse.glsp.graph.GraphExtension;
-import org.eclipse.glsp.server.DefaultGLSPModule;
 import org.eclipse.glsp.server.actions.ActionHandler;
+import org.eclipse.glsp.server.di.DefaultGLSPModule;
 import org.eclipse.glsp.server.diagram.DiagramConfiguration;
-import org.eclipse.glsp.server.factory.ModelFactory;
-import org.eclipse.glsp.server.factory.PopupModelFactory;
 import org.eclipse.glsp.server.features.commandpalette.CommandPaletteActionProvider;
 import org.eclipse.glsp.server.features.contextactions.ContextActionsProvider;
 import org.eclipse.glsp.server.features.contextactions.RequestContextActionsHandler;
 import org.eclipse.glsp.server.features.contextmenu.ContextMenuItemProvider;
+import org.eclipse.glsp.server.features.core.model.ModelFactory;
 import org.eclipse.glsp.server.features.directediting.ContextEditValidator;
 import org.eclipse.glsp.server.features.directediting.LabelEditValidator;
 import org.eclipse.glsp.server.features.modelsourcewatcher.FileWatcher;
 import org.eclipse.glsp.server.features.modelsourcewatcher.ModelSourceWatcher;
 import org.eclipse.glsp.server.features.navigation.NavigationTargetProvider;
 import org.eclipse.glsp.server.features.navigation.NavigationTargetResolver;
+import org.eclipse.glsp.server.features.popup.PopupModelFactory;
 import org.eclipse.glsp.server.features.validation.ModelValidator;
 import org.eclipse.glsp.server.layout.ILayoutEngine;
 import org.eclipse.glsp.server.layout.ServerLayoutConfiguration;

diff --git a/...pse.glsp.example.workflow/src/org/eclipse/glsp/example/workflow/WorkflowPopupFactory.java b/...pse.glsp.example.workflow/src/org/eclipse/glsp/example/workflow/WorkflowPopupFactory.java
@@ -26,7 +26,7 @@
 import org.eclipse.glsp.graph.GModelElement;
 import org.eclipse.glsp.graph.GPreRenderedElement;
 import org.eclipse.glsp.graph.GraphFactory;
-import org.eclipse.glsp.server.factory.PopupModelFactory;
+import org.eclipse.glsp.server.features.popup.PopupModelFactory;
 import org.eclipse.glsp.server.features.popup.RequestPopupModelAction;
 import org.eclipse.glsp.server.model.GModelState;
 

diff --git a/...sp.example.workflow/src/org/eclipse/glsp/example/workflow/model/WorkflowModelFactory.java b/...sp.example.workflow/src/org/eclipse/glsp/example/workflow/model/WorkflowModelFactory.java
@@ -17,8 +17,8 @@
 
 import org.eclipse.glsp.graph.GModelRoot;
 import org.eclipse.glsp.server.actions.ActionDispatcher;
-import org.eclipse.glsp.server.actions.RequestModelAction;
-import org.eclipse.glsp.server.factory.JsonFileModelFactory;
+import org.eclipse.glsp.server.features.core.model.JsonFileModelFactory;
+import org.eclipse.glsp.server.features.core.model.RequestModelAction;
 import org.eclipse.glsp.server.model.GModelState;
 import org.eclipse.glsp.server.utils.ServerMessageUtil;
 import org.eclipse.glsp.server.utils.ServerStatusUtil;

diff --git a/....glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java b/....glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java
@@ -22,7 +22,7 @@
 import javax.websocket.server.ServerEndpointConfig;
 
 import org.apache.log4j.Logger;
-import org.eclipse.glsp.server.GLSPModule;
+import org.eclipse.glsp.server.di.GLSPModule;
 import org.eclipse.glsp.server.launch.GLSPServerLauncher;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;

diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
@@ -16,19 +16,21 @@ Require-Bundle: org.apache.commons.io;bundle-version="2.2.0",
  javax.websocket;bundle-version="1.0.0";visibility:=reexport,
  org.eclipse.glsp.graph;bundle-version="[0.8.0,1.0.0)";visibility:=reexport
 Import-Package: com.google.inject.multibindings;version="1.3.0"
-Export-Package: org.eclipse.glsp.server,
- org.eclipse.glsp.server.actions,
+Export-Package: org.eclipse.glsp.server.actions,
+ org.eclipse.glsp.server.di,
  org.eclipse.glsp.server.diagram,
- org.eclipse.glsp.server.factory,
+ org.eclipse.glsp.server.disposable,
  org.eclipse.glsp.server.features.clipboard,
  org.eclipse.glsp.server.features.commandpalette,
  org.eclipse.glsp.server.features.contextactions,
  org.eclipse.glsp.server.features.contextmenu,
+ org.eclipse.glsp.server.features.core.model,
  org.eclipse.glsp.server.features.directediting,
  org.eclipse.glsp.server.features.modelsourcewatcher,
  org.eclipse.glsp.server.features.navigation,
  org.eclipse.glsp.server.features.popup,
  org.eclipse.glsp.server.features.toolpalette,
+ org.eclipse.glsp.server.features.undoredo,
  org.eclipse.glsp.server.features.validation,
  org.eclipse.glsp.server.internal.action;x-internal:=true,
  org.eclipse.glsp.server.internal.di;x-internal:=true,

diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionHandler.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionHandler.java
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.eclipse.glsp.server.Handler;
 import org.eclipse.glsp.server.model.GModelState;
+import org.eclipse.glsp.server.utils.Handler;
 
 public interface ActionHandler extends Handler<Action> {
    List<Class<? extends Action>> getHandledActionTypes();

diff --git a/...ns/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionHandlerRegistry.java b/...ns/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionHandlerRegistry.java
@@ -17,7 +17,7 @@
 
 import java.util.List;
 
-import org.eclipse.glsp.server.MultiRegistry;
+import org.eclipse.glsp.server.utils.MultiRegistry;
 
 public interface ActionHandlerRegistry extends MultiRegistry<Class<? extends Action>, ActionHandler> {
    default List<ActionHandler> get(final Action action) {

diff --git a/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionRegistry.java b/plugins/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/ActionRegistry.java
@@ -15,6 +15,6 @@
  ********************************************************************************/
 package org.eclipse.glsp.server.actions;
 
-import org.eclipse.glsp.server.Registry;
+import org.eclipse.glsp.server.utils.Registry;
 
 public interface ActionRegistry extends Registry<String, Action> {}
diff --git a/...s/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/SaveModelActionHandler.java b/...s/org.eclipse.glsp.server/src/org/eclipse/glsp/server/actions/SaveModelActionHandler.java
@@ -26,8 +26,8 @@
 
 import org.apache.log4j.Logger;
 import org.eclipse.glsp.graph.GGraph;
-import org.eclipse.glsp.server.factory.GraphGsonConfiguratorFactory;
 import org.eclipse.glsp.server.features.modelsourcewatcher.ModelSourceWatcher;
+import org.eclipse.glsp.server.jsonrpc.GraphGsonConfiguratorFactory;
 import org.eclipse.glsp.server.model.GModelState;
 import org.eclipse.glsp.server.utils.ClientOptions;
 

diff --git a/...clipse/glsp/server/DefaultGLSPModule.java → ...pse/glsp/server/di/DefaultGLSPModule.java b/...clipse/glsp/server/DefaultGLSPModule.java → ...pse/glsp/server/di/DefaultGLSPModule.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-package org.eclipse.glsp.server;
+package org.eclipse.glsp.server.di;
 
 import static org.eclipse.glsp.server.actions.ClientActionHandler.CLIENT_ACTIONS;
 
@@ -27,7 +27,6 @@
 import org.eclipse.glsp.server.actions.ClientActionHandler;
 import org.eclipse.glsp.server.diagram.DiagramConfiguration;
 import org.eclipse.glsp.server.diagram.DiagramConfigurationRegistry;
-import org.eclipse.glsp.server.factory.GraphGsonConfiguratorFactory;
 import org.eclipse.glsp.server.features.contextactions.ContextActionsProvider;
 import org.eclipse.glsp.server.features.contextactions.ContextActionsProviderRegistry;
 import org.eclipse.glsp.server.features.directediting.ContextEditValidator;
@@ -48,6 +47,7 @@
 import org.eclipse.glsp.server.internal.json.DefaultGraphGsonConfiguratorFactory;
 import org.eclipse.glsp.server.jsonrpc.DefaultClientSessionManager;
 import org.eclipse.glsp.server.jsonrpc.DefaultGLSPServer;
+import org.eclipse.glsp.server.jsonrpc.GraphGsonConfiguratorFactory;
 import org.eclipse.glsp.server.model.DefaultModelStateProvider;
 import org.eclipse.glsp.server.model.ModelStateProvider;
 import org.eclipse.glsp.server.operations.OperationHandler;

diff --git a/...c/org/eclipse/glsp/server/GLSPModule.java → ...rg/eclipse/glsp/server/di/GLSPModule.java b/...c/org/eclipse/glsp/server/GLSPModule.java → ...rg/eclipse/glsp/server/di/GLSPModule.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ******************************************************************************/
-package org.eclipse.glsp.server;
+package org.eclipse.glsp.server.di;
 
 import java.util.Optional;
 
@@ -22,19 +22,19 @@
 import org.eclipse.glsp.server.actions.ActionHandlerRegistry;
 import org.eclipse.glsp.server.actions.ActionRegistry;
 import org.eclipse.glsp.server.diagram.DiagramConfigurationRegistry;
-import org.eclipse.glsp.server.factory.GraphGsonConfiguratorFactory;
-import org.eclipse.glsp.server.factory.ModelFactory;
-import org.eclipse.glsp.server.factory.PopupModelFactory;
 import org.eclipse.glsp.server.features.commandpalette.CommandPaletteActionProvider;
 import org.eclipse.glsp.server.features.contextactions.ContextActionsProviderRegistry;
 import org.eclipse.glsp.server.features.contextmenu.ContextMenuItemProvider;
+import org.eclipse.glsp.server.features.core.model.ModelFactory;
 import org.eclipse.glsp.server.features.directediting.ContextEditValidatorRegistry;
 import org.eclipse.glsp.server.features.directediting.LabelEditValidator;
 import org.eclipse.glsp.server.features.modelsourcewatcher.ModelSourceWatcher;
 import org.eclipse.glsp.server.features.navigation.NavigationTargetProviderRegistry;
 import org.eclipse.glsp.server.features.navigation.NavigationTargetResolver;
+import org.eclipse.glsp.server.features.popup.PopupModelFactory;
 import org.eclipse.glsp.server.features.toolpalette.ToolPaletteItemProvider;
 import org.eclipse.glsp.server.features.validation.ModelValidator;
+import org.eclipse.glsp.server.jsonrpc.GraphGsonConfiguratorFactory;
 import org.eclipse.glsp.server.layout.ILayoutEngine;
 import org.eclipse.glsp.server.layout.ServerLayoutConfiguration;
 import org.eclipse.glsp.server.model.ModelStateProvider;

diff --git a/...eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/DiagramConfigurationRegistry.java b/...eclipse.glsp.server/src/org/eclipse/glsp/server/diagram/DiagramConfigurationRegistry.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.glsp.server.Registry;
+import org.eclipse.glsp.server.utils.Registry;
 
 public interface DiagramConfigurationRegistry extends Registry<String, DiagramConfiguration> {
 

diff --git a/...ver/src/org/eclipse/glsp/server/features/clipboard/RequestClipboardDataActionHandler.java b/...ver/src/org/eclipse/glsp/server/features/clipboard/RequestClipboardDataActionHandler.java
@@ -23,7 +23,7 @@
 import org.eclipse.glsp.graph.GModelIndex;
 import org.eclipse.glsp.server.actions.Action;
 import org.eclipse.glsp.server.actions.BasicActionHandler;
-import org.eclipse.glsp.server.factory.GraphGsonConfiguratorFactory;
+import org.eclipse.glsp.server.jsonrpc.GraphGsonConfiguratorFactory;
 import org.eclipse.glsp.server.model.GModelState;
 
 import com.google.gson.Gson;

diff --git a/...r/src/org/eclipse/glsp/server/features/contextactions/ContextActionsProviderRegistry.java b/...r/src/org/eclipse/glsp/server/features/contextactions/ContextActionsProviderRegistry.java
@@ -15,6 +15,6 @@
  ********************************************************************************/
 package org.eclipse.glsp.server.features.contextactions;
 
-import org.eclipse.glsp.server.Registry;
+import org.eclipse.glsp.server.utils.Registry;
 
 public interface ContextActionsProviderRegistry extends Registry<String, ContextActionsProvider> {}
diff --git a/.../server/actions/ComputedBoundsAction.java → ...ures/core/model/ComputedBoundsAction.java b/.../server/actions/ComputedBoundsAction.java → ...ures/core/model/ComputedBoundsAction.java
@@ -13,10 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import java.util.List;
 
+import org.eclipse.glsp.server.actions.Action;
 import org.eclipse.glsp.server.types.ElementAndAlignment;
 import org.eclipse.glsp.server.types.ElementAndBounds;
 

diff --git a/.../actions/ComputedBoundsActionHandler.java → ...re/model/ComputedBoundsActionHandler.java b/.../actions/ComputedBoundsActionHandler.java → ...re/model/ComputedBoundsActionHandler.java
@@ -13,11 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import java.util.List;
 
 import org.eclipse.glsp.graph.GModelRoot;
+import org.eclipse.glsp.server.actions.Action;
+import org.eclipse.glsp.server.actions.BasicActionHandler;
 import org.eclipse.glsp.server.model.GModelState;
 import org.eclipse.glsp.server.utils.LayoutUtil;
 

diff --git a/.../server/factory/JsonFileModelFactory.java → ...ures/core/model/JsonFileModelFactory.java b/.../server/factory/JsonFileModelFactory.java → ...ures/core/model/JsonFileModelFactory.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-package org.eclipse.glsp.server.factory;
+package org.eclipse.glsp.server.features.core.model;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,7 +25,7 @@
 
 import org.eclipse.glsp.graph.GGraph;
 import org.eclipse.glsp.graph.GModelRoot;
-import org.eclipse.glsp.server.actions.RequestModelAction;
+import org.eclipse.glsp.server.jsonrpc.GraphGsonConfiguratorFactory;
 import org.eclipse.glsp.server.model.GModelState;
 import org.eclipse.glsp.server.protocol.GLSPServerException;
 import org.eclipse.glsp.server.utils.ClientOptions;

diff --git a/...pse/glsp/server/factory/ModelFactory.java → ...ver/features/core/model/ModelFactory.java b/...pse/glsp/server/factory/ModelFactory.java → ...ver/features/core/model/ModelFactory.java
@@ -13,10 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ******************************************************************************/
-package org.eclipse.glsp.server.factory;
+package org.eclipse.glsp.server.features.core.model;
 
 import org.eclipse.glsp.graph.GModelRoot;
-import org.eclipse.glsp.server.actions.RequestModelAction;
 import org.eclipse.glsp.server.model.GModelState;
 
 public interface ModelFactory {

diff --git a/...erver/actions/ModelSubmissionHandler.java → ...es/core/model/ModelSubmissionHandler.java b/...erver/actions/ModelSubmissionHandler.java → ...es/core/model/ModelSubmissionHandler.java
@@ -13,13 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.glsp.graph.GModelRoot;
+import org.eclipse.glsp.server.actions.Action;
 import org.eclipse.glsp.server.layout.ILayoutEngine;
 import org.eclipse.glsp.server.layout.ServerLayoutConfiguration;
 import org.eclipse.glsp.server.layout.ServerLayoutKind;

diff --git a/...p/server/actions/RequestBoundsAction.java → ...tures/core/model/RequestBoundsAction.java b/...p/server/actions/RequestBoundsAction.java → ...tures/core/model/RequestBoundsAction.java
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ******************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import org.eclipse.glsp.graph.GModelRoot;
+import org.eclipse.glsp.server.actions.Action;
 
 public class RequestBoundsAction extends Action {
 

diff --git a/...sp/server/actions/RequestModelAction.java → ...atures/core/model/RequestModelAction.java b/...sp/server/actions/RequestModelAction.java → ...atures/core/model/RequestModelAction.java
@@ -13,10 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ******************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import java.util.Map;
 
+import org.eclipse.glsp.server.actions.Action;
+
 public class RequestModelAction extends Action {
 
    public static final String ID = "requestModel";

diff --git a/...er/actions/RequestModelActionHandler.java → ...core/model/RequestModelActionHandler.java b/...er/actions/RequestModelActionHandler.java → ...core/model/RequestModelActionHandler.java
@@ -13,12 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import java.util.List;
 
 import org.eclipse.glsp.graph.GModelRoot;
-import org.eclipse.glsp.server.factory.ModelFactory;
+import org.eclipse.glsp.server.actions.Action;
+import org.eclipse.glsp.server.actions.BasicActionHandler;
 import org.eclipse.glsp.server.features.modelsourcewatcher.ModelSourceWatcher;
 import org.eclipse.glsp.server.model.GModelState;
 import org.eclipse.glsp.server.utils.ClientOptions;

diff --git a/.../glsp/server/actions/SetBoundsAction.java → .../features/core/model/SetBoundsAction.java b/.../glsp/server/actions/SetBoundsAction.java → .../features/core/model/SetBoundsAction.java
@@ -13,10 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ******************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import java.util.List;
 
+import org.eclipse.glsp.server.actions.Action;
 import org.eclipse.glsp.server.types.ElementAndBounds;
 
 public class SetBoundsAction extends Action {

diff --git a/...e/glsp/server/actions/SetModelAction.java → ...r/features/core/model/SetModelAction.java b/...e/glsp/server/actions/SetModelAction.java → ...r/features/core/model/SetModelAction.java
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ******************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import org.eclipse.glsp.graph.GModelRoot;
+import org.eclipse.glsp.server.actions.Action;
 
 public class SetModelAction extends Action {
 

diff --git a/...lsp/server/actions/UpdateModelAction.java → ...eatures/core/model/UpdateModelAction.java b/...lsp/server/actions/UpdateModelAction.java → ...eatures/core/model/UpdateModelAction.java
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ******************************************************************************/
-package org.eclipse.glsp.server.actions;
+package org.eclipse.glsp.server.features.core.model;
 
 import org.eclipse.glsp.graph.GModelRoot;
+import org.eclipse.glsp.server.actions.Action;
 
 public class UpdateModelAction extends Action {
 

diff --git a/...rver/src/org/eclipse/glsp/server/features/directediting/ContextEditValidatorRegistry.java b/...rver/src/org/eclipse/glsp/server/features/directediting/ContextEditValidatorRegistry.java
@@ -15,6 +15,6 @@
  ********************************************************************************/
 package org.eclipse.glsp.server.features.directediting;
 
-import org.eclipse.glsp.server.Registry;
+import org.eclipse.glsp.server.utils.Registry;
 
 public interface ContextEditValidatorRegistry extends Registry<String, ContextEditValidator> {}
diff --git a/...ver/src/org/eclipse/glsp/server/features/navigation/NavigationTargetProviderRegistry.java b/...ver/src/org/eclipse/glsp/server/features/navigation/NavigationTargetProviderRegistry.java
@@ -15,6 +15,6 @@
  ********************************************************************************/
 package org.eclipse.glsp.server.features.navigation;
 
-import org.eclipse.glsp.server.Registry;
+import org.eclipse.glsp.server.utils.Registry;
 
 public interface NavigationTargetProviderRegistry extends Registry<String, NavigationTargetProvider> {}
diff --git a/...lsp/server/factory/PopupModelFactory.java → ...ver/features/popup/PopupModelFactory.java b/...lsp/server/factory/PopupModelFactory.java → ...ver/features/popup/PopupModelFactory.java
@@ -13,13 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ******************************************************************************/
-package org.eclipse.glsp.server.factory;
+package org.eclipse.glsp.server.features.popup;
 
 import java.util.Optional;
 
 import org.eclipse.glsp.graph.GHtmlRoot;
 import org.eclipse.glsp.graph.GModelElement;
-import org.eclipse.glsp.server.features.popup.RequestPopupModelAction;
 import org.eclipse.glsp.server.model.GModelState;
 
 public interface PopupModelFactory {

diff --git a/...lsp.server/src/org/eclipse/glsp/server/features/popup/RequestPopupModelActionHandler.java b/...lsp.server/src/org/eclipse/glsp/server/features/popup/RequestPopupModelActionHandler.java
@@ -21,7 +21,6 @@
 import org.eclipse.glsp.graph.GModelElement;
 import org.eclipse.glsp.server.actions.Action;
 import org.eclipse.glsp.server.actions.BasicActionHandler;
-import org.eclipse.glsp.server.factory.PopupModelFactory;
 import org.eclipse.glsp.server.model.GModelState;
 
 import com.google.inject.Inject;