sonar/sonarqube-community-branch-plugin
1
0
Fork 0
mirror of https://github.com/mc1arke/sonarqube-community-branch-plugin.git synced 2025-02-21 19:20:09 +02:00
Code Issues Releases Activity

Fix detection of previous PR annotation comments

Browse Source 
MarkdownFormatterFactory uses System.lineSeparator() as the end-of-line
character for annotation comments.

GraphqlGithubClient.postSummaryComment(), however, uses hardcoded \r\n
as end-of-line character, so it isn't able to match legitimate comments
if SonarQube is not running on Windows.

This change updates GraphqlGithubClient to also use system end-of-line
char.
This commit is contained in:
Mykola Rybak 2024-04-18 01:57:11 +03:00 committed by Michael Clarke
parent 6e50df12ff
commit 9ec99e0fdf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/github/mc1arke/sonarqube/plugin/almclient/github/v4/GraphqlGithubClient.java
View File

@ -133,11 +133,12 @@ public class GraphqlGithubClient implements GithubClient {
GetRepository.PullRequest pullRequest = getPullRequest(graphqlUrl, headers, pullRequestKey);
String pullRequestId = pullRequest.getId();
String projectCommentMarker = String.format("**Project ID:** %s%n", projectId);
getComments(pullRequest, graphqlUrl, headers, pullRequestKey).stream()
.filter(c -> "Bot".equalsIgnoreCase(c.getAuthor().getType()) && login.equalsIgnoreCase(c.getAuthor().getLogin()))
.filter(c -> !c.isMinimized())
.filter(c -> c.getBody().contains(String.format("**Project ID:** %s\r\n", projectId)))
.filter(c -> c.getBody().contains(projectCommentMarker))
.map(Comments.CommentNode::getId)
.forEach(commentId -> this.minimizeComment(graphqlUrl, headers, commentId));

3
src/test/java/com/github/mc1arke/sonarqube/plugin/almclient/github/v4/GraphqlGithubClientTest.java
View File

@ -148,6 +148,7 @@ class GraphqlGithubClientTest {
ArgumentCaptor<GraphQLRequestEntity> getViewer = ArgumentCaptor.forClass(GraphQLRequestEntity.class);
when(graphQLTemplate.query(getViewer.capture(), eq(Viewer.class))).thenReturn(viewerResponseEntity);
String bodyString = objectMapper.writeValueAsString("**Project ID:** project-key-test" + System.lineSeparator());
GraphQLResponseEntity<GetRepository> getPullRequestResponseEntity =
objectMapper.readValue("{" +
"\"response\": " +
@ -159,7 +160,7 @@ class GraphqlGithubClientTest {
" {" +
" \"id\": \"MDEyOklzc3VlQ29tbWVudDE1MDE3\"," +
" \"isMinimized\": false," +
" \"body\": \"**Project ID:** project-key-test\\r\\n\"," +
" \"body\": " + bodyString + "," +
" \"author\": {" +
" \"__typename\": \"Bot\"," +
" \"login\": \"test-sonar\"" +