Skip to content

Sonar82 finterprint fix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 21, 2021
Merged

Sonar82 finterprint fix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fcc0e1
Fix fingerprints
jkroepke Dec 3, 2020
5745746
Fix fingerprints
jkroepke Dec 3, 2020
b06f579
Added severity
jkroepke Jan 10, 2021
0008e9a
Added severity
jkroepke Jan 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/main/java/com/talanlabs/sonar/plugins/gitlab/Reporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,20 @@
*/
package com.talanlabs.sonar.plugins.gitlab;

import com.google.common.base.Charsets;
import com.google.common.hash.HashCode;
import com.google.common.hash.HashFunction;
import com.google.common.hash.Hashing;
import com.talanlabs.sonar.plugins.gitlab.models.*;
import org.apache.commons.lang3.StringEscapeUtils;
import org.sonar.api.batch.rule.Severity;

import javax.annotation.Nullable;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -231,10 +239,22 @@ public String buildJson() {
private String buildIssueCodeQualityJson(ReportIssue reportIssue) {
Issue issue = reportIssue.getIssue();

String description = prepareMessageJson(issue.getMessage());
String location = buildLocationCodeQualityJson(reportIssue);

HashFunction hf = Hashing.md5();
HashCode hc = hf.newHasher()
.putString(description, Charsets.UTF_8)
.putString(location, Charsets.UTF_8)
.hash();

String fingerprint = hc.toString();

StringJoiner sj = new StringJoiner(",", "{", "}");
sj.add("\"fingerprint\":\"" + issue.getKey() + "\"");
sj.add("\"description\":\"" + prepareMessageJson(issue.getMessage()) + "\"");
sj.add("\"location\":" + buildLocationCodeQualityJson(reportIssue));
sj.add("\"fingerprint\":\"" + fingerprint + "\"");
sj.add("\"description\":\"" + description + "\"");
sj.add("\"severity\":\"" + issue.getSeverity().name().toLowerCase() + "\"");
sj.add("\"location\":" + location);
return sj.toString();
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/talanlabs/sonar/plugins/gitlab/ReporterBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ public void testCommitAnalysisWithNewIssuesCodeClimate() {
reporterBuilder.build(null, Arrays.asList(newIssue, globalIssue, issueOnProject, issueOnDir, fileNotInPR, lineNotVisible, notNewIssue));

Mockito.verify(commitFacade).writeJsonFile(Mockito.contains(
"[{\"fingerprint\":\"null\",\"description\":\"msg\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":0,\"end\":0}}},{\"fingerprint\":\"null\",\"description\":\"msg4\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":0,\"end\":0}}},{\"fingerprint\":\"null\",\"description\":\"msg5\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":0,\"end\":0}}},{\"fingerprint\":\"null\",\"description\":\"msg1\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":1,\"end\":1}}},{\"fingerprint\":\"null\",\"description\":\"msg2\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":2,\"end\":2}}},{\"fingerprint\":\"null\",\"description\":\"msg3\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":1,\"end\":1}}}]"));
"[{\"fingerprint\":\"06496daf6fab6a0f97d6e0469e23c314\",\"description\":\"msg\",\"severity\":\"blocker\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":0,\"end\":0}}},{\"fingerprint\":\"0c0d7bbe0396951af65c450966b422fb\",\"description\":\"msg4\",\"severity\":\"blocker\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":0,\"end\":0}}},{\"fingerprint\":\"7d626e4f4d387b14046054a2c2eff2ff\",\"description\":\"msg5\",\"severity\":\"blocker\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":0,\"end\":0}}},{\"fingerprint\":\"42e8b6ecbbab8acf76ead03757e49300\",\"description\":\"msg1\",\"severity\":\"blocker\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":1,\"end\":1}}},{\"fingerprint\":\"52660d2146c00c13d697e8a12be7cad3\",\"description\":\"msg2\",\"severity\":\"blocker\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":2,\"end\":2}}},{\"fingerprint\":\"c6acd4f8aa70e27dde47469a54efdebe\",\"description\":\"msg3\",\"severity\":\"blocker\",\"location\":{\"path\":\"null\",\"lines\": { \"begin\":1,\"end\":1}}}]"));
}

@Test
Expand Down