From 565779dceee975103aecaa3fa96bcc1fec6b8b3b Mon Sep 17 00:00:00 2001 From: Nicolas Quinquenel Date: Wed, 27 Nov 2024 14:51:38 +0100 Subject: [PATCH] Remove pullRequest --- API_CHANGES.md | 3 +-- .../core/embedded/server/ShowIssueRequestHandler.java | 3 +-- .../mediumtest/issues/OpenIssueInIdeMediumTests.java | 2 -- .../rpc/protocol/client/issue/IssueDetailsDto.java | 11 +---------- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/API_CHANGES.md b/API_CHANGES.md index 85a1334225..a18745a0ad 100644 --- a/API_CHANGES.md +++ b/API_CHANGES.md @@ -4,8 +4,7 @@ * Signature of `org.sonarsource.sonarlint.core.rpc.protocol.backend.file.DidUpdateFileSystemParams#DidUpdateFileSystemParams` was changed * Parameter `addedOrChangedFiles` was split into `addedFiles` and `changedFiles` -* Removed parameter `branch` from `org.sonarsource.sonarlint.core.rpc.protocol.client.issue.IssueDetailsDto` as it should not be used anymore by the client. - This is used as part of the Open in IDE feature, and SLCORE is now checking for branches. +* Removed parameter `branch` and `pullRequest` from `org.sonarsource.sonarlint.core.rpc.protocol.client.issue.IssueDetailsDto` as it should not be used anymore by the client. # 10.10 diff --git a/backend/core/src/main/java/org/sonarsource/sonarlint/core/embedded/server/ShowIssueRequestHandler.java b/backend/core/src/main/java/org/sonarsource/sonarlint/core/embedded/server/ShowIssueRequestHandler.java index aa840d0364..0c0ea1a25e 100644 --- a/backend/core/src/main/java/org/sonarsource/sonarlint/core/embedded/server/ShowIssueRequestHandler.java +++ b/backend/core/src/main/java/org/sonarsource/sonarlint/core/embedded/server/ShowIssueRequestHandler.java @@ -176,8 +176,7 @@ ShowIssueParams getShowIssueParams(IssueApi.ServerIssueDetails issueDetails, Str var isTaint = isIssueTaint(issueDetails.ruleKey); return new ShowIssueParams(configScopeId, new IssueDetailsDto(textRangeDto, issueDetails.ruleKey, issueDetails.key, translation.serverToIdePath(issueDetails.path), - pullRequest, issueDetails.message, issueDetails.creationDate, issueDetails.codeSnippet, isTaint, - flowLocations)); + issueDetails.message, issueDetails.creationDate, issueDetails.codeSnippet, isTaint, flowLocations)); } static boolean isIssueTaint(String ruleKey) { diff --git a/medium-tests/src/test/java/mediumtest/issues/OpenIssueInIdeMediumTests.java b/medium-tests/src/test/java/mediumtest/issues/OpenIssueInIdeMediumTests.java index dce327e23d..3c68d3ea48 100644 --- a/medium-tests/src/test/java/mediumtest/issues/OpenIssueInIdeMediumTests.java +++ b/medium-tests/src/test/java/mediumtest/issues/OpenIssueInIdeMediumTests.java @@ -165,7 +165,6 @@ void it_should_open_an_issue_in_ide() throws Exception { TextRangeDto::getEndLine, TextRangeDto::getEndLineOffset) .contains(1, 0, 3, 4); assertThat(issueDetails.getCodeSnippet()).isEqualTo("source\ncode\nfile"); - assertThat(issueDetails.getPullRequest()).isNull(); } @Test @@ -199,7 +198,6 @@ void it_should_open_pr_issue_in_ide() throws IOException, InterruptedException { TextRangeDto::getEndLine, TextRangeDto::getEndLineOffset) .contains(1, 0, 3, 4); assertThat(issueDetails.getCodeSnippet()).isEqualTo("source\ncode\nfile"); - assertThat(issueDetails.getPullRequest()).isEqualTo("1234"); } @Test diff --git a/rpc-protocol/src/main/java/org/sonarsource/sonarlint/core/rpc/protocol/client/issue/IssueDetailsDto.java b/rpc-protocol/src/main/java/org/sonarsource/sonarlint/core/rpc/protocol/client/issue/IssueDetailsDto.java index 3a77e4f8e6..f7ed6ff883 100644 --- a/rpc-protocol/src/main/java/org/sonarsource/sonarlint/core/rpc/protocol/client/issue/IssueDetailsDto.java +++ b/rpc-protocol/src/main/java/org/sonarsource/sonarlint/core/rpc/protocol/client/issue/IssueDetailsDto.java @@ -21,7 +21,6 @@ import java.nio.file.Path; import java.util.List; -import javax.annotation.Nullable; import org.sonarsource.sonarlint.core.rpc.protocol.common.FlowDto; import org.sonarsource.sonarlint.core.rpc.protocol.common.TextRangeDto; @@ -29,8 +28,6 @@ public class IssueDetailsDto { private final String issueKey; private final String ruleKey; private final Path ideFilePath; - @Nullable - private final String pullRequest; private final String message; private final String creationDate; private final String codeSnippet; @@ -39,13 +36,12 @@ public class IssueDetailsDto { private final TextRangeDto textRange; public IssueDetailsDto(TextRangeDto textRange, String ruleKey, String issueKey, - Path ideFilePath, @Nullable String pullRequest, String message, String creationDate, + Path ideFilePath, String message, String creationDate, String codeSnippet, boolean isTaint, List flows) { this.issueKey = issueKey; this.ruleKey = ruleKey; this.textRange = textRange; this.ideFilePath = ideFilePath; - this.pullRequest = pullRequest; this.message = message; this.creationDate = creationDate; this.codeSnippet = codeSnippet; @@ -73,11 +69,6 @@ public Path getIdeFilePath() { return ideFilePath; } - @Nullable - public String getPullRequest() { - return pullRequest; - } - public String getCodeSnippet() { return codeSnippet; }