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 204 additions and 706 deletions
app/src/main/java/com/commit451/gitlab/model/api/AwardEmoji.java deleted 100644 → 0
+ 0
− 57
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.util.Date;
/**
* http://docs.gitlab.com/ce/api/award_emoji.html
*/
@Parcel
public class AwardEmoji {
@Json(name = "id")
String id;
@Json(name = "name")
String name;
@Json(name = "user")
UserBasic user;
@Json(name = "created_at")
Date createdAt;
@Json(name = "updated_at")
Date updatedAt;
@Json(name = "awardable_id")
int awardableId;
@Json(name = "awardable_type")
String awardableType;
public String getId() {
return id;
}
public String getName() {
return name;
}
public UserBasic getUser() {
return user;
}
public Date getCreatedAt() {
return createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public int getAwardableId() {
return awardableId;
}
public String getAwardableType() {
return awardableType;
}
}
app/src/main/java/com/commit451/gitlab/model/api/AwardEmoji.kt 0 → 100644
+ 27
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
/**
* http://docs.gitlab.com/ce/api/award_emoji.html
*/
@Parcel(Parcel.Serialization.BEAN)
open class AwardEmoji {
@field:Json(name = "id")
var id: String? = null
@field:Json(name = "name")
var name: String? = null
@field:Json(name = "user")
var user: User? = null
@field:Json(name = "created_at")
var createdAt: Date? = null
@field:Json(name = "updated_at")
var updatedAt: Date? = null
@field:Json(name = "awardable_id")
var awardableId: Int = 0
@field:Json(name = "awardable_type")
var awardableType: String? = null
}
app/src/main/java/com/commit451/gitlab/model/api/Branch.java deleted 100644 → 0
+ 0
− 44
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.commit451.gitlab.util.ObjectUtil;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
@Parcel
public class Branch {
@Json(name = "name")
String name;
@Json(name = "protected")
boolean isProtected;
public Branch() {}
public String getName() {
return name;
}
public boolean isProtected() {
return isProtected;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof Branch)) {
return false;
}
Branch branch = (Branch) o;
return ObjectUtil.INSTANCE.equals(name, branch.name);
}
@Override
public int hashCode() {
return ObjectUtil.INSTANCE.hash(name);
}
@Override
public String toString() {
return name;
}
}
app/src/main/java/com/commit451/gitlab/model/api/Branch.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 Branch {
@field:Json(name = "name")
var name: String? = null
@field:Json(name = "protected")
var isProtected: Boolean = false
}
app/src/main/java/com/commit451/gitlab/model/api/Build.java deleted 100644 → 0
+ 0
− 105
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.util.Date;
/**
* Represents a build
*/
@Parcel
public class Build {
@Json(name = "commit")
RepositoryCommit commit;
@Json(name = "coverage")
String coverage;
@Json(name = "created_at")
Date createdAt;
@Json(name = "artifacts_file")
ArtifactsFile artifactsFile;
@Json(name = "finished_at")
Date finishedAt;
@Json(name = "id")
long id;
@Json(name = "name")
String name;
@Json(name = "ref")
String ref;
@Json(name = "runner")
Runner runner;
@Json(name = "pipeline")
Pipeline pipeline;
@Json(name = "stage")
String stage;
@Json(name = "started_at")
Date startedAt;
@Json(name = "status")
String status;
@Json(name = "tag")
boolean tag;
@Json(name = "user")
User user;
public RepositoryCommit getCommit() {
return commit;
}
public String getCoverage() {
return coverage;
}
public Date getCreatedAt() {
return createdAt;
}
public ArtifactsFile getArtifactsFile() {
return artifactsFile;
}
public Date getFinishedAt() {
return finishedAt;
}
public long getId() {
return id;
}
public String getName() {
return name;
}
public String getRef() {
return ref;
}
public Runner getRunner() {
return runner;
}
public Pipeline getPipeline() {
return pipeline;
}
public String getStage() {
return stage;
}
public Date getStartedAt() {
return startedAt;
}
public String getStatus() {
return status;
}
public boolean isTag() {
return tag;
}
public User getUser() {
return user;
}
}
app/src/main/java/com/commit451/gitlab/model/api/Build.kt 0 → 100644
+ 43
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import com.squareup.moshi.Json
import org.parceler.Parcel
import java.util.*
/**
* Represents a build
*/
@Parcel(Parcel.Serialization.BEAN)
open class Build {
@field:Json(name = "commit")
var commit: RepositoryCommit? = null
@field:Json(name = "coverage")
var coverage: String? = null
@field:Json(name = "created_at")
lateinit var createdAt: Date
@field:Json(name = "artifacts_file")
var artifactsFile: ArtifactsFile? = null
@field:Json(name = "finished_at")
var finishedAt: Date? = null
@field:Json(name = "id")
var id: Long = 0
@field:Json(name = "name")
var name: String? = null
@field:Json(name = "ref")
var ref: String? = null
@field:Json(name = "runner")
var runner: Runner? = null
@field:Json(name = "pipeline")
var pipeline: Pipeline? = null
@field:Json(name = "stage")
var stage: String? = null
@field:Json(name = "started_at")
var startedAt: Date? = null
@field:Json(name = "status")
var status: String? = null
@field:Json(name = "tag")
var isTag: Boolean = false
@field:Json(name = "user")
var user: User? = null
}
app/src/main/java/com/commit451/gitlab/model/api/CommitUser.java deleted 100644 → 0
+ 0
− 63
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.commit451.gitlab.util.ObjectUtil;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
@Parcel
public class CommitUser {
@Json(name = "id")
String id;
@Json(name = "name")
String name;
@Json(name = "username")
String username;
@Json(name = "state")
String state;
@Json(name = "avatar_url")
String avatarUrl;
@Json(name = "web_url")
String webUrl;
public CommitUser() {}
public String getId() {
return id;
}
public String getName() {
return name;
}
public String getUsername() {
return username;
}
public String getState() {
return state;
}
public String getAvatarUrl() {
return avatarUrl;
}
public String getWebUrl() {
return webUrl;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof CommitUser)) {
return false;
}
CommitUser commit = (CommitUser) o;
return ObjectUtil.INSTANCE.equals(id, commit.id);
}
@Override
public int hashCode() {
return ObjectUtil.INSTANCE.hash(id);
}
}
app/src/main/java/com/commit451/gitlab/model/api/CommitUser.kt 0 → 100644
+ 35
− 0
View file @ 6366db54
package com.commit451.gitlab.model.api
import com.commit451.gitlab.util.ObjectUtil
import com.squareup.moshi.Json
import org.parceler.Parcel
@Parcel(Parcel.Serialization.BEAN)
open class CommitUser {
@field:Json(name = "id")
var id: String? = null
@field:Json(name = "name")
var name: String? = null
@field:Json(name = "username")
var username: String? = null
@field:Json(name = "state")
var state: String? = null
@field:Json(name = "avatar_url")
var avatarUrl: String? = null
@field:Json(name = "web_url")
var webUrl: String? = null
override fun equals(o: Any?): Boolean {
if (o !is CommitUser) {
return false
}
val commit = o as CommitUser?
return ObjectUtil.equals(id, commit!!.id)
}
override fun hashCode(): Int {
return ObjectUtil.hash(id!!)
}
}
app/src/main/java/com/commit451/gitlab/model/api/Contributor.java deleted 100644 → 0
+ 0
− 118
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.commit451.gitlab.util.ObjectUtil;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@Parcel
public class Contributor {
@Json(name = "name")
String name;
@Json(name = "email")
String email;
@Json(name = "commits")
int commits;
@Json(name = "additions")
int additions;
@Json(name = "deletions")
int deletions;
public Contributor() {}
public String getName() {
return name;
}
public String getEmail() {
return email;
}
public int getCommits() {
return commits;
}
public int getAdditions() {
return additions;
}
public int getDeletions() {
return deletions;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof Contributor)) {
return false;
}
Contributor contributor = (Contributor) o;
return ObjectUtil.INSTANCE.equals(name, contributor.name) && ObjectUtil.INSTANCE.equals(email, contributor.email);
}
@Override
public int hashCode() {
return ObjectUtil.INSTANCE.hash(name, email);
}
public static List<Contributor> groupContributors(List<Contributor> contributors) {
Set<ContributorEntry> contributorEntries = new LinkedHashSet<>();
for (Contributor contributor : contributors) {
ContributorEntry contrib = null;
for (ContributorEntry entry : contributorEntries) {
if ((contributor.name != null && contributor.name.equals(entry.mContributor.name))
|| (contributor.email != null && contributor.email.equals(entry.mContributor.email))) {
while (entry.mReplacement != null) {
entry = entry.mReplacement;
}
if (contrib == entry) {
continue;
}
if (contrib == null) {
contrib = entry;
} else {
contrib.mContributor.commits += entry.mContributor.commits;
contrib.mContributor.additions += entry.mContributor.additions;
contrib.mContributor.deletions += entry.mContributor.deletions;
entry.mReplacement = contrib;
}
}
}
if (contrib == null) {
contrib = new ContributorEntry();
contrib.mContributor = contributor;
contributorEntries.add(contrib);
} else {
contrib.mContributor.commits += contributor.commits;
contrib.mContributor.additions += contributor.additions;
contrib.mContributor.deletions += contributor.deletions;
}
}
contributors = new ArrayList<>();
for (ContributorEntry entry : contributorEntries) {
if (entry.mReplacement == null) {
contributors.add(entry.mContributor);
}
}
return contributors;
}
private static class ContributorEntry {
Contributor mContributor;
ContributorEntry mReplacement;
}
}
app/src/main/java/com/commit451/gitlab/model/api/Contributor.kt 0 → 100644
+ 20
− 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 Contributor {
@field:Json(name = "name")
var name: String? = null
@field:Json(name = "email")
var email: String? = null
@field:Json(name = "commits")
var commits: Int = 0
@field:Json(name = "additions")
var additions: Int = 0
@field:Json(name = "deletions")
var deletions: Int = 0
}
app/src/main/java/com/commit451/gitlab/model/api/Diff.java deleted 100644 → 0
+ 0
− 68
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
@Parcel
public class Diff {
@Json(name = "old_path")
String oldPath;
@Json(name = "new_path")
String newPath;
@Json(name = "a_mode")
int aMode;
@Json(name = "b_mode")
int bMode;
@Json(name = "diff")
String diff;
@Json(name = "new_file")
boolean newFile;
@Json(name = "renamed_file")
boolean renamedFile;
@Json(name = "deleted_file")
boolean deletedFile;
public Diff() {}
public String getOldPath() {
return oldPath;
}
public String getNewPath() {
return newPath;
}
public int getAMode() {
return aMode;
}
public int getBMode() {
return bMode;
}
public String getDiff() {
return diff;
}
public boolean isNewFile() {
return newFile;
}
public boolean isRenamedFile() {
return renamedFile;
}
public boolean isDeletedFile() {
return deletedFile;
}
public String getFileName() {
if (newPath.contains("/")) {
String[] paths = newPath.split("/");
return paths[paths.length-1];
} else {
return newPath;
}
}
}
app/src/main/java/com/commit451/gitlab/model/api/Diff.kt 0 → 100644
+ 25
− 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 Diff {
@field:Json(name = "old_path")
var oldPath: String? = null
@field:Json(name = "new_path")
var newPath: String? = null
@field:Json(name = "a_mode")
var aMode: Int = 0
@field:Json(name = "b_mode")
var bMode: Int = 0
@field:Json(name = "diff")
var diff: String? = null
@field:Json(name = "new_file")
var isNewFile: Boolean = false
@field:Json(name = "renamed_file")
var isRenamedFile: Boolean = false
@field:Json(name = "deleted_file")
var isDeletedFile: Boolean = false
}
app/src/main/java/com/commit451/gitlab/model/api/Email.java deleted 100644 → 0
+ 0
− 38
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
@Parcel
public class Email {
@Json(name = "id")
long id;
@Json(name = "email")
String email;
public Email() {}
public long getId() {
return id;
}
public String getEmail() {
return email;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof Email)) {
return false;
}
Email email = (Email) o;
return id == email.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
}
app/src/main/java/com/commit451/gitlab/model/api/FileUploadResponse.java deleted 100644 → 0
+ 0
− 41
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
/**
* Response when a file is uploaded
*/
@Parcel
public class FileUploadResponse {
@Json(name = "alt")
String alt;
@Json(name = "url")
String url;
@Json(name = "is_image")
boolean isImage;
@Json(name = "markdown")
String markdown;
protected FileUploadResponse() {
//for json
}
public String getAlt() {
return alt;
}
public String getUrl() {
return url;
}
public boolean isImage() {
return isImage;
}
public String getMarkdown() {
return markdown;
}
}
app/src/main/java/com/commit451/gitlab/model/api/ForkedFromProject.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 ForkedFromProject {
@Json(name = "id")
long id;
@Json(name = "name")
String name;
@Json(name = "name_with_namespace")
String nameWithNamespace;
@Json(name = "path")
String path;
@Json(name = "path_with_namespace")
String pathWithNamespace;
public ForkedFromProject() {}
public long getId() {
return id;
}
public String getName() {
return name;
}
public String getNameWithNamespace() {
return nameWithNamespace;
}
public String getPath() {
return path;
}
public String getPathWithNamespace() {
return pathWithNamespace;
}
@Override
public boolean equals(Object o) {
if (!(o instanceof ForkedFromProject)) {
return false;
}
ForkedFromProject that = (ForkedFromProject) o;
return id == that.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
}
app/src/main/java/com/commit451/gitlab/model/api/ForkedFromProject.kt 0 → 100644
+ 19
− 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 ForkedFromProject {
@field:Json(name = "id")
var id: Long = 0
@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
}
app/src/main/java/com/commit451/gitlab/model/api/Group.java deleted 100644 → 0
+ 0
− 74
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import android.net.Uri;
import android.support.annotation.Nullable;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
@Parcel
public class Group {
@Json(name = "id")
long id;
@Json(name = "name")
String name;
@Json(name = "path")
String path;
@Json(name = "description")
String description;
@Json(name = "avatar_url")
String avatarUrl;
@Json(name = "web_url")
String webUrl;
public Group() {}
public long getId() {
return id;
}
public String getName() {
return name;
}
public String getPath() {
return path;
}
public String getDescription() {
return description;
}
public String getAvatarUrl() {
return avatarUrl;
}
public String getWebUrl() {
return webUrl;
}
@Nullable
public Uri getFeedUrl() {
if (webUrl == null) {
return null;
}
return Uri.parse(webUrl + ".atom");
}
@Override
public boolean equals(Object o) {
if (!(o instanceof Group)) {
return false;
}
Group group = (Group) o;
return id == group.id;
}
@Override
public int hashCode() {
return (int) (id ^ (id >>> 32));
}
}
app/src/main/java/com/commit451/gitlab/model/api/Group.kt 0 → 100644
+ 22
− 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 Group {
@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 = "description")
var description: String? = null
@field:Json(name = "avatar_url")
var avatarUrl: String? = null
@field:Json(name = "web_url")
lateinit var webUrl: String
@field:Json(name = "projects")
var projects: MutableList<Project>? = null
}
app/src/main/java/com/commit451/gitlab/model/api/GroupDetail.java deleted 100644 → 0
+ 0
− 19
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
import java.util.List;
@Parcel
public class GroupDetail extends Group {
@Json(name = "projects")
List<Project> projects;
public GroupDetail() {}
public List<Project> getProjects() {
return projects;
}
}
app/src/main/java/com/commit451/gitlab/model/api/Identity.java deleted 100644 → 0
+ 0
− 23
View file @ cbd7ebc0
package com.commit451.gitlab.model.api;
import com.squareup.moshi.Json;
import org.parceler.Parcel;
@Parcel
public class Identity {
@Json(name = "provider")
String provider;
@Json(name = "extern_uid")
String externUid;
public Identity() {}
public String getProvider() {
return provider;
}
public String getExternUid() {
return externUid;
}
}
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