@field: for Moshi annotations

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

@@ -8,6 +8,6 @@ import com.squareup.moshi.Json
  */
 class Message {
-    @Json(name = "message")
+    @field:Json(name = "message")
     var message: String? = null
 }

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

@@ -25,24 +25,24 @@ class Milestone {
     @Retention(AnnotationRetention.SOURCE)
     annotation class StateEvent
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "iid")
+    @field:Json(name = "iid")
     var iid: Long = 0
-    @Json(name = "project_id")
+    @field:Json(name = "project_id")
     var projectId: Long = 0
-    @Json(name = "title")
+    @field:Json(name = "title")
     var title: String? = null
-    @Json(name = "description")
+    @field:Json(name = "description")
     var description: String? = null
-    @Json(name = "state")
+    @field:Json(name = "state")
     @get:State
     var state: String? = null
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
-    @Json(name = "updated_at")
+    @field:Json(name = "updated_at")
     var updatedAt: Date? = null
-    @DashDateAdapter.DueDate
-    @Json(name = "due_date")
+    @field:DashDateAdapter.DueDate
+    @field:Json(name = "due_date")
     var dueDate: Date? = null
 }

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

@@ -18,23 +18,23 @@ class Note {
     @Retention(AnnotationRetention.SOURCE)
     annotation class Type
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "body")
+    @field:Json(name = "body")
     var body: String? = null
-    @Json(name = "author")
+    @field:Json(name = "author")
     var author: UserBasic? = null
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
-    @Json(name = "system")
+    @field:Json(name = "system")
     var isSystem: Boolean = false
-    @Json(name = "noteable_id")
+    @field:Json(name = "noteable_id")
     var noteableId: Long = 0
-    @Json(name = "noteable_type")
+    @field:Json(name = "noteable_type")
     @Type
     @get:Type var noteableType: String? = null
-    @Json(name = "upvote?")
+    @field:Json(name = "upvote?")
     var isUpvote: Boolean = false
-    @Json(name = "downvote?")
+    @field:Json(name = "downvote?")
     var isDownvote: Boolean = false
 }

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

@@ -10,20 +10,20 @@ import java.util.*
 @Parcel
 class Pipeline {
-    @Json(name = "user")
+    @field:Json(name = "user")
     var user: CommitUser? = null
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "sha")
+    @field:Json(name = "sha")
     var sha: String? = null
-    @Json(name = "ref")
+    @field:Json(name = "ref")
     var ref: String? = null
-    @Json(name = "status")
+    @field:Json(name = "status")
     var status: String? = null
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
-    @Json(name = "started_at")
+    @field:Json(name = "started_at")
     var startedAt: Date? = null
-    @Json(name = "finished_at")
+    @field:Json(name = "finished_at")
     var finishedAt: Date? = null
 }

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

@@ -10,12 +10,12 @@ import org.parceler.Parcel
 @Parcel
 class Pipelines {
-    @Json(name = "sha")
+    @field:Json(name = "sha")
     var sha: String? = null
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "ref")
+    @field:Json(name = "ref")
     var ref: String? = null
-    @Json(name = "status")
+    @field:Json(name = "status")
     var status: String? = null
 }

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

@@ -6,62 +6,62 @@ import java.util.*
 @Parcel
 class Project {
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "description")
+    @field:Json(name = "description")
     var description: String? = null
-    @Json(name = "default_branch")
+    @field:Json(name = "default_branch")
     var defaultBranch: String? = null
-    @Json(name = "tag_list")
+    @field:Json(name = "tag_list")
     var tagList: List<String>? = null
-    @Json(name = "public")
+    @field:Json(name = "public")
     var isPublic: Boolean = false
-    @Json(name = "archived")
+    @field:Json(name = "archived")
     var isArchived: Boolean = false
-    @Json(name = "visibility_level")
+    @field:Json(name = "visibility_level")
     var visibilityLevel: Int = 0
-    @Json(name = "ssh_url_to_repo")
+    @field:Json(name = "ssh_url_to_repo")
     var sshUrlToRepo: String? = null
-    @Json(name = "http_url_to_repo")
+    @field:Json(name = "http_url_to_repo")
     var httpUrlToRepo: String? = null
-    @Json(name = "web_url")
+    @field:Json(name = "web_url")
     lateinit var webUrl: String
-    @Json(name = "owner")
+    @field:Json(name = "owner")
     var owner: UserBasic? = null
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "name_with_namespace")
+    @field:Json(name = "name_with_namespace")
     var nameWithNamespace: String? = null
-    @Json(name = "path")
+    @field:Json(name = "path")
     var path: String? = null
-    @Json(name = "path_with_namespace")
+    @field:Json(name = "path_with_namespace")
     var pathWithNamespace: String? = null
-    @Json(name = "issues_enabled")
+    @field:Json(name = "issues_enabled")
     var isIssuesEnabled: Boolean? = null
-    @Json(name = "merge_requests_enabled")
+    @field:Json(name = "merge_requests_enabled")
     var isMergeRequestsEnabled: Boolean? = null
-    @Json(name = "wiki_enabled")
+    @field:Json(name = "wiki_enabled")
     var isWikiEnabled: Boolean? = null
-    @Json(name = "builds_enabled")
+    @field:Json(name = "builds_enabled")
     var isBuildEnabled: Boolean? = null
-    @Json(name = "snippets_enabled")
+    @field:Json(name = "snippets_enabled")
     var isSnippetsEnabled: Boolean? = null
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
-    @Json(name = "last_activity_at")
+    @field:Json(name = "last_activity_at")
     var lastActivityAt: Date? = null
-    @Json(name = "creator_id")
+    @field:Json(name = "creator_id")
     var creatorId: Long = 0
-    @Json(name = "namespace")
+    @field:Json(name = "namespace")
     lateinit var namespace: ProjectNamespace
-    @Json(name = "forked_from_project")
+    @field:Json(name = "forked_from_project")
     var forkedFromProject: ForkedFromProject? = null
-    @Json(name = "avatar_url")
+    @field:Json(name = "avatar_url")
     var avatarUrl: String? = null
-    @Json(name = "star_count")
+    @field:Json(name = "star_count")
     var starCount: Int = 0
-    @Json(name = "forks_count")
+    @field:Json(name = "forks_count")
     var forksCount: Int = 0
-    @Json(name = "open_issues_count")
+    @field:Json(name = "open_issues_count")
     var openIssuesCount: Int = 0
 }

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

@@ -6,28 +6,28 @@ import java.util.*
 @Parcel
 class ProjectNamespace {
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "path")
+    @field:Json(name = "path")
     var path: String? = null
-    @Json(name = "owner_id")
+    @field:Json(name = "owner_id")
     var ownerId: Long = 0
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
-    @Json(name = "updated_at")
+    @field:Json(name = "updated_at")
     var updatedAt: Date? = null
-    @Json(name = "description")
+    @field:Json(name = "description")
     var description: String? = null
-    @Json(name = "avatar")
+    @field:Json(name = "avatar")
     var avatar: Avatar? = null
-    @Json(name = "public")
+    @field:Json(name = "public")
     var isPublic: Boolean = false
     @Parcel
     class Avatar {
-        @Json(name = "url")
+        @field:Json(name = "url")
         var url: String? = null
     }
 }

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

@@ -6,18 +6,18 @@ import java.util.*
 @Parcel
 class RepositoryCommit {
-    @Json(name = "id")
+    @field:Json(name = "id")
     lateinit var id: String
-    @Json(name = "short_id")
+    @field:Json(name = "short_id")
     var shortId: String? = null
-    @Json(name = "title")
+    @field:Json(name = "title")
     var title: String? = null
-    @Json(name = "author_name")
+    @field:Json(name = "author_name")
     var authorName: String? = null
-    @Json(name = "author_email")
+    @field:Json(name = "author_email")
     var authorEmail: String? = null
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
-    @Json(name = "message")
+    @field:Json(name = "message")
     var message: String? = null
 }

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

@@ -6,22 +6,22 @@ import org.parceler.Parcel
 @Parcel
 class RepositoryFile {
-    @Json(name = "file_name")
+    @field:Json(name = "file_name")
     var fileName: String? = null
-    @Json(name = "file_path")
+    @field:Json(name = "file_path")
     var filePath: String? = null
-    @Json(name = "size")
+    @field:Json(name = "size")
     var size: Long = 0
-    @Json(name = "encoding")
+    @field:Json(name = "encoding")
     var encoding: String? = null
-    @Json(name = "content")
+    @field:Json(name = "content")
     lateinit var content: String
-    @Json(name = "ref")
+    @field:Json(name = "ref")
     var ref: String? = null
-    @Json(name = "blob_id")
+    @field:Json(name = "blob_id")
     var blobId: String? = null
-    @Json(name = "commit_id")
+    @field:Json(name = "commit_id")
     var commitId: String? = null
-    @Json(name = "last_commit_id")
+    @field:Json(name = "last_commit_id")
     var lastCommitId: String? = null
 }

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

@@ -18,13 +18,13 @@ class RepositoryTreeObject {
     @Retention(AnnotationRetention.SOURCE)
     annotation class Type
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: String? = null
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "type")
+    @field:Json(name = "type")
     @Type
     @get:Type var type: String? = null
-    @Json(name = "mode")
+    @field:Json(name = "mode")
     var mode: String? = null
 }

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

@@ -10,14 +10,14 @@ import org.parceler.Parcel
 @Parcel
 class Runner {
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "description")
+    @field:Json(name = "description")
     var description: String? = null
-    @Json(name = "active")
+    @field:Json(name = "active")
     var isActive: Boolean = false
-    @Json(name = "is_shared")
+    @field:Json(name = "is_shared")
     var isShared: Boolean = false
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
 }

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

@@ -9,34 +9,34 @@ import java.util.*
  */
 @Parcel
 class Snippet {
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "title")
+    @field:Json(name = "title")
     var title: String? = null
-    @Json(name = "file_name")
+    @field:Json(name = "file_name")
     var fileName: String? = null
-    @Json(name = "author")
+    @field:Json(name = "author")
     var author: Author? = null
-    @Json(name = "expires_at")
+    @field:Json(name = "expires_at")
     var expiresAt: Date? = null
-    @Json(name = "updated_at")
+    @field:Json(name = "updated_at")
     var updatedAt: Date? = null
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
     @Parcel
     class Author {
-        @Json(name = "id")
+        @field:Json(name = "id")
         var id: Long = 0
-        @Json(name = "username")
+        @field:Json(name = "username")
         var username: String? = null
-        @Json(name = "email")
+        @field:Json(name = "email")
         var email: String? = null
-        @Json(name = "name")
+        @field:Json(name = "name")
         var name: String? = null
-        @Json(name = "state")
+        @field:Json(name = "state")
         var state: String? = null
-        @Json(name = "created_at")
+        @field:Json(name = "created_at")
         var createdAt: Date? = null
     }
 }

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

@@ -7,27 +7,27 @@ import com.squareup.moshi.Json
  */
 class Tag {
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "message")
+    @field:Json(name = "message")
     var message: String? = null
-    @Json(name = "commit")
+    @field:Json(name = "commit")
     var commit: Commit? = null
-    @Json(name = "release")
+    @field:Json(name = "release")
     var release: Release? = null
     class Commit {
-        @Json(name = "id")
+        @field:Json(name = "id")
         var id: String? = null
-        @Json(name = "message")
+        @field:Json(name = "message")
         var message: String? = null
     }
     class Release {
-        @Json(name = "tag_name")
+        @field:Json(name = "tag_name")
         var tagName: String? = null
-        @Json(name = "description")
+        @field:Json(name = "description")
         var description: String? = null
     }
 }

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

@@ -29,26 +29,26 @@ class Todo {
     @Retention(AnnotationRetention.SOURCE)
     annotation class State
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: String? = null
-    @Json(name = "project")
+    @field:Json(name = "project")
     var project: Project? = null
-    @Json(name = "author")
+    @field:Json(name = "author")
     var author: UserBasic? = null
-    @Json(name = "action_name")
+    @field:Json(name = "action_name")
     var actionName: String? = null
-    @Json(name = "target_type")
+    @field:Json(name = "target_type")
     @TargetType
     @get:TargetType
     var targetType: String? = null
-    @Json(name = "target_url")
+    @field:Json(name = "target_url")
     var targetUrl: String? = null
-    @Json(name = "body")
+    @field:Json(name = "body")
     var body: String? = null
-    @Json(name = "state")
+    @field:Json(name = "state")
     @State
     @get:State
     var state: String? = null
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
 }

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

@@ -6,18 +6,18 @@ import java.util.*
 @Parcel
 open class User : UserBasic() {
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     var createdAt: Date? = null
-    @Json(name = "is_admin")
+    @field:Json(name = "is_admin")
     var isAdmin: Boolean = false
-    @Json(name = "bio")
+    @field:Json(name = "bio")
     var bio: String? = null
-    @Json(name = "skype")
+    @field:Json(name = "skype")
     var skype: String? = null
-    @Json(name = "linkedin")
+    @field:Json(name = "linkedin")
     var linkedin: String? = null
-    @Json(name = "twitter")
+    @field:Json(name = "twitter")
     var twitter: String? = null
-    @Json(name = "website_url")
+    @field:Json(name = "website_url")
     var websiteUrl: String? = null
 }

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

@@ -18,14 +18,14 @@ open class UserBasic : UserSafe() {
     @Retention(AnnotationRetention.SOURCE)
     annotation class State
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "state")
+    @field:Json(name = "state")
     @State
     @get:State
     var state: String? = null
-    @Json(name = "avatar_url")
+    @field:Json(name = "avatar_url")
     var avatarUrl: String? = null
-    @Json(name = "web_url")
+    @field:Json(name = "web_url")
     lateinit var webUrl: String
 }

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

@@ -6,22 +6,22 @@ import java.util.*
 @Parcel
 open class UserFull : User() {
-    @Json(name = "email")
+    @field:Json(name = "email")
     var email: String? = null
-    @Json(name = "theme_id")
+    @field:Json(name = "theme_id")
     var themeId: Int = 0
-    @Json(name = "color_scheme_id")
+    @field:Json(name = "color_scheme_id")
     var colorSchemeId: Int = 0
-    @Json(name = "projects_limit")
+    @field:Json(name = "projects_limit")
     var projectsLimit: Int = 0
-    @Json(name = "current_sign_in_at")
+    @field:Json(name = "current_sign_in_at")
     var currentSignInAt: Date? = null
-    @Json(name = "identities")
+    @field:Json(name = "identities")
     var identities: List<Identity>? = null
-    @Json(name = "can_create_group")
+    @field:Json(name = "can_create_group")
     var canCreateGroup: Boolean = false
-    @Json(name = "can_create_project")
+    @field:Json(name = "can_create_project")
     var canCreateProject: Boolean = false
-    @Json(name = "two_factor_enabled")
+    @field:Json(name = "two_factor_enabled")
     var isTwoFactorEnabled: Boolean = false
 }

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

@@ -6,6 +6,6 @@ import org.parceler.Parcel
 @Parcel
 class UserLogin : UserFull() {
-    @Json(name = "private_token")
+    @field:Json(name = "private_token")
     var privateToken: String? = null
 }

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

@@ -6,8 +6,8 @@ import org.parceler.Parcel
 @Parcel
 open class UserSafe {
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "username")
+    @field:Json(name = "username")
     var username: String? = null
 }

app/src/test/java/com/commit451/gitlab/ApiTests.kt

@@ -21,7 +21,6 @@ class ApiTests {
         @JvmStatic
         @BeforeClass
-        @Throws(Exception::class)
         fun setUp() {
             //for logging
@@ -37,7 +36,6 @@ class ApiTests {
     }
     @Test
-    @Throws(Exception::class)
     fun getProjects() {
         val projectsResponse = gitLab!!
                 .getAllProjects()
@@ -47,7 +45,6 @@ class ApiTests {
     }
     @Test
-    @Throws(Exception::class)
     fun getGroups() {
         val groupResponse = gitLab!!
                 .getGroups()
@@ -57,7 +54,6 @@ class ApiTests {
     }
     @Test
-    @Throws(Exception::class)
     fun getGroupMembers() {
         //GitLabService group id
         val gitLabGroupId: Long = 9970
@@ -69,7 +65,6 @@ class ApiTests {
     }
     @Test
-    @Throws(Exception::class)
     fun getIssues() {
         val defaultState = "opened"
         val issuesResponse = gitLab!!
@@ -80,7 +75,6 @@ class ApiTests {
     }
     @Test
-    @Throws(Exception::class)
     fun getFiles() {
         val defaultBranch = "master"
         val currentPath = ""
@@ -91,7 +85,6 @@ class ApiTests {
     }
     @Test
-    @Throws(Exception::class)
     fun getCommits() {
         val defaultBranch = "master"
         val commitsResponse = gitLab!!
@@ -101,7 +94,6 @@ class ApiTests {
     }
     @Test
-    @Throws(Exception::class)
     fun getMergeRequests() {
         val defaultState = "opened"
         val mergeRequestResponse = gitLab!!
@@ -112,7 +104,6 @@ class ApiTests {
     }
     @Test
-    @Throws(Exception::class)
     fun getCurrentUser() {
         val userFullResponse = gitLab!!
                 .getThisUser()