Keeping comments and adjusting checkstyle

 * Checkstyle now allows empty source attribute.
 * Comments can optionaly be kept and not removed when new comments are added.
 * Will no longer re-create identical comments.

Author: tomasbjerre

CHANGELOG.md

@@ -3,10 +3,31 @@
 ## Unreleased
 ### No issue
 
+**Keeping comments and adjusting checkstyle**
+
+ * Checkstyle now allows empty source attribute. 
+ * Comments can optionaly be kept and not removed when new comments are added. 
+ * Will no longer re-create identical comments. 
+
+[75375780b599622](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/75375780b599622) Tomas Bjerre *2017-09-02 09:18:53*
+
+
+## 1.29
+### No issue
+
+**Checking for null in API-calls**
+
+
+[fdff3f2ae865d81](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/fdff3f2ae865d81) Tomas Bjerre *2017-08-11 10:04:40*
+
+
+## 1.28
+### No issue
+
 **URL encoding paths #2**
 
 
-[73a75a3c4ffe8d1](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/73a75a3c4ffe8d1) Tomas Bjerre *2017-08-02 15:29:12*
+[7122da4322e2f6e](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/7122da4322e2f6e) Tomas Bjerre *2017-08-02 15:29:50*
 
 
 ## 1.27

build.gradle

@@ -68,7 +68,7 @@ repositories {
 }
 
 dependencies {
- compile 'se.bjurr.violations:violation-comments-lib:1.40'
+ compile 'se.bjurr.violations:violation-comments-lib:1.42'
  compile 'com.jayway.jsonpath:json-path:2.0.0'
  compile 'com.google.code.gson:gson:2.8.0'
  compile 'com.google.guava:guava:20.0'

src/main/java/se/bjurr/violations/comments/bitbucketserver/lib/BitbucketServerCommentsProvider.java

@@ -12,9 +12,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Supplier;
-
 import se.bjurr.violations.comments.bitbucketserver.lib.client.BitbucketServerClient;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerComment;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerDiff;
@@ -29,6 +26,9 @@
 import se.bjurr.violations.lib.model.Violation;
 import se.bjurr.violations.lib.util.Optional;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Supplier;
+
 public class BitbucketServerCommentsProvider implements CommentsProvider {
 
  private static final Logger LOG = LoggerFactory.getLogger(BitbucketServerCommentsProvider.class);
@@ -52,12 +52,12 @@ public BitbucketServerDiffResponse get() {
  }
 
  public BitbucketServerCommentsProvider(ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi) {
-  String bitbucketServerBaseUrl = violationCommentsToBitbucketApi.getBitbucketServerUrl();
-  String bitbucketServerProject = violationCommentsToBitbucketApi.getProjectKey();
-  String bitbucketServerRepo = violationCommentsToBitbucketApi.getRepoSlug();
-  Integer bitbucketServerPullRequestId = violationCommentsToBitbucketApi.getPullRequestId();
-  String bitbucketServerUser = violationCommentsToBitbucketApi.getUsername();
-  String bitbucketServerPassword = violationCommentsToBitbucketApi.getPassword();
+  final String bitbucketServerBaseUrl = violationCommentsToBitbucketApi.getBitbucketServerUrl();
+  final String bitbucketServerProject = violationCommentsToBitbucketApi.getProjectKey();
+  final String bitbucketServerRepo = violationCommentsToBitbucketApi.getRepoSlug();
+  final Integer bitbucketServerPullRequestId = violationCommentsToBitbucketApi.getPullRequestId();
+  final String bitbucketServerUser = violationCommentsToBitbucketApi.getUsername();
+  final String bitbucketServerPassword = violationCommentsToBitbucketApi.getPassword();
   client = new BitbucketServerClient(bitbucketServerBaseUrl, bitbucketServerProject, bitbucketServerRepo,
     bitbucketServerPullRequestId, bitbucketServerUser, bitbucketServerPassword);
   this.violationCommentsToBitbucketApi = violationCommentsToBitbucketApi;
@@ -75,11 +75,11 @@ public void createSingleFileComment(ChangedFile file, Integer line, String comme
 
  @Override
  public List<Comment> getComments() {
-  List<Comment> comments = newArrayList();
-  for (String changedFile : client.pullRequestChanges()) {
-   List<BitbucketServerComment> bitbucketServerCommentsOnFile = client.pullRequestComments(changedFile);
-   for (BitbucketServerComment fileComment : bitbucketServerCommentsOnFile) {
-    List<String> specifics = newArrayList(fileComment.getVersion() + "", changedFile);
+  final List<Comment> comments = newArrayList();
+  for (final String changedFile : client.pullRequestChanges()) {
+   final List<BitbucketServerComment> bitbucketServerCommentsOnFile = client.pullRequestComments(changedFile);
+   for (final BitbucketServerComment fileComment : bitbucketServerCommentsOnFile) {
+    final List<String> specifics = newArrayList(fileComment.getVersion() + "", changedFile);
     comments.add(new Comment(fileComment.getId() + "", fileComment.getText(), null, specifics));
    }
   }
@@ -89,11 +89,11 @@ public List<Comment> getComments() {
 
  @Override
  public List<ChangedFile> getFiles() {
-  List<ChangedFile> changedFiles = newArrayList();
+  final List<ChangedFile> changedFiles = newArrayList();
 
-  List<String> bitbucketServerChangedFiles = client.pullRequestChanges();
+  final List<String> bitbucketServerChangedFiles = client.pullRequestChanges();
 
-  for (String changedFile : bitbucketServerChangedFiles) {
+  for (final String changedFile : bitbucketServerChangedFiles) {
    changedFiles.add(new ChangedFile(changedFile, new ArrayList<String>()));
   }
 
@@ -102,14 +102,14 @@ public List<ChangedFile> getFiles() {
 
  @Override
  public void removeComments(List<Comment> comments) {
-  for (Comment comment : comments) {
+  for (final Comment comment : comments) {
    Integer commentId = null;
    Integer commentVersion = null;
    try {
     commentId = Integer.valueOf(comment.getIdentifier());
     commentVersion = Integer.valueOf(comment.getSpecifics().get(0));
     client.pullRequestRemoveComment(commentId, commentVersion);
-   } catch (Exception e) {
+   } catch (final Exception e) {
     LOG.warn("Was unable to remove comment " + commentId + " " + commentVersion, e);
    }
   }
@@ -120,24 +120,24 @@ public boolean shouldComment(ChangedFile changedFile, Integer changedLine) {
   if (!violationCommentsToBitbucketApi.getCommentOnlyChangedContent()) {
    return true;
   }
-  int context = violationCommentsToBitbucketApi.getCommentOnlyChangedContentContext();
-  List<BitbucketServerDiff> diffs = diffResponse.get().getDiffs();
+  final int context = violationCommentsToBitbucketApi.getCommentOnlyChangedContentContext();
+  final List<BitbucketServerDiff> diffs = diffResponse.get().getDiffs();
   return shouldComment(changedFile, changedLine, context, diffs);
  }
 
  @VisibleForTesting
  boolean shouldComment(ChangedFile changedFile, Integer changedLine, int context, List<BitbucketServerDiff> diffs) {
-  for (BitbucketServerDiff diff : diffs) {
-   DiffDestination destination = diff.getDestination();
+  for (final BitbucketServerDiff diff : diffs) {
+   final DiffDestination destination = diff.getDestination();
    if (destination != null) {
-    String destinationToString = destination.getToString();
+    final String destinationToString = destination.getToString();
     if (!isNullOrEmpty(destinationToString)) {
      if (destinationToString.equals(changedFile.getFilename())) {
       if (diff.getHunks() != null) {
-       for (DiffHunk hunk : diff.getHunks()) {
-        for (Segment segment : hunk.getSegments()) {
+       for (final DiffHunk hunk : diff.getHunks()) {
+        for (final Segment segment : hunk.getSegments()) {
          if (segment.getType() == ADDED) {
-          for (Line line : segment.getLines()) {
+          for (final Line line : segment.getLines()) {
            if (line.getDestination() >= changedLine - context && line.getDestination() <= changedLine + context) {
             return true;
            }
@@ -167,4 +167,9 @@ public boolean shouldCreateSingleFileComment() {
  public Optional<String> findCommentFormat(ChangedFile changedFile, Violation violation) {
    return Optional.absent();
  }
+
+@Override
+public boolean shouldKeepOldComments() {
+	return violationCommentsToBitbucketApi.getShouldKeepOldComments();
+}
 }

src/main/java/se/bjurr/violations/comments/bitbucketserver/lib/ViolationCommentsToBitbucketServerApi.java

@@ -31,6 +31,7 @@ public static ViolationCommentsToBitbucketServerApi violationCommentsToBitbucket
  private List<Violation> violations;
  private boolean commentOnlyChangedContent = false;
  private int commentOnlyChangedContentContext;
+private boolean shouldKeepOldComments;
 
  private ViolationCommentsToBitbucketServerApi() {
 
@@ -109,7 +110,7 @@ private void populateFromEnvironmentVariables() {
  public void toPullRequest() throws Exception {
   populateFromEnvironmentVariables();
   checkState();
-  CommentsProvider commentsProvider = new BitbucketServerCommentsProvider(this);
+  final CommentsProvider commentsProvider = new BitbucketServerCommentsProvider(this);
   createComments(commentsProvider, violations, BITBUCKET_MAX_COMMENT_SIZE);
  }
 
@@ -177,4 +178,10 @@ public ViolationCommentsToBitbucketServerApi withViolations(List<Violation> viol
   this.violations = violations;
   return this;
  }
+public ViolationCommentsToBitbucketServerApi setShouldKeepOldComments(boolean shouldKeepOldComments) {
+	this.shouldKeepOldComments = shouldKeepOldComments;
+return this;}
+public boolean getShouldKeepOldComments() {
+	return shouldKeepOldComments;
+}
 }