Moving multiple/single commenting logic to lib

Author: tomasbjerre

build.gradle

@@ -63,7 +63,7 @@ repositories {
 }
 
 dependencies {
- compile 'se.bjurr.violations:violation-comments-lib:1.18'
+ compile 'se.bjurr.violations:violation-comments-lib:1.19'
  compile 'com.jayway.jsonpath:json-path:2.0.0'
  compile 'com.google.code.gson:gson:2.8.0'
 

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

@@ -55,19 +55,11 @@ public BitbucketServerCommentsProvider(ViolationCommentsToBitbucketServerApi vio
 
  @Override
  public void createCommentWithAllSingleFileComments(String comment) {
-  if (!violationCommentsToBitbucketApi.getCreateCommentWithAllSingleFileComments()) {
-   return;
-  }
-
   client.pullRequestComment(comment);
  }
 
  @Override
  public void createSingleFileComment(ChangedFile file, Integer line, String comment) {
-  if (!violationCommentsToBitbucketApi.getCreateSingleFileComments()) {
-   return;
-  }
-
   client.pullRequestComment(file.getFilename(), line, comment);
  }
 
@@ -115,9 +107,6 @@ public void removeComments(List<Comment> comments) {
 
  @Override
  public boolean shouldComment(ChangedFile changedFile, Integer changedLine) {
-  if (!violationCommentsToBitbucketApi.getCommentOnlyChangedContent()) {
-   return true;
-  }
   for (BitbucketServerDiff diff : diffResponse.get().getDiffs()) {
    if (diff.getDestination().getToString().equals(changedFile.getFilename())) {
     for (DiffHunk hunk : diff.getHunks()) {
@@ -136,4 +125,14 @@ public boolean shouldComment(ChangedFile changedFile, Integer changedLine) {
   }
   return false;
  }
+
+ @Override
+ public boolean shouldCreateCommentWithAllSingleFileComments() {
+  return violationCommentsToBitbucketApi.getCreateCommentWithAllSingleFileComments();
+ }
+
+ @Override
+ public boolean shouldCreateSingleFileComment() {
+  return violationCommentsToBitbucketApi.getCreateSingleFileComments();
+ }
 }