Added JSON-RPC back-end to Project API and removed deprecated VFS classes

core/che-core-api-core/src/main/java/org/eclipse/che/api/core/websocket/impl/BasicWebSocketMessageTransmitter.java

@@ -43,7 +43,11 @@ public BasicWebSocketMessageTransmitter(
 
   @Override
   public synchronized void transmit(String endpointId, String message) {
-    final Optional<Session> sessionOptional = registry.get(endpointId);
+    Optional<Session> sessionOptional = registry.get(endpointId);
+
+    if (!sessionOptional.isPresent()) {
+      sessionOptional = registry.getByPartialMatch(endpointId).stream().findFirst();
+    }
 
     if (!sessionOptional.isPresent() || !sessionOptional.get().isOpen()) {
       LOG.debug("Session is not registered or closed, adding message to pending");

ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/app/AppContext.java

@@ -189,7 +189,7 @@ public interface AppContext {
    *
    * @return identifier
    */
-  Optional<String> getApplicationWebsocketId();
+  Optional<String> getApplicationId();
 
   /**
    * Sets web application identifier. Most obvious use - to distinguish web applications on server

ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/jsonrpc/WorkspaceMasterJsonRpcInitializer.java

@@ -86,12 +86,9 @@ private void internalInitialize() {
                   separator
                       + "token="
                       + token
-                      + appContext
-                          .getApplicationWebsocketId()
-                          .map(id -> "&clientId=" + id)
-                          .orElse("");
+                      + appContext.getApplicationId().map(id -> "&clientId=" + id).orElse("");
               Set<Runnable> initActions =
-                  appContext.getApplicationWebsocketId().isPresent()
+                  appContext.getApplicationId().isPresent()
                       ? emptySet()
                       : singleton(WorkspaceMasterJsonRpcInitializer.this::processWsId);
 

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java

@@ -439,7 +439,7 @@ public String getWsAgentServerApiEndpoint() {
   }
 
   @Override
-  public Optional<String> getApplicationWebsocketId() {
+  public Optional<String> getApplicationId() {
     return Optional.ofNullable(applicationWebsocketId);
   }
 

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/jsonrpc/WsAgentJsonRpcInitializer.java

@@ -105,11 +105,11 @@ private void internalInitialize() {
                         String separator = wsAgentWebSocketUrl.contains("?") ? "&" : "?";
                         String queryParams =
                             appContext
-                                .getApplicationWebsocketId()
+                                .getApplicationId()
                                 .map(id -> separator + "clientId=" + id)
                                 .orElse("");
                         Set<Runnable> initActions =
-                            appContext.getApplicationWebsocketId().isPresent()
+                            appContext.getApplicationId().isPresent()
                                 ? emptySet()
                                 : singleton(this::processWsId);
 

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/jsonrpc/WsMasterJsonRpcInitializer.java

@@ -102,7 +102,7 @@ private void initialize() {
               }
 
               char separator = url.contains("?") ? '&' : '?';
-              Optional<String> appWebSocketId = appContext.getApplicationWebsocketId();
+              Optional<String> appWebSocketId = appContext.getApplicationId();
               String queryParams =
                   separator
                       + "token="

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/ProjectApiModule.java

@@ -20,7 +20,6 @@
 import org.eclipse.che.ide.api.project.type.wizard.ProjectWizardRegistrar;
 import org.eclipse.che.ide.api.project.wizard.ImportWizardRegistrar;
 import org.eclipse.che.ide.projectimport.InitialProjectImporter;
-import org.eclipse.che.ide.projectimport.ProjectImportNotificationSubscriber;
 import org.eclipse.che.ide.projectimport.wizard.ImportProjectNotificationSubscriberFactory;
 import org.eclipse.che.ide.projectimport.wizard.ImportWizardFactory;
 import org.eclipse.che.ide.projectimport.wizard.ProjectImportOutputJsonRpcNotifier;
@@ -75,8 +74,6 @@ protected void configure() {
                 ProjectNotificationSubscriber.class, ProjectImportOutputJsonRpcNotifier.class)
             .build(ImportProjectNotificationSubscriberFactory.class));
 
-    bind(ProjectImportNotificationSubscriber.class).asEagerSingleton();
-
     bind(WorkspaceProjectsSyncer.class).asEagerSingleton();
   }
 }

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/project/ProjectServiceClient.java

@@ -160,6 +160,9 @@ public Promise<List<SourceEstimation>> resolveSources(Path path) {
   public Promise<Void> importProject(Path path, SourceStorageDto source) {
     String url = getBaseUrl() + IMPORT + encodePath(path);
 
+    url += url.contains("?") ? "&" : "?";
+    url += "clientId=" + appContext.getApplicationId().orElse("");
+
     return reqFactory.createPostRequest(url, source).header(CONTENT_TYPE, APPLICATION_JSON).send();
   }
 
@@ -230,6 +233,7 @@ public Promise<ProjectConfigDto> createProject(
     for (String key : options.keySet()) {
       urlBuilder.setParameter(key, options.get(key));
     }
+    urlBuilder.setParameter("clientId", appContext.getApplicationId().orElse(""));
     return reqFactory
         .createPostRequest(urlBuilder.buildString(), configuration)
         .header(ACCEPT, APPLICATION_JSON)
@@ -259,7 +263,11 @@ public Promise<ProjectConfigDto> createProject(
    */
   public Promise<List<ProjectConfigDto>> createBatchProjects(
       List<NewProjectConfigDto> configurations) {
-    final String url = getBaseUrl() + BATCH_PROJECTS;
+    String url = getBaseUrl() + BATCH_PROJECTS;
+
+    url += url.contains("?") ? "&" : "?";
+    url += "clientId=" + appContext.getApplicationId().orElse("");
+
     final String loaderMessage =
         configurations.size() > 1 ? "Creating the batch of projects..." : "Creating project...";
     return reqFactory

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifier.java

@@ -13,9 +13,7 @@
 import static com.google.common.base.Strings.nullToEmpty;
 import static org.eclipse.che.api.project.shared.Constants.EVENT_IMPORT_OUTPUT_PROGRESS;
 import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE;
-import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL;
-import static org.eclipse.che.ide.api.notification.StatusNotification.Status.PROGRESS;
-import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS;
+import static org.eclipse.che.ide.api.notification.StatusNotification.Status.*;
 
 import com.google.inject.Inject;
 import com.google.web.bindery.event.shared.EventBus;
@@ -59,7 +57,7 @@ public ProjectImportOutputJsonRpcNotifier(
     eventBus.addHandler(
         WsAgentServerStoppedEvent.TYPE,
         e -> {
-          requestHandlerManager.deregister(EVENT_IMPORT_OUTPUT_PROGRESS + "/" + projectName);
+          requestHandlerManager.deregister(EVENT_IMPORT_OUTPUT_PROGRESS);
           if (singletonNotification != null) {
             singletonNotification.setStatus(FAIL);
             singletonNotification.setContent("");
@@ -72,17 +70,19 @@ public void subscribe(String projectName, StatusNotification notification) {
     this.projectName = projectName;
     this.singletonNotification = notification;
 
-    configurator
-        .newConfiguration()
-        .methodName(EVENT_IMPORT_OUTPUT_PROGRESS + "/" + projectName)
-        .paramsAsDto(ImportProgressRecordDto.class)
-        .noResult()
-        .withConsumer(
-            progressRecord -> {
-              singletonNotification.setTitle(
-                  locale.importingProject(ProjectImportOutputJsonRpcNotifier.this.projectName));
-              singletonNotification.setContent(nullToEmpty(progressRecord.getLine()));
-            });
+    if (!requestHandlerManager.isRegistered(EVENT_IMPORT_OUTPUT_PROGRESS)) {
+      configurator
+          .newConfiguration()
+          .methodName(EVENT_IMPORT_OUTPUT_PROGRESS)
+          .paramsAsDto(ImportProgressRecordDto.class)
+          .noResult()
+          .withConsumer(
+              progressRecord -> {
+                singletonNotification.setTitle(
+                    locale.importingProject(ProjectImportOutputJsonRpcNotifier.this.projectName));
+                singletonNotification.setContent(nullToEmpty(progressRecord.getLine()));
+              });
+    }
   }
 
   @Override
@@ -94,7 +94,7 @@ public void subscribe(String projectName) {
 
   @Override
   public void onSuccess() {
-    requestHandlerManager.deregister(EVENT_IMPORT_OUTPUT_PROGRESS + "/" + projectName);
+    requestHandlerManager.deregister(EVENT_IMPORT_OUTPUT_PROGRESS);
 
     singletonNotification.setStatus(SUCCESS);
     singletonNotification.setTitle(locale.importProjectMessageSuccess(projectName));
@@ -103,7 +103,7 @@ public void onSuccess() {
 
   @Override
   public void onFailure(String errorMessage) {
-    requestHandlerManager.deregister(EVENT_IMPORT_OUTPUT_PROGRESS + "/" + projectName);
+    requestHandlerManager.deregister(EVENT_IMPORT_OUTPUT_PROGRESS);
 
     singletonNotification.setStatus(FAIL);
     singletonNotification.setContent(errorMessage);

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizard.java

@@ -80,9 +80,14 @@ public void complete(@NotNull final CompleteCallback callback) {
           .then(onComplete(callback))
           .catchError(onFailure(callback));
     } else if (mode == UPDATE) {
+      String path =
+          dataObject.getPath().startsWith("/")
+              ? dataObject.getPath().substring(1)
+              : dataObject.getPath();
+
       appContext
           .getWorkspaceRoot()
-          .getContainer(Path.valueOf(dataObject.getPath()))
+          .getContainer(Path.valueOf(path))
           .then(
               optContainer -> {
                 checkState(optContainer.isPresent(), "Failed to update non existed path");

ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/ProjectServiceClientTest.java

@@ -17,12 +17,12 @@
 import static org.eclipse.che.ide.rest.HTTPHeader.ACCEPT;
 import static org.eclipse.che.ide.rest.HTTPHeader.CONTENT_TYPE;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -110,9 +110,7 @@ public void setUp() throws Exception {
         new ProjectServiceClient(
             loaderFactory, requestFactory, dtoFactory, unmarshaller, appContext);
 
-    when(appContext.getWsAgentServerApiEndpoint()).thenReturn("http://127.0.0.3/api");
-
-    when(loaderFactory.newLoader(any())).thenReturn(messageLoader);
+    when(loaderFactory.newLoader(any(String.class))).thenReturn(messageLoader);
     when(asyncRequest.loader(messageLoader)).thenReturn(asyncRequest);
     when(asyncRequest.data(any(String.class))).thenReturn(asyncRequest);
     when(asyncRequest.send(unmarshallableItemRef)).thenReturn(itemRefPromise);
@@ -177,7 +175,7 @@ public void shouldReturnListProjects() {
     client.getProjects();
 
     verify(requestFactory).createGetRequest(any());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(unmarshaller).newListUnmarshaller(ProjectConfigDto.class);
     verify(asyncRequest).send(unmarshallablePrjsConf);
   }
@@ -189,7 +187,7 @@ public void shouldEncodeUrlAndEstimateProject() {
     client.estimate(resourcePath, prjType);
 
     verify(requestFactory).createGetRequest(any());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(loaderFactory).newLoader("Estimating project...");
     verify(asyncRequest).loader(messageLoader);
     verify(asyncRequest).send(unmarshallbleSourceEstimation);
@@ -200,7 +198,7 @@ public void shouldEncodeUrlAndResolveProjectSources() {
     client.resolveSources(resourcePath);
 
     verify(requestFactory).createGetRequest(any());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(loaderFactory).newLoader("Resolving sources...");
     verify(asyncRequest).loader(messageLoader);
     verify(unmarshaller).newListUnmarshaller(SourceEstimation.class);
@@ -229,7 +227,7 @@ public void shouldEncodeUrlAndSearchResourceReferences() {
     client.search(expression);
 
     verify(requestFactory).createGetRequest(any());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(loaderFactory).newLoader("Searching...");
     verify(asyncRequest).loader(messageLoader);
     verify(unmarshaller).newUnmarshaller(ProjectSearchResponseDto.class);
@@ -243,7 +241,7 @@ public void shouldCreateOneProjectByBatch() {
     client.createBatchProjects(configs);
 
     verify(requestFactory).createPostRequest(anyString(), prjsArgCaptor.capture());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(loaderFactory).newLoader("Creating project...");
     verify(asyncRequest).loader(messageLoader);
     verify(asyncRequest).send(unmarshallablePrjsConf);
@@ -259,7 +257,7 @@ public void shouldCreateFewProjectByBatch() {
     client.createBatchProjects(configs);
 
     verify(requestFactory).createPostRequest(anyString(), prjsArgCaptor.capture());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(loaderFactory).newLoader("Creating the batch of projects...");
     verify(asyncRequest).loader(messageLoader);
     verify(asyncRequest).send(unmarshallablePrjsConf);
@@ -355,7 +353,7 @@ public void shouldEncodeUrlAndGetTree() {
     client.getTree(resourcePath, 2, true);
 
     verify(requestFactory).createGetRequest(any());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(unmarshaller).newUnmarshaller(TreeElement.class);
     verify(asyncRequest).send(unmarshallableTreeElem);
   }
@@ -365,7 +363,7 @@ public void shouldEncodeUrlAndGetItem() {
     client.getItem(resourcePath);
 
     verify(requestFactory).createGetRequest(any());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(loaderFactory).newLoader("Getting item...");
     verify(unmarshaller).newUnmarshaller(ItemReference.class);
     verify(asyncRequest).send(unmarshallableItemRef);
@@ -376,7 +374,7 @@ public void shouldEncodeUrlAndGetProject() {
     client.getProject(Path.valueOf(TEXT));
 
     verify(requestFactory).createGetRequest(any());
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(loaderFactory).newLoader("Getting project...");
     verify(asyncRequest).loader(messageLoader);
     verify(unmarshaller).newUnmarshaller(ProjectConfigDto.class);
@@ -393,8 +391,8 @@ public void shouldEncodeUrlAndUpdateProject() {
     client.updateProject(prjConfig1);
 
     verify(requestFactory).createRequest(eq(PUT), anyString(), eq(prjConfig1), eq(false));
-    verify(asyncRequest).header(CONTENT_TYPE, MimeType.APPLICATION_JSON);
-    verify(asyncRequest).header(ACCEPT, MimeType.APPLICATION_JSON);
+    verify(asyncRequest).header(CONTENT_TYPE, APPLICATION_JSON);
+    verify(asyncRequest).header(ACCEPT, APPLICATION_JSON);
     verify(loaderFactory).newLoader("Updating project...");
     verify(asyncRequest).loader(messageLoader);
     verify(unmarshaller).newUnmarshaller(ProjectConfigDto.class);