Skip to content

J
java-gitlab-api
Commit 71efa977 authored by timols's avatar timols
Browse files
Options

Updated code conventions to not use _ variables, fixed whitespace, resolved backwards compat issues

parent 3dbfade8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1075 additions and 1091 deletions
src/main/java/org/gitlab/api/GitlabAPI.java
View file @ 71efa977
This diff is collapsed.
src/main/java/org/gitlab/api/http/Query.java
View file @ 71efa977
......@@ -16,6 +16,7 @@ public class Query {
private class Tuple<T1, T2> {
T1 _1;
T2 _2;
public Tuple(T1 _1, T2 _2) {
this._1 = _1;
this._2 = _2;
......@@ -33,11 +34,10 @@ public class Query {
*
* @param name Parameter name
* @param value Parameter value
*
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
*/
public Query append(final String name, final String value) throws UnsupportedEncodingException {
params.add(new Tuple(name, new Tuple(value, URLEncoder.encode(value, "UTF-8"))));
params.add(new Tuple<String, Tuple<String, String>>(name, new Tuple<String, String>(value, URLEncoder.encode(value, "UTF-8"))));
return this;
}
......@@ -47,11 +47,10 @@ public class Query {
*
* @param name Parameter name
* @param value Parameter value
*
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
*/
public Query appendIf(final String name, final String value) throws UnsupportedEncodingException {
if(value != null) {
if (value != null) {
append(name, value);
}
return this;
......@@ -63,11 +62,10 @@ public class Query {
*
* @param name Parameter name
* @param value Parameter value
*
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
*/
public Query appendIf(final String name, final Integer value) throws UnsupportedEncodingException {
if(value != null) {
if (value != null) {
append(name, value.toString());
}
return this;
......@@ -79,11 +77,10 @@ public class Query {
*
* @param name Parameter name
* @param value Parameter value
*
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
*/
public Query appendIf(final String name, final Boolean value) throws UnsupportedEncodingException {
if(value != null) {
if (value != null) {
append(name, value.toString());
}
return this;
......@@ -95,11 +92,10 @@ public class Query {
*
* @param name Parameter name
* @param value Parameter value
*
* @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded
*/
public Query appendIf(final String name, final GitlabAccessLevel value) throws UnsupportedEncodingException {
if(value != null) {
if (value != null) {
append(name, Integer.toString(value.accessValue));
}
return this;
......@@ -113,8 +109,8 @@ public class Query {
public String toString() {
final StringBuilder builder = new StringBuilder();
for(final Tuple<String, Tuple<String, String>> param : params) {
if(builder.length() == 0) {
for (final Tuple<String, Tuple<String, String>> param : params) {
if (builder.length() == 0) {
builder.append('?');
} else {
builder.append('&');
......
src/main/java/org/gitlab/api/models/GitlabAbstractMember.java
View file @ 71efa977
......@@ -7,14 +7,14 @@ public abstract class GitlabAbstractMember extends GitlabUser {
public static final String URL = "/members";
@JsonProperty("access_level")
private int _accessLevel;
private int accessLevel;
public GitlabAccessLevel getAccessLevel() {
return GitlabAccessLevel.fromAccessValue(_accessLevel);
return GitlabAccessLevel.fromAccessValue(accessLevel);
}
public void setAccessLevel(GitlabAccessLevel accessLevel) {
_accessLevel = accessLevel.accessValue;
this.accessLevel = accessLevel.accessValue;
}
}
src/main/java/org/gitlab/api/models/GitlabAccessLevel.java
View file @ 71efa977
......@@ -9,13 +9,14 @@ public enum GitlabAccessLevel {
Owner(50);
public final int accessValue;
GitlabAccessLevel(int accessValue) {
this.accessValue = accessValue;
}
public static GitlabAccessLevel fromAccessValue(final int accessValue) throws IllegalArgumentException {
for(final GitlabAccessLevel gitlabAccessLevel : GitlabAccessLevel.values()) {
if(gitlabAccessLevel.accessValue == accessValue) {
for (final GitlabAccessLevel gitlabAccessLevel : GitlabAccessLevel.values()) {
if (gitlabAccessLevel.accessValue == accessValue) {
return gitlabAccessLevel;
}
}
......
src/main/java/org/gitlab/api/models/GitlabBranch.java
View file @ 71efa977
......@@ -6,35 +6,35 @@ public class GitlabBranch {
public final static String URL = "/repository/branches/";
@JsonProperty("name")
private String _name;
private String name;
@JsonProperty("commit")
private GitlabBranchCommit _commit;
private GitlabBranchCommit commit;
@JsonProperty("protected")
private boolean _protected;
private boolean branchProtected;
public String getName() {
return _name;
return name;
}
public void setName(String name) {
this._name = name;
this.name = name;
}
public GitlabBranchCommit getCommit() {
return _commit;
return commit;
}
public void setCommit(GitlabBranchCommit commit) {
this._commit = commit;
this.commit = commit;
}
public boolean isProtected() {
return _protected;
return branchProtected;
}
public void setProtected(boolean isProtected) {
this._protected = isProtected;
this.branchProtected = isProtected;
}
}
src/main/java/org/gitlab/api/models/GitlabBranchCommit.java
View file @ 71efa977
package org.gitlab.api.models;
import org.gitlab.api.models.GitlabUser;
import org.codehaus.jackson.annotate.JsonProperty;
import java.lang.String;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonProperty;
public class GitlabBranchCommit {
public static String URL = "/users";
private String _id;
private String _tree;
private String _message;
private GitlabUser _author;
private GitlabUser _committer;
private String id;
private String tree;
private String message;
private GitlabUser author;
private GitlabUser committer;
@JsonProperty("authored_date")
private Date _authoredDate;
private Date authoredDate;
@JsonProperty("committed_date")
private Date _committedDate;
private Date committedDate;
public String getId() {
return _id;
return id;
}
public void setId(String id) {
_id = id;
this.id = id;
}
public String getTree() {
return _tree;
return tree;
}
public void setTree(String tree) {
_tree = tree;
this.tree = tree;
}
public String getMessage() {
return _message;
return message;
}
public void setMessage(String message) {
_message = message;
this.message = message;
}
public GitlabUser getAuthor() {
return _author;
return author;
}
public void setAuthor(GitlabUser author) {
_author = author;
this.author = author;
}
public GitlabUser getCommitter() {
return _committer;
return committer;
}
public void setCommitter(GitlabUser committer) {
_committer = committer;
this.committer = committer;
}
public Date getAuthoredDate() {
return _authoredDate;
return authoredDate;
}
public void setAuthoredDate(Date authoredDate) {
_authoredDate = authoredDate;
this.authoredDate = authoredDate;
}
public Date getCommittedDate() {
return _committedDate;
return committedDate;
}
public void setCommittedDate(Date committedDate) {
_committedDate = committedDate;
this.committedDate = committedDate;
}
}
src/main/java/org/gitlab/api/models/GitlabCommit.java
View file @ 71efa977
package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
import java.util.List;
import org.codehaus.jackson.annotate.JsonProperty;
public class GitlabCommit {
public final static String URL = "/commits";
private String _id;
private String _title;
private String _description;
private String id;
private String title;
private String description;
@JsonProperty("short_id")
private String _shortId;
private String shortId;
@JsonProperty("author_name")
private String _authorName;
private String authorName;
@JsonProperty("author_email")
private String _authorEmail;
private String authorEmail;
@JsonProperty("created_at")
private Date _createdAt;
private Date createdAt;
@JsonProperty("committed_date")
private Date _committedDate;
private Date committedDate;
@JsonProperty("authored_date")
private Date _authoredDate;
private Date authoredDate;
@JsonProperty("parent_ids")
private List<String> _parentIds;
private List<String> parentIds;
public String getId() {
return _id;
return id;
}
public void setId(String id) {
_id = id;
this.id = id;
}
public String getShortId() {
return _shortId;
return shortId;
}
public void setShortId(String shortId) {
_shortId = shortId;
this.shortId = shortId;
}
public String getTitle() {
return _title;
return title;
}
public void setTitle(String title) {
_title = title;
this.title = title;
}
public String getDescription() {
return _description;
return description;
}
public void setDescription(String description) {
_description = description;
this.description = description;
}
public String getAuthorName() {
return _authorName;
return authorName;
}
public void setAuthorName(String authorName) {
_authorName = authorName;
this.authorName = authorName;
}
public String getAuthorEmail() {
return _authorEmail;
return authorEmail;
}
public void setAuthorEmail(String authorEmail) {
_authorEmail = authorEmail;
this.authorEmail = authorEmail;
}
public Date getCreatedAt() {
return _createdAt;
return createdAt;
}
public void setCreatedAt(Date createdAt) {
_createdAt = createdAt;
this.createdAt = createdAt;
}
public List<String> getParentIds() {
return _parentIds;
return parentIds;
}
public void setParentIds(List<String> parentIds) {
_parentIds = parentIds;
this.parentIds = parentIds;
}
@Override
......
src/main/java/org/gitlab/api/models/GitlabCommitDiff.java
View file @ 71efa977
......@@ -7,90 +7,90 @@ public class GitlabCommitDiff {
public final static String URL = "/diff";
@JsonProperty("diff")
private String _diff;
private String diff;
@JsonProperty("new_path")
private String _newPath;
private String newPath;
@JsonProperty("old_path")
private String _oldPath;
private String oldPath;
@JsonProperty("a_mode")
private String _aMode;
private String aMode;
@JsonProperty("b_mode")
private String _bMode;
private String bMode;
@JsonProperty("new_file")
private boolean _newFile;
private boolean newFile;
@JsonProperty("renamed_file")
private boolean _renamedFile;
private boolean renamedFile;
@JsonProperty("deleted_file")
private boolean _deletedFile;
private boolean deletedFile;
public String getDiff() {
return _diff;
return diff;
}
public void setDiff(String diff) {
_diff = diff;
this.diff = diff;
}
public String getNewPath() {
return _newPath;
return newPath;
}
public void setNewPath(String newPath) {
_newPath = newPath;
this.newPath = newPath;
}
public String getOldPath() {
return _oldPath;
return oldPath;
}
public void setOldPath(String oldPath) {
_oldPath = oldPath;
this.oldPath = oldPath;
}
public String getAMode() {
return _aMode;
return aMode;
}
public void setAMode(String aMode) {
_aMode = aMode;
this.aMode = aMode;
}
public String getBMode() {
return _bMode;
return bMode;
}
public void setBMode(String bMode) {
_bMode = bMode;
this.bMode = bMode;
}
public boolean getNewFile() {
return _newFile;
return newFile;
}
public void setNewFile(boolean newFile) {
_newFile = newFile;
this.newFile = newFile;
}
public boolean getRenamedFile() {
return _renamedFile;
return renamedFile;
}
public void setRenamedFile(boolean renamedFile) {
_renamedFile = renamedFile;
this.renamedFile = renamedFile;
}
public boolean getDeletedFile() {
return _deletedFile;
return deletedFile;
}
public void setDeletedFile(boolean deletedFile) {
_deletedFile = deletedFile;
this.deletedFile = deletedFile;
}
}
src/main/java/org/gitlab/api/models/GitlabGroup.java
View file @ 71efa977
......@@ -6,53 +6,53 @@ public class GitlabGroup {
public static final String URL = "/groups";
private Integer _id;
private String _name;
private String _path;
private Integer id;
private String name;
private String path;
@JsonProperty("ldap_cn")
private String _ldapCn;
private String ldapCn;
@JsonProperty("ldap_access")
private Integer _ldapAccess;
private Integer ldapAccess;
public Integer getId() {
return _id;
return id;
}
public void setId(Integer id) {
_id = id;
this.id = id;
}
public String getName() {
return _name;
return name;
}
public void setName(String name) {
_name = name;
this.name = name;
}
public String getPath() {
return _path;
return path;
}
public void setPath(String path) {
_path = path;
this.path = path;
}
public String getLdapCn() {
return _ldapCn;
return ldapCn;
}
public void setLdapCn(String ldapCn) {
this._ldapCn = ldapCn;
this.ldapCn = ldapCn;
}
public GitlabAccessLevel getLdapAccess() {
return GitlabAccessLevel.fromAccessValue(_ldapAccess);
return GitlabAccessLevel.fromAccessValue(ldapAccess);
}
public void setLdapAccess(GitlabAccessLevel ldapGitlabAccessLevel) {
this._ldapAccess = ldapGitlabAccessLevel.accessValue;
this.ldapAccess = ldapGitlabAccessLevel.accessValue;
}
}
src/main/java/org/gitlab/api/models/GitlabIssue.java
View file @ 71efa977
package org.gitlab.api.models;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabIssue {
public enum Action {
LEAVE, CLOSE, REOPEN
}
public static final String StateClosed = "closed";
public static final String StateOpened = "opened";
public static final String STATE_CLOSED = "closed";
public static final String STATE_OPENED = "opened";
public static final String URL = "/issues";
private int _id;
private int _iid;
private int id;
private int iid;
@JsonProperty("project_id")
private int _projectId;
private int projectId;
private String _title;
private String _description;
private String[] _labels;
private GitlabMilestone _milestone;
private String title;
private String description;
private String[] labels;
private GitlabMilestone milestone;
private GitlabUser _assignee;
private GitlabUser _author;
private GitlabUser assignee;
private GitlabUser author;
private String _state;
private String state;
@JsonProperty("updated_at")
private Date _updatedAt;
private Date updatedAt;
@JsonProperty("created_at")
private Date _createdAt;
private Date createdAt;
public int getId() {
return _id;
return id;
}
public void setId(int id) {
_id = id;
this.id = id;
}
public int getIid() {
return _iid;
return iid;
}
public void setIid(int iid) {
_iid = iid;
this.iid = iid;
}
public int getProjectId() {
return _projectId;
return projectId;
}
public void setProjectId(int projectId) {
_projectId = projectId;
this.projectId = projectId;
}
public String getTitle() {
return _title;
return title;
}
public void setTitle(String title) {
_title = title;
this.title = title;
}
public String getDescription() {
return _description;
return description;
}
public void setDescription(String description) {
_description = description;
this.description = description;
}
public String[] getLabels() {
return _labels;
return labels;
}
public void setLabels(String[] labels) {
_labels = labels;
this.labels = labels;
}
public GitlabMilestone getMilestone() {
return _milestone;
return milestone;
}
public void setMilestone(GitlabMilestone milestone) {
_milestone = milestone;
this.milestone = milestone;
}
public GitlabUser getAssignee() {
return _assignee;
return assignee;
}
public void setAssignee(GitlabUser assignee) {
_assignee = assignee;
this.assignee = assignee;
}
public GitlabUser getAuthor() {
return _author;
return author;
}
public void setAuthor(GitlabUser author) {
_author = author;
this.author = author;
}
public String getState() {
return _state;
return state;
}
public void setState(String state) {
_state = state;
this.state = state;
}
public Date getUpdatedAt() {
return _updatedAt;
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
_updatedAt = updatedAt;
this.updatedAt = updatedAt;
}
public Date getCreatedAt() {
return _createdAt;
return createdAt;
}
public void setCreatedAt(Date createdAt) {
_createdAt = createdAt;
this.createdAt = createdAt;
}
}
src/main/java/org/gitlab/api/models/GitlabMergeRequest.java
View file @ 71efa977
......@@ -5,136 +5,145 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class GitlabMergeRequest {
public static final String URL = "/merge_requests";
private Integer _id;
private Integer _iid;
private String _title;
private String _state;
private String _description;
private boolean _closed;
private boolean _merged;
private GitlabUser _author;
private GitlabUser _assignee;
private Integer id;
private Integer iid;
private String title;
private String state;
private String description;
private boolean closed;
private boolean merged;
private GitlabUser author;
private GitlabUser assignee;
@JsonProperty("target_branch")
private String _targetBranch;
private String targetBranch;
@JsonProperty("source_branch")
private String _sourceBranch;
private String sourceBranch;
@JsonProperty("project_id")
private Integer _projectId;
private Integer projectId;
@JsonProperty("source_project_id")
private Integer _sourceProjectId;
private Integer sourceProjectId;
@JsonProperty("milestone_id")
private Integer _milestone_id;
private Integer milestoneId;
public Integer getId() {
return _id;
return id;
}
public void setId(Integer id) {
_id = id;
this.id = id;
}
public Integer getMilestoneId(){ return _milestone_id; }
public void setMilestoneId(Integer id) { _milestone_id = id; }
public Integer getMilestoneId() {
return milestoneId;
}
public void setMilestoneId(Integer id) {
milestoneId = id;
}
public Integer getIid() {
return _iid;
return iid;
}
public void setIid(Integer iid) {
_iid = iid;
this.iid = iid;
}
public String getTargetBranch() {
return _targetBranch;
return targetBranch;
}
public void setTargetBranch(String targetBranch) {
_targetBranch = targetBranch;
this.targetBranch = targetBranch;
}
public String getSourceBranch() {
return _sourceBranch;
return sourceBranch;
}
public void setSourceBranch(String sourceBranch) {
_sourceBranch = sourceBranch;
this.sourceBranch = sourceBranch;
}
public Integer getProjectId() {
return _projectId;
return projectId;
}
public void setProjectId(Integer projectId) {
_projectId = projectId;
this.projectId = projectId;
}
public Integer getSourceProjectId() {
return _sourceProjectId;
return sourceProjectId;
}
public void setSourceProjectId(Integer sourceProjectId) {
_sourceProjectId = sourceProjectId;
this.sourceProjectId = sourceProjectId;
}
public String getTitle() {
return _title;
return title;
}
public void setTitle(String title) {
_title = title;
this.title = title;
}
public String getDescription() { return _description; }
public String getDescription() {
return description;
}
public void setDescription(String d) { _description = d; }
public void setDescription(String d) {
description = d;
}
public boolean isClosed() {
return _closed;
return closed;
}
public void setClosed(boolean closed) {
_closed = closed;
this.closed = closed;
}
public boolean isMerged() {
return _merged;
return merged;
}
public void setMerged(boolean merged) {
_merged = merged;
this.merged = merged;
}
public GitlabUser getAuthor() {
return _author;
return author;
}
public void setAuthor(GitlabUser author) {
_author = author;
this.author = author;
}
public GitlabUser getAssignee() {
return _assignee;
return assignee;
}
public void setAssignee(GitlabUser assignee) {
_assignee = assignee;
this.assignee = assignee;
}
public String getState() {
return _state;
return state;
}
public void setState(String state) {
_state = state;
if(state != null) {
_closed = state.equals("closed");
_merged = state.equals("merged");
this.state = state;
if (state != null) {
closed = state.equals("closed");
merged = state.equals("merged");
}
}
}
src/main/java/org/gitlab/api/models/GitlabMilestone.java
View file @ 71efa977
package org.gitlab.api.models;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabMilestone {
public static final String URL = "/milestones";
private int _id;
private int _iid;
private int _projectId;
private String _title;
private String _description;
private int id;
private int iid;
private int projectId;
private String title;
private String description;
@JsonProperty("due_date")
private Date _dueDate;
private Date dueDate;
private String _state;
private String state;
@JsonProperty("updated_date")
private Date _updatedDate;
private Date updatedDate;
@JsonProperty("created_date")
private Date _createdDate;
private Date createdDate;
public int getId() {
return _id;
return id;
}
public void setId(int id) {
_id = id;
this.id = id;
}
public int getIid() {
return _iid;
return iid;
}
public void setIid(int iid) {
_iid = iid;
this.iid = iid;
}
public int getProjectId() {
return _projectId;
return projectId;
}
public void setProjectId(int projectId) {
_projectId = projectId;
this.projectId = projectId;
}
public String getTitle() {
return _title;
return title;
}
public void setTitle(String title) {
_title = title;
this.title = title;
}
public String getDescription() {
return _description;
return description;
}
public void setDescription(String description) {
_description = description;
this.description = description;
}
public Date getDueDate() {
return _dueDate;
return dueDate;
}
public void setDueDate(Date dueDate) {
_dueDate = dueDate;
this.dueDate = dueDate;
}
public String getState() {
return _state;
return state;
}
public void setState(String state) {
_state = state;
this.state = state;
}
public Date getUpdatedDate() {
return _updatedDate;
return updatedDate;
}
public void setUpdatedDate(Date updatedDate) {
_updatedDate = updatedDate;
this.updatedDate = updatedDate;
}
public Date getCreatedDate() {
return _createdDate;
return createdDate;
}
public void setCreatedDate(Date createdDate) {
_createdDate = createdDate;
this.createdDate = createdDate;
}
}
src/main/java/org/gitlab/api/models/GitlabNamespace.java
View file @ 71efa977
package org.gitlab.api.models;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabNamespace {
public static final String URL = "/groups";
private Integer _id;
private String _name;
private String _path;
private String _description;
private Integer id;
private String name;
private String path;
private String description;
@JsonProperty("created_at")
private Date _createdAt;
private Date createdAt;
@JsonProperty("updated_at")
private Date _updatedAt;
private Date updatedAt;
@JsonProperty("owner_id")
private Integer _ownerId;
private Integer ownerId;
public Integer getId() {
return _id;
return id;
}
public void setId(Integer id) {
_id = id;
this.id = id;
}
public Date getCreatedAt() {
return _createdAt;
return createdAt;
}
public void setCreatedAt(Date createdAt) {
_createdAt = createdAt;
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return _updatedAt;
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
_updatedAt = updatedAt;
this.updatedAt = updatedAt;
}
public Integer getOwnerId() {
return _ownerId;
return ownerId;
}
public void setOwnerId(Integer ownerId) {
_ownerId = ownerId;
this.ownerId = ownerId;
}
public String getName() {
return _name;
return name;
}
public void setName(String name) {
_name = name;
this.name = name;
}
public String getPath() {
return _path;
return path;
}
public void setPath(String path) {
_path = path;
this.path = path;
}
public String getDescription() {
return _description;
return description;
}
public void setDescription(String description) {
_description = description;
this.description = description;
}
}
src/main/java/org/gitlab/api/models/GitlabNote.java
View file @ 71efa977
package org.gitlab.api.models;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabNote {
public static final String URL = "/notes";
private Integer _id;
private String _body;
private String _attachment;
private GitlabUser _author;
private Integer id;
private String body;
private String attachment;
private GitlabUser author;
@JsonProperty("created_at")
private Date _createdAt;
private Date createdAt;
public Integer getId() {
return _id;
return id;
}
public void setId(Integer id) {
_id = id;
this.id = id;
}
public String getBody() {
return _body;
return body;
}
public void setBody(String body) {
_body = body;
this.body = body;
}
public GitlabUser getAuthor() {
return _author;
return author;
}
public void setAuthor(GitlabUser author) {
_author = author;
this.author = author;
}
public Date getCreatedAt() {
return _createdAt;
return createdAt;
}
public void setCreatedAt(Date createdAt) {
_createdAt = createdAt;
this.createdAt = createdAt;
}
public String getAttachment() {
return _attachment;
return attachment;
}
public void setAttachment(String attachment) {
_attachment = attachment;
this.attachment = attachment;
}
}
src/main/java/org/gitlab/api/models/GitlabPermission.java 0 → 100644
View file @ 71efa977
package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
public class GitlabPermission {
@JsonProperty("project_access")
private GitlabProjectAccessLevel projectAccess;
@JsonProperty("group_access")
private GitlabProjectAccessLevel groupAccess;
public GitlabProjectAccessLevel getProjectAccess() {
return projectAccess;
}
public GitlabProjectAccessLevel getProjectGroupAccess() {
return groupAccess;
}
}
src/main/java/org/gitlab/api/models/GitlabPersmission.java deleted 100644 → 0
View file @ 3dbfade8
package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
public class GitlabPersmission {
@JsonProperty("project_access")
private GitlabProjectAccessLevel _projectAccess;
@JsonProperty("group_access")
private GitlabProjectAccessLevel _groupAccess;
public GitlabProjectAccessLevel getProjectAccess() {
return _projectAccess;
}
public GitlabProjectAccessLevel getProjectGroupAccess() {
return _groupAccess;
}
}
src/main/java/org/gitlab/api/models/GitlabProject.java
View file @ 71efa977
package org.gitlab.api.models;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabProject {
public static final String URL = "/projects";
private Integer _id;
private String _name;
private Integer id;
private String name;
@JsonProperty("name_with_namespace")
private String _nameWithNamespace;
private String nameWithNamespace;
private String _description;
private String description;
@JsonProperty("default_branch")
private String _defaultBranch;
private String defaultBranch;
private GitlabUser _owner;
private boolean _public;
private String _path;
private GitlabUser owner;
private boolean publicProject;
private String path;
@JsonProperty("visibility_level")
private Integer _visibilityLevel;
private Integer visibilityLevel;
@JsonProperty("path_with_namespace")
private String _pathWithNamespace;
private String pathWithNamespace;
@JsonProperty("issues_enabled")
private boolean _issuesEnabled;
private boolean issuesEnabled;
@JsonProperty("merge_requests_enabled")
private boolean _mergeRequestsEnabled;
private boolean mergeRequestsEnabled;
@JsonProperty("snippets_enabled")
private boolean _snippetsEnabled;
private boolean snippetsEnabled;
@JsonProperty("wall_enabled")
private boolean _wallEnabled;
private boolean wallEnabled;
@JsonProperty("wiki_enabled")
private boolean _wikiEnabled;
private boolean wikiEnabled;
@JsonProperty("created_at")
private Date _createdAt;
private Date createdAt;
@JsonProperty("ssh_url_to_repo")
private String _sshUrl;
private String sshUrl;
@JsonProperty("web_url")
private String _webUrl;
private String webUrl;
@JsonProperty("http_url_to_repo")
private String _httpUrl;
private String httpUrl;
@JsonProperty("last_activity_at")
private Date _lastActivityAt;
private Date lastActivityAt;
@JsonProperty("archived")
private boolean _archived;
private boolean archived;
private GitlabNamespace _namespace;
private GitlabNamespace namespace;
@JsonProperty("permissions")
private GitlabPersmission _permissions;
private GitlabPermission permissions;
public Integer getId() {
return _id;
return id;
}
public void setId(Integer id) {
_id = id;
this.id = id;
}
public String getName() {
return _name;
return name;
}
public void setName(String name) {
_name = name;
this.name = name;
}
public String getNameWithNamespace() {
return _nameWithNamespace;
return nameWithNamespace;
}
public void setNameWithNamespace(String nameWithNamespace) {
this._nameWithNamespace = nameWithNamespace;
this.nameWithNamespace = nameWithNamespace;
}
public String getDescription() {
return _description;
return description;
}
public void setDescription(String description) {
_description = description;
this.description = description;
}
public String getDefaultBranch() {
return _defaultBranch;
return defaultBranch;
}
public void setDefaultBranch(String defaultBranch) {
_defaultBranch = defaultBranch;
this.defaultBranch = defaultBranch;
}
public Integer getVisibilityLevel() {
return _visibilityLevel;
return visibilityLevel;
}
public void setVisibilityLevel(Integer visibilityLevel) {
this._visibilityLevel = visibilityLevel;
this.visibilityLevel = visibilityLevel;
}
public GitlabUser getOwner() {
return _owner;
return owner;
}
public void setOwner(GitlabUser owner) {
_owner = owner;
this.owner = owner;
}
public String getPath() {
return _path;
return path;
}
public void setPath(String path) {
_path = path;
this.path = path;
}
public String getPathWithNamespace() {
return _pathWithNamespace;
return pathWithNamespace;
}
public void setPathWithNamespace(String pathWithNamespace) {
_pathWithNamespace = pathWithNamespace;
this.pathWithNamespace = pathWithNamespace;
}
public boolean isIssuesEnabled() {
return _issuesEnabled;
return issuesEnabled;
}
public void setIssuesEnabled(boolean issuesEnabled) {
_issuesEnabled = issuesEnabled;
this.issuesEnabled = issuesEnabled;
}
public boolean isMergeRequestsEnabled() {
return _mergeRequestsEnabled;
return mergeRequestsEnabled;
}
public void setMergeRequestsEnabled(boolean mergeRequestsEnabled) {
_mergeRequestsEnabled = mergeRequestsEnabled;
this.mergeRequestsEnabled = mergeRequestsEnabled;
}
public boolean isSnippetsEnabled() {
return _snippetsEnabled;
return snippetsEnabled;
}
public void setSnippetsEnabled(boolean snippetsEnabled) {
this._snippetsEnabled = snippetsEnabled;
this.snippetsEnabled = snippetsEnabled;
}
public boolean isWallEnabled() {
return _wallEnabled;
return wallEnabled;
}
public void setWallEnabled(boolean wallEnabled) {
_wallEnabled = wallEnabled;
this.wallEnabled = wallEnabled;
}
public boolean isWikiEnabled() {
return _wikiEnabled;
return wikiEnabled;
}
public void setWikiEnabled(boolean wikiEnabled) {
_wikiEnabled = wikiEnabled;
this.wikiEnabled = wikiEnabled;
}
public Date getCreatedAt() {
return _createdAt;
return createdAt;
}
public void setCreatedAt(Date createdAt) {
_createdAt = createdAt;
this.createdAt = createdAt;
}
public String getSshUrl() {
return _sshUrl;
return sshUrl;
}
public void setSshUrl(String sshUrl) {
_sshUrl = sshUrl;
this.sshUrl = sshUrl;
}
public String getWebUrl() {
return _webUrl;
return webUrl;
}
public void setWebUrl(String webUrl) {
_webUrl = webUrl;
this.webUrl = webUrl;
}
public String getHttpUrl() {
return _httpUrl;
return httpUrl;
}
public void setHttpUrl(String httpUrl) {
_httpUrl = httpUrl;
this.httpUrl = httpUrl;
}
public GitlabNamespace getNamespace() {
return _namespace;
return namespace;
}
public void setNamespace(GitlabNamespace namespace) {
_namespace = namespace;
this.namespace = namespace;
}
public boolean isPublic() {
return _public;
return publicProject;
}
public void setPublic(boolean aPublic) {
_public = aPublic;
publicProject = aPublic;
}
public boolean isArchived() {
return _archived;
return archived;
}
public void setArchived(boolean archived) {
_archived = archived;
this.archived = archived;
}
public Date getLastActivityAt() {
return _lastActivityAt;
return lastActivityAt;
}
public void setLastActivityAt(Date lastActivityAt) {
_lastActivityAt = lastActivityAt;
this.lastActivityAt = lastActivityAt;
}
public GitlabPersmission getPermissions() {
return _permissions;
public GitlabPermission getPermissions() {
return permissions;
}
public void setPermissions(GitlabPersmission permissions) {
this._permissions = permissions;
public void setPermissions(GitlabPermission permissions) {
this.permissions = permissions;
}
}
src/main/java/org/gitlab/api/models/GitlabProjectAccessLevel.java
View file @ 71efa977
......@@ -5,27 +5,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class GitlabProjectAccessLevel {
@JsonProperty("access_level")
private int _accessLevel;
private int accessLevel;
@JsonProperty("notification_level")
private int _notificationLevel;
private int notificationLevel;
public GitlabAccessLevel getAccessLevel() {
return GitlabAccessLevel.fromAccessValue(_accessLevel);
return GitlabAccessLevel.fromAccessValue(accessLevel);
}
public void setAccessLevel(GitlabAccessLevel accessLevel) {
_accessLevel = accessLevel.accessValue;
this.accessLevel = accessLevel.accessValue;
}
public int getNoficationLevel() {
return _notificationLevel;
return notificationLevel;
}
public void setNoficationLevel(int notificationLevel) {
this._accessLevel=notificationLevel;
this.accessLevel = notificationLevel;
}
......
src/main/java/org/gitlab/api/models/GitlabProjectHook.java
View file @ 71efa977
package org.gitlab.api.models;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabProjectHook {
public final static String URL = "/hooks";
private String _id;
private String _url;
private Integer _projectId;
private String id;
private String url;
private Integer projectId;
@JsonProperty("push_events")
private boolean _pushEvents;
private boolean pushEvents;
@JsonProperty("issues_events")
private boolean _issueEvents;
private boolean issueEvents;
@JsonProperty("merge_requests_events")
private boolean _mergeRequestsEvents;
private boolean mergeRequestsEvents;
@JsonProperty("created_at")
private Date _createdAt;
private Date createdAt;
public String getId() {
return _id;
return id;
}
public void setId(String id) {
_id = id;
this.id = id;
}
public String getUrl() {
return _url;
return url;
}
public void setUrl(String url) {
this._url = url;
this.url = url;
}
public Integer getProjectId() {
return _projectId;
return projectId;
}
public void setProjectId(Integer projectId) {
_projectId = projectId;
this.projectId = projectId;
}
public boolean getPushEvents() {
return _pushEvents;
return pushEvents;
}
public void setPushEvents(boolean pushEvents) {
_pushEvents = pushEvents;
this.pushEvents = pushEvents;
}
public boolean getIssueEvents() {
return _issueEvents;
return issueEvents;
}
public void setIssueEvents(boolean issueEvents) {
_issueEvents = issueEvents;
this.issueEvents = issueEvents;
}
public boolean isMergeRequestsEvents() {
return _mergeRequestsEvents;
return mergeRequestsEvents;
}
public void setMergeRequestsEvents(boolean mergeRequestsEvents) {
_mergeRequestsEvents = mergeRequestsEvents;
this.mergeRequestsEvents = mergeRequestsEvents;
}
public Date getCreatedAt() {
return _createdAt;
return createdAt;
}
public void setCreatedAt(Date createdAt) {
_createdAt = createdAt;
this.createdAt = createdAt;
}
}
src/main/java/org/gitlab/api/models/GitlabSession.java
View file @ 71efa977
......@@ -3,17 +3,18 @@ package org.gitlab.api.models;
import org.codehaus.jackson.annotate.JsonProperty;
public class GitlabSession extends GitlabUser {
public static final String URL = "/session";
@JsonProperty("private_token")
private String _privateToken;
private String privateToken;
public String getPrivateToken() {
return _privateToken;
return privateToken;
}
public void setPrivateToken(String privateToken) {
_privateToken = privateToken;
this.privateToken = privateToken;
}
}
src/main/java/org/gitlab/api/models/GitlabUser.java
View file @ 71efa977
package org.gitlab.api.models;
import java.util.Date;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.Date;
public class GitlabUser {
public static String URL = "/users";
public static String USERS_URL = "/users";
......
src/test/java/org/gitlab/api/GitlabAPIT.java
View file @ 71efa977
package org.gitlab.api;
import org.gitlab.api.models.GitlabUser;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.ConnectException;
import java.net.URL;
import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeNoException;
import java.net.ConnectException;
public class GitlabAPIT {
GitlabAPI _api;
GitlabAPI api;
private static final String TEST_URL = System.getProperty("TEST_URL", "http://localhost");
private static final String TEST_TOKEN = System.getProperty("TEST_TOKEN", "y0E5b9761b7y4qk");
......@@ -25,12 +23,11 @@ public class GitlabAPIT {
String rand = UUID.randomUUID().toString().replace("-", "").substring(0, 8);
@Before
public void setup() throws IOException {
_api = GitlabAPI.connect(TEST_URL, TEST_TOKEN);
api = GitlabAPI.connect(TEST_URL, TEST_TOKEN);
try {
_api.dispatch().with("login", "INVALID").with("password", rand).to("session", GitlabUser.class);
api.dispatch().with("login", "INVALID").with("password", rand).to("session", GitlabUser.class);
} catch (ConnectException e) {
assumeNoException("GITLAB not running on '" + TEST_URL + "', skipping...", e);
} catch (IOException e) {
......@@ -43,19 +40,19 @@ public class GitlabAPIT {
@Test
public void testConnect() throws IOException {
assertEquals(GitlabAPI.class, _api.getClass());
assertEquals(GitlabAPI.class, api.getClass());
}
@Test
public void testGetAPIUrl() throws IOException {
URL expected = new URL(TEST_URL+"/api/v3/?private_token="+TEST_TOKEN);
assertEquals(expected, _api.getAPIUrl(""));
URL expected = new URL(TEST_URL + "/api/v3/?private_token=" + TEST_TOKEN);
assertEquals(expected, api.getAPIUrl(""));
}
@Test
public void testGetUrl() throws IOException {
URL expected = new URL(TEST_URL);
assertEquals(expected +"/", _api.getUrl("").toString());
assertEquals(expected + "/", api.getUrl("").toString());
}
@Test
......@@ -64,14 +61,14 @@ public class GitlabAPIT {
String password = randVal("$%password");
GitlabUser gitUser = _api.createUser(randVal("testEmail@gitlabapitest.com"),
GitlabUser gitUser = api.createUser(randVal("testEmail@gitlabapitest.com"),
password,
randVal("userName"),
randVal("fullName"),
randVal("skypeId"),
randVal("linledin"),
randVal("twitter"),
"http://"+randVal("url.com"),
"http://" + randVal("url.com"),
10,
randVal("externuid"),
randVal("externprovidername"),
......@@ -79,36 +76,35 @@ public class GitlabAPIT {
false,
false,
false);
Assert.assertNotNull(gitUser);
assertNotNull(gitUser);
GitlabUser refetched = _api.getUserViaSudo(gitUser.getUsername());
GitlabUser refetched = api.getUserViaSudo(gitUser.getUsername());
Assert.assertNotNull(refetched);
assertNotNull(refetched);
Assert.assertEquals(refetched.getUsername(),gitUser.getUsername());
assertEquals(refetched.getUsername(), gitUser.getUsername());
_api.updateUser(gitUser.getId(), gitUser.getEmail(), password , gitUser.getUsername(),
api.updateUser(gitUser.getId(), gitUser.getEmail(), password, gitUser.getUsername(),
gitUser.getName(), "newSkypeId", gitUser.getLinkedin(), gitUser.getTwitter(), gitUser.getWebsiteUrl(),
10 /* project limit does not come back on GET */, gitUser.getExternUid(), gitUser.getExternProviderName(),
gitUser.getBio(), gitUser.isAdmin(), gitUser.isCanCreateGroup(), false);
GitlabUser postUpdate = _api.getUserViaSudo(gitUser.getUsername());
GitlabUser postUpdate = api.getUserViaSudo(gitUser.getUsername());
Assert.assertNotNull(postUpdate);
Assert.assertEquals(postUpdate.getSkype(),"newSkypeId");
assertNotNull(postUpdate);
assertEquals(postUpdate.getSkype(), "newSkypeId");
_api.deleteUser(postUpdate.getId());
api.deleteUser(postUpdate.getId());
// expect a 404, but we have no access to it
try {
GitlabUser shouldNotExist = _api.getUser(postUpdate.getId());
Assert.assertNull(shouldNotExist); // should never even get here
} catch(FileNotFoundException thisIsSoOddForAnRESTApiClient) {
Assert.assertTrue(true); // expected
GitlabUser shouldNotExist = api.getUser(postUpdate.getId());
assertNull(shouldNotExist);
} catch (FileNotFoundException thisIsSoOddForAnRESTApiClient) {
assertTrue(true); // expected
}
......
src/test/java/org/gitlab/api/http/QueryTest.java
View file @ 71efa977
package org.gitlab.api.http;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import java.io.UnsupportedEncodingException;
import static org.junit.Assert.assertEquals;
public class QueryTest {
@Test
......@@ -59,7 +60,7 @@ public class QueryTest {
@Test
public void conditionalAppend_null_notNull() throws UnsupportedEncodingException {
Query query = new Query()
.appendIf("p1", (String)null)
.appendIf("p1", (String) null)
.appendIf("p2", "v2");
assertEquals("?p2=v2", query.toString());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment