Skip to content
Snippets Groups Projects
Commit cbd7ebc0 authored by John Carlson's avatar John Carlson
Browse files

Merge branch 'develop'

parents 35eba923 e31b881c
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 198 additions and 264 deletions
app/src/main/java/com/commit451/gitlab/model/api/Build.java
+ 16
− 18
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -11,38 +10,37 @@ import java.util.Date;
* Represents a build
*/
@Parcel
@JsonObject
public class Build {
 
@JsonField(name = "commit")
@Json(name = "commit")
RepositoryCommit commit;
@JsonField(name = "coverage")
@Json(name = "coverage")
String coverage;
@JsonField(name = "created_at")
@Json(name = "created_at")
Date createdAt;
@JsonField(name = "artifacts_file")
@Json(name = "artifacts_file")
ArtifactsFile artifactsFile;
@JsonField(name = "finished_at")
@Json(name = "finished_at")
Date finishedAt;
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "name")
@Json(name = "name")
String name;
@JsonField(name = "ref")
@Json(name = "ref")
String ref;
@JsonField(name = "runner")
@Json(name = "runner")
Runner runner;
@JsonField(name = "pipeline")
@Json(name = "pipeline")
Pipeline pipeline;
@JsonField(name = "stage")
@Json(name = "stage")
String stage;
@JsonField(name = "started_at")
@Json(name = "started_at")
Date startedAt;
@JsonField(name = "status")
@Json(name = "status")
String status;
@JsonField(name = "tag")
@Json(name = "tag")
boolean tag;
@JsonField(name = "user")
@Json(name = "user")
User user;
 
public RepositoryCommit getCommit() {
app/src/main/java/com/commit451/gitlab/model/api/CommitUser.java
+ 7
− 11
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.commit451.gitlab.util.ObjectUtil;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
import java.util.Date;
@Parcel
@JsonObject
public class CommitUser {
@JsonField(name = "id")
@Json(name = "id")
String id;
@JsonField(name = "name")
@Json(name = "name")
String name;
@JsonField(name = "username")
@Json(name = "username")
String username;
@JsonField(name = "state")
@Json(name = "state")
String state;
@JsonField(name = "avatar_url")
@Json(name = "avatar_url")
String avatarUrl;
@JsonField(name = "web_url")
@Json(name = "web_url")
String webUrl;
 
public CommitUser() {}
app/src/main/java/com/commit451/gitlab/model/api/Contributor.java
+ 6
− 8
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.commit451.gitlab.util.ObjectUtil;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -12,17 +11,16 @@ import java.util.List;
import java.util.Set;
 
@Parcel
@JsonObject
public class Contributor {
@JsonField(name = "name")
@Json(name = "name")
String name;
@JsonField(name = "email")
@Json(name = "email")
String email;
@JsonField(name = "commits")
@Json(name = "commits")
int commits;
@JsonField(name = "additions")
@Json(name = "additions")
int additions;
@JsonField(name = "deletions")
@Json(name = "deletions")
int deletions;
 
public Contributor() {}
app/src/main/java/com/commit451/gitlab/model/api/Diff.java
+ 9
− 11
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@Parcel
@JsonObject
public class Diff {
@JsonField(name = "old_path")
@Json(name = "old_path")
String oldPath;
@JsonField(name = "new_path")
@Json(name = "new_path")
String newPath;
@JsonField(name = "a_mode")
@Json(name = "a_mode")
int aMode;
@JsonField(name = "b_mode")
@Json(name = "b_mode")
int bMode;
@JsonField(name = "diff")
@Json(name = "diff")
String diff;
@JsonField(name = "new_file")
@Json(name = "new_file")
boolean newFile;
@JsonField(name = "renamed_file")
@Json(name = "renamed_file")
boolean renamedFile;
@JsonField(name = "deleted_file")
@Json(name = "deleted_file")
boolean deletedFile;
 
public Diff() {}
app/src/main/java/com/commit451/gitlab/model/api/Email.java
+ 3
− 5
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@Parcel
@JsonObject
public class Email {
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "email")
@Json(name = "email")
String email;
 
public Email() {}
app/src/main/java/com/commit451/gitlab/model/api/FileUploadResponse.java
+ 5
− 7
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -9,16 +8,15 @@ import org.parceler.Parcel;
* Response when a file is uploaded
*/
@Parcel
@JsonObject
public class FileUploadResponse {
 
@JsonField(name = "alt")
@Json(name = "alt")
String alt;
@JsonField(name = "url")
@Json(name = "url")
String url;
@JsonField(name = "is_image")
@Json(name = "is_image")
boolean isImage;
@JsonField(name = "markdown")
@Json(name = "markdown")
String markdown;
 
protected FileUploadResponse() {
app/src/main/java/com/commit451/gitlab/model/api/ForkedFromProject.java
+ 6
− 8
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@Parcel
@JsonObject
public class ForkedFromProject {
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "name")
@Json(name = "name")
String name;
@JsonField(name = "name_with_namespace")
@Json(name = "name_with_namespace")
String nameWithNamespace;
@JsonField(name = "path")
@Json(name = "path")
String path;
@JsonField(name = "path_with_namespace")
@Json(name = "path_with_namespace")
String pathWithNamespace;
 
public ForkedFromProject() {}
app/src/main/java/com/commit451/gitlab/model/api/Group.java
+ 12
− 14
View file @ cbd7ebc0
@@ -3,26 +3,24 @@ package com.commit451.gitlab.model.api;
import android.net.Uri;
import android.support.annotation.Nullable;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@Parcel
@JsonObject
public class Group {
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "name")
@Json(name = "name")
String name;
@JsonField(name = "path")
@Json(name = "path")
String path;
@JsonField(name = "description")
@Json(name = "description")
String description;
@JsonField(name = "avatar_url")
Uri avatarUrl;
@JsonField(name = "web_url")
Uri webUrl;
@Json(name = "avatar_url")
String avatarUrl;
@Json(name = "web_url")
String webUrl;
 
public Group() {}
 
@@ -42,11 +40,11 @@ public class Group {
return description;
}
 
public Uri getAvatarUrl() {
public String getAvatarUrl() {
return avatarUrl;
}
 
public Uri getWebUrl() {
public String getWebUrl() {
return webUrl;
}
 
@@ -56,7 +54,7 @@ public class Group {
return null;
}
 
return Uri.parse(webUrl.toString() + ".atom");
return Uri.parse(webUrl + ".atom");
}
 
@Override
app/src/main/java/com/commit451/gitlab/model/api/GroupDetail.java
+ 2
− 4
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
import java.util.List;
 
@Parcel
@JsonObject
public class GroupDetail extends Group {
@JsonField(name = "projects")
@Json(name = "projects")
List<Project> projects;
 
public GroupDetail() {}
app/src/main/java/com/commit451/gitlab/model/api/Identity.java
+ 3
− 5
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@Parcel
@JsonObject
public class Identity {
@JsonField(name = "provider")
@Json(name = "provider")
String provider;
@JsonField(name = "extern_uid")
@Json(name = "extern_uid")
String externUid;
 
public Identity() {}
app/src/main/java/com/commit451/gitlab/model/api/Issue.java
+ 14
− 24
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import android.net.Uri;
import android.support.annotation.StringDef;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -14,7 +12,6 @@ import java.util.Date;
import java.util.List;
 
@Parcel
@JsonObject
public class Issue {
public static final String STATE_REOPEN = "reopen";
public static final String STATE_CLOSE = "close";
@@ -33,32 +30,32 @@ public class Issue {
public @interface State {
}
 
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "iid")
@Json(name = "iid")
long iId;
@JsonField(name = "project_id")
@Json(name = "project_id")
long projectId;
@JsonField(name = "title")
@Json(name = "title")
String title;
@JsonField(name = "description")
@Json(name = "description")
String description;
@JsonField(name = "state")
@Json(name = "state")
@State
String state;
@JsonField(name = "created_at")
@Json(name = "created_at")
Date createdAt;
@JsonField(name = "updated_at")
@Json(name = "updated_at")
Date updatedAt;
@JsonField(name = "labels")
@Json(name = "labels")
List<String> labels;
@JsonField(name = "milestone")
@Json(name = "milestone")
Milestone milestone;
@JsonField(name = "assignee")
@Json(name = "assignee")
UserBasic assignee;
@JsonField(name = "author")
@Json(name = "author")
UserBasic author;
@JsonField(name = "confidential")
@Json(name = "confidential")
boolean confidential;
 
public Issue() {
@@ -112,13 +109,6 @@ public class Issue {
return author;
}
 
public Uri getUrl(Project project) {
return project.getWebUrl().buildUpon()
.appendPath("issues")
.appendPath(Long.toString(getId()))
.build();
}
public boolean isConfidential() {
return confidential;
}
app/src/main/java/com/commit451/gitlab/model/api/Label.java
+ 8
− 10
View file @ cbd7ebc0
@@ -3,8 +3,7 @@ package com.commit451.gitlab.model.api;
import android.graphics.Color;
import android.support.annotation.ColorInt;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -12,22 +11,21 @@ import org.parceler.Parcel;
* A label
*/
@Parcel
@JsonObject
public class Label {
 
@JsonField(name = "color")
@Json(name = "color")
String color;
@JsonField(name = "name")
@Json(name = "name")
String name;
@JsonField(name = "description")
@Json(name = "description")
String description;
@JsonField(name = "open_issues_count")
@Json(name = "open_issues_count")
int openIssuesCount;
@JsonField(name = "closed_issues_count")
@Json(name = "closed_issues_count")
int closedIssuesCount;
@JsonField(name = "open_merge_requests_count")
@Json(name = "open_merge_requests_count")
int openMergeRequestsCount;
@JsonField(name = "subscribed")
@Json(name = "subscribed")
boolean subscribed;
 
protected Label() {
app/src/main/java/com/commit451/gitlab/model/api/Member.java
+ 2
− 4
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@Parcel
@JsonObject
public class Member extends UserBasic {
@JsonField(name = "access_level")
@Json(name = "access_level")
int accessLevel;
 
public Member() {}
app/src/main/java/com/commit451/gitlab/model/api/MergeRequest.java
+ 23
− 25
View file @ cbd7ebc0
@@ -3,8 +3,7 @@ package com.commit451.gitlab.model.api;
import android.support.annotation.Nullable;
import android.support.annotation.StringDef;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -14,7 +13,6 @@ import java.util.Date;
import java.util.List;
 
@Parcel
@JsonObject
public class MergeRequest {
 
public static final String STATE_OPENED = "opened";
@@ -25,50 +23,50 @@ public class MergeRequest {
@Retention(RetentionPolicy.SOURCE)
public @interface State {}
 
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "iid")
@Json(name = "iid")
long iId;
@JsonField(name = "project_id")
@Json(name = "project_id")
long projectId;
@JsonField(name = "title")
@Json(name = "title")
String title;
@JsonField(name = "description")
@Json(name = "description")
String description;
@JsonField(name = "state")
@Json(name = "state")
@State
String state;
@JsonField(name = "updated_at")
@Json(name = "updated_at")
Date updatedAt;
@JsonField(name = "created_at")
@Json(name = "created_at")
Date createdAt;
@JsonField(name = "target_branch")
@Json(name = "target_branch")
String targetBranch;
@JsonField(name = "source_branch")
@Json(name = "source_branch")
String sourceBranch;
@JsonField(name = "upvotes")
@Json(name = "upvotes")
long upvotes;
@JsonField(name = "downvotes")
@Json(name = "downvotes")
long downvotes;
@JsonField(name = "author")
@Json(name = "author")
UserBasic author;
@JsonField(name = "assignee")
@Json(name = "assignee")
UserBasic assignee;
@JsonField(name = "source_project_id")
@Json(name = "source_project_id")
long sourceProjectId;
@JsonField(name = "target_project_id")
@Json(name = "target_project_id")
long targetProjectId;
@JsonField(name = "labels")
@Json(name = "labels")
List<String> labels;
@JsonField(name = "work_in_progress")
@Json(name = "work_in_progress")
boolean workInProgress;
@JsonField(name = "milestone")
@Json(name = "milestone")
Milestone milestone;
@JsonField(name = "merge_when_build_succeeds")
@Json(name = "merge_when_build_succeeds")
boolean mergeWhenBuildSucceeds;
@JsonField(name = "merge_status")
@Json(name = "merge_status")
String mergeStatus;
@JsonField(name = "changes")
@Json(name = "changes")
@Nullable
List<Diff> changes;
 
app/src/main/java/com/commit451/gitlab/model/api/Message.java
+ 2
− 4
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
/**
* The structure for a message from the server, which is usually found in a response body
*/
@JsonObject
public class Message {
 
@JsonField(name = "message")
@Json(name = "message")
String message;
 
public String getMessage() {
app/src/main/java/com/commit451/gitlab/model/api/Milestone.java
+ 12
− 17
View file @ cbd7ebc0
@@ -3,20 +3,16 @@ package com.commit451.gitlab.model.api;
import android.support.annotation.Nullable;
import android.support.annotation.StringDef;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.commit451.gitlab.api.converter.DueDateTypeConverter;
import com.commit451.gitlab.api.converter.DashDateAdapter;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
 
@Parcel
@JsonObject
public class Milestone {
public static final String STATE_ACTIVE = "active";
public static final String STATE_CLOSED = "closed";
@@ -32,25 +28,24 @@ public class Milestone {
@Retention(RetentionPolicy.SOURCE)
public @interface StateEvent {}
 
public static final SimpleDateFormat DUE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-d", Locale.US);
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "iid")
@Json(name = "iid")
long iId;
@JsonField(name = "project_id")
@Json(name = "project_id")
long projectId;
@JsonField(name = "title")
@Json(name = "title")
String title;
@JsonField(name = "description")
@Json(name = "description")
String description;
@JsonField(name = "state")
@Json(name = "state")
String state;
@JsonField(name = "created_at")
@Json(name = "created_at")
Date createdAt;
@JsonField(name = "updated_at")
@Json(name = "updated_at")
Date updatedAt;
@JsonField(name = "due_date", typeConverter = DueDateTypeConverter.class)
@DashDateAdapter.DueDate
@Json(name = "due_date")
Date dueDate;
 
public Milestone() {}
app/src/main/java/com/commit451/gitlab/model/api/Note.java
+ 10
− 12
View file @ cbd7ebc0
@@ -2,8 +2,7 @@ package com.commit451.gitlab.model.api;
 
import android.support.annotation.StringDef;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -12,7 +11,6 @@ import java.lang.annotation.RetentionPolicy;
import java.util.Date;
 
@Parcel
@JsonObject
public class Note {
 
public static final String TYPE_ISSUE = "Issue";
@@ -22,24 +20,24 @@ public class Note {
@Retention(RetentionPolicy.SOURCE)
public @interface Type {}
 
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "body")
@Json(name = "body")
String body;
@JsonField(name = "author")
@Json(name = "author")
UserBasic author;
@JsonField(name = "created_at")
@Json(name = "created_at")
Date createdAt;
@JsonField(name = "system")
@Json(name = "system")
boolean system;
@JsonField(name = "noteable_id")
@Json(name = "noteable_id")
long noteableId;
@JsonField(name = "noteable_type")
@Json(name = "noteable_type")
@Type
String noteableType;
@JsonField(name = "upvote?")
@Json(name = "upvote?")
boolean upvote;
@JsonField(name = "downvote?")
@Json(name = "downvote?")
boolean downvote;
 
public Note() {}
app/src/main/java/com/commit451/gitlab/model/api/Pipeline.java
+ 9
− 11
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -11,24 +10,23 @@ import java.util.Date;
* A pipeline.
*/
@Parcel
@JsonObject
public class Pipeline {
 
@JsonField(name = "user")
@Json(name = "user")
CommitUser user;
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "sha")
@Json(name = "sha")
String sha;
@JsonField(name = "ref")
@Json(name = "ref")
String ref;
@JsonField(name = "status")
@Json(name = "status")
String status;
@JsonField(name = "created_at")
@Json(name = "created_at")
Date createdAt;
@JsonField(name = "started_at")
@Json(name = "started_at")
Date startedAt;
@JsonField(name = "finished_at")
@Json(name = "finished_at")
Date finishedAt;
 
public CommitUser getUser() {
app/src/main/java/com/commit451/gitlab/model/api/Pipelines.java
+ 5
− 9
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
import java.util.Date;
/**
* Represents a pipeline
*/
@Parcel
@JsonObject
public class Pipelines {
 
@JsonField(name = "sha")
@Json(name = "sha")
String sha;
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "ref")
@Json(name = "ref")
String ref;
@JsonField(name = "status")
@Json(name = "status")
String status;
 
public long getId() {
app/src/main/java/com/commit451/gitlab/model/api/Project.java
+ 44
− 57
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
 
import android.net.Uri;
import android.support.annotation.Nullable;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.squareup.moshi.Json;
 
import org.parceler.Parcel;
 
@@ -12,65 +8,64 @@ import java.util.Date;
import java.util.List;
 
@Parcel
@JsonObject
public class Project {
@JsonField(name = "id")
@Json(name = "id")
long id;
@JsonField(name = "description")
@Json(name = "description")
String description;
@JsonField(name = "default_branch")
@Json(name = "default_branch")
String defaultBranch;
@JsonField(name = "tag_list")
@Json(name = "tag_list")
List<String> tagList;
@JsonField(name = "public")
@Json(name = "public")
boolean isPublic;
@JsonField(name = "archived")
@Json(name = "archived")
boolean archived;
@JsonField(name = "visibility_level")
@Json(name = "visibility_level")
int visibilityLevel;
@JsonField(name = "ssh_url_to_repo")
@Json(name = "ssh_url_to_repo")
String sshUrlToRepo;
@JsonField(name = "http_url_to_repo")
@Json(name = "http_url_to_repo")
String httpUrlToRepo;
@JsonField(name = "web_url")
Uri webUrl;
@JsonField(name = "owner")
@Json(name = "web_url")
String webUrl;
@Json(name = "owner")
UserBasic owner;
@JsonField(name = "name")
@Json(name = "name")
String name;
@JsonField(name = "name_with_namespace")
@Json(name = "name_with_namespace")
String nameWithNamespace;
@JsonField(name = "path")
@Json(name = "path")
String path;
@JsonField(name = "path_with_namespace")
@Json(name = "path_with_namespace")
String pathWithNamespace;
@JsonField(name = "issues_enabled")
boolean issuesEnabled;
@JsonField(name = "merge_requests_enabled")
boolean mergeRequestsEnabled;
@JsonField(name = "wiki_enabled")
boolean wikiEnabled;
@JsonField(name = "builds_enabled")
boolean buildEnabled;
@JsonField(name = "snippets_enabled")
boolean snippetsEnabled;
@JsonField(name = "created_at")
@Json(name = "issues_enabled")
Boolean issuesEnabled;
@Json(name = "merge_requests_enabled")
Boolean mergeRequestsEnabled;
@Json(name = "wiki_enabled")
Boolean wikiEnabled;
@Json(name = "builds_enabled")
Boolean buildEnabled;
@Json(name = "snippets_enabled")
Boolean snippetsEnabled;
@Json(name = "created_at")
Date createdAt;
@JsonField(name = "last_activity_at")
@Json(name = "last_activity_at")
Date lastActivityAt;
@JsonField(name = "creator_id")
@Json(name = "creator_id")
long creatorId;
@JsonField(name = "namespace")
@Json(name = "namespace")
ProjectNamespace namespace;
@JsonField(name = "forked_from_project")
@Json(name = "forked_from_project")
ForkedFromProject forkedFromProject;
@JsonField(name = "avatar_url")
Uri avatarUrl;
@JsonField(name = "star_count")
@Json(name = "avatar_url")
String avatarUrl;
@Json(name = "star_count")
int starCount;
@JsonField(name = "forks_count")
@Json(name = "forks_count")
int forksCount;
@JsonField(name = "open_issues_count")
@Json(name = "open_issues_count")
int openIssuesCount;
 
public Project() {}
@@ -111,7 +106,7 @@ public class Project {
return httpUrlToRepo;
}
 
public Uri getWebUrl() {
public String getWebUrl() {
return webUrl;
}
 
@@ -135,23 +130,23 @@ public class Project {
return pathWithNamespace;
}
 
public boolean isIssuesEnabled() {
public Boolean isIssuesEnabled() {
return issuesEnabled;
}
 
public boolean isMergeRequestsEnabled() {
public Boolean isMergeRequestsEnabled() {
return mergeRequestsEnabled;
}
 
public boolean isWikiEnabled() {
public Boolean isWikiEnabled() {
return wikiEnabled;
}
 
public boolean isBuildEnabled() {
public Boolean isBuildEnabled() {
return buildEnabled;
}
 
public boolean isSnippetsEnabled() {
public Boolean isSnippetsEnabled() {
return snippetsEnabled;
}
 
@@ -175,7 +170,7 @@ public class Project {
return forkedFromProject;
}
 
public Uri getAvatarUrl() {
public String getAvatarUrl() {
return avatarUrl;
}
 
@@ -191,14 +186,6 @@ public class Project {
return openIssuesCount;
}
 
@Nullable
public Uri getFeedUrl() {
if (webUrl == null) {
return null;
}
return Uri.parse(webUrl + ".atom");
}
public boolean belongsToGroup() {
//If there is an owner, then there is no group
return getOwner() == null;
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