From a9766b309dc1e2f6f47258f9e70a990adb175074 Mon Sep 17 00:00:00 2001 From: robinsoc Date: Fri, 15 Oct 2021 15:18:54 +0200 Subject: [PATCH] Support the pull request `title` key in GitPullRequest (#210) Part of [request #23441](https://tuleap.net/plugins/tracker/?aid=23441) Display the title of the PR instead of TLP-PR- This commit introduce the request Co-authored-by: Clarck Robinson --- .../jenkins/plugins/tuleap_api/client/GitPullRequest.java | 2 ++ .../client/internals/entities/GitPullRequestEntity.java | 8 ++++++++ .../tuleap_api/client/internals/TuleapApiClientTest.java | 5 +++-- .../internals/tuleap_git_pull_requests_payload.json | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/jenkins/plugins/tuleap_api/client/GitPullRequest.java b/src/main/java/io/jenkins/plugins/tuleap_api/client/GitPullRequest.java index ce5ac46..aac11b1 100644 --- a/src/main/java/io/jenkins/plugins/tuleap_api/client/GitPullRequest.java +++ b/src/main/java/io/jenkins/plugins/tuleap_api/client/GitPullRequest.java @@ -3,6 +3,8 @@ public interface GitPullRequest { String getId(); + String getTitle(); + GitRepositoryReference getSourceRepository(); GitRepositoryReference getDestinationRepository(); diff --git a/src/main/java/io/jenkins/plugins/tuleap_api/client/internals/entities/GitPullRequestEntity.java b/src/main/java/io/jenkins/plugins/tuleap_api/client/internals/entities/GitPullRequestEntity.java index b56ad07..ad9f87c 100644 --- a/src/main/java/io/jenkins/plugins/tuleap_api/client/internals/entities/GitPullRequestEntity.java +++ b/src/main/java/io/jenkins/plugins/tuleap_api/client/internals/entities/GitPullRequestEntity.java @@ -8,6 +8,7 @@ public class GitPullRequestEntity implements GitPullRequest { private final String id; + private final String title; private final GitRepositoryReference sourceRepository; private final GitRepositoryReference destinationRepository; private final String sourceBranch; @@ -16,12 +17,14 @@ public class GitPullRequestEntity implements GitPullRequest { public GitPullRequestEntity( @JsonProperty("id") String id, + @JsonProperty("title") String title, @JsonProperty("repository") GitRepositoryReferenceEntity sourceRepository, @JsonProperty("repository_dest") GitRepositoryReferenceEntity destinationRepository, @JsonProperty("branch_src") String sourceBranch, @JsonProperty("branch_dest") String destinationBranch, @JsonProperty("head") GitHeadEntity head) { this.id = id; + this.title = title; this.sourceRepository = sourceRepository; this.destinationRepository = destinationRepository; this.sourceBranch = sourceBranch; @@ -34,6 +37,11 @@ public String getId() { return this.id; } + @Override + public String getTitle() { + return this.title; + } + @Override public GitRepositoryReference getSourceRepository() { return this.sourceRepository; diff --git a/src/test/java/io/jenkins/plugins/tuleap_api/client/internals/TuleapApiClientTest.java b/src/test/java/io/jenkins/plugins/tuleap_api/client/internals/TuleapApiClientTest.java index 3400f09..e9326b5 100644 --- a/src/test/java/io/jenkins/plugins/tuleap_api/client/internals/TuleapApiClientTest.java +++ b/src/test/java/io/jenkins/plugins/tuleap_api/client/internals/TuleapApiClientTest.java @@ -565,8 +565,8 @@ public void itReturnsThePullRequests() throws IOException { TuleapAccessToken accessToken = this.getTuleapAccessTokenStubClass(); - GitPullRequest pr1 = new GitPullRequestEntity("1", new GitRepositoryReferenceEntity("repo001", 4), new GitRepositoryReferenceEntity("repo001", 4), "pr1", "master", new GitHeadEntity("9e419faf4a8cc2614ae536e995fa0528dad44b01")); - GitPullRequest pr2 = new GitPullRequestEntity("2", new GitRepositoryReferenceEntity("u/darwinw/repo001", 18), new GitRepositoryReferenceEntity("repo001", 4), "from-fork", "pr5", new GitHeadEntity("95fd78ba6238cfeac8d6a10874353130da04b1d7")); + GitPullRequest pr1 = new GitPullRequestEntity("1","add file in pr1", new GitRepositoryReferenceEntity("repo001", 4), new GitRepositoryReferenceEntity("repo001", 4), "pr1", "master", new GitHeadEntity("9e419faf4a8cc2614ae536e995fa0528dad44b01")); + GitPullRequest pr2 = new GitPullRequestEntity("2", "new message from fork", new GitRepositoryReferenceEntity("u/darwinw/repo001", 18), new GitRepositoryReferenceEntity("repo001", 4), "from-fork", "pr5", new GitHeadEntity("95fd78ba6238cfeac8d6a10874353130da04b1d7")); List expectedPullRequests = ImmutableList.of(pr1,pr2); List currentPullRequests = this.tuleapApiClient.getPullRequests("4", accessToken); @@ -580,6 +580,7 @@ public void itReturnsThePullRequests() throws IOException { .orElseThrow(RuntimeException::new); assertEquals(expectedPullRequest.getId(), pullRequest.getId()); + assertEquals(expectedPullRequest.getTitle(), pullRequest.getTitle()); assertEquals(expectedPullRequest.getSourceBranch(), pullRequest.getSourceBranch()); assertEquals(expectedPullRequest.getDestinationBranch(), pullRequest.getDestinationBranch()); assertEquals(expectedPullRequest.getSourceRepository().getId(), pullRequest.getSourceRepository().getId()); diff --git a/src/test/resources/io/jenkins/plugins/tuleap_api/client/internals/tuleap_git_pull_requests_payload.json b/src/test/resources/io/jenkins/plugins/tuleap_api/client/internals/tuleap_git_pull_requests_payload.json index 021f638..bae67d1 100644 --- a/src/test/resources/io/jenkins/plugins/tuleap_api/client/internals/tuleap_git_pull_requests_payload.json +++ b/src/test/resources/io/jenkins/plugins/tuleap_api/client/internals/tuleap_git_pull_requests_payload.json @@ -39,7 +39,7 @@ }, { "id": 2, - "title": "new lessage from fork", + "title": "new message from fork", "uri": "pull_requests/4", "repository": { "name": "u/darwinw/repo001",