Base URL to the master will be provided by AppContext (eclipse-che#3658)

Vitalii Parfonov · web-flow · commit 88a1fa41cac3 · 2017-01-13T14:40:25.000+02:00
Add ability to take base endpoint to thews master from AppContext
Mark RestContextProvider ad deprecated   


Signed-off-by: Vitalii Parfonov &lt;vparfonov@codenvy.com&gt;
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/app/AppContext.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/app/AppContext.java
@@ -203,7 +203,11 @@ public interface AppContext {
      */
     void setWorkspace(Workspace workspace);
 
-
     ActiveRuntime getActiveRuntime();
 
+
+    String getMasterEndpoint();
+
+
+    String getDevAgentEndpoint();
 }
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/importer/AbstractImporter.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/importer/AbstractImporter.java
@@ -75,4 +75,5 @@ public Promise<Project> apply(PromiseError error) throws FunctionException {
      * @return returns instance of Promise
      */
     protected abstract Promise<Project> importProject(Path path, SourceStorage sourceStorage);
+
 }
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClientImpl.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/MachineServiceClientImpl.java
@@ -12,16 +12,11 @@
 
 import com.google.inject.Inject;
 
-import org.eclipse.che.api.core.model.machine.Command;
-import org.eclipse.che.api.machine.shared.dto.CommandDto;
 import org.eclipse.che.api.machine.shared.dto.MachineDto;
-import org.eclipse.che.api.machine.shared.dto.MachineProcessDto;
 import org.eclipse.che.api.promises.client.Promise;
-import org.eclipse.che.commons.annotation.Nullable;
-import org.eclipse.che.ide.dto.DtoFactory;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
 import org.eclipse.che.ide.rest.DtoUnmarshallerFactory;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.ide.ui.loaders.request.LoaderFactory;
 
 import javax.validation.constraints.NotNull;
@@ -44,14 +39,14 @@ public class MachineServiceClientImpl implements MachineServiceClient {
     private final String                 baseHttpUrl;
 
     @Inject
-    protected MachineServiceClientImpl(@RestContext String restContext,
+    protected MachineServiceClientImpl(AppContext appContext,
                                        DtoUnmarshallerFactory dtoUnmarshallerFactory,
                                        AsyncRequestFactory asyncRequestFactory,
                                        LoaderFactory loaderFactory) {
         this.dtoUnmarshallerFactory = dtoUnmarshallerFactory;
         this.asyncRequestFactory = asyncRequestFactory;
         this.loaderFactory = loaderFactory;
-        this.baseHttpUrl = restContext + "/workspace/";
+        this.baseHttpUrl = appContext.getMasterEndpoint() + "/workspace/";
     }
 
     @Override
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClientImpl.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/machine/RecipeServiceClientImpl.java
@@ -17,9 +17,9 @@
 import org.eclipse.che.api.machine.shared.dto.recipe.RecipeUpdate;
 import org.eclipse.che.api.promises.client.Promise;
 import org.eclipse.che.commons.annotation.Nullable;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
 import org.eclipse.che.ide.rest.DtoUnmarshallerFactory;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.ide.rest.StringUnmarshaller;
 import org.eclipse.che.ide.ui.loaders.request.LoaderFactory;
 
@@ -47,14 +47,14 @@ public class RecipeServiceClientImpl implements RecipeServiceClient {
     private final String                 baseHttpUrl;
 
     @Inject
-    protected RecipeServiceClientImpl(@RestContext String restContext,
+    protected RecipeServiceClientImpl(AppContext appContext,
                                       DtoUnmarshallerFactory dtoUnmarshallerFactory,
                                       AsyncRequestFactory asyncRequestFactory,
                                       LoaderFactory loaderFactory) {
         this.dtoUnmarshallerFactory = dtoUnmarshallerFactory;
         this.asyncRequestFactory = asyncRequestFactory;
         this.loaderFactory = loaderFactory;
-        this.baseHttpUrl = restContext + "/recipe";
+        this.baseHttpUrl = appContext.getMasterEndpoint() + "/recipe";
     }
 
     @Override
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClientImpl.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/ProjectTemplateServiceClientImpl.java
@@ -13,11 +13,10 @@
 import com.google.inject.Inject;
 
 import org.eclipse.che.api.project.templates.shared.dto.ProjectTemplateDescriptor;
-import org.eclipse.che.ide.api.project.ProjectTemplateServiceClient;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.rest.AsyncRequestCallback;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
 import org.eclipse.che.ide.rest.AsyncRequestLoader;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.ide.ui.loaders.request.LoaderFactory;
 
 import javax.validation.constraints.NotNull;
@@ -39,13 +38,13 @@ public class ProjectTemplateServiceClientImpl implements ProjectTemplateServiceC
     private String baseUrl;
 
     @Inject
-    protected ProjectTemplateServiceClientImpl(@RestContext String restContext,
+    protected ProjectTemplateServiceClientImpl(AppContext appContext,
                                                AsyncRequestFactory asyncRequestFactory,
                                                LoaderFactory loaderFactory) {
         this.asyncRequestFactory = asyncRequestFactory;
         this.loader = loaderFactory.newLoader();
 
-        baseUrl = restContext + "/project-template/";
+        baseUrl = appContext.getMasterEndpoint() + "/project-template/";
     }
 
     @Override
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClientImpl.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/ssh/SshServiceClientImpl.java
@@ -16,11 +16,11 @@
 import org.eclipse.che.api.ssh.shared.dto.GenerateSshPairRequest;
 import org.eclipse.che.api.ssh.shared.dto.SshPairDto;
 import org.eclipse.che.ide.MimeType;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.dto.DtoFactory;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
 import org.eclipse.che.ide.rest.DtoUnmarshallerFactory;
 import org.eclipse.che.ide.rest.HTTPHeader;
-import org.eclipse.che.ide.rest.RestContext;
 
 import java.util.List;
 
@@ -36,14 +36,14 @@ public class SshServiceClientImpl implements SshServiceClient {
     private final String                 sshApi;
 
     @Inject
-    protected SshServiceClientImpl(@RestContext String baseUrl,
+    protected SshServiceClientImpl(AppContext appContext,
                                    DtoFactory dtoFactory,
                                    AsyncRequestFactory asyncRequestFactory,
                                    DtoUnmarshallerFactory unmarshallerFactory) {
         this.dtoFactory = dtoFactory;
         this.asyncRequestFactory = asyncRequestFactory;
         this.unmarshallerFactory = unmarshallerFactory;
-        this.sshApi = baseUrl + "/ssh";
+        this.sshApi = appContext.getMasterEndpoint() + "/ssh";
     }
 
     /**
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java
@@ -16,6 +16,7 @@
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import com.google.web.bindery.event.shared.EventBus;
+
 import org.eclipse.che.api.core.model.workspace.Workspace;
 import org.eclipse.che.api.factory.shared.dto.FactoryDto;
 import org.eclipse.che.api.promises.client.Operation;
@@ -486,10 +487,35 @@ public void apply(Void arg) throws OperationException {
     public void onWindowClosed(WindowActionEvent event) {
     }
 
+    @Override
+    public String getMasterEndpoint() {
+        String fromUrl = this.browserQueryFieldRenderer.getParameterFromURLByName("master");
+        if(fromUrl == null || fromUrl.isEmpty())
+            return masterFromIDEConfig();
+        else
+            return fromUrl;
+    }
+
+    @Override
+    public String getDevAgentEndpoint() {
+        String fromUrl = this.browserQueryFieldRenderer.getParameterFromURLByName("agent");
+        if(fromUrl == null || fromUrl.isEmpty())
+            return runtime.getDevMachine().getWsAgentBaseUrl();
+        else
+            return fromUrl;
+    }
 
     @Override
     public ActiveRuntime getActiveRuntime() {
         return runtime;
     }
 
+
+    private static native String masterFromIDEConfig() /*-{
+        if ($wnd.IDE && $wnd.IDE.config) {
+            return $wnd.IDE.config.restContext;
+        } else {
+            return null;
+        }
+    }-*/;
 }
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java
@@ -122,6 +122,7 @@ protected void configure() {
 
         bind(EventBus.class).to(SimpleEventBus.class).in(Singleton.class);
 
+        //TODO: don't remove binding until not fix Codenvy and other packaging  
         bind(String.class).annotatedWith(RestContext.class).toProvider(RestContextProvider.class).in(Singleton.class);
 
         install(new GinFactoryModuleBuilder().build(LoaderFactory.class));
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/OAuthApiModule.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/oauth/OAuthApiModule.java
@@ -14,8 +14,6 @@
 import com.google.gwt.inject.client.multibindings.GinMultibinder;
 import com.google.inject.Singleton;
 
-import org.eclipse.che.ide.api.auth.OAuthServiceClient;
-import org.eclipse.che.ide.api.auth.OAuthServiceClientImpl;
 import org.eclipse.che.ide.api.oauth.OAuth2Authenticator;
 import org.eclipse.che.ide.api.oauth.OAuth2AuthenticatorRegistry;
 
@@ -28,7 +26,6 @@ public class OAuthApiModule extends AbstractGinModule {
 
     @Override
     protected void configure() {
-        bind(OAuthServiceClient.class).to(OAuthServiceClientImpl.class).in(Singleton.class);
 
         GinMultibinder.newSetBinder(binder(), OAuth2Authenticator.class).addBinding().to(DefaultOAuthAuthenticatorImpl.class);
 
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesServiceClientImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/preferences/PreferencesServiceClientImpl.java
@@ -13,10 +13,10 @@
 import com.google.inject.Inject;
 
 import org.eclipse.che.api.promises.client.Promise;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.user.PreferencesServiceClient;
 import org.eclipse.che.ide.json.JsonHelper;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.ide.rest.StringMapUnmarshaller;
 import org.eclipse.che.ide.ui.loaders.request.LoaderFactory;
 
@@ -38,16 +38,18 @@ public class PreferencesServiceClientImpl implements PreferencesServiceClient {
     private final AsyncRequestFactory asyncRequestFactory;
 
     @Inject
-    protected PreferencesServiceClientImpl(@RestContext String restContext,
+    protected PreferencesServiceClientImpl(AppContext appContext,
                                            LoaderFactory loaderFactory,
                                            AsyncRequestFactory asyncRequestFactory) {
         this.loaderFactory = loaderFactory;
         this.asyncRequestFactory = asyncRequestFactory;
-        PREFERENCES_PATH = restContext + "/preferences";
+        PREFERENCES_PATH = appContext.getMasterEndpoint() + "/preferences";
     }
 
     @Override
     public Promise<Map<String, String>> getPreferences() {
+
+
         return asyncRequestFactory.createGetRequest(PREFERENCES_PATH)
                                   .header(ACCEPT, APPLICATION_JSON)
                                   .header(CONTENT_TYPE, APPLICATION_JSON)
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporter.java
@@ -29,15 +29,14 @@
 import org.eclipse.che.ide.api.oauth.OAuth2Authenticator;
 import org.eclipse.che.ide.api.oauth.OAuth2AuthenticatorRegistry;
 import org.eclipse.che.ide.api.oauth.OAuth2AuthenticatorUrlProvider;
-import org.eclipse.che.ide.api.subversion.Credentials;
-import org.eclipse.che.ide.api.subversion.SubversionCredentialsDialog;
 import org.eclipse.che.ide.api.project.MutableProjectConfig;
 import org.eclipse.che.ide.api.project.wizard.ImportProjectNotificationSubscriberFactory;
 import org.eclipse.che.ide.api.project.wizard.ProjectNotificationSubscriber;
 import org.eclipse.che.ide.api.resources.Project;
+import org.eclipse.che.ide.api.subversion.Credentials;
+import org.eclipse.che.ide.api.subversion.SubversionCredentialsDialog;
 import org.eclipse.che.ide.api.wizard.Wizard.CompleteCallback;
 import org.eclipse.che.ide.resource.Path;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.ide.util.ExceptionUtils;
 import org.eclipse.che.security.oauth.OAuthStatus;
 
@@ -62,7 +61,6 @@ public class ProjectImporter extends AbstractImporter {
 
     private final CoreLocalizationConstant    localizationConstant;
     private final ProjectResolver             projectResolver;
-    private final String                      restContext;
     private final SubversionCredentialsDialog credentialsDialog;
     private final OAuth2AuthenticatorRegistry oAuth2AuthenticatorRegistry;
 
@@ -72,13 +70,11 @@ public ProjectImporter(CoreLocalizationConstant localizationConstant,
                            ImportProjectNotificationSubscriberFactory subscriberFactory,
                            AppContext appContext,
                            ProjectResolver projectResolver,
-                           @RestContext String restContext,
                            SubversionCredentialsDialog credentialsDialog,
                            OAuth2AuthenticatorRegistry oAuth2AuthenticatorRegistry) {
         super(appContext, subscriberFactory);
         this.localizationConstant = localizationConstant;
         this.projectResolver = projectResolver;
-        this.restContext = restContext;
         this.credentialsDialog = credentialsDialog;
         this.oAuth2AuthenticatorRegistry = oAuth2AuthenticatorRegistry;
     }
@@ -204,7 +200,7 @@ public void makeCall(final AsyncCallback<Project> callback) {
                     authenticator = oAuth2AuthenticatorRegistry.getAuthenticator("default");
                 }
 
-                authenticator.authenticate(OAuth2AuthenticatorUrlProvider.get(restContext, authenticateUrl),
+                authenticator.authenticate(OAuth2AuthenticatorUrlProvider.get(appContext.getMasterEndpoint(), authenticateUrl),
                                            new AsyncCallback<OAuthStatus>() {
                                                @Override
                                                public void onFailure(Throwable caught) {
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/user/UserProfileServiceClientImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/user/UserProfileServiceClientImpl.java
@@ -13,11 +13,11 @@
 import com.google.inject.Inject;
 
 import org.eclipse.che.api.user.shared.dto.ProfileDto;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.user.UserProfileServiceClient;
 import org.eclipse.che.ide.json.JsonHelper;
 import org.eclipse.che.ide.rest.AsyncRequestCallback;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.ide.ui.loaders.request.LoaderFactory;
 
 import javax.validation.constraints.NotNull;
@@ -38,12 +38,12 @@ public class UserProfileServiceClientImpl implements UserProfileServiceClient {
     private final AsyncRequestFactory asyncRequestFactory;
 
     @Inject
-    protected UserProfileServiceClientImpl(@RestContext String restContext,
+    protected UserProfileServiceClientImpl(AppContext appContext,
                                            LoaderFactory loaderFactory,
                                            AsyncRequestFactory asyncRequestFactory) {
         this.loaderFactory = loaderFactory;
         this.asyncRequestFactory = asyncRequestFactory;
-        PROFILE = restContext + "/profile/";
+        PROFILE = appContext.getMasterEndpoint() + "/profile/";
     }
 
     /** {@inheritDoc} */
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/user/UserServiceClientImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/user/UserServiceClientImpl.java
@@ -14,10 +14,10 @@
 
 import org.eclipse.che.api.user.shared.dto.UserDto;
 import org.eclipse.che.ide.MimeType;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.user.UserServiceClient;
 import org.eclipse.che.ide.rest.AsyncRequestCallback;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.ide.ui.loaders.request.LoaderFactory;
 
 import javax.validation.constraints.NotNull;
@@ -40,12 +40,12 @@ public class UserServiceClientImpl implements UserServiceClient {
     private final AsyncRequestFactory asyncRequestFactory;
 
     @Inject
-    protected UserServiceClientImpl(@RestContext String restContext,
+    protected UserServiceClientImpl(AppContext appContext,
                                     LoaderFactory loaderFactory,
                                     AsyncRequestFactory asyncRequestFactory) {
         this.loaderFactory = loaderFactory;
         this.asyncRequestFactory = asyncRequestFactory;
-        USER = restContext + "/user/";
+        USER = appContext.getMasterEndpoint() + "/user/";
         CREATE = USER + "create";
         FIND = USER + "find";
         PASSWORD = USER + "password";
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceServiceClientImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceServiceClientImpl.java
@@ -27,10 +27,10 @@
 import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto;
 import org.eclipse.che.api.workspace.shared.dto.WsAgentHealthStateDto;
 import org.eclipse.che.commons.annotation.Nullable;
+import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient;
 import org.eclipse.che.ide.rest.AsyncRequestFactory;
 import org.eclipse.che.ide.rest.DtoUnmarshallerFactory;
-import org.eclipse.che.ide.rest.RestContext;
 import org.eclipse.che.ide.ui.loaders.request.LoaderFactory;
 
 import javax.validation.constraints.NotNull;
@@ -61,14 +61,14 @@ public class WorkspaceServiceClientImpl implements WorkspaceServiceClient {
     private final String                 baseHttpUrl;
 
     @Inject
-    private WorkspaceServiceClientImpl(@RestContext String restContext,
+    private WorkspaceServiceClientImpl(AppContext appContext,
                                        DtoUnmarshallerFactory dtoUnmarshallerFactory,
                                        AsyncRequestFactory asyncRequestFactory,
                                        LoaderFactory loaderFactory) {
         this.dtoUnmarshallerFactory = dtoUnmarshallerFactory;
         this.asyncRequestFactory = asyncRequestFactory;
         this.loaderFactory = loaderFactory;
-        this.baseHttpUrl = restContext + "/workspace";
+        this.baseHttpUrl = appContext.getMasterEndpoint() + "/workspace";
     }
 
     @Override
diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java
@@ -95,7 +95,6 @@ public void setUp() {
                                        appContext,
                                        resolver,
                                        null,
-                                       null,
                                        null);
     }
 
diff --git a/ide/commons-gwt/src/main/java/org/eclipse/che/ide/rest/RestContext.java b/ide/commons-gwt/src/main/java/org/eclipse/che/ide/rest/RestContext.java
@@ -20,6 +20,7 @@
 /**
  * @author Vitaly Parfonov
  */
+@Deprecated
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.PARAMETER})
 @BindingAnnotation
diff --git a/ide/commons-gwt/src/main/java/org/eclipse/che/ide/rest/RestContextProvider.java b/ide/commons-gwt/src/main/java/org/eclipse/che/ide/rest/RestContextProvider.java
@@ -18,6 +18,7 @@
  *
  * @author Vitaly Parfonov
  */
+@Deprecated
 public class RestContextProvider implements Provider<String> {
 
 
diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/GitHubSshKeyUploader.java b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/GitHubSshKeyUploader.java
diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImpl.java
diff --git a/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenter.java b/plugins/plugin-github/che-plugin-github-ide/src/main/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenter.java
diff --git a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java
diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/RecipeScriptDownloadServiceClientImpl.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/RecipeScriptDownloadServiceClientImpl.java
diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/upload/UploadSshKeyPresenter.java b/plugins/plugin-machine/che-plugin-machine-ssh-client/src/main/java/org/eclipse/che/ide/ext/ssh/client/upload/UploadSshKeyPresenter.java
diff --git a/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/main/java/org/eclipse/che/plugin/ssh/key/client/upload/UploadSshKeyPresenter.java b/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/main/java/org/eclipse/che/plugin/ssh/key/client/upload/UploadSshKeyPresenter.java
diff --git a/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/WorkspaceHolder.java b/wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/project/server/WorkspaceHolder.java

Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,5 @@ public Promise<Project> apply(PromiseError error) throws FunctionException {`
`75`	`75`	`* @return returns instance of Promise`
`76`	`76`	`*/`
`77`	`77`	`protected abstract Promise<Project> importProject(Path path, SourceStorage sourceStorage);`
	`78`	`+`
`78`	`79`	`}`