Fix Parceler to not use reflection

app/src/main/java/com/commit451/gitlab/model/api/MergeRequest.kt

@@ -5,8 +5,8 @@ import com.squareup.moshi.Json
 import org.parceler.Parcel
 import java.util.*
-@Parcel
-class MergeRequest {
+@Parcel(Parcel.Serialization.BEAN)
+open class MergeRequest {
     companion object {
@@ -45,9 +45,9 @@ class MergeRequest {
     @field:Json(name = "downvotes")
     var downvotes: Long = 0
     @field:Json(name = "author")
-    var author: UserBasic? = null
+    var author: User? = null
     @field:Json(name = "assignee")
-    var assignee: UserBasic? = null
+    var assignee: User? = null
     @field:Json(name = "source_project_id")
     var sourceProjectId: Long = 0
     @field:Json(name = "target_project_id")
@@ -62,10 +62,11 @@ class MergeRequest {
     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: List<Diff>? = null
+    var changes: MutableList<Diff>? = null
 }

app/src/main/java/com/commit451/gitlab/model/api/Milestone.kt

@@ -6,8 +6,8 @@ import com.squareup.moshi.Json
 import org.parceler.Parcel
 import java.util.*
-@Parcel
-class Milestone {
+@Parcel(Parcel.Serialization.BEAN)
+open class Milestone {
     companion object {
         const val STATE_ACTIVE = "active"

app/src/main/java/com/commit451/gitlab/model/api/Note.kt

@@ -5,8 +5,8 @@ import com.squareup.moshi.Json
 import org.parceler.Parcel
 import java.util.*
-@Parcel
-class Note {
+@Parcel(Parcel.Serialization.BEAN)
+open class Note {
     companion object {
@@ -23,7 +23,7 @@ class Note {
     @field:Json(name = "body")
     var body: String? = null
     @field:Json(name = "author")
-    var author: UserBasic? = null
+    var author: User? = null
     @field:Json(name = "created_at")
     var createdAt: Date? = null
     @field:Json(name = "system")

app/src/main/java/com/commit451/gitlab/model/api/Pipeline.kt

@@ -7,8 +7,8 @@ import java.util.*
 /**
  * A pipeline.
  */
-@Parcel
-class Pipeline {
+@Parcel(Parcel.Serialization.BEAN)
+open class Pipeline {
     @field:Json(name = "user")
     var user: CommitUser? = null

app/src/main/java/com/commit451/gitlab/model/api/Pipelines.kt

-package com.commit451.gitlab.model.api
-
-import com.squareup.moshi.Json
-
-import org.parceler.Parcel
-
-/**
- * Represents a pipeline
- */
-@Parcel
-class Pipelines {
-
-    @field:Json(name = "sha")
-    var sha: String? = null
-    @field:Json(name = "id")
-    var id: Long = 0
-    @field:Json(name = "ref")
-    var ref: String? = null
-    @field:Json(name = "status")
-    var status: String? = null
-}

app/src/main/java/com/commit451/gitlab/model/api/Project.kt

@@ -4,8 +4,8 @@ import com.squareup.moshi.Json
 import org.parceler.Parcel
 import java.util.*
-@Parcel
-class Project {
+@Parcel(Parcel.Serialization.BEAN)
+open class Project {
     @field:Json(name = "id")
     var id: Long = 0
     @field:Json(name = "description")
@@ -27,7 +27,7 @@ class Project {
     @field:Json(name = "web_url")
     lateinit var webUrl: String
     @field:Json(name = "owner")
-    var owner: UserBasic? = null
+    var owner: User? = null
     @field:Json(name = "name")
     var name: String? = null
     @field:Json(name = "name_with_namespace")

app/src/main/java/com/commit451/gitlab/model/api/ProjectNamespace.kt

@@ -4,8 +4,8 @@ import com.squareup.moshi.Json
 import org.parceler.Parcel
 import java.util.*
-@Parcel
-class ProjectNamespace {
+@Parcel(Parcel.Serialization.BEAN)
+open class ProjectNamespace {
     @field:Json(name = "id")
     var id: Long = 0
     @field:Json(name = "name")
@@ -25,7 +25,7 @@ class ProjectNamespace {
     @field:Json(name = "public")
     var isPublic: Boolean = false
-    @Parcel
+    @Parcel(Parcel.Serialization.BEAN)
     class Avatar {
         @field:Json(name = "url")
         var url: String? = null

app/src/main/java/com/commit451/gitlab/model/api/RepositoryCommit.kt

@@ -4,8 +4,8 @@ import com.squareup.moshi.Json
 import org.parceler.Parcel
 import java.util.*
-@Parcel
-class RepositoryCommit {
+@Parcel(Parcel.Serialization.BEAN)
+open class RepositoryCommit {
     @field:Json(name = "id")
     lateinit var id: String
     @field:Json(name = "short_id")

app/src/main/java/com/commit451/gitlab/model/api/RepositoryFile.kt

@@ -4,8 +4,8 @@ import com.squareup.moshi.Json
 import org.parceler.Parcel
-@Parcel
-class RepositoryFile {
+@Parcel(Parcel.Serialization.BEAN)
+open class RepositoryFile {
     @field:Json(name = "file_name")
     var fileName: String? = null
     @field:Json(name = "file_path")

app/src/main/java/com/commit451/gitlab/model/api/RepositoryTreeObject.kt

@@ -4,8 +4,8 @@ import android.support.annotation.StringDef
 import com.squareup.moshi.Json
 import org.parceler.Parcel
-@Parcel
-class RepositoryTreeObject {
+@Parcel(Parcel.Serialization.BEAN)
+open class RepositoryTreeObject {
     companion object {

app/src/main/java/com/commit451/gitlab/model/api/Runner.kt

@@ -7,8 +7,8 @@ import org.parceler.Parcel
 /**
  * A runner. It runs builds. yeah
  */
-@Parcel
-class Runner {
+@Parcel(Parcel.Serialization.BEAN)
+open class Runner {
     @field:Json(name = "id")
     var id: Long = 0

app/src/main/java/com/commit451/gitlab/model/api/Snippet.kt

@@ -7,8 +7,8 @@ import java.util.*
 /**
  * A snippet!
  */
-@Parcel
-class Snippet {
+@Parcel(Parcel.Serialization.BEAN)
+open class Snippet {
     @field:Json(name = "id")
     var id: Long = 0
     @field:Json(name = "title")
@@ -24,7 +24,7 @@ class Snippet {
     @field:Json(name = "created_at")
     var createdAt: Date? = null
-    @Parcel
+    @Parcel(Parcel.Serialization.BEAN)
     class Author {
         @field:Json(name = "id")
         var id: Long = 0

app/src/main/java/com/commit451/gitlab/model/api/Todo.kt

@@ -9,8 +9,8 @@ import java.util.*
  * Todos. Not processing Target, since it is different depending on what the type is, which
  * makes it not play nice with any automated json parsing
  */
-@Parcel
-class Todo {
+@Parcel(Parcel.Serialization.BEAN)
+open class Todo {
     companion object {
@@ -34,7 +34,7 @@ class Todo {
     @field:Json(name = "project")
     var project: Project? = null
     @field:Json(name = "author")
-    var author: UserBasic? = null
+    var author: User? = null
     @field:Json(name = "action_name")
     var actionName: String? = null
     @field:Json(name = "target_type")

app/src/main/java/com/commit451/gitlab/model/api/User.kt

 package com.commit451.gitlab.model.api
+import android.support.annotation.StringDef
 import com.squareup.moshi.Json
 import org.parceler.Parcel
 import java.util.*
-@Parcel
-open class User : UserBasic() {
+@Parcel(Parcel.Serialization.BEAN)
+open class User {
+
+    companion object {
+        const val STATE_ACTIVE = "active"
+        const val STATE_BLOCKED = "blocked"
+
+        fun getAccessLevel(accessLevel: String): Int {
+            when (accessLevel.toLowerCase()) {
+                "guest" -> return 10
+                "reporter" -> return 20
+                "developer" -> return 30
+                "master" -> return 40
+                "owner" -> return 50
+            }
+
+            throw IllegalStateException("No known code for this access level")
+        }
+
+        fun getAccessLevel(accessLevel: Int): String {
+            when (accessLevel) {
+                10 -> return "Guest"
+                20 -> return "Reporter"
+                30 -> return "Developer"
+                40 -> return "Master"
+                50 -> return "Owner"
+            }
+
+            return "Unknown"
+        }
+    }
+
+    @StringDef(STATE_ACTIVE, STATE_BLOCKED)
+    @Retention(AnnotationRetention.SOURCE)
+    annotation class State
+
     @field:Json(name = "created_at")
     var createdAt: Date? = null
     @field:Json(name = "is_admin")
@@ -20,4 +55,40 @@ open class User : UserBasic() {
     var twitter: String? = null
     @field:Json(name = "website_url")
     var websiteUrl: String? = null
+    @field:Json(name = "email")
+    var email: String? = null
+    @field:Json(name = "theme_id")
+    var themeId: Int = 0
+    @field:Json(name = "color_scheme_id")
+    var colorSchemeId: Int = 0
+    @field:Json(name = "projects_limit")
+    var projectsLimit: Int = 0
+    @field:Json(name = "current_sign_in_at")
+    var currentSignInAt: Date? = null
+    @field:Json(name = "identities")
+    var identities: MutableList<Identity>? = null
+    @field:Json(name = "can_create_group")
+    var canCreateGroup: Boolean = false
+    @field:Json(name = "can_create_project")
+    var canCreateProject: Boolean = false
+    @field:Json(name = "two_factor_enabled")
+    var isTwoFactorEnabled: Boolean = false
+    @field:Json(name = "id")
+    var id: Long = 0
+    @field:Json(name = "state")
+    @State
+    @get:State
+    var state: String? = null
+    @field:Json(name = "avatar_url")
+    var avatarUrl: String? = null
+    @field:Json(name = "web_url")
+    lateinit var webUrl: String
+    @field:Json(name = "name")
+    var name: String? = null
+    @field:Json(name = "username")
+    var username: String? = null
+    @field:Json(name = "private_token")
+    var privateToken: String? = null
+    @field:Json(name = "access_level")
+    var accessLevel: Int = 0
 }

app/src/main/java/com/commit451/gitlab/model/api/UserBasic.kt

-package com.commit451.gitlab.model.api
-
-import android.support.annotation.StringDef
-import com.squareup.moshi.Json
-import org.parceler.Parcel
-
-
-@Parcel
-open class UserBasic : UserSafe() {
-
-    companion object {
-
-        const val STATE_ACTIVE = "active"
-        const val STATE_BLOCKED = "blocked"
-    }
-
-    @StringDef(STATE_ACTIVE, STATE_BLOCKED)
-    @Retention(AnnotationRetention.SOURCE)
-    annotation class State
-
-    @field:Json(name = "id")
-    var id: Long = 0
-    @field:Json(name = "state")
-    @State
-    @get:State
-    var state: String? = null
-    @field:Json(name = "avatar_url")
-    var avatarUrl: String? = null
-    @field:Json(name = "web_url")
-    lateinit var webUrl: String
-}

app/src/main/java/com/commit451/gitlab/model/api/UserFull.kt

-package com.commit451.gitlab.model.api
-
-import com.squareup.moshi.Json
-import org.parceler.Parcel
-import java.util.*
-
-@Parcel
-open class UserFull : User() {
-    @field:Json(name = "email")
-    var email: String? = null
-    @field:Json(name = "theme_id")
-    var themeId: Int = 0
-    @field:Json(name = "color_scheme_id")
-    var colorSchemeId: Int = 0
-    @field:Json(name = "projects_limit")
-    var projectsLimit: Int = 0
-    @field:Json(name = "current_sign_in_at")
-    var currentSignInAt: Date? = null
-    @field:Json(name = "identities")
-    var identities: List<Identity>? = null
-    @field:Json(name = "can_create_group")
-    var canCreateGroup: Boolean = false
-    @field:Json(name = "can_create_project")
-    var canCreateProject: Boolean = false
-    @field:Json(name = "two_factor_enabled")
-    var isTwoFactorEnabled: Boolean = false
-}

app/src/main/java/com/commit451/gitlab/model/api/UserLogin.kt

-package com.commit451.gitlab.model.api
-
-import com.squareup.moshi.Json
-
-import org.parceler.Parcel
-
-@Parcel
-class UserLogin : UserFull() {
-    @field:Json(name = "private_token")
-    var privateToken: String? = null
-}

app/src/main/java/com/commit451/gitlab/model/api/UserSafe.kt

-package com.commit451.gitlab.model.api
-
-import com.squareup.moshi.Json
-
-import org.parceler.Parcel
-
-@Parcel
-open class UserSafe {
-    @field:Json(name = "name")
-    var name: String? = null
-    @field:Json(name = "username")
-    var username: String? = null
-}

app/src/main/java/com/commit451/gitlab/model/rss/Entry.java

-package com.commit451.gitlab.model.rss;
-
-import org.parceler.Parcel;
-import org.simpleframework.xml.Element;
-import org.simpleframework.xml.Root;
-
-import java.util.Date;
-
-@Parcel
-@Root(strict = false)
-public class Entry {
-    @Element(name = "link", required = true)
-    Link link;
-    @Element(name = "title", required = true)
-    String title;
-    @Element(name = "updated", required = true)
-    Date updated;
-    @Element(name = "thumbnail", required = true)
-    Thumbnail thumbnail;
-    @Element(name = "summary", required = true)
-    String summary;
-
-    public Entry() {}
-
-    public Link getLink() {
-        return link;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public Date getUpdated() {
-        return updated;
-    }
-
-    public Thumbnail getThumbnail() {
-        return thumbnail;
-    }
-
-    public String getSummary() {
-        return summary;
-    }
-}

app/src/main/java/com/commit451/gitlab/model/rss/Entry.kt

+package com.commit451.gitlab.model.rss
+
+import org.parceler.Parcel
+import org.simpleframework.xml.Element
+import org.simpleframework.xml.Root
+import java.util.*
+
+@Parcel(Parcel.Serialization.BEAN)
+@Root(strict = false)
+class Entry {
+    @Element(name = "link", required = true)
+    lateinit var link: Link
+    @Element(name = "title", required = true)
+    lateinit var title: String
+    @Element(name = "updated", required = true)
+    lateinit var updated: Date
+    @Element(name = "thumbnail", required = true)
+    lateinit var thumbnail: Thumbnail
+    @Element(name = "summary", required = true)
+    lateinit var summary: String
+}