CODENVY-191: Add client and implementation for factory update and github pull request update

Author: akorneta

core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClient.java

@@ -61,7 +61,7 @@ public interface FactoryServiceClient {
     void getFactoryJson(@NotNull String workspaceId, @NotNull String path, @NotNull AsyncRequestCallback<Factory> callback);
 
     /**
-     * Save factory to storage.
+     * Get factory as JSON.
      *
      * @param workspaceId
      *         workspace id
@@ -90,4 +90,15 @@ public interface FactoryServiceClient {
      * @return a promise that will provide a list of {@link Factory}s, or rejects with an error
      */
     Promise<List<Factory>> findFactory(Integer skipCount, Integer maxItems, List<Pair<String, String>> params);
+
+    /**
+     * Updates factory by id
+     *
+     * @param id
+     *         factory identifier
+     * @param factory
+     *         update body
+     * @return updated factory
+     */
+    Promise<Factory> updateFactory(String id, Factory factory);
 }

core/platform-api-client-gwt/che-core-client-gwt-factory/src/main/java/org/eclipse/che/api/factory/gwt/client/FactoryServiceClientImpl.java

@@ -11,6 +11,7 @@
 package org.eclipse.che.api.factory.gwt.client;
 
 import com.google.common.base.Joiner;
+import com.google.gwt.http.client.RequestBuilder;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -85,7 +86,7 @@ public void getFactoryJson(String workspaceId, String path, AsyncRequestCallback
         }
         asyncRequestFactory.createGetRequest(url.toString())
                            .header(HTTPHeader.ACCEPT, MimeType.APPLICATION_JSON)
-                            .loader(loaderFactory.newLoader("Getting info about factory..."))
+                           .loader(loaderFactory.newLoader("Getting info about factory..."))
                            .send(callback);
     }
 
@@ -132,6 +133,14 @@ public Promise<List<Factory>> findFactory(@Nullable Integer skipCount,
                                   .send(unmarshallerFactory.newListUnmarshaller(Factory.class));
     }
 
+    @Override
+    public Promise<Factory> updateFactory(String id, Factory factory) {
+        return asyncRequestFactory.createRequest(RequestBuilder.PUT, API_FACTORY_BASE_URL + id, factory, false)
+                                  .header(HTTPHeader.CONTENT_TYPE, MimeType.APPLICATION_JSON)
+                                  .loader(loaderFactory.newLoader("Updating factory..."))
+                                  .send(unmarshallerFactory.newUnmarshaller(Factory.class));
+    }
+
     /**
      * Forms the query string from collection of query params
      *

core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClient.java

@@ -350,13 +350,36 @@ void pull(String workspaceId,
      * @param callback
      *         callback
      * @throws WebSocketException
+     * @deprecated use {@link #push(String, ProjectConfigDto, List, String , boolean)}
      */
+    @Deprecated
     void push(String workspaceId,
               ProjectConfigDto project,
               List<String> refSpec,
               String remote, boolean force,
               AsyncRequestCallback<PushResponse> callback);
 
+
+    /**
+     * Push changes from local repository to remote one (sends request over WebSocket).
+     *
+     * @param wsId
+     *         id of current workspace
+     * @param project
+     *         project
+     * @param refSpec
+     *         list of refspec to push
+     * @param remote
+     *         remote repository name or url
+     * @param force
+     *         push refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. If <code>true</code>
+     *         disables the check. This can cause the remote repository to lose commits
+     */
+    Promise<PushResponse> push(String wsId,
+                               ProjectConfigDto project,
+                               List<String> refSpec,
+                               String remote,
+                               boolean force);
     /**
      * Clones one remote repository to local one (over WebSocket).
      *

core/platform-api-client-gwt/che-core-client-gwt-git/src/main/java/org/eclipse/che/api/git/gwt/client/GitServiceClientImpl.java

@@ -288,6 +288,16 @@ public void push(String workspaceId,
         asyncRequestFactory.createPostRequest(url, pushRequest).send(callback);
     }
 
+    @Override
+    public Promise<PushResponse> push(String wsId, ProjectConfigDto project, List<String> refSpec, String remote, boolean force) {
+        PushRequest pushRequest = dtoFactory.createDto(PushRequest.class)
+                                            .withRemote(remote)
+                                            .withRefSpec(refSpec)
+                                            .withForce(force);
+        return asyncRequestFactory.createPostRequest(extPath + "/git/" + wsId + PUSH + "?projectPath=" + project.getPath(), pushRequest)
+                                  .send(dtoUnmarshallerFactory.newUnmarshaller(PushResponse.class));
+    }
+
     /** {@inheritDoc} */
     @Override
     public void remoteList(String workspaceId,

plugins/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/client/GitHubClientService.java

@@ -275,4 +275,22 @@ Promise<GitHubPullRequest> createPullRequest(@NotNull String user,
      *         callback called when operation is done.
      */
     void updatePublicKey(@NotNull AsyncRequestCallback<Void> callback);
-}
+
+    /**
+     * Updates github pull request
+     *
+     * @param user
+     *         repository owner
+     * @param repository
+     *         name of repository
+     * @param pullRequestId
+     *         pull request identifier
+     * @param pullRequest
+     *         update body
+     * @return updated pull request
+     */
+    Promise<GitHubPullRequest> updatePullRequest(String user,
+                                                 String repository,
+                                                 String pullRequestId,
+                                                 GitHubPullRequest pullRequest);
+}

plugins/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/client/GitHubClientServiceImpl.java

@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.che.ide.ext.github.client;
 
+import com.google.gwt.http.client.RequestBuilder;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -240,4 +241,15 @@ public void updatePublicKey(@NotNull AsyncRequestCallback<Void> callback) {
         String url = baseUrl + SSH_GEN;
         asyncRequestFactory.createPostRequest(url, null).loader(loader).send(callback);
     }
+
+    @Override
+    public Promise<GitHubPullRequest> updatePullRequest(String owner,
+                                                        String repository,
+                                                        String pullRequestId,
+                                                        GitHubPullRequest updateInput) {
+        final String url = baseUrl + PULL_REQUEST + '/' + owner + '/' + repository + '/' + pullRequestId;
+        return asyncRequestFactory.createRequest(RequestBuilder.PUT, url, updateInput, false)
+                                  .loader(loader)
+                                  .send(dtoUnmarshallerFactory.newUnmarshaller(GitHubPullRequest.class));
+    }
 }

plugins/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/server/GitHubDTOFactory.java

@@ -177,6 +177,8 @@ public GitHubPullRequest createPullRequest(GHPullRequest ghPullRequest) throws I
         dtoPullRequest.setState(ghPullRequest.getState().toString());
         dtoPullRequest.setHead(createPullRequestHead(ghPullRequest.getHead()));
         dtoPullRequest.setMerged(ghPullRequest.isMerged());
+        dtoPullRequest.setBody(ghPullRequest.getBody());
+        dtoPullRequest.setTitle(ghPullRequest.getTitle());
         if (ghPullRequest.getMergedBy() != null) {
             dtoPullRequest.setMergedBy(createUser(ghPullRequest.getMergedBy()));
         }

plugins/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/server/rest/GitHubService.java

@@ -13,6 +13,7 @@
 import org.eclipse.che.api.core.ApiException;
 import org.eclipse.che.api.core.NotFoundException;
 import org.eclipse.che.api.core.ServerException;
+import org.eclipse.che.api.core.UnauthorizedException;
 import org.eclipse.che.api.git.GitException;
 import org.eclipse.che.api.ssh.server.SshServiceClient;
 import org.eclipse.che.api.ssh.shared.dto.GenerateSshPairRequest;
@@ -38,6 +39,7 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -233,6 +235,36 @@ public GitHubPullRequest createPullRequest(@PathParam("user") String user, @Path
         }
     }
 
+    @PUT
+    @Path("pullrequest/{user}/{repository}/{pullRequestId}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public GitHubPullRequest updatePullRequest(@PathParam("user")
+                                               String user,
+                                               @PathParam("repository")
+                                               String repository,
+                                               @PathParam("pullRequestId")
+                                               String pullRequestId,
+                                               GitHubPullRequest pullRequest) throws ServerException,
+                                                                                     UnauthorizedException {
+        try {
+            final GHPullRequest ghPullRequest = gitHubFactory.connect()
+                                                             .getUser(user)
+                                                             .getRepository(repository)
+                                                             .getPullRequest(Integer.valueOf(pullRequestId));
+            final String body = pullRequest.getBody();
+            if (body != null && !body.equals(ghPullRequest.getBody())) {
+                ghPullRequest.setBody(body);
+            }
+            final String title = pullRequest.getTitle();
+            if (title != null && !title.equals(ghPullRequest.getTitle())) {
+                ghPullRequest.setTitle(title);
+            }
+            return gitHubDTOFactory.createPullRequest(ghPullRequest);
+        } catch (IOException ioEx) {
+            throw new ServerException(ioEx.getMessage());
+        }
+    }
+
     @GET
     @Path("orgs")
     @Produces(MediaType.APPLICATION_JSON)

plugins/plugin-github/che-plugin-github-ext-github/src/main/java/org/eclipse/che/ide/ext/github/shared/GitHubPullRequest.java

@@ -112,4 +112,26 @@ public interface GitHubPullRequest {
     void setMergeable(boolean mergeable);
 
     GitHubPullRequest withMergeable(boolean mergeable);
+
+    /**
+     * Get pull request body.
+     *
+     * @return {@link String} body
+     */
+    String getBody();
+
+    void setBody(String body);
+
+    GitHubPullRequest withBody(String body);
+
+    /**
+     * Get pull request title.
+     *
+     * @return {@link String} title
+     */
+    String getTitle();
+
+    void setTitle(String title);
+
+    GitHubPullRequest withTitle(String title);
 }