CHE-956 Move che-jdt-ext-machine to java-ext-lang-server module and c…

…hange REST paths from jdt to java

assembly/assembly-wsagent-war/pom.xml

@@ -94,11 +94,6 @@
             <groupId>org.eclipse.che.lib</groupId>
             <artifactId>che-swagger-module</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-jdt-ext-machine</artifactId>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-cpp-lang-server</artifactId>

plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml

@@ -32,6 +32,5 @@
         <module>che-plugin-java-jdt-core-repack</module>
         <module>org-eclipse-jdt-ui</module>
         <module>org-eclipse-ltk-core-refactoring</module>
-        <module>che-jdt-ext-machine</module>
     </modules>
 </project>

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/dependenciesupdater/JavaClasspathServiceClientImpl.java

@@ -45,7 +45,7 @@ public class JavaClasspathServiceClientImpl implements JavaClasspathServiceClien
     protected JavaClasspathServiceClientImpl(AppContext appContext,
                                              WsAgentStateController wsAgentStateController) {
         this.wsAgentStateController = wsAgentStateController;
-        this.baseHttpUrl = "/jdt/";
+        this.baseHttpUrl = "/java/";
     }
 
     /** {@inheritDoc} */

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/documentation/QuickDocPresenter.java

@@ -56,7 +56,7 @@ public void showDocumentation() {
         TextEditorPresenter editor = ((TextEditorPresenter)activeEditor);
         int offset = editor.getCursorOffset();
         final PositionConverter.PixelCoordinates coordinates = editor.getPositionConverter().offsetToPixel(offset);
-        view.show(appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/javadoc/find?fqn=" +
+        view.show(appContext.getDevMachine().getWsAgentBaseUrl() + "/java/javadoc/find?fqn=" +
                   JavaSourceFolderUtil.getFQNForFile(editor.getEditorInput().getFile()) + "&projectpath=" +
                   appContext.getCurrentProject().getProjectConfig().getPath() + "&offset=" + offset, coordinates.getX(),
                   coordinates.getY());

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaCodeAssistClient.java

@@ -62,14 +62,14 @@ public JavaCodeAssistClient(DtoUnmarshallerFactory unmarshallerFactory,
     }
 
     public void computeProposals(String projectPath, String fqn, int offset, String contents, AsyncRequestCallback<Proposals> callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/completion" + "/?projectpath=" +
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/completion" + "/?projectpath=" +
                      projectPath + "&fqn=" + fqn + "&offset=" + offset;
         asyncRequestFactory.createPostRequest(url, null).data(contents).send(callback);
     }
 
     public void computeAssistProposals(String projectPath, String fqn, int offset, List<Problem> problems,
                                        AsyncRequestCallback<Proposals> callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/assist" + "/?projectpath=" +
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/assist" + "/?projectpath=" +
                      projectPath + "&fqn=" + fqn + "&offset=" + offset;
         List<Problem> prob = new ArrayList<>();
         prob.addAll(problems);
@@ -78,7 +78,7 @@ public void computeAssistProposals(String projectPath, String fqn, int offset, L
 
 
     public void applyProposal(String sessionId, int index, boolean insert, final AsyncCallback<ProposalApplyResult> callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/apply/completion/?sessionid=" +
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/apply/completion/?sessionid=" +
                      sessionId + "&index=" + index + "&insert=" + insert;
         Unmarshallable<ProposalApplyResult> unmarshaller =
                 unmarshallerFactory.newUnmarshaller(ProposalApplyResult.class);
@@ -96,7 +96,7 @@ protected void onFailure(Throwable throwable) {
     }
 
     public String getProposalDocUrl(int id, String sessionId) {
-        return appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/code-assist/compute/info?sessionid=" + sessionId +
+        return appContext.getDevMachine().getWsAgentBaseUrl() + "/java/code-assist/compute/info?sessionid=" + sessionId +
                "&index=" + id;
     }
 
@@ -146,7 +146,7 @@ public List<Change> apply(List<Change> arg) throws FunctionException {
      */
     public Promise<List<ConflictImportDTO>> organizeImports(String projectPath, String fqn) {
         String url = appContext.getDevMachine().getWsAgentBaseUrl() +
-                     "/jdt/code-assist/organize-imports?projectpath=" + projectPath +
+                     "/java/code-assist/organize-imports?projectpath=" + projectPath +
                      "&fqn=" + fqn;
 
         return asyncRequestFactory.createPostRequest(url, null)
@@ -164,7 +164,7 @@ public Promise<List<ConflictImportDTO>> organizeImports(String projectPath, Stri
      */
     public Promise<Void> applyChosenImports(String projectPath, String fqn, ConflictImportDTO chosen) {
         String url = appContext.getDevMachine().getWsAgentBaseUrl() +
-                     "/jdt/code-assist/apply-imports?projectpath=" + projectPath +
+                     "/java/code-assist/apply-imports?projectpath=" + projectPath +
                      "&fqn=" + fqn;
 
         return asyncRequestFactory.createPostRequest(url, chosen)

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcileClient.java

@@ -40,7 +40,7 @@ public JavaReconcileClient(DtoUnmarshallerFactory dtoUnmarshallerFactory,
     }
 
     public void reconcile(String projectPath, String fqn, final ReconcileCallback callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/reconcile/?projectpath=" + projectPath + "&fqn=" + fqn;
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/reconcile/?projectpath=" + projectPath + "&fqn=" + fqn;
         asyncRequestFactory.createGetRequest(url)
                            .send(new AsyncRequestCallback<ReconcileResult>(dtoUnmarshallerFactory.newUnmarshaller(ReconcileResult.class)) {
                                @Override

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/navigation/service/JavaNavigationServiceImpl.java

@@ -62,34 +62,34 @@ public JavaNavigationServiceImpl(AppContext appContext,
 
     @Override
     public void findDeclaration(String projectPath, String fqn, int offset, AsyncRequestCallback<OpenDeclarationDescriptor> callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/find-declaration" +
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/find-declaration" +
                      "?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset;
         requestFactory.createGetRequest(url).send(callback);
     }
 
     public void getExternalLibraries(String projectPath, AsyncRequestCallback<List<Jar>> callback) {
         String url =
-                appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/libraries?projectpath=" + projectPath;
+                appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/libraries?projectpath=" + projectPath;
         requestFactory.createGetRequest(url).send(callback);
     }
 
     @Override
     public void getLibraryChildren(String projectPath, int libId, AsyncRequestCallback<List<JarEntry>> callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/lib/children" +
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/lib/children" +
                      "?projectpath=" + projectPath + "&root=" + libId;
         requestFactory.createGetRequest(url).send(callback);
     }
 
     @Override
     public void getChildren(String projectPath, int libId, String path, AsyncRequestCallback<List<JarEntry>> callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/children" +
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/children" +
                      "?projectpath=" + projectPath + "&root=" + libId + "&path=" + path;
         requestFactory.createGetRequest(url).send(callback);
     }
 
     @Override
     public void getEntry(String projectPath, int libId, String path, AsyncRequestCallback<JarEntry> callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/entry" +
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/entry" +
                      "?projectpath=" + projectPath + "&root=" + libId + "&path=" + path;
         requestFactory.createGetRequest(url).send(callback);
     }
@@ -103,14 +103,14 @@ public void getContent(String projectPath, int libId, String path, AsyncRequestC
 
     @Override
     public void getContent(String projectPath, String fqn, AsyncRequestCallback<ClassContent> callback) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/contentbyfqn?projectpath=" + projectPath + "&fqn=" + fqn;
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/contentbyfqn?projectpath=" + projectPath + "&fqn=" + fqn;
         requestFactory.createGetRequest(url).send(callback);
     }
 
     /** {@inheritDoc} */
     @Override
     public Promise<CompilationUnit> getCompilationUnit(String projectPath, String fqn, boolean showInherited) {
-        final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/compilation-unit" +
+        final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/compilation-unit" +
                            "?projectpath=" + projectPath + "&fqn=" + fqn + "&showinherited=" + showInherited;
 
         return newPromise(new AsyncPromiseHelper.RequestCall<CompilationUnit>() {
@@ -125,7 +125,7 @@ public void makeCall(AsyncCallback<CompilationUnit> callback) {
 
     @Override
     public Promise<ImplementationsDescriptorDTO> getImplementations(String projectPath, String fqn, int offset) {
-        final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/implementations" +
+        final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/implementations" +
                            "?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset;
 
         return requestFactory.createGetRequest(url)
@@ -136,7 +136,7 @@ public Promise<ImplementationsDescriptorDTO> getImplementations(String projectPa
 
     @Override
     public Promise<List<JavaProject>> getProjectsAndPackages(boolean includePackage) {
-        final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/get/projects/and/packages"
+        final String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/get/projects/and/packages"
                            + "?includepackages=" + includePackage;
 
         return newPromise(new AsyncPromiseHelper.RequestCall<List<JavaProject>>() {
@@ -153,13 +153,13 @@ public void makeCall(AsyncCallback<List<JavaProject>> callback) {
 
     @Override
     public String getContentUrl(String projectPath, int libId, String path) {
-        return appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/content" +
+        return appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/content" +
                "?projectpath=" + projectPath + "&root=" + libId + "&path=" + path;
     }
 
     @Override
     public Promise<List<MethodParameters>> getMethodParametersHints(String projectPath, String fqn, int offset, int lineStartOffset) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/navigation/parameters" +
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/navigation/parameters" +
                      "?projectpath=" + projectPath + "&fqn=" + fqn + "&offset=" + offset + "&lineStart=" + lineStartOffset;
 
         return requestFactory.createGetRequest(url)

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/project/classpath/service/ClasspathServiceClientImpl.java

@@ -47,7 +47,7 @@ public ClasspathServiceClientImpl(AsyncRequestFactory asyncRequestFactory,
         this.appContext = appContext;
         this.loader = loaderFactory.newLoader();
 
-        this.pathToService = "/jdt/classpath";
+        this.pathToService = "/java/classpath";
     }
 
     @Override

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/refactoring/service/RefactoringServiceClientImpl.java

@@ -68,7 +68,7 @@ public RefactoringServiceClientImpl(AsyncRequestFactory asyncRequestFactory,
         this.unmarshallerFactory = unmarshallerFactory;
         this.appContext = appContext;
         this.loader = loaderFactory.newLoader();
-        this.pathToService = "/jdt/refactoring/";
+        this.pathToService = "/java/refactoring/";
     }
 
     /** {@inheritDoc} */

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceRest.java

@@ -52,7 +52,7 @@ public JavaSearchServiceRest(AsyncRequestFactory asyncRequestFactory,
         this.unmarshallerFactory = unmarshallerFactory;
         this.appContext = appContext;
         this.loader = loaderFactory.newLoader();
-        this.pathToService = "/jdt/search/find/usages";
+        this.pathToService = "/java/search/find/usages";
     }
 
     @Override

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/search/JavaSearchServiceWS.java

@@ -59,7 +59,7 @@ public JavaSearchServiceWS(MessageBusProvider provider,
         this.dtoFactory = dtoFactory;
         this.loader = loaderFactory.newLoader();
         this.unmarshallerFactory = unmarshallerFactory;
-        this.pathToService = "/jdt/search/";
+        this.pathToService = "/java/search/";
     }
 
     @Override

plugins/plugin-java/che-plugin-java-ext-lang-client/src/main/java/org/eclipse/che/ide/ext/java/client/settings/service/SettingsServiceClientImpl.java

@@ -44,7 +44,7 @@ public SettingsServiceClientImpl(AppContext appContext,
     /** {@inheritDoc} */
     @Override
     public Promise<Void> applyCompileParameters(@NotNull final Map<String, String> parameters) {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/compiler-settings/set";
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/compiler-settings/set";
 
         JsonSerializable data = new JsonSerializable() {
             @Override
@@ -62,7 +62,7 @@ public String toJson() {
     /** {@inheritDoc} */
     @Override
     public Promise<Map<String, String>> getCompileParameters() {
-        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/jdt/compiler-settings/all";
+        String url = appContext.getDevMachine().getWsAgentBaseUrl() + "/java/compiler-settings/all";
 
         return asyncRequestFactory.createGetRequest(url)
                                   .header(ACCEPT, APPLICATION_JSON)