Skip to content

Commit e2daf34

Browse files
authored
Merge pull request #108 from brentwatson/master
Fix crash on large GitHub "id" values
2 parents 0aa9fa6 + 83cb38b commit e2daf34

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

danger-kotlin-library/src/main/kotlin/systems/danger/kotlin/GitHub.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ data class GitHubPR(
173173
*/
174174
@JsonClass(generateAdapter = true)
175175
data class GitHubTeam(
176-
val id: Int,
176+
val id: Long,
177177
val name: String
178178
)
179179

@@ -238,7 +238,7 @@ data class GitHubMergeRef(
238238
*/
239239
@JsonClass(generateAdapter = true)
240240
data class GitHubRepo(
241-
val id: Int,
241+
val id: Long,
242242
val name: String,
243243
@Json(name = "full_name") val fullName: String,
244244
@Json(name = "private") val isPrivate: Boolean,
@@ -272,7 +272,7 @@ enum class GitHubReviewState(val value: String) {
272272
@JsonClass(generateAdapter = true)
273273
data class GitHubReview(
274274
val user: GitHubUser,
275-
val id: Int?,
275+
val id: Long?,
276276
val body: String?,
277277
@Json(name = "commit_id") val commitId: String?,
278278
val state: GitHubReviewState?
@@ -333,7 +333,7 @@ enum class GitHubIssueState(val value: String) {
333333
*/
334334
@JsonClass(generateAdapter = true)
335335
data class GitHubIssue(
336-
val id: Int,
336+
val id: Long,
337337
val number: Int,
338338
val title: String,
339339
val user: GitHubUser,
@@ -375,7 +375,7 @@ data class GitHubIssue(
375375
}
376376

377377
override fun hashCode(): Int {
378-
var result = id
378+
var result = id.hashCode()
379379
result = 31 * result + number
380380
result = 31 * result + title.hashCode()
381381
result = 31 * result + user.hashCode()
@@ -402,7 +402,7 @@ data class GitHubIssue(
402402
*/
403403
@JsonClass(generateAdapter = true)
404404
data class GitHubIssueLabel(
405-
val id: Int,
405+
val id: Long,
406406
val url: String,
407407
val name: String,
408408
val color: String
@@ -426,7 +426,7 @@ enum class GitHubUserType {
426426
*/
427427
@JsonClass(generateAdapter = true)
428428
data class GitHubUser(
429-
val id: Int,
429+
val id: Long,
430430
val login: String,
431431
val type: GitHubUserType,
432432
@Json(name="avatar_url")
@@ -460,7 +460,7 @@ enum class GitHubMilestoneState(val value: String) {
460460
*/
461461
@JsonClass(generateAdapter = true)
462462
data class GitHubMilestone(
463-
val id: Int,
463+
val id: Long,
464464
val number: Int,
465465
val state: GitHubMilestoneState,
466466
val title: String,

danger-kotlin-library/src/test/kotlin/systems/danger/kotlin/GitHubParsingTests.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class GitHubParsingTests {
138138
@Test
139139
fun testItCorrectlyParsesTheIssue() {
140140
with(github.issue) {
141-
assertEquals(167696965, id)
141+
assertEquals(2190001234, id)
142142
assertEquals(609, number)
143143
assertEquals("Xcode updates", title)
144144
assertEquals(

danger-kotlin-library/src/test/resources/githubDangerJSON.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@
371371
"comments_url": "https://api.github.com/repos/artsy/eidolon/issues/609/comments",
372372
"events_url": "https://api.github.com/repos/artsy/eidolon/issues/609/events",
373373
"html_url": "https://github.com/artsy/eidolon/pull/609",
374-
"id": 167696965,
374+
"id": 2190001234,
375375
"number": 609,
376376
"title": "Xcode updates",
377377
"user": {

0 commit comments

Comments
 (0)