Skip to content

Commit cb6aff0

Browse files
authored
Merge pull request #254 from msarelo/master
Fixed MissingFieldException's during parsing Bitbucket Server responses
2 parents 949a1d9 + 52db6fd commit cb6aff0

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/models/bitbucket/BitBucketServer.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ data class BitBucketServerCommentDetail(
9090
val id: Int,
9191
val version: Int,
9292
val text: String,
93-
val author: BitBucketServerUser,
93+
val author: BitBucketServerUser? = null,
9494
@SerialName("createdDate")
9595
val createdAt: Long,
9696
@SerialName("updatedDate")
9797
val updatedAt: Long,
98-
val comments: List<BitBucketServerCommentDetail>,
99-
val properties: BitBucketServerCommentInnerProperties,
100-
val tasks: List<BitBucketServerCommentTask>
98+
val comments: List<BitBucketServerCommentDetail>? = null,
99+
val properties: BitBucketServerCommentInnerProperties? = null,
100+
val tasks: List<BitBucketServerCommentTask>? = null
101101
)
102102

103103
/**
@@ -115,7 +115,7 @@ data class BitBucketServerCommentTask(
115115
val createdAt: Long,
116116
val text: String,
117117
val state: String,
118-
val author: BitBucketServerUser
118+
val author: BitBucketServerUser? = null,
119119
)
120120

121121
/**
@@ -144,7 +144,7 @@ data class BitBucketServerCommentInnerProperties(
144144
data class BitBucketServerCommit(
145145
val id: String,
146146
val displayId: String,
147-
val author: BitBucketServerUser,
147+
val author: BitBucketServerUser? = null,
148148
val authorTimestamp: Long,
149149
val committer: BitBucketServerUser? = null,
150150
val committerTimestamp: Long,
@@ -198,9 +198,9 @@ data class BitBucketServerPR(
198198
val toRef: BitBucketServerMergeRef,
199199
@SerialName("locked")
200200
val isLocked: Boolean,
201-
val author: BitBucketServerParticipant,
202-
val reviewers: List<BitBucketServerReviewer>,
203-
val participants: List<BitBucketServerParticipant>
201+
val author: BitBucketServerParticipant? = null,
202+
val reviewers: List<BitBucketServerReviewer>? = null,
203+
val participants: List<BitBucketServerParticipant>? = null
204204
) {
205205
@Serializable
206206
enum class State {
@@ -293,9 +293,9 @@ data class BitBucketServerProject(
293293
@Serializable
294294
data class BitBucketServerUser(
295295
val id: Int? = null,
296-
val name: String,
296+
val name: String? = null,
297297
val displayName: String? = null,
298-
val emailAddress: String,
298+
val emailAddress: String? = null,
299299
val active: Boolean = false,
300300
val slug: String? = null,
301301
val type: Type = Type.NORMAL

danger-kotlin-library/src/test/kotlin/systems/danger/kotlin/models/bitbucket/BitBucketServerParsingTests.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class BitBucketServerParsingTests {
2525
null,
2626
BitBucketServerUser.Type.NORMAL
2727
)
28-
assertEquals(expectedUser, author.user)
28+
assertEquals(expectedUser, author?.user)
2929

3030
val expectedProject =
3131
BitBucketServerProject(1, "PROJ", "Project", false, "NORMAL")
@@ -62,8 +62,8 @@ class BitBucketServerParsingTests {
6262
"danger",
6363
BitBucketServerUser.Type.NORMAL
6464
)
65-
assertEquals(1, participants.count())
66-
assertEquals(expectedPartecipant, participants[0].user)
65+
assertEquals(1, participants?.count())
66+
assertEquals(expectedPartecipant, participants?.get(0)?.user)
6767

6868
assertEquals(false, closed)
6969
assertEquals(1518863923273, createdAt)
@@ -86,8 +86,8 @@ class BitBucketServerParsingTests {
8686
true,
8787
"8942a1f75e4c95df836f19ef681d20a87da2ee20"
8888
)
89-
assertEquals(1, reviewers.count())
90-
assertEquals(expectedReviewer, reviewers[0])
89+
assertEquals(1, reviewers?.count())
90+
assertEquals(expectedReviewer, reviewers?.get(0))
9191
}
9292
}
9393

0 commit comments

Comments
 (0)