@field: for Moshi annotations

app/src/main/java/com/commit451/gitlab/api/converter/DashDateAdapter.kt

 package com.commit451.gitlab.api.converter
-import com.commit451.gitlab.model.api.Milestone
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonQualifier
 import com.squareup.moshi.ToJson
-import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*

app/src/main/java/com/commit451/gitlab/api/request/SessionRequest.kt

@@ -7,10 +7,10 @@ import com.squareup.moshi.Json
  */
 class SessionRequest {
-    @Json(name = "email")
+    @field:Json(name = "email")
     var email: String? = null
-    @Json(name = "login")
+    @field:Json(name = "login")
     var login: String? = null
-    @Json(name = "password")
+    @field:Json(name = "password")
     var password: String? = null
 }

app/src/main/java/com/commit451/gitlab/api/response/FileUploadResponse.kt

@@ -10,12 +10,12 @@ import org.parceler.Parcel
 @Parcel
 class FileUploadResponse {
-    @Json(name = "alt")
+    @field:Json(name = "alt")
     var alt: String? = null
-    @Json(name = "url")
+    @field:Json(name = "url")
     var url: String? = null
-    @Json(name = "is_image")
+    @field:Json(name = "is_image")
     var isImage: Boolean = false
-    @Json(name = "markdown")
+    @field:Json(name = "markdown")
     lateinit var markdown: String
 }

app/src/main/java/com/commit451/gitlab/model/Account.kt

@@ -11,21 +11,21 @@ import java.util.*
 @Parcel
 class Account : Comparable<Account> {
-    @Json(name = "server_url")
+    @field:Json(name = "server_url")
     var serverUrl: String? = null
-    @Json(name = "authorization_header")
+    @field:Json(name = "authorization_header")
     var authorizationHeader: String? = null
-    @Json(name = "private_token")
+    @field:Json(name = "private_token")
     var privateToken: String? = null
-    @Json(name = "trusted_certificate")
+    @field:Json(name = "trusted_certificate")
     var trustedCertificate: String? = null
-    @Json(name = "trusted_hostname")
+    @field:Json(name = "trusted_hostname")
     var trustedHostname: String? = null
-    @Json(name = "private_key_alias")
+    @field:Json(name = "private_key_alias")
     var privateKeyAlias: String? = null
-    @Json(name = "user")
+    @field:Json(name = "user")
     var user: UserFull? = null
-    @Json(name = "last_used")
+    @field:Json(name = "last_used")
     var lastUsed: Date? = null
     override fun compareTo(another: Account): Int {

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

@@ -7,8 +7,8 @@ import org.parceler.Parcel
 @Parcel
 class ArtifactsFile {
-    @Json(name = "filename")
+    @field:Json(name = "filename")
     lateinit var fileName: String
-    @Json(name = "size")
+    @field:Json(name = "size")
     var size: Long = 0
 }

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

@@ -10,18 +10,18 @@ import java.util.*
 @Parcel
 class AwardEmoji {
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: String? = null
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "user")
+    @field:Json(name = "user")
     var user: UserBasic? = 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
-    @Json(name = "awardable_id")
+    @field:Json(name = "awardable_id")
     var awardableId: Int = 0
-    @Json(name = "awardable_type")
+    @field:Json(name = "awardable_type")
     var awardableType: String? = null
 }

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

@@ -8,9 +8,9 @@ import org.parceler.Parcel
 @Parcel
 class Branch {
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "protected")
+    @field:Json(name = "protected")
     var isProtected: Boolean = false
     override fun equals(o: Any?): Boolean {

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

@@ -10,34 +10,34 @@ import java.util.*
 @Parcel
 class Build {
-    @Json(name = "commit")
+    @field:Json(name = "commit")
     var commit: RepositoryCommit? = null
-    @Json(name = "coverage")
+    @field:Json(name = "coverage")
     var coverage: String? = null
-    @Json(name = "created_at")
+    @field:Json(name = "created_at")
     lateinit var createdAt: Date
-    @Json(name = "artifacts_file")
+    @field:Json(name = "artifacts_file")
     var artifactsFile: ArtifactsFile? = null
-    @Json(name = "finished_at")
+    @field:Json(name = "finished_at")
     var finishedAt: Date? = null
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "ref")
+    @field:Json(name = "ref")
     var ref: String? = null
-    @Json(name = "runner")
+    @field:Json(name = "runner")
     var runner: Runner? = null
-    @Json(name = "pipeline")
+    @field:Json(name = "pipeline")
     var pipeline: Pipeline? = null
-    @Json(name = "stage")
+    @field:Json(name = "stage")
     var stage: String? = null
-    @Json(name = "started_at")
+    @field:Json(name = "started_at")
     var startedAt: Date? = null
-    @Json(name = "status")
+    @field:Json(name = "status")
     var status: String? = null
-    @Json(name = "tag")
+    @field:Json(name = "tag")
     var isTag: Boolean = false
-    @Json(name = "user")
+    @field:Json(name = "user")
     var user: User? = null
 }

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

@@ -7,17 +7,17 @@ import org.parceler.Parcel
 @Parcel
 class CommitUser {
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: String? = null
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "username")
+    @field:Json(name = "username")
     var username: String? = null
-    @Json(name = "state")
+    @field:Json(name = "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")
     var webUrl: String? = null
     override fun equals(o: Any?): Boolean {

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

@@ -7,14 +7,14 @@ import org.parceler.Parcel
 @Parcel
 class Contributor {
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "email")
+    @field:Json(name = "email")
     var email: String? = null
-    @Json(name = "commits")
+    @field:Json(name = "commits")
     var commits: Int = 0
-    @Json(name = "additions")
+    @field:Json(name = "additions")
     var additions: Int = 0
-    @Json(name = "deletions")
+    @field:Json(name = "deletions")
     var deletions: Int = 0
 }

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

@@ -6,20 +6,20 @@ import org.parceler.Parcel
 @Parcel
 class Diff {
-    @Json(name = "old_path")
+    @field:Json(name = "old_path")
     var oldPath: String? = null
-    @Json(name = "new_path")
+    @field:Json(name = "new_path")
     var newPath: String? = null
-    @Json(name = "a_mode")
+    @field:Json(name = "a_mode")
     var aMode: Int = 0
-    @Json(name = "b_mode")
+    @field:Json(name = "b_mode")
     var bMode: Int = 0
-    @Json(name = "diff")
+    @field:Json(name = "diff")
     var diff: String? = null
-    @Json(name = "new_file")
+    @field:Json(name = "new_file")
     var isNewFile: Boolean = false
-    @Json(name = "renamed_file")
+    @field:Json(name = "renamed_file")
     var isRenamedFile: Boolean = false
-    @Json(name = "deleted_file")
+    @field:Json(name = "deleted_file")
     var isDeletedFile: Boolean = false
 }

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

@@ -6,8 +6,8 @@ import org.parceler.Parcel
 @Parcel
 class Email {
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @Json(name = "email")
+    @field:Json(name = "email")
     var email: String? = null
 }

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

@@ -6,14 +6,14 @@ import org.parceler.Parcel
 @Parcel
 class ForkedFromProject {
-    @Json(name = "id")
+    @field:Json(name = "id")
     var id: Long = 0
-    @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
 }

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

@@ -5,16 +5,16 @@ import org.parceler.Parcel
 @Parcel
 open class Group {
-    @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 = "description")
+    @field:Json(name = "description")
     var description: 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/GroupDetail.kt

@@ -6,6 +6,6 @@ import org.parceler.Parcel
 @Parcel
 class GroupDetail : Group() {
-    @Json(name = "projects")
+    @field:Json(name = "projects")
     var projects: List<Project>? = null
 }

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

@@ -6,8 +6,8 @@ import org.parceler.Parcel
 @Parcel
 class Identity {
-    @Json(name = "provider")
+    @field:Json(name = "provider")
     var provider: String? = null
-    @Json(name = "extern_uid")
+    @field:Json(name = "extern_uid")
     var externUid: String? = null
 }

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

@@ -25,31 +25,31 @@ class Issue {
     @Retention(AnnotationRetention.SOURCE)
     annotation class State
-    @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")
     @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
-    @Json(name = "labels")
+    @field:Json(name = "labels")
     var labels: List<String>? = null
-    @Json(name = "milestone")
+    @field:Json(name = "milestone")
     var milestone: Milestone? = null
-    @Json(name = "assignee")
+    @field:Json(name = "assignee")
     var assignee: UserBasic? = null
-    @Json(name = "author")
+    @field:Json(name = "author")
     var author: UserBasic? = null
-    @Json(name = "confidential")
+    @field:Json(name = "confidential")
     var isConfidential: Boolean = false
 }

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

@@ -10,18 +10,18 @@ import org.parceler.Parcel
 @Parcel
 class Label {
-    @Json(name = "color")
+    @field:Json(name = "color")
     var color: String? = null
-    @Json(name = "name")
+    @field:Json(name = "name")
     var name: String? = null
-    @Json(name = "description")
+    @field:Json(name = "description")
     var description: String? = null
-    @Json(name = "open_issues_count")
+    @field:Json(name = "open_issues_count")
     var openIssuesCount: Int = 0
-    @Json(name = "closed_issues_count")
+    @field:Json(name = "closed_issues_count")
     var closedIssuesCount: Int = 0
-    @Json(name = "open_merge_requests_count")
+    @field:Json(name = "open_merge_requests_count")
     var openMergeRequestsCount: Int = 0
-    @Json(name = "subscribed")
+    @field:Json(name = "subscribed")
     var isSubscribed: Boolean = false
 }

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

@@ -34,6 +34,6 @@ class Member : UserBasic() {
         }
     }
-    @Json(name = "access_level")
+    @field:Json(name = "access_level")
     var accessLevel: Int = 0
 }

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

@@ -19,53 +19,53 @@ class MergeRequest {
     @Retention(AnnotationRetention.SOURCE)
     annotation class State
-    @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")
     @State
     @get:State var state: String? = 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
-    @Json(name = "target_branch")
+    @field:Json(name = "target_branch")
     var targetBranch: String? = null
-    @Json(name = "source_branch")
+    @field:Json(name = "source_branch")
     var sourceBranch: String? = null
-    @Json(name = "upvotes")
+    @field:Json(name = "upvotes")
     var upvotes: Long = 0
-    @Json(name = "downvotes")
+    @field:Json(name = "downvotes")
     var downvotes: Long = 0
-    @Json(name = "author")
+    @field:Json(name = "author")
     var author: UserBasic? = null
-    @Json(name = "assignee")
+    @field:Json(name = "assignee")
     var assignee: UserBasic? = null
-    @Json(name = "source_project_id")
+    @field:Json(name = "source_project_id")
     var sourceProjectId: Long = 0
-    @Json(name = "target_project_id")
+    @field:Json(name = "target_project_id")
     var targetProjectId: Long = 0
-    @Json(name = "labels")
+    @field:Json(name = "labels")
     var labels: List<String>? = null
-    @Json(name = "work_in_progress")
+    @field:Json(name = "work_in_progress")
     var isWorkInProgress: Boolean = false
-    @Json(name = "milestone")
+    @field:Json(name = "milestone")
     var milestone: Milestone? = null
-    @Json(name = "merge_when_build_succeeds")
+    @field:Json(name = "merge_when_build_succeeds")
     var isMergeWhenBuildSucceedsEnabled: Boolean = false
-    @Json(name = "merge_status")
+    @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
      */
-    @Json(name = "changes")
+    @field:Json(name = "changes")
     var changes: List<Diff>? = null
 }