From 8adcaebc533a9862489edc3aa1112976d667a358 Mon Sep 17 00:00:00 2001 From: mingshewhe Date: Wed, 12 Oct 2022 10:01:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug:=20github=20pr=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=9C=89milestone=E6=97=B6=E4=B8=8D=E8=A7=A6=E5=8F=91=20#7767?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 591dadae1a83c465cb47fa07992854ce7fd0b708) --- .../common/webhook/pojo/code/github/GithubPullRequestEvent.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt index 08889953825..5d3624bfbaa 100644 --- a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt +++ b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt @@ -155,7 +155,7 @@ data class GithubPullRequest( data class GithubMilestone( @JsonProperty("closed_at") - val closedAt: String, // 2013-02-12T13:22:01Z + val closedAt: String?, // 2013-02-12T13:22:01Z @JsonProperty("closed_issues") val closedIssues: Int, // 8 @JsonProperty("created_at") @@ -183,7 +183,7 @@ data class GithubMilestone( @JsonProperty("title") val title: String, // v1.0 @JsonProperty("updated_at") - val updatedAt: String // 2014-03-03T18:58:10Z + val updatedAt: String? // 2014-03-03T18:58:10Z // @JsonProperty("url") // val url: String // https://api.github.com/repos/octocat/Hello-World/milestones/1 ) From abb93312f1c6012442954e9f6267bd610c6941d4 Mon Sep 17 00:00:00 2001 From: mingshewhe Date: Wed, 12 Oct 2022 10:14:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug:=20github=20pr=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=9C=89milestone=E6=97=B6=E4=B8=8D=E8=A7=A6=E5=8F=91=20#7767?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit acd7f64f91cc7ed0d3b8b550a39ea21351d296e7) --- .../common/webhook/pojo/code/github/GithubPullRequestEvent.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt index 5d3624bfbaa..b5c1376fc6e 100644 --- a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt +++ b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt @@ -165,7 +165,7 @@ data class GithubMilestone( @JsonProperty("description") val description: String, // Tracking milestone for version 1.0 @JsonProperty("due_on") - val dueOn: String, // 2012-10-09T23:39:01Z + val dueOn: String?, // 2012-10-09T23:39:01Z @JsonProperty("html_url") val htmlUrl: String, // https://github.com/octocat/Hello-World/milestones/v1.0 @JsonProperty("id") From e8bb2dc6a6866ba4033f490ae1d6da738d61dd5a Mon Sep 17 00:00:00 2001 From: mingshewhe Date: Thu, 13 Oct 2022 15:35:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug:=20github=20pr=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=9C=89milestone=E6=97=B6=E4=B8=8D=E8=A7=A6=E5=8F=91=20#7767?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 56b3797f97cccb9e427eb44ac03ca8e457386efc) --- .../tencent/devops/common/sdk/github/pojo/GithubMilestone.kt | 4 ++-- .../com/tencent/devops/common/sdk/github/pojo/GithubRepo.kt | 4 ++-- .../devops/common/sdk/github/response/CheckRunResponse.kt | 2 +- .../common/sdk/github/response/CreateIssueCommentResponse.kt | 2 +- .../devops/common/sdk/github/response/GetUserResponse.kt | 2 +- .../devops/common/webhook/pojo/code/github/GithubEvent.kt | 2 +- .../common/webhook/pojo/code/github/GithubPullRequestEvent.kt | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubMilestone.kt b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubMilestone.kt index cc2b85afc5c..ae44def8d48 100644 --- a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubMilestone.kt +++ b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubMilestone.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty data class GithubMilestone( @JsonProperty("closed_at") - val closedAt: String, + val closedAt: String?, @JsonProperty("closed_issues") val closedIssues: Int, @JsonProperty("created_at") @@ -26,6 +26,6 @@ data class GithubMilestone( val state: String, val title: String, @JsonProperty("updated_at") - val updatedAt: String, + val updatedAt: String?, val url: String ) diff --git a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubRepo.kt b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubRepo.kt index 04b9a5413d9..2cf2b2ade0c 100644 --- a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubRepo.kt +++ b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubRepo.kt @@ -140,7 +140,7 @@ data class GithubRepo( @JsonProperty("pulls_url") val pullsUrl: String, @JsonProperty("pushed_at") - val pushedAt: String, + val pushedAt: String?, @JsonProperty("releases_url") val releasesUrl: String?, val size: Int, @@ -168,7 +168,7 @@ data class GithubRepo( @JsonProperty("trees_url") val treesUrl: String, @JsonProperty("updated_at") - val updatedAt: String, + val updatedAt: String?, val url: String, val watchers: Int, @JsonProperty("watchers_count") diff --git a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CheckRunResponse.kt b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CheckRunResponse.kt index 1c35d427918..cac5562f207 100644 --- a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CheckRunResponse.kt +++ b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CheckRunResponse.kt @@ -28,7 +28,7 @@ data class CheckRunResponse( @JsonProperty("pull_requests") val pullRequests: List, @JsonProperty("started_at") - val startedAt: String, + val startedAt: String?, val status: String, val url: String ) diff --git a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CreateIssueCommentResponse.kt b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CreateIssueCommentResponse.kt index 9386aa54bd3..f39909bdabd 100644 --- a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CreateIssueCommentResponse.kt +++ b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CreateIssueCommentResponse.kt @@ -49,7 +49,7 @@ data class CreateIssueCommentResponse( @JsonProperty("node_id") val nodeId: String, @JsonProperty("updated_at") - val updatedAt: String, + val updatedAt: String?, @JsonProperty("url") val url: String, @JsonProperty("user") diff --git a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/GetUserResponse.kt b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/GetUserResponse.kt index 4fc708f5d78..9c7107dde2a 100644 --- a/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/GetUserResponse.kt +++ b/src/backend/ci/core/common/common-third-sdk/common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/GetUserResponse.kt @@ -78,7 +78,7 @@ data class GetUserResponse( @JsonProperty("type") val type: String, @JsonProperty("updated_at") - val updatedAt: String, + val updatedAt: String?, @JsonProperty("url") val url: String ) diff --git a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubEvent.kt b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubEvent.kt index dd36571c43e..f366fb98274 100644 --- a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubEvent.kt +++ b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubEvent.kt @@ -289,7 +289,7 @@ data class GithubRepository( // @JsonProperty("trees_url") // val treesUrl: String, // https://api.github.com/repos/yongyiduan/webhook-test/git/trees{/sha} @JsonProperty("updated_at") - val updatedAt: String, // 2022-06-21T07:54:56Z + val updatedAt: String?, // 2022-06-21T07:54:56Z @JsonProperty("url") val url: String, // https://github.com/yongyiduan/webhook-test @JsonProperty("visibility") diff --git a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt index b5c1376fc6e..3a79fe905f9 100644 --- a/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt +++ b/src/backend/ci/core/common/common-webhook/api-common-webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt @@ -142,11 +142,11 @@ data class GithubPullRequest( @JsonProperty("state") val state: String, // open @JsonProperty("statuses_url") - val statusesUrl: String, // https://api.github.com/repos/yongyiduan/webhook-test/statuses/bed5f474e52f1fadae3f5b770e3d752129678cf8 + val statusesUrl: String, @JsonProperty("title") val title: String, // Update 1 testesteste @JsonProperty("updated_at") - val updatedAt: String, // 2022-06-21T08:45:42Z + val updatedAt: String?, // 2022-06-21T08:45:42Z @JsonProperty("url") val url: String, // https://api.github.com/repos/yongyiduan/webhook-test/pulls/1 @JsonProperty("user")