public MergeRequestImpl(org.eclipse.che.api.git.shared.MergeRequest origin) { this.commit = origin.getCommit(); }
@Override public Promise<MergeResult> merge(Path project, String commit) { MergeRequest mergeRequest = dtoFactory.createDto(MergeRequest.class).withCommit(commit); String url = getWsAgentBaseUrl() + MERGE + "?projectPath=" + encodePath(project); return asyncRequestFactory .createPostRequest(url, mergeRequest) .loader(loader) .header(ACCEPT, APPLICATION_JSON) .send(dtoUnmarshallerFactory.newUnmarshaller(MergeResult.class)); }
@POST @Path("merge") @Consumes(MediaType.APPLICATION_JSON) @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN}) public MergeResult merge(MergeRequest request) throws ApiException { try (GitConnection gitConnection = getGitConnection()) { return gitConnection.merge(request.getCommit()); } }