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

Merge remote-tracking branch 'origin/develop'

parents cbd7ebc0 f5eb33a1
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 397 additions and 1061 deletions
app/src/main/java/com/commit451/gitlab/model/api/Identity.kt 0 → 100644
+ 13
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import com.squareup.moshi.Json
import org.parceler.Parcel
@Parcel(Parcel.Serialization.BEAN)
open class Identity {
@field:Json(name = "provider")
var provider: String? = null
@field:Json(name = "extern_uid")
var externUid: String? = null
}
app/src/main/java/com/commit451/gitlab/model/api/Issue.java deleted 100644 → 0
+ 0
− 130
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import android.support.annotation.StringDef;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Date;
import java.util.List;
@Parcel
public class Issue {
public static final String STATE_REOPEN = "reopen";
public static final String STATE_CLOSE = "close";
@StringDef({STATE_REOPEN, STATE_CLOSE})
@Retention(RetentionPolicy.SOURCE)
public @interface EditState {
}
public static final String STATE_OPENED = "opened";
public static final String STATE_REOPENED = "reopened";
public static final String STATE_CLOSED = "closed";
@StringDef({STATE_OPENED, STATE_REOPENED, STATE_CLOSED})
@Retention(RetentionPolicy.SOURCE)
public @interface State {
}
@Json(name = "id")
long id;
@Json(name = "iid")
long iId;
@Json(name = "project_id")
long projectId;
@Json(name = "title")
String title;
@Json(name = "description")
String description;
@Json(name = "state")
@State
String state;
@Json(name = "created_at")
Date createdAt;
@Json(name = "updated_at")
Date updatedAt;
@Json(name = "labels")
List<String> labels;
@Json(name = "milestone")
Milestone milestone;
@Json(name = "assignee")
UserBasic assignee;
@Json(name = "author")
UserBasic author;
@Json(name = "confidential")
boolean confidential;
public Issue() {
}
public long getId() {
return id;
}
public long getIid() {
return iId;
}
public long getProjectId() {
return projectId;
}
public String getTitle() {
return title;
}
public String getDescription() {
return description;
}
public @State String getState() {
return state;
}
public Date getCreatedAt() {
return createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public List<String> getLabels() {
return labels;
}
public Milestone getMilestone() {
return milestone;
}
public UserBasic getAssignee() {
return assignee;
}
public UserBasic getAuthor() {
return author;
}
public boolean isConfidential() {
return confidential;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof Issue)) {
return false;
}
Issue issue = (Issue) o;
return id == issue.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
}
app/src/main/java/com/commit451/gitlab/model/api/Issue.kt 0 → 100644
+ 55
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import android.support.annotation.StringDef
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
@Parcel(Parcel.Serialization.BEAN)
open class Issue {
companion object {
const val STATE_REOPEN = "reopen"
const val STATE_CLOSE = "close"
const val STATE_OPENED = "opened"
const val STATE_REOPENED = "reopened"
const val STATE_CLOSED = "closed"
}
@StringDef(STATE_REOPEN, STATE_CLOSE)
@Retention(AnnotationRetention.SOURCE)
annotation class EditState
@StringDef(STATE_OPENED, STATE_REOPENED, STATE_CLOSED)
@Retention(AnnotationRetention.SOURCE)
annotation class State
@field:Json(name = "id")
var id: Long = 0
@field:Json(name = "iid")
var iid: Long = 0
@field:Json(name = "project_id")
var projectId: Long = 0
@field:Json(name = "title")
var title: String? = null
@field:Json(name = "description")
var description: String? = null
@field:Json(name = "state")
@State
@get:State var state: String? = null
@field:Json(name = "created_at")
var createdAt: Date? = null
@field:Json(name = "updated_at")
var updatedAt: Date? = null
@field:Json(name = "labels")
var labels: List<String>? = null
@field:Json(name = "milestone")
var milestone: Milestone? = null
@field:Json(name = "assignee")
var assignee: User? = null
@field:Json(name = "author")
var author: User? = null
@field:Json(name = "confidential")
var isConfidential: Boolean = false
}
app/src/main/java/com/commit451/gitlab/model/api/Label.java deleted 100644 → 0
+ 0
− 88
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import android.graphics.Color;
import android.support.annotation.ColorInt;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
/**
* A label
*/
@Parcel
public class Label {
@Json(name = "color")
String color;
@Json(name = "name")
String name;
@Json(name = "description")
String description;
@Json(name = "open_issues_count")
int openIssuesCount;
@Json(name = "closed_issues_count")
int closedIssuesCount;
@Json(name = "open_merge_requests_count")
int openMergeRequestsCount;
@Json(name = "subscribed")
boolean subscribed;
protected Label() {
//for json parsing
}
public String getName() {
return name;
}
@ColorInt
public int getColor() {
try {
return Color.parseColor(color);
} catch (Exception e) {
return Color.TRANSPARENT;
}
}
public String getDescription() {
return description;
}
public int getOpenIssuesCount() {
return openIssuesCount;
}
public int getClosedIssuesCount() {
return closedIssuesCount;
}
public int getOpenMergeRequestsCount() {
return openMergeRequestsCount;
}
public boolean isSubscribed() {
return subscribed;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Label label = (Label) o;
if (color != null ? !color.equals(label.color) : label.color != null) return false;
if (name != null ? !name.equals(label.name) : label.name != null) return false;
return description != null ? description.equals(label.description) : label.description == null;
}
@Override
public int hashCode() {
int result = color != null ? color.hashCode() : 0;
result = 31 * result + (name != null ? name.hashCode() : 0);
result = 31 * result + (description != null ? description.hashCode() : 0);
return result;
}
}
app/src/main/java/com/commit451/gitlab/model/api/Label.kt 0 → 100644
+ 27
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import com.squareup.moshi.Json
import org.parceler.Parcel
/**
* A label
*/
@Parcel(Parcel.Serialization.BEAN)
open class Label {
@field:Json(name = "color")
var color: String? = null
@field:Json(name = "name")
var name: String? = null
@field:Json(name = "description")
var description: String? = null
@field:Json(name = "open_issues_count")
var openIssuesCount: Int = 0
@field:Json(name = "closed_issues_count")
var closedIssuesCount: Int = 0
@field:Json(name = "open_merge_requests_count")
var openMergeRequestsCount: Int = 0
@field:Json(name = "subscribed")
var isSubscribed: Boolean = false
}
app/src/main/java/com/commit451/gitlab/model/api/Member.java deleted 100644 → 0
+ 0
− 56
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
@Parcel
public class Member extends UserBasic {
@Json(name = "access_level")
int accessLevel;
public Member() {}
public int getAccessLevel() {
return accessLevel;
}
public static int getAccessLevel(String accessLevel) {
switch (accessLevel.toLowerCase()) {
case "guest":
return 10;
case "reporter":
return 20;
case "developer":
return 30;
case "master":
return 40;
case "owner":
return 50;
}
throw new IllegalStateException("No known code for this access level");
}
public static String getAccessLevel(int accessLevel) {
switch (accessLevel) {
case 10:
return "Guest";
case 20:
return "Reporter";
case 30:
return "Developer";
case 40:
return "Master";
case 50:
return "Owner";
}
return "Unknown";
}
@Override
public String toString() {
return getUsername();
}
}
app/src/main/java/com/commit451/gitlab/model/api/MergeRequest.java deleted 100644 → 0
+ 0
− 182
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import android.support.annotation.Nullable;
import android.support.annotation.StringDef;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Date;
import java.util.List;
@Parcel
public class MergeRequest {
public static final String STATE_OPENED = "opened";
public static final String STATE_MERGED = "merged";
public static final String STATE_CLOSED = "closed";
@StringDef({STATE_OPENED, STATE_MERGED, STATE_CLOSED})
@Retention(RetentionPolicy.SOURCE)
public @interface State {}
@Json(name = "id")
long id;
@Json(name = "iid")
long iId;
@Json(name = "project_id")
long projectId;
@Json(name = "title")
String title;
@Json(name = "description")
String description;
@Json(name = "state")
@State
String state;
@Json(name = "updated_at")
Date updatedAt;
@Json(name = "created_at")
Date createdAt;
@Json(name = "target_branch")
String targetBranch;
@Json(name = "source_branch")
String sourceBranch;
@Json(name = "upvotes")
long upvotes;
@Json(name = "downvotes")
long downvotes;
@Json(name = "author")
UserBasic author;
@Json(name = "assignee")
UserBasic assignee;
@Json(name = "source_project_id")
long sourceProjectId;
@Json(name = "target_project_id")
long targetProjectId;
@Json(name = "labels")
List<String> labels;
@Json(name = "work_in_progress")
boolean workInProgress;
@Json(name = "milestone")
Milestone milestone;
@Json(name = "merge_when_build_succeeds")
boolean mergeWhenBuildSucceeds;
@Json(name = "merge_status")
String mergeStatus;
@Json(name = "changes")
@Nullable
List<Diff> changes;
public MergeRequest() {}
public long getId() {
return id;
}
public long getIid() {
return iId;
}
public long getProjectId() {
return projectId;
}
public String getTitle() {
return title;
}
public String getDescription() {
return description;
}
public @State String getState() {
return state;
}
public Date getUpdatedAt() {
return updatedAt;
}
public Date getCreatedAt() {
return createdAt;
}
public String getTargetBranch() {
return targetBranch;
}
public String getSourceBranch() {
return sourceBranch;
}
public long getUpvotes() {
return upvotes;
}
public long getDownvotes() {
return downvotes;
}
public UserBasic getAuthor() {
return author;
}
public UserBasic getAssignee() {
return assignee;
}
public long getSourceProjectId() {
return sourceProjectId;
}
public long getTargetProjectId() {
return targetProjectId;
}
public List<String> getLabels() {
return labels;
}
public boolean isWorkInProgress() {
return workInProgress;
}
public Milestone getMilestone() {
return milestone;
}
public boolean isMergeWhenBuildSucceedsEnabled() {
return mergeWhenBuildSucceeds;
}
public String getMergeStatus() {
return mergeStatus;
}
/**
* Get the changes. Only not null if this merge request was retrieved via {@link com.commit451.gitlab.api.GitLabService#getMergeRequestChanges(long, long)}
* @return the changes
*/
@Nullable
public List<Diff> getChanges() {
return changes;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof MergeRequest)) {
return false;
}
MergeRequest mergeRequest = (MergeRequest) o;
return id == mergeRequest.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
}
app/src/main/java/com/commit451/gitlab/model/api/MergeRequest.kt 0 → 100644
+ 72
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import android.support.annotation.StringDef
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
@Parcel(Parcel.Serialization.BEAN)
open class MergeRequest {
companion object {
const val STATE_OPENED = "opened"
const val STATE_MERGED = "merged"
const val STATE_CLOSED = "closed"
}
@StringDef(STATE_OPENED, STATE_MERGED, STATE_CLOSED)
@Retention(AnnotationRetention.SOURCE)
annotation class State
@field:Json(name = "id")
var id: Long = 0
@field:Json(name = "iid")
var iid: Long = 0
@field:Json(name = "project_id")
var projectId: Long = 0
@field:Json(name = "title")
var title: String? = null
@field:Json(name = "description")
var description: String? = null
@field:Json(name = "state")
@State
@get:State var state: String? = null
@field:Json(name = "updated_at")
var updatedAt: Date? = null
@field:Json(name = "created_at")
var createdAt: Date? = null
@field:Json(name = "target_branch")
var targetBranch: String? = null
@field:Json(name = "source_branch")
var sourceBranch: String? = null
@field:Json(name = "upvotes")
var upvotes: Long = 0
@field:Json(name = "downvotes")
var downvotes: Long = 0
@field:Json(name = "author")
var author: User? = null
@field:Json(name = "assignee")
var assignee: User? = null
@field:Json(name = "source_project_id")
var sourceProjectId: Long = 0
@field:Json(name = "target_project_id")
var targetProjectId: Long = 0
@field:Json(name = "labels")
var labels: List<String>? = null
@field:Json(name = "work_in_progress")
var isWorkInProgress: Boolean = false
@field:Json(name = "milestone")
var milestone: Milestone? = null
@field:Json(name = "merge_when_build_succeeds")
var isMergeWhenBuildSucceedsEnabled: Boolean = false
@field:Json(name = "merge_status")
var mergeStatus: String? = null
/**
* Get the changes. Only not null if this merge request was retrieved via [com.commit451.gitlab.api.GitLabService.getMergeRequestChanges]
* @return the changes
*/
@field:Json(name = "changes")
var changes: MutableList<Diff>? = null
}
app/src/main/java/com/commit451/gitlab/model/api/Message.java → app/src/main/java/com/commit451/gitlab/model/api/Message.kt
+ 13
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api;
package com.commit451.gitlab.model.api
 
 
import com.squareup.moshi.Json;
import com.squareup.moshi.Json
 
/**
* The structure for a message from the server, which is usually found in a response body
*/
public class Message {
class Message {
 
@Json(name = "message")
String message;
public String getMessage() {
return message;
}
@field:Json(name = "message")
var message: String? = null
}
app/src/main/java/com/commit451/gitlab/model/api/Milestone.java deleted 100644 → 0
+ 0
− 110
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import android.support.annotation.Nullable;
import android.support.annotation.StringDef;
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.util.Date;
@Parcel
public class Milestone {
public static final String STATE_ACTIVE = "active";
public static final String STATE_CLOSED = "closed";
@StringDef({STATE_ACTIVE, STATE_CLOSED})
@Retention(RetentionPolicy.SOURCE)
public @interface State {}
public static final String STATE_EVENT_ACTIVATE = "activate";
public static final String STATE_EVENT_CLOSE = "close";
@StringDef({STATE_EVENT_ACTIVATE, STATE_EVENT_CLOSE})
@Retention(RetentionPolicy.SOURCE)
public @interface StateEvent {}
@Json(name = "id")
long id;
@Json(name = "iid")
long iId;
@Json(name = "project_id")
long projectId;
@Json(name = "title")
String title;
@Json(name = "description")
String description;
@Json(name = "state")
String state;
@Json(name = "created_at")
Date createdAt;
@Json(name = "updated_at")
Date updatedAt;
@DashDateAdapter.DueDate
@Json(name = "due_date")
Date dueDate;
public Milestone() {}
public long getId() {
return id;
}
public long getIid() {
return iId;
}
public long getProjectId() {
return projectId;
}
public String getTitle() {
return title;
}
public String getDescription() {
return description;
}
@State
public String getState() {
return state;
}
public Date getCreatedAt() {
return createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
@Nullable
public Date getDueDate() {
return dueDate;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof Milestone)) {
return false;
}
Milestone milestone = (Milestone) o;
return id == milestone.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
@Override
public String toString() {
return title;
}
}
app/src/main/java/com/commit451/gitlab/model/api/Milestone.kt 0 → 100644
+ 48
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import android.support.annotation.StringDef
import com.commit451.gitlab.api.converter.DashDateAdapter
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
@Parcel(Parcel.Serialization.BEAN)
open class Milestone {
companion object {
const val STATE_ACTIVE = "active"
const val STATE_CLOSED = "closed"
const val STATE_EVENT_ACTIVATE = "activate"
const val STATE_EVENT_CLOSE = "close"
}
@StringDef(STATE_ACTIVE, STATE_CLOSED)
@Retention(AnnotationRetention.SOURCE)
annotation class State
@StringDef(STATE_EVENT_ACTIVATE, STATE_EVENT_CLOSE)
@Retention(AnnotationRetention.SOURCE)
annotation class StateEvent
@field:Json(name = "id")
var id: Long = 0
@field:Json(name = "iid")
var iid: Long = 0
@field:Json(name = "project_id")
var projectId: Long = 0
@field:Json(name = "title")
var title: String? = null
@field:Json(name = "description")
var description: String? = null
@field:Json(name = "state")
@get:State
var state: String? = null
@field:Json(name = "created_at")
var createdAt: Date? = null
@field:Json(name = "updated_at")
var updatedAt: Date? = null
@field:DashDateAdapter.DueDate
@field:Json(name = "due_date")
var dueDate: Date? = null
}
app/src/main/java/com/commit451/gitlab/model/api/Note.java deleted 100644 → 0
+ 0
− 95
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import android.support.annotation.StringDef;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Date;
@Parcel
public class Note {
public static final String TYPE_ISSUE = "Issue";
public static final String TYPE_MERGE_REQUEST = "MergeRequest";
@StringDef({TYPE_ISSUE, TYPE_MERGE_REQUEST})
@Retention(RetentionPolicy.SOURCE)
public @interface Type {}
@Json(name = "id")
long id;
@Json(name = "body")
String body;
@Json(name = "author")
UserBasic author;
@Json(name = "created_at")
Date createdAt;
@Json(name = "system")
boolean system;
@Json(name = "noteable_id")
long noteableId;
@Json(name = "noteable_type")
@Type
String noteableType;
@Json(name = "upvote?")
boolean upvote;
@Json(name = "downvote?")
boolean downvote;
public Note() {}
public long getId() {
return id;
}
public String getBody() {
return body;
}
public UserBasic getAuthor() {
return author;
}
public Date getCreatedAt() {
return createdAt;
}
public boolean isSystem() {
return system;
}
public long getNoteableId() {
return noteableId;
}
public @Type String getNoteableType() {
return noteableType;
}
public boolean isUpvote() {
return upvote;
}
public boolean isDownvote() {
return downvote;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof Note)) {
return false;
}
Note note = (Note) o;
return id == note.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
}
app/src/main/java/com/commit451/gitlab/model/api/Note.kt 0 → 100644
+ 40
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import android.support.annotation.StringDef
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
@Parcel(Parcel.Serialization.BEAN)
open class Note {
companion object {
const val TYPE_ISSUE = "Issue"
const val TYPE_MERGE_REQUEST = "MergeRequest"
}
@StringDef(TYPE_ISSUE, TYPE_MERGE_REQUEST)
@Retention(AnnotationRetention.SOURCE)
annotation class Type
@field:Json(name = "id")
var id: Long = 0
@field:Json(name = "body")
var body: String? = null
@field:Json(name = "author")
var author: User? = null
@field:Json(name = "created_at")
var createdAt: Date? = null
@field:Json(name = "system")
var isSystem: Boolean = false
@field:Json(name = "noteable_id")
var noteableId: Long = 0
@field:Json(name = "noteable_type")
@Type
@get:Type var noteableType: String? = null
@field:Json(name = "upvote?")
var isUpvote: Boolean = false
@field:Json(name = "downvote?")
var isDownvote: Boolean = false
}
app/src/main/java/com/commit451/gitlab/model/api/Pipeline.java deleted 100644 → 0
+ 0
− 58
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.util.Date;
/**
* A pipeline.
*/
@Parcel
public class Pipeline {
@Json(name = "user")
CommitUser user;
@Json(name = "id")
long id;
@Json(name = "sha")
String sha;
@Json(name = "ref")
String ref;
@Json(name = "status")
String status;
@Json(name = "created_at")
Date createdAt;
@Json(name = "started_at")
Date startedAt;
@Json(name = "finished_at")
Date finishedAt;
public CommitUser getUser() {
return user;
}
public long getId() {
return id;
}
public String getSha() {
return sha;
}
public String getRef() {
return ref;
}
public String getStatus() {
return status;
}
public Date getCreatedAt() {
return createdAt;
}
public Date getStartedAt() { return startedAt; }
public Date getFinishedAt() { return finishedAt; }
}
app/src/main/java/com/commit451/gitlab/model/api/Pipeline.kt 0 → 100644
+ 29
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
/**
* A pipeline.
*/
@Parcel(Parcel.Serialization.BEAN)
open class Pipeline {
@field:Json(name = "user")
var user: CommitUser? = null
@field:Json(name = "id")
var id: Long = 0
@field:Json(name = "sha")
var sha: String? = null
@field:Json(name = "ref")
var ref: String? = null
@field:Json(name = "status")
var status: String? = null
@field:Json(name = "created_at")
var createdAt: Date? = null
@field:Json(name = "started_at")
var startedAt: Date? = null
@field:Json(name = "finished_at")
var finishedAt: Date? = null
}
app/src/main/java/com/commit451/gitlab/model/api/Pipelines.java deleted 100644 → 0
+ 0
− 37
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
/**
* Represents a pipeline
*/
@Parcel
public class Pipelines {
@Json(name = "sha")
String sha;
@Json(name = "id")
long id;
@Json(name = "ref")
String ref;
@Json(name = "status")
String status;
public long getId() {
return id;
}
public String getSha() {
return sha;
}
public String getRef() {
return ref;
}
public String getStatus() {
return status;
}
}
app/src/main/java/com/commit451/gitlab/model/api/Project.java deleted 100644 → 0
+ 0
− 209
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.util.Date;
import java.util.List;
@Parcel
public class Project {
@Json(name = "id")
long id;
@Json(name = "description")
String description;
@Json(name = "default_branch")
String defaultBranch;
@Json(name = "tag_list")
List<String> tagList;
@Json(name = "public")
boolean isPublic;
@Json(name = "archived")
boolean archived;
@Json(name = "visibility_level")
int visibilityLevel;
@Json(name = "ssh_url_to_repo")
String sshUrlToRepo;
@Json(name = "http_url_to_repo")
String httpUrlToRepo;
@Json(name = "web_url")
String webUrl;
@Json(name = "owner")
UserBasic owner;
@Json(name = "name")
String name;
@Json(name = "name_with_namespace")
String nameWithNamespace;
@Json(name = "path")
String path;
@Json(name = "path_with_namespace")
String pathWithNamespace;
@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;
@Json(name = "last_activity_at")
Date lastActivityAt;
@Json(name = "creator_id")
long creatorId;
@Json(name = "namespace")
ProjectNamespace namespace;
@Json(name = "forked_from_project")
ForkedFromProject forkedFromProject;
@Json(name = "avatar_url")
String avatarUrl;
@Json(name = "star_count")
int starCount;
@Json(name = "forks_count")
int forksCount;
@Json(name = "open_issues_count")
int openIssuesCount;
public Project() {}
public long getId() {
return id;
}
public String getDescription() {
return description;
}
public String getDefaultBranch() {
return defaultBranch;
}
public List<String> getTagList() {
return tagList;
}
public boolean isPublic() {
return isPublic;
}
public boolean isArchived() {
return archived;
}
public int getVisibilityLevel() {
return visibilityLevel;
}
public String getSshUrlToRepo() {
return sshUrlToRepo;
}
public String getHttpUrlToRepo() {
return httpUrlToRepo;
}
public String getWebUrl() {
return webUrl;
}
public UserBasic getOwner() {
return owner;
}
public String getName() {
return name;
}
public String getNameWithNamespace() {
return nameWithNamespace;
}
public String getPath() {
return path;
}
public String getPathWithNamespace() {
return pathWithNamespace;
}
public Boolean isIssuesEnabled() {
return issuesEnabled;
}
public Boolean isMergeRequestsEnabled() {
return mergeRequestsEnabled;
}
public Boolean isWikiEnabled() {
return wikiEnabled;
}
public Boolean isBuildEnabled() {
return buildEnabled;
}
public Boolean isSnippetsEnabled() {
return snippetsEnabled;
}
public Date getCreatedAt() {
return createdAt;
}
public Date getLastActivityAt() {
return lastActivityAt;
}
public long getCreatorId() {
return creatorId;
}
public ProjectNamespace getNamespace() {
return namespace;
}
public ForkedFromProject getForkedFromProject() {
return forkedFromProject;
}
public String getAvatarUrl() {
return avatarUrl;
}
public int getStarCount() {
return starCount;
}
public int getForksCount() {
return forksCount;
}
public int getOpenIssuesCount() {
return openIssuesCount;
}
public boolean belongsToGroup() {
//If there is an owner, then there is no group
return getOwner() == null;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof Project)) {
return false;
}
Project project = (Project) o;
return id == project.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
}
app/src/main/java/com/commit451/gitlab/model/api/Project.kt 0 → 100644
+ 67
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
@Parcel(Parcel.Serialization.BEAN)
open class Project {
@field:Json(name = "id")
var id: Long = 0
@field:Json(name = "description")
var description: String? = null
@field:Json(name = "default_branch")
var defaultBranch: String? = null
@field:Json(name = "tag_list")
var tagList: List<String>? = null
@field:Json(name = "public")
var isPublic: Boolean = false
@field:Json(name = "archived")
var isArchived: Boolean = false
@field:Json(name = "visibility_level")
var visibilityLevel: Int = 0
@field:Json(name = "ssh_url_to_repo")
var sshUrlToRepo: String? = null
@field:Json(name = "http_url_to_repo")
var httpUrlToRepo: String? = null
@field:Json(name = "web_url")
lateinit var webUrl: String
@field:Json(name = "owner")
var owner: User? = null
@field:Json(name = "name")
var name: String? = null
@field:Json(name = "name_with_namespace")
var nameWithNamespace: String? = null
@field:Json(name = "path")
var path: String? = null
@field:Json(name = "path_with_namespace")
var pathWithNamespace: String? = null
@field:Json(name = "issues_enabled")
var isIssuesEnabled: Boolean? = null
@field:Json(name = "merge_requests_enabled")
var isMergeRequestsEnabled: Boolean? = null
@field:Json(name = "wiki_enabled")
var isWikiEnabled: Boolean? = null
@field:Json(name = "builds_enabled")
var isBuildEnabled: Boolean? = null
@field:Json(name = "snippets_enabled")
var isSnippetsEnabled: Boolean? = null
@field:Json(name = "created_at")
var createdAt: Date? = null
@field:Json(name = "last_activity_at")
var lastActivityAt: Date? = null
@field:Json(name = "creator_id")
var creatorId: Long = 0
@field:Json(name = "namespace")
lateinit var namespace: ProjectNamespace
@field:Json(name = "forked_from_project")
var forkedFromProject: ForkedFromProject? = null
@field:Json(name = "avatar_url")
var avatarUrl: String? = null
@field:Json(name = "star_count")
var starCount: Int = 0
@field:Json(name = "forks_count")
var forksCount: Int = 0
@field:Json(name = "open_issues_count")
var openIssuesCount: Int = 0
}
app/src/main/java/com/commit451/gitlab/model/api/ProjectNamespace.java deleted 100644 → 0
+ 0
− 96
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.util.Date;
@Parcel
public class ProjectNamespace {
@Json(name = "id")
long id;
@Json(name = "name")
String name;
@Json(name = "path")
String path;
@Json(name = "owner_id")
long ownerId;
@Json(name = "created_at")
Date createdAt;
@Json(name = "updated_at")
Date updatedAt;
@Json(name = "description")
String description;
@Json(name = "avatar")
Avatar avatar;
@Json(name = "public")
boolean isPublic;
public ProjectNamespace() {
}
public long getId() {
return id;
}
public String getName() {
return name;
}
public String getPath() {
return path;
}
public long getOwnerId() {
return ownerId;
}
public Date getCreatedAt() {
return createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public String getDescription() {
return description;
}
public Avatar getAvatar() {
return avatar;
}
public boolean isPublic() {
return isPublic;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof ProjectNamespace)) {
return false;
}
ProjectNamespace that = (ProjectNamespace) o;
return id == that.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
@Parcel
public static class Avatar {
@Json(name = "url")
String url;
public Avatar() {
}
public String getUrl() {
return url;
}
}
}
app/src/main/java/com/commit451/gitlab/model/api/ProjectNamespace.kt 0 → 100644
+ 33
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
@Parcel(Parcel.Serialization.BEAN)
open class ProjectNamespace {
@field:Json(name = "id")
var id: Long = 0
@field:Json(name = "name")
var name: String? = null
@field:Json(name = "path")
var path: String? = null
@field:Json(name = "owner_id")
var ownerId: Long = 0
@field:Json(name = "created_at")
var createdAt: Date? = null
@field:Json(name = "updated_at")
var updatedAt: Date? = null
@field:Json(name = "description")
var description: String? = null
@field:Json(name = "avatar")
var avatar: Avatar? = null
@field:Json(name = "public")
var isPublic: Boolean = false
@Parcel(Parcel.Serialization.BEAN)
class Avatar {
@field:Json(name = "url")
var url: String? = 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