Fix up command id for jdt.ls code actions

Author: Thomas Mäder

plugins/plugin-java/che-plugin-java-server/src/main/java/org/eclipse/che/plugin/java/languageserver/JavaLSWrapper.java

@@ -0,0 +1,24 @@
+package org.eclipse.che.plugin.java.languageserver;
+
+import java.lang.reflect.Proxy;
+import org.eclipse.che.api.languageserver.util.DynamicWrapper;
+import org.eclipse.lsp4j.services.LanguageServer;
+import org.eclipse.lsp4j.services.TextDocumentService;
+
+public class JavaLSWrapper {
+  private LanguageServer wrapped;
+
+  public JavaLSWrapper(LanguageServer wrapped) {
+    this.wrapped = wrapped;
+  }
+
+  public TextDocumentService getTextDocumentService() {
+    return (TextDocumentService)
+        Proxy.newProxyInstance(
+            getClass().getClassLoader(),
+            new Class[] {TextDocumentService.class},
+            new DynamicWrapper(
+                new JavaTextDocumentServiceWraper(wrapped.getTextDocumentService()),
+                wrapped.getTextDocumentService()));
+  }
+}

plugins/plugin-java/che-plugin-java-server/src/main/java/org/eclipse/che/plugin/java/languageserver/JavaLanguageServerLauncher.java

@@ -13,6 +13,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.io.IOException;
+import java.lang.reflect.Proxy;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -21,6 +22,7 @@
 import org.eclipse.che.api.languageserver.launcher.LanguageServerLauncherTemplate;
 import org.eclipse.che.api.languageserver.registry.DocumentFilter;
 import org.eclipse.che.api.languageserver.registry.LanguageServerDescription;
+import org.eclipse.che.api.languageserver.util.DynamicWrapper;
 import org.eclipse.che.plugin.java.inject.JavaModule;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.services.LanguageClient;
@@ -57,7 +59,14 @@ protected LanguageServer connectToLanguageServer(
             languageServerProcess.getInputStream(),
             languageServerProcess.getOutputStream());
     launcher.startListening();
-    return launcher.getRemoteProxy();
+    LanguageServer proxy = launcher.getRemoteProxy();
+    LanguageServer wrapped =
+        (LanguageServer)
+            Proxy.newProxyInstance(
+                getClass().getClassLoader(),
+                new Class[] {LanguageServer.class},
+                new DynamicWrapper(new JavaLSWrapper(proxy), proxy));
+    return wrapped;
   }
 
   protected Process startLanguageServerProcess(String projectPath) throws LanguageServerException {

plugins/plugin-java/che-plugin-java-server/src/main/java/org/eclipse/che/plugin/java/languageserver/JavaTextDocumentServiceWraper.java

@@ -0,0 +1,29 @@
+package org.eclipse.che.plugin.java.languageserver;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import org.eclipse.lsp4j.CodeActionParams;
+import org.eclipse.lsp4j.Command;
+import org.eclipse.lsp4j.services.TextDocumentService;
+
+public class JavaTextDocumentServiceWraper {
+  private TextDocumentService wrapped;
+
+  public JavaTextDocumentServiceWraper(TextDocumentService wrapped) {
+    this.wrapped = wrapped;
+  }
+
+  public CompletableFuture<List<? extends Command>> codeAction(CodeActionParams params) {
+    CompletableFuture<List<? extends Command>> result = wrapped.codeAction(params);
+    return result.thenApply(
+        (List<? extends Command> commands) -> {
+          commands.forEach(
+              cmd -> {
+                if ("java.apply.workspaceEdit".equals(cmd.getCommand())) {
+                  cmd.setCommand("lsp.applyWorkspaceEdit");
+                }
+              });
+          return commands;
+        });
+  }
+}

wsagent/che-core-api-languageserver/src/main/java/org/eclipse/che/api/languageserver/util/DynamicWrapper.java

@@ -0,0 +1,32 @@
+package org.eclipse.che.api.languageserver.util;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ * This class forwards invocation of methods from a wrapped instance to another object, if it
+ * declares the method in question. It serves to create wrapper classes without having to implement
+ * a large protocol
+ *
+ * @author thomas
+ */
+public class DynamicWrapper implements InvocationHandler {
+  private Object overrides;
+  private Object wrapped;
+
+  public DynamicWrapper(Object overrides, Object wrapped) {
+    this.overrides = overrides;
+    this.wrapped = wrapped;
+  }
+
+  @Override
+  public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+    try {
+      Method declaredMethod =
+          overrides.getClass().getDeclaredMethod(method.getName(), method.getParameterTypes());
+      return declaredMethod.invoke(overrides, args);
+    } catch (NoSuchMethodException e) {
+      return method.invoke(wrapped, args);
+    }
+  }
+}