Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
added GitlabProjectMember, GitlabMilestone and fixed the editIssue
method
  • Loading branch information
pweingardt committed Mar 11, 2014
commit 19eeb591b581c672ebcd247c33d12f15f609a24d
33 changes: 25 additions & 8 deletions src/main/java/org/gitlab/api/GitlabAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
import org.gitlab.api.models.GitlabCommit;
import org.gitlab.api.models.GitlabIssue;
import org.gitlab.api.models.GitlabMergeRequest;
import org.gitlab.api.models.GitlabMilestone;
import org.gitlab.api.models.GitlabNote;
import org.gitlab.api.models.GitlabProject;
import org.gitlab.api.models.GitlabProjectHook;
import org.gitlab.api.models.GitlabSession;
import org.gitlab.api.models.GitlabProjectMember;

/**
* Gitlab API Wrapper class
Expand Down Expand Up @@ -257,14 +259,11 @@ private void applyIssue(GitlabHTTPRequestor requestor, int projectId,

requestor.with("title", title)
.with("description", description)
.with("labels", labels);

if (assigneeId != 0) {
requestor.with("assignee_id", assigneeId);
}

if (milestoneId != 0) {
requestor.with("milestone_id", milestoneId);
.with("labels", labels)
.with("milestone_id", milestoneId);

if(assigneeId != 0) {
requestor.with("assignee_id", assigneeId == -1 ? 0 : assigneeId);
}
}

Expand All @@ -283,4 +282,22 @@ public GitlabNote createNote(Integer projectId, Integer issueId, String message)
public GitlabNote createNote(GitlabIssue issue, String message) throws IOException {
return createNote(issue.getProjectId(), issue.getId(), message);
}

public List<GitlabMilestone> getMilestones(GitlabProject project) throws IOException {
return getMilestones(project.getId());
}

public List<GitlabMilestone> getMilestones(Integer projectId) throws IOException {
String tailUrl = GitlabProject.URL + "/" + projectId + GitlabMilestone.URL;
return Arrays.asList(retrieve().to(tailUrl, GitlabMilestone[].class));
}

public List<GitlabProjectMember> getProjectMembers(GitlabProject project) throws IOException {
return getProjectMembers(project.getId());
}

public List<GitlabProjectMember> getProjectMembers(Integer projectId) throws IOException {
String tailUrl = GitlabProject.URL + "/" + projectId + GitlabProjectMember.URL;
return Arrays.asList(retrieve().to(tailUrl, GitlabProjectMember[].class));
}
}
6 changes: 3 additions & 3 deletions src/main/java/org/gitlab/api/models/GitlabIssue.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public enum Action {
private String _title;
private String _description;
private String[] _labels;
private String _milestone;
private GitlabMilestone _milestone;

private GitlabUser _assignee;
private GitlabUser _author;
Expand Down Expand Up @@ -84,11 +84,11 @@ public void setLabels(String[] labels) {
_labels = labels;
}

public String getMilestone() {
public GitlabMilestone getMilestone() {
return _milestone;
}

public void setMilestone(String milestone) {
public void setMilestone(GitlabMilestone milestone) {
_milestone = milestone;
}

Expand Down
100 changes: 100 additions & 0 deletions src/main/java/org/gitlab/api/models/GitlabMilestone.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
package org.gitlab.api.models;

import java.util.Date;

import org.codehaus.jackson.annotate.JsonProperty;

public class GitlabMilestone {

public static final String URL = "/milestones";

private int _id;
private int _iid;
private int _projectId;
private String _title;
private String _description;

@JsonProperty("due_date")
private Date _dueDate;

private String _state;

@JsonProperty("updated_date")
private Date _updatedDate;

@JsonProperty("created_date")
private Date _createdDate;

public int getId() {
return _id;
}

public void setId(int id) {
_id = id;
}

public int getIid() {
return _iid;
}

public void setIid(int iid) {
_iid = iid;
}

public int getProjectId() {
return _projectId;
}

public void setProjectId(int projectId) {
_projectId = projectId;
}

public String getTitle() {
return _title;
}

public void setTitle(String title) {
_title = title;
}

public String getDescription() {
return _description;
}

public void setDescription(String description) {
_description = description;
}

public Date getDueDate() {
return _dueDate;
}

public void setDueDate(Date dueDate) {
_dueDate = dueDate;
}

public String getState() {
return _state;
}

public void setState(String state) {
_state = state;
}

public Date getUpdatedDate() {
return _updatedDate;
}

public void setUpdatedDate(Date updatedDate) {
_updatedDate = updatedDate;
}

public Date getCreatedDate() {
return _createdDate;
}

public void setCreatedDate(Date createdDate) {
_createdDate = createdDate;
}

}
17 changes: 17 additions & 0 deletions src/main/java/org/gitlab/api/models/GitlabProjectMember.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package org.gitlab.api.models;

public class GitlabProjectMember extends GitlabUser {

public static final String URL = "/members";

private int _accessLevel;

public int getAccessLevel() {
return _accessLevel;
}

public void setAccessLevel(int accessLevel) {
_accessLevel = accessLevel;
}

}