The Unified and Autonomous Development Platform
Add minimum github endpoints to work with Jenkins
Robin Shencd1bcd8a1597
diff --git a/rest/src/main/java/com/gitplex/server/rest/RestConstants.java b/rest/src/main/java/com/gitplex/server/rest/RestConstants.javaindex b2f726bfa7..6584285e1c 100644--- a/rest/src/main/java/com/gitplex/server/rest/RestConstants.java+++ b/rest/src/main/java/com/gitplex/server/rest/RestConstants.java@@ -8,4 +8,6 @@ public class RestConstants {public static final String JSON_UTF8 = MediaType.APPLICATION_JSON + ";charset=utf-8";+ public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";+}diff --git a/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.java b/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.javaindex c539f5dcc9..ac77b870c7 100644--- a/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/github/CommitStatusResource.java@@ -1,12 +1,11 @@package com.gitplex.server.rest.github;+import java.io.IOException;import java.util.Date;import java.util.Map;import javax.inject.Inject;import javax.inject.Singleton;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;import javax.ws.rs.Consumes;import javax.ws.rs.POST;import javax.ws.rs.Path;@@ -14,12 +13,14 @@ import javax.ws.rs.PathParam;import javax.ws.rs.Produces;import javax.ws.rs.core.Context;import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.MultivaluedMap;import javax.ws.rs.core.Response;import javax.ws.rs.core.UriBuilder;import javax.ws.rs.core.UriInfo;import org.apache.shiro.authz.UnauthorizedException;+import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.VerificationManager;import com.gitplex.server.model.Project;@@ -38,21 +39,26 @@ public class CommitStatusResource {private final VerificationManager verificationManager;+ private final ObjectMapper objectMapper;+@Inject- public CommitStatusResource(ProjectManager projectManager, VerificationManager verificationManager) {+ public CommitStatusResource(ProjectManager projectManager, VerificationManager verificationManager,+ ObjectMapper objectMapper) {this.projectManager = projectManager;this.verificationManager = verificationManager;+ this.objectMapper = objectMapper;}private Project getProject(String projectName) {return Preconditions.checkNotNull(projectManager.find(projectName));}+ @Consumes(MediaType.APPLICATION_JSON)@Path("/{projectName}/statuses/{commit}")@POSTpublic Response save(@PathParam("projectName") String projectName, @PathParam("commit") String commit,- @NotNull @Valid Map<String, String> commitStatus, @Context UriInfo uriInfo) {-+ Map<String, String> commitStatus, @Context UriInfo uriInfo) {+Project project = getProject(projectName);if (!SecurityUtils.canWrite(project))throw new UnauthorizedException();@@ -70,5 +76,19 @@ public class CommitStatusResource {return Response.created(uriBuilder.build()).entity(commitStatus).type(RestConstants.JSON_UTF8).build();}++ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)+ @Path("/{projectName}/statuses/{commit}")+ @POST+ public Response save(@PathParam("projectName") String projectName, @PathParam("commit") String commit,+ MultivaluedMap<String, String> map, @Context UriInfo uriInfo) {+ try {+ @SuppressWarnings("unchecked")+ Map<String, String> commitStatus = objectMapper.readValue(map.keySet().iterator().next(), Map.class);+ return save(projectName, commit, commitStatus, uriInfo);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }}diff --git a/rest/src/main/java/com/gitplex/server/rest/github/IssueCommentResource.java b/rest/src/main/java/com/gitplex/server/rest/github/IssueCommentResource.javaindex 0bcfa51db0..a82e7d3b3e 100644--- a/rest/src/main/java/com/gitplex/server/rest/github/IssueCommentResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/github/IssueCommentResource.java@@ -1,7 +1,10 @@package com.gitplex.server.rest.github;+import java.util.ArrayList;+import javax.inject.Singleton;import javax.ws.rs.Consumes;+import javax.ws.rs.GET;import javax.ws.rs.POST;import javax.ws.rs.Path;import javax.ws.rs.PathParam;@@ -11,6 +14,8 @@ import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;import javax.ws.rs.core.UriInfo;+import com.gitplex.server.rest.RestConstants;+@Path("/repos/projects")@Consumes(MediaType.WILDCARD)@Produces(MediaType.WILDCARD)@@ -24,4 +29,11 @@ public class IssueCommentResource {return Response.created(uriInfo.getAbsolutePath()).build();}+ @Path("/{projectName}/issues/{issueNumber}/comments")+ @GET+ public Response list(@PathParam("projectName") String projectName,+ @PathParam("issueNumber") Long issueNumber, @Context UriInfo uriInfo) {+ return Response.ok(new ArrayList<>(), RestConstants.JSON_UTF8).build();+ }+}diff --git a/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.java b/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.javaindex 50ae6e6a6a..600f7632cb 100644--- a/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/github/PullRequestResource.java@@ -1,6 +1,8 @@package com.gitplex.server.rest.github;+import java.text.SimpleDateFormat;import java.util.ArrayList;+import java.util.Date;import java.util.HashMap;import java.util.List;import java.util.Map;@@ -13,10 +15,13 @@ import javax.ws.rs.Path;import javax.ws.rs.PathParam;import javax.ws.rs.Produces;import javax.ws.rs.QueryParam;+import javax.ws.rs.core.Context;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;+import javax.ws.rs.core.UriInfo;import org.apache.shiro.authz.UnauthorizedException;+import org.eclipse.jgit.revwalk.RevCommit;import org.hibernate.criterion.Restrictions;import com.gitplex.server.manager.ProjectManager;@@ -49,13 +54,124 @@ public class PullRequestResource {return Preconditions.checkNotNull(projectManager.find(projectName));}+ @Path("/{name}/pulls/{pullRequestNumber}")+ @GET+ public Response getPullRequest(@PathParam("name") String projectName,+ @PathParam("pullRequestNumber") Long pullRequestNumber, @Context UriInfo uriInfo) {+ Project project = getProject(projectName);++ if (!SecurityUtils.canRead(project))+ throw new UnauthorizedException("Unauthorized access to project '" + projectName + "'");++ PullRequest request = Preconditions.checkNotNull(pullRequestManager.find(project, pullRequestNumber));++ Map<String, Object> entity = getRequestMap(request, uriInfo);+ return Response.ok(entity, RestConstants.JSON_UTF8).build();+ }++ @Path("/{name}/pulls/{pullRequestNumber}/commits")+ @GET+ public Response getCommits(@PathParam("name") String projectName,+ @PathParam("pullRequestNumber") Long pullRequestNumber) {+ Project project = getProject(projectName);++ if (!SecurityUtils.canRead(project))+ throw new UnauthorizedException("Unauthorized access to project '" + projectName + "'");++ PullRequest request = pullRequestManager.find(project, pullRequestNumber);+ List<Map<String, Object>> entity = new ArrayList<>();+ for (RevCommit commit: request.getCommits()) {+ Map<String, Object> commitMap = new HashMap<>();+ commitMap.put("sha", commit.name());++ Map<String, Object> commitDetailMap = new HashMap<>();+ Map<String, String> authorMap = new HashMap<>();+ authorMap.put("name", commit.getAuthorIdent().getName());+ authorMap.put("email", commit.getAuthorIdent().getEmailAddress());+ authorMap.put("date", new SimpleDateFormat(RestConstants.DATE_FORMAT).format(commit.getAuthorIdent().getWhen()));+ commitDetailMap.put("author", authorMap);++ Map<String, String> committerMap = new HashMap<>();+ committerMap.put("name", commit.getCommitterIdent().getName());+ committerMap.put("email", commit.getCommitterIdent().getEmailAddress());+ committerMap.put("date", new SimpleDateFormat(RestConstants.DATE_FORMAT).format(commit.getCommitterIdent().getWhen()));+ commitDetailMap.put("committer", authorMap);++ commitMap.put("commit", commitDetailMap);++ entity.add(commitMap);+ }+ return Response.ok(entity, RestConstants.JSON_UTF8).build();+ }++ private Map<String, Object> getRequestMap(PullRequest request, UriInfo uriInfo) {+ Map<String, Object> requestMap = new HashMap<>();+ requestMap.put("number", String.valueOf(request.getNumber()));+ if (request.isOpen())+ requestMap.put("state", "open");+ else+ requestMap.put("state", "closed");+ requestMap.put("title", request.getTitle());+ MergePreview preview = request.getMergePreview();+ if (preview != null && preview.getMerged() != null) {+ requestMap.put("merge_commit_sha", preview.getMerged());+ if (request.isOpen())+ requestMap.put("mergeable", "true");+ } else {+ requestMap.put("mergeable", "false");+ }+ if (request.isMerged()) {+ requestMap.put("merged", "true");+ } else {+ requestMap.put("merged", "false");+ }++ Map<String, Object> headMap = new HashMap<>();+ if (request.getSourceBranch() != null)+ headMap.put("ref", request.getSourceBranch());+ headMap.put("sha", request.getHeadCommitHash());+ requestMap.put("head", headMap);++ Map<String, Object> baseMap = new HashMap<>();+ baseMap.put("ref", request.getTargetBranch());+ baseMap.put("sha", request.getBaseCommitHash());+ requestMap.put("base", baseMap);++ if (request.getSubmitter() != null) {+ Map<String, Object> userMap = new HashMap<>();+ userMap.put("name", request.getSubmitter().getFullName());+ userMap.put("login", request.getSubmitter().getName());+ userMap.put("id", "1000000");+ userMap.put("type", "User");+ userMap.put("site_admin", SecurityUtils.isAdministrator());+ userMap.put("created_at", new SimpleDateFormat(RestConstants.DATE_FORMAT).format(new Date()));+ requestMap.put("user", userMap);+ }++ String url = uriInfo.getBaseUriBuilder()+ .path("repos").path("projects")+ .path(request.getTargetProject().getName())+ .path("pulls").path(String.valueOf(request.getNumber()))+ .build().toString();+ requestMap.put("url", url);++ SimpleDateFormat sdf = new SimpleDateFormat(RestConstants.DATE_FORMAT);+ requestMap.put("created_at", sdf.format(request.getSortedUpdates().get(0).getDate()));+ requestMap.put("updated_at", sdf.format(request.getLatestUpdate().getDate()));++ if (!request.isOpen()) {+ requestMap.put("closed_at", sdf.format(request.getCloseInfo().getCloseDate()));+ }++ return requestMap;+ }+@Path("/{name}/pulls")@GETpublic Response query(@PathParam("name") String projectName, @QueryParam("base") String branch,@QueryParam("state") String state, @QueryParam("per_page") Integer perPage,- @QueryParam("page") Integer page) {-+ @QueryParam("page") Integer page, @Context UriInfo uriInfo) {Project project = getProject(projectName);if (!SecurityUtils.canRead(project))@@ -81,30 +197,9 @@ public class PullRequestResource {List<Map<String, Object>> entity = new ArrayList<>();for (PullRequest request: pullRequestManager.findRange(criteria, page, perPage)) {- Map<String, Object> map = new HashMap<>();- map.put("number", String.valueOf(request.getNumber()));- if (request.isOpen())- map.put("state", "open");- else- map.put("state", "closed");- map.put("title", request.getTitle());- MergePreview preview = request.getMergePreview();- if (preview != null && preview.getMerged() != null)- map.put("merge_commit_sha", preview.getMerged());-- Map<String, Object> headMap = new HashMap<>();- if (request.getSourceBranch() != null)- headMap.put("ref", request.getSourceBranch());- headMap.put("sha", request.getHeadCommitHash());- map.put("head", headMap);-- Map<String, Object> baseMap = new HashMap<>();- baseMap.put("ref", request.getTargetBranch());- baseMap.put("sha", request.getBaseCommitHash());- map.put("base", baseMap);-- entity.add(map);+ entity.add(getRequestMap(request, uriInfo));}+return Response.ok(entity, RestConstants.JSON_UTF8).build();}diff --git a/rest/src/main/java/com/gitplex/server/rest/github/RepositoryResource.java b/rest/src/main/java/com/gitplex/server/rest/github/RepositoryResource.javaindex 600a2b11ec..9a9add46a8 100644--- a/rest/src/main/java/com/gitplex/server/rest/github/RepositoryResource.java+++ b/rest/src/main/java/com/gitplex/server/rest/github/RepositoryResource.java@@ -43,11 +43,18 @@ public class RepositoryResource {} else {Map<String, Object> entity = new HashMap<>();Map<String, String> permissionsMap = new HashMap<>();+ entity.put("name", project.getName());permissionsMap.put("admin", String.valueOf(SecurityUtils.canManage(project)));permissionsMap.put("push", String.valueOf(SecurityUtils.canWrite(project)));permissionsMap.put("pull", "true");entity.put("permissions", permissionsMap);- entity.put("name", project.getName());++ Map<String, String> ownerMap = new HashMap<>();+ ownerMap.put("login", "projects");+ ownerMap.put("id", "1000000");++ entity.put("owner", ownerMap);+return Response.ok(entity, RestConstants.JSON_UTF8).build();}}diff --git a/rest/src/main/java/com/gitplex/server/rest/github/UserResource.java b/rest/src/main/java/com/gitplex/server/rest/github/UserResource.javanew file mode 100644index 0000000000..c4c3baa2c5--- /dev/null+++ b/rest/src/main/java/com/gitplex/server/rest/github/UserResource.java@@ -0,0 +1,56 @@+package com.gitplex.server.rest.github;++import java.io.IOException;+import java.text.SimpleDateFormat;+import java.util.Date;+import java.util.HashMap;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.ws.rs.Consumes;+import javax.ws.rs.GET;+import javax.ws.rs.Path;+import javax.ws.rs.Produces;+import javax.ws.rs.core.Context;+import javax.ws.rs.core.MediaType;+import javax.ws.rs.core.Response;+import javax.ws.rs.core.UriInfo;++import com.fasterxml.jackson.core.JsonParseException;+import com.fasterxml.jackson.databind.JsonMappingException;+import com.gitplex.server.manager.UserManager;+import com.gitplex.server.model.User;+import com.gitplex.server.rest.RestConstants;+import com.gitplex.server.security.SecurityUtils;++@Path("/user")+@Consumes(MediaType.WILDCARD)+@Produces(MediaType.WILDCARD)+@Singleton+public class UserResource {++ private final UserManager userManager;++ @Inject+ public UserResource(UserManager userManager) {+ this.userManager = userManager;+ }++ @GET+ public Response get(@Context UriInfo uriInfo) throws JsonParseException, JsonMappingException, IOException {+ Map<String, Object> entity = new HashMap<>();++ User user = userManager.getCurrent();+ entity.put("name", user.getFullName());+ entity.put("login", user.getName());+ entity.put("id", "1000000");+ entity.put("type", "User");+ entity.put("url", uriInfo.getBaseUri().toString() + "/users/" + user.getName());+ entity.put("site_admin", SecurityUtils.isAdministrator());+ entity.put("created_at", new SimpleDateFormat(RestConstants.DATE_FORMAT).format(new Date()));++ return Response.ok(entity, RestConstants.JSON_UTF8).build();+ }++}