Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8d4024b

Browse files
gildaygilday
committed
Add side and start_side Paramters to Create Review Comment
Follows existing pattern from line and start_line
1 parent da9d777 commit 8d4024b

File tree

4 files changed

+41
-5
lines changed

4 files changed

+41
-5
lines changed

‎src/main/java/org/kohsuke/github/GHPullRequestReviewCommentBuilder.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,35 @@ public GHPullRequestReviewCommentBuilder lines(int startLine, int endLine) {
110110
return this;
111111
}
112112

113+
/**
114+
* The side of the diff in the pull request that the comment applies to.
115+
* <p>
116+
* {@link #side(GHPullRequestReviewComment.Side)} and {@link #sides(GHPullRequestReviewComment.Side, GHPullRequestReviewComment.Side)} will overwrite each other's values.
117+
*
118+
* @param side side of the diff to which the comment applies
119+
* @return the gh pull request review comment builder
120+
*/
121+
public GHPullRequestReviewCommentBuilder side(GHPullRequestReviewComment.Side side) {
122+
builder.with("side", side.toString().toLowerCase());
123+
builder.remove("start_side");
124+
return this;
125+
}
126+
127+
/**
128+
* The sides of the diff in the pull request that the comment applies to.
129+
* <p>
130+
* {@link #side(GHPullRequestReviewComment.Side)} and {@link #sides(GHPullRequestReviewComment.Side, GHPullRequestReviewComment.Side)} will overwrite each other's values.
131+
*
132+
* @param startSide side of the diff to which the start of the comment applies
133+
* @param endSide side of the diff to which the end of the comment applies
134+
* @return the gh pull request review comment builder
135+
*/
136+
public GHPullRequestReviewCommentBuilder sides(GHPullRequestReviewComment.Side startSide, GHPullRequestReviewComment.Side endSide) {
137+
builder.with("start_side", startSide.toString().toLowerCase());
138+
builder.with("side", endSide.toString().toLowerCase());
139+
return this;
140+
}
141+
113142
/**
114143
* Create gh pull request review comment.
115144
*

‎src/test/java/org/kohsuke/github/GHPullRequestTest.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import static org.hamcrest.Matchers.not;
2626
import static org.hamcrest.Matchers.notNullValue;
2727
import static org.hamcrest.Matchers.nullValue;
28+
import static org.kohsuke.github.GHPullRequestReviewComment.Side.LEFT;
29+
import static org.kohsuke.github.GHPullRequestReviewComment.Side.RIGHT;
2830

2931
// TODO: Auto-generated Javadoc
3032
/**
@@ -337,12 +339,14 @@ public void pullRequestReviewComments() throws Exception {
337339
.body("A single line review comment")
338340
.path("README.md")
339341
.line(2)
342+
.side(RIGHT)
340343
.create();
341344
p.createReviewComment()
342345
.commitId(p.getHead().getSha())
343346
.body("A multiline review comment")
344347
.path("README.md")
345348
.lines(2, 3)
349+
.sides(RIGHT, RIGHT)
346350
.create();
347351
List<GHPullRequestReviewComment> comments = p.listReviewComments().toList();
348352
assertThat(comments.size(), equalTo(3));
@@ -362,7 +366,7 @@ public void pullRequestReviewComments() throws Exception {
362366
assertThat(comment.getStartSide(), equalTo(GHPullRequestReviewComment.Side.UNKNOWN));
363367
assertThat(comment.getLine(), equalTo(1));
364368
assertThat(comment.getOriginalLine(), equalTo(1));
365-
assertThat(comment.getSide(), equalTo(GHPullRequestReviewComment.Side.LEFT));
369+
assertThat(comment.getSide(), equalTo(LEFT));
366370
assertThat(comment.getPullRequestUrl(), notNullValue());
367371
assertThat(comment.getPullRequestUrl().toString(), containsString("hub4j-test-org/github-api/pulls/"));
368372
assertThat(comment.getBodyHtml(), nullValue());
@@ -375,11 +379,14 @@ public void pullRequestReviewComments() throws Exception {
375379
comment = comments.get(1);
376380
assertThat(comment.getBody(), equalTo("A single line review comment"));
377381
assertThat(comment.getLine(), equalTo(2));
382+
assertThat(comment.getSide(), equalTo(RIGHT));
378383

379384
comment = comments.get(2);
380385
assertThat(comment.getBody(), equalTo("A multiline review comment"));
381386
assertThat(comment.getStartLine(), equalTo(2));
382387
assertThat(comment.getLine(), equalTo(3));
388+
assertThat(comment.getStartSide(), equalTo(RIGHT));
389+
assertThat(comment.getSide(), equalTo(RIGHT));
383390

384391
comment.createReaction(ReactionContent.EYES);
385392
GHReaction toBeRemoved = comment.createReaction(ReactionContent.CONFUSED);

‎src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/7-r_h_g_pulls_484_comments.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"bodyPatterns": [
1313
{
14-
"equalToJson": "{\"path\":\"README.md\",\"line\":2,\"body\":\"A single line review comment\",\"commit_id\":\"07374fe73aff1c2024a8d4114b32406c7a8e89b7\"}",
14+
"equalToJson": "{\"path\":\"README.md\",\"side\":\"right\",\"line\":2,\"body\":\"A single line review comment\",\"commit_id\":\"07374fe73aff1c2024a8d4114b32406c7a8e89b7\"}",
1515
"ignoreArrayOrder": true,
1616
"ignoreExtraElements": false
1717
}
@@ -55,4 +55,4 @@
5555
"uuid": "43f15589-cf59-4ed5-a2b8-8f6b7ebae791",
5656
"persistent": true,
5757
"insertionIndex": 7
58-
}
58+
}

‎src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/8-r_h_g_pulls_484_comments.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"bodyPatterns": [
1313
{
14-
"equalToJson": "{\"path\":\"README.md\",\"line\":3,\"start_line\":2,\"body\":\"A multiline review comment\",\"commit_id\":\"07374fe73aff1c2024a8d4114b32406c7a8e89b7\"}",
14+
"equalToJson": "{\"path\":\"README.md\",\"side\":\"right\",\"start_side\":\"right\",\"line\":3,\"start_line\":2,\"body\":\"A multiline review comment\",\"commit_id\":\"07374fe73aff1c2024a8d4114b32406c7a8e89b7\"}",
1515
"ignoreArrayOrder": true,
1616
"ignoreExtraElements": false
1717
}
@@ -55,4 +55,4 @@
5555
"uuid": "efe94b1b-7f9c-4bba-9af2-0a7a59a498ab",
5656
"persistent": true,
5757
"insertionIndex": 8
58-
}
58+
}

0 commit comments

Comments
 (0)