Commenting only ADDED, and adding context integer

Author: tomasbjerre

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

@@ -4,14 +4,14 @@
 import static com.google.common.collect.Lists.newArrayList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static se.bjurr.violations.comments.bitbucketserver.lib.client.model.DIFFTYPE.ADDED;
-import static se.bjurr.violations.comments.bitbucketserver.lib.client.model.DIFFTYPE.CONTEXT;
 
 import java.util.ArrayList;
 import java.util.List;
 
 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;
@@ -41,6 +41,12 @@ public BitbucketServerDiffResponse get() {
 
  private final ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi;
 
+ @VisibleForTesting
+ BitbucketServerCommentsProvider() {
+  client = null;
+  violationCommentsToBitbucketApi = null;
+ }
+
  public BitbucketServerCommentsProvider(ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi) {
   String bitbucketServerBaseUrl = violationCommentsToBitbucketApi.getBitbucketServerUrl();
   String bitbucketServerProject = violationCommentsToBitbucketApi.getProjectKey();
@@ -107,14 +113,23 @@ public void removeComments(List<Comment> comments) {
 
  @Override
  public boolean shouldComment(ChangedFile changedFile, Integer changedLine) {
-  for (BitbucketServerDiff diff : diffResponse.get().getDiffs()) {
+  if (!violationCommentsToBitbucketApi.getCommentOnlyChangedContent()) {
+   return true;
+  }
+  int context = violationCommentsToBitbucketApi.getCommentOnlyChangedContentContext();
+  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) {
    if (diff.getDestination().getToString().equals(changedFile.getFilename())) {
     for (DiffHunk hunk : diff.getHunks()) {
      for (Segment segment : hunk.getSegments()) {
-      if (segment.getType() == ADDED //
-        || segment.getType() == CONTEXT) {
+      if (segment.getType() == ADDED) {
        for (Line line : segment.getLines()) {
-        if (line.getDestination() == changedLine) {
+        if (line.getDestination() >= changedLine - context && line.getDestination() <= changedLine + context) {
          return true;
         }
        }

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

@@ -30,6 +30,7 @@ public static ViolationCommentsToBitbucketServerApi violationCommentsToBitbucket
  private String username;
  private List<Violation> violations;
  private boolean commentOnlyChangedContent = false;
+ private int commentOnlyChangedContentContext;
 
  private ViolationCommentsToBitbucketServerApi() {
 
@@ -56,6 +57,10 @@ public boolean getCommentOnlyChangedContent() {
   return commentOnlyChangedContent;
  }
 
+ public int getCommentOnlyChangedContentContext() {
+  return commentOnlyChangedContentContext;
+ }
+
  public boolean getCreateCommentWithAllSingleFileComments() {
   return createCommentWithAllSingleFileComments;
  }
@@ -118,6 +123,12 @@ public ViolationCommentsToBitbucketServerApi withCommentOnlyChangedContent(boole
   return this;
  }
 
+ public ViolationCommentsToBitbucketServerApi withCommentOnlyChangedContentContext(
+   int commentOnlyChangedContentContext) {
+  this.commentOnlyChangedContentContext = commentOnlyChangedContentContext;
+  return this;
+ }
+
  public ViolationCommentsToBitbucketServerApi withCreateCommentWithAllSingleFileComments(
    boolean createCommentWithAllSingleFileComments) {
   this.createCommentWithAllSingleFileComments = createCommentWithAllSingleFileComments;

src/test/java/se/bjurr/violations/comments/bitbucketserver/lib/BitbucketServerCommentsProviderTest.java

@@ -0,0 +1,63 @@
+package se.bjurr.violations.comments.bitbucketserver.lib;
+
+import static com.google.common.collect.Lists.newArrayList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerDiff;
+import se.bjurr.violations.comments.bitbucketserver.lib.client.model.DIFFTYPE;
+import se.bjurr.violations.comments.bitbucketserver.lib.client.model.DiffDestination;
+import se.bjurr.violations.comments.bitbucketserver.lib.client.model.DiffHunk;
+import se.bjurr.violations.comments.bitbucketserver.lib.client.model.Line;
+import se.bjurr.violations.comments.bitbucketserver.lib.client.model.Segment;
+import se.bjurr.violations.comments.lib.model.ChangedFile;
+
+public class BitbucketServerCommentsProviderTest {
+
+ private BitbucketServerCommentsProvider sut;
+
+ @Before
+ public void before() {
+  sut = new BitbucketServerCommentsProvider();
+ }
+
+ @Test
+ public void testThatOnlyAddedCanBeCommented() {
+  ChangedFile changedFile = new ChangedFile("filename", null);
+  List<BitbucketServerDiff> diffs = newArrayList();
+  DiffDestination destination = new DiffDestination("filename");
+  List<DiffHunk> hunks = newArrayList();
+  List<Segment> segments = newArrayList();
+  List<Line> lines = newArrayList();
+  lines.add(new Line(10));
+  segments.add(new Segment(DIFFTYPE.ADDED, lines));
+  hunks.add(new DiffHunk(segments));
+  BitbucketServerDiff diff = new BitbucketServerDiff(destination, hunks);
+  diffs.add(diff);
+
+  Integer changedLine = 10;
+  int context = 0;
+  boolean actual = sut.shouldComment(changedFile, changedLine, context, diffs);
+  assertThat(actual).isTrue();
+
+  changedLine = 11;
+  context = 0;
+  actual = sut.shouldComment(changedFile, changedLine, context, diffs);
+  assertThat(actual).isFalse();
+
+  changedLine = 11;
+  context = 1;
+  actual = sut.shouldComment(changedFile, changedLine, context, diffs);
+  assertThat(actual).isTrue();
+
+  changedLine = 9;
+  context = 1;
+  actual = sut.shouldComment(changedFile, changedLine, context, diffs);
+  assertThat(actual).isTrue();
+ }
+
+}