Skip to content

Commit 4f19ee7

Browse files
authored
Merge pull request #317 from danger/fix-gitlab-int-parse-error
gitlab: Fix Gitlab parsing error by changing ids to Long
2 parents 1fa1cee + 919e1b4 commit 4f19ee7

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/models/gitlab/GitLab.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ data class GitLabMergeRequest(
5555
val firstDeployedToProductionAt: Instant? = null,
5656
@SerialName("force_remove_source_branch")
5757
val forceRemoveSourceBranch: Boolean? = null,
58-
val id: Int,
59-
val iid: Int,
58+
val id: Long,
59+
val iid: Long,
6060
@SerialName("latest_build_finished_at")
6161

6262
val latestBuildFinishedAt: Instant? = null,
@@ -147,10 +147,10 @@ data class GitLabMilestone(
147147
val description: String,
148148
@SerialName("due_date")
149149
val dueDate: Instant,
150-
val id: Int,
151-
val iid: Int,
150+
val id: Long,
151+
val iid: Long,
152152
@SerialName("project_id")
153-
val projectID: Int,
153+
val projectID: Long,
154154
@SerialName("start_date")
155155
val startDate: Instant,
156156
val state: GitLabMilestoneState,
@@ -172,7 +172,7 @@ enum class GitLabMilestoneState {
172172

173173
@Serializable
174174
data class GitLabPipeline(
175-
val id: Int,
175+
val id: Long,
176176
val ref: String,
177177
val sha: String,
178178
val status: GitLabPipelineStatus,
@@ -205,7 +205,7 @@ enum class GitLabPipelineStatus {
205205
data class GitLabUser(
206206
@SerialName("avatar_url")
207207
val avatarUrl: String? = null,
208-
val id: Int,
208+
val id: Long,
209209
val name: String,
210210
val state: GitLabUserState,
211211
val username: String,

danger-kotlin-library/src/test/kotlin/systems/danger/kotlin/models/gitlab/GitLabParsingTests.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ class GitLabParsingTests {
2121
assertEquals(false, allowMaintainerToPush)
2222
assertEquals(1, approvalsBeforeMerge)
2323
val orta = GitLabUser(
24-
"https://secure.gravatar.com/avatar/f116cb3be23153ec08b94e8bd4dbcfeb?s=80&d=identicon", 377669, "Orta",
24+
"https://secure.gravatar.com/avatar/f116cb3be23153ec08b94e8bd4dbcfeb?s=80&d=identicon", 377669L, "Orta",
2525
GitLabUserState.ACTIVE, "orta", "https://gitlab.com/orta"
2626
)
2727
assertEquals(orta, assignee)
2828
val fmeloni = GitLabUser(
2929
"https://secure.gravatar.com/avatar/3d90e967de2beab6d44cfadbb4976b87?s=80&d=identicon",
30-
3331525,
30+
3331525L,
3131
"Franco Meloni",
3232
GitLabUserState.ACTIVE,
3333
"f-meloni",
@@ -48,8 +48,8 @@ class GitLabParsingTests {
4848
assertEquals(0, downvotes)
4949
assertEquals(Instant.fromEpochMilliseconds(1554942622492), firstDeployedToProductionAt)
5050
assertEquals(true, forceRemoveSourceBranch)
51-
assertEquals(27469633, id)
52-
assertEquals(182, iid)
51+
assertEquals(27469633L, id)
52+
assertEquals(182L, iid)
5353
assertEquals(Instant.fromEpochMilliseconds(1554942802492), latestBuildFinishedAt)
5454
assertEquals(Instant.fromEpochMilliseconds(1619786100103), latestBuildStartedAt)
5555
assertEquals(listOf<String>(), labels)
@@ -61,9 +61,9 @@ class GitLabParsingTests {
6161
Instant.fromEpochMilliseconds(1554933465346),
6262
"Test Description",
6363
Instant.fromEpochMilliseconds(1560124800000),
64-
1,
65-
2,
66-
1000,
64+
1L,
65+
2L,
66+
1000L,
6767
Instant.fromEpochMilliseconds(1554933465346),
6868
GitLabMilestoneState.CLOSED,
6969
"Test Milestone",
@@ -72,7 +72,7 @@ class GitLabParsingTests {
7272
)
7373
assertEquals(expectedMilestone, milestone)
7474
val expectedPipeline = GitLabPipeline(
75-
50,
75+
50L,
7676
"ef28580bb2a00d985bffe4a4ce3fe09fdb12283f",
7777
"621bc3348549e51c5bd6ea9f094913e9e4667c7b",
7878
GitLabPipelineStatus.SUCCESS,

0 commit comments

Comments
 (0)