Not searching comments on files when not commenting files

Author: tomasbjerre

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

@@ -41,7 +41,8 @@ public class BitbucketServerCommentsProvider implements CommentsProvider {
           .expireAfterWrite(2, MINUTES)
           .build(
               new CacheLoader<String, BitbucketServerDiffResponse>() {
-                public BitbucketServerDiffResponse load(String path) {
+                @Override
+                public BitbucketServerDiffResponse load(final String path) {
                   return client.pullRequestDiff(path);
                 }
               });
@@ -108,15 +109,26 @@ public void createSingleFileComment(
   @Override
   public List<Comment> getComments() {
     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));
+    if (shouldCreateSingleFileComment()) {
+      /**
+       * This is time consuming to do and is only needed if we are creating comments on each file.
+       */
+      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));
+        }
       }
     }
 
+    for (final BitbucketServerComment comment : client.pullRequestComments()) {
+      final List<String> specifics = newArrayList(comment.getVersion() + "", "");
+      comments.add(new Comment(comment.getId() + "", comment.getText(), null, specifics));
+    }
+
     return comments;
   }
 
@@ -162,7 +174,7 @@ public boolean shouldComment(final ChangedFile changedFile, final Integer change
       final List<BitbucketServerDiff> diffs =
           diffResponse.get(changedFile.getFilename()).getDiffs();
       return shouldComment(changedFile, changedLine, context, diffs);
-    } catch (Exception e) {
+    } catch (final Exception e) {
       violationsLogger.log(SEVERE, "Was unable to get diff from " + changedFile.getFilename(), e);
       return false;
     }
@@ -246,9 +258,9 @@ private void removeComment(final BitbucketServerComment comment) {
   }
 
   private void removeTasks(final BitbucketServerComment comment) {
-    List<BitbucketServerTask> bitbucketServerTasks = comment.getTasks();
+    final List<BitbucketServerTask> bitbucketServerTasks = comment.getTasks();
 
-    for (BitbucketServerTask bitbucketServerTask : bitbucketServerTasks) {
+    for (final BitbucketServerTask bitbucketServerTask : bitbucketServerTasks) {
       client.removeTask(bitbucketServerTask);
     }
   }

src/main/java/se/bjurr/violations/comments/bitbucketserver/lib/client/BitbucketServerClient.java

@@ -99,12 +99,12 @@ private <T> T invokeAndParse(
   }
 
   public List<String> pullRequestChanges() {
-    String url = getBitbucketServerPullRequestBase() + "/changes?limit=999999";
+    final String url = getBitbucketServerPullRequestBase() + "/changes?limit=999999";
     final String json = doInvokeUrl(url, Method.GET, null);
 
-    String jsonPath = "$..path.toString";
+    final String jsonPath = "$..path.toString";
     try {
-      List<String> response = JsonPath.read(json, jsonPath);
+      final List<String> response = JsonPath.read(json, jsonPath);
       if (response.isEmpty()) {
         violationsLogger.log(
             INFO,
@@ -176,45 +176,55 @@ public BitbucketServerComment pullRequestComment(
   }
 
   public BitbucketServerComment pullRequestComment(final Long commentId) {
-    String url = getBitbucketServerPullRequestBase() + "/comments/" + commentId;
+    final String url = getBitbucketServerPullRequestBase() + "/comments/" + commentId;
 
     final LinkedHashMap<?, ?> parsed =
         invokeAndParse(url, BitbucketServerInvoker.Method.GET, null, "$");
 
     return toBitbucketServerComment(parsed);
   }
 
+  public List<BitbucketServerComment> pullRequestComments() {
+    final String url =
+        getBitbucketServerPullRequestBase() + "/comments?limit=999999&anchorState=ALL";
+    return getComments(url);
+  }
+
   public List<BitbucketServerComment> pullRequestComments(final String changedFile) {
     try {
       final String encodedChangedFile = encode(changedFile, UTF_8.name());
-      String url =
+      final String url =
           getBitbucketServerPullRequestBase()
               + "/comments?path="
               + encodedChangedFile
               + "&limit=999999&anchorState=ALL";
-      String jsonPath = "$.values[*]";
-
-      final String json = doInvokeUrl(url, Method.GET, null);
-      List<LinkedHashMap<?, ?>> parsed = null;
-      try {
-        parsed = JsonPath.read(json, jsonPath);
-      } catch (final Exception e) {
-        throw new RuntimeException(
-            "Unable to parse diff response from " + url + " using " + jsonPath + "\n\n" + json, e);
-      }
-
-      if (parsed.isEmpty()) {
-        violationsLogger.log(
-            INFO,
-            "Found no comments from " + url + " with JSONPath " + jsonPath + " in JSON:\n" + json);
-      }
-
-      return toBitbucketServerComments(parsed);
+      return getComments(url);
     } catch (final UnsupportedEncodingException e) {
       throw new RuntimeException(e.getMessage(), e);
     }
   }
 
+  private List<BitbucketServerComment> getComments(final String url) {
+    final String jsonPath = "$.values[*]";
+
+    final String json = doInvokeUrl(url, Method.GET, null);
+    List<LinkedHashMap<?, ?>> parsed = null;
+    try {
+      parsed = JsonPath.read(json, jsonPath);
+    } catch (final Exception e) {
+      throw new RuntimeException(
+          "Unable to parse diff response from " + url + " using " + jsonPath + "\n\n" + json, e);
+    }
+
+    if (parsed.isEmpty()) {
+      violationsLogger.log(
+          INFO,
+          "Found no comments from " + url + " with JSONPath " + jsonPath + " in JSON:\n" + json);
+    }
+
+    return toBitbucketServerComments(parsed);
+  }
+
   public BitbucketServerDiffResponse pullRequestDiff(final String path) {
     final String url = getBitbucketServerPullRequestBase() + "/diff/" + path;
     final String json = doInvokeUrl(url, BitbucketServerInvoker.Method.GET, null);
@@ -249,7 +259,7 @@ public void removeTask(final BitbucketServerTask task) {
   }
 
   public void commentCreateTask(
-      final BitbucketServerComment comment, String changedFile, int line) {
+      final BitbucketServerComment comment, final String changedFile, final int line) {
     final String changedFileName = new File(changedFile).getName();
 
     final String taskPostContent =
@@ -278,7 +288,7 @@ private List<BitbucketServerComment> toBitbucketServerComments(
     return transformed;
   }
 
-  private BitbucketServerComment toBitbucketServerComment(LinkedHashMap<?, ?> parsed) {
+  private BitbucketServerComment toBitbucketServerComment(final LinkedHashMap<?, ?> parsed) {
     final Integer version = (Integer) parsed.get("version");
     final String text = (String) parsed.get("text");
     final Integer id = (Integer) parsed.get("id");
@@ -303,17 +313,17 @@ private BitbucketServerComment toBitbucketServerComment(LinkedHashMap<?, ?> pars
     return comment;
   }
 
-  private List<BitbucketServerTask> toBitbucketServerTasks(List<LinkedHashMap<?, ?>> parsed) {
-    List<BitbucketServerTask> bitbucketServerTasks = new ArrayList<>();
+  private List<BitbucketServerTask> toBitbucketServerTasks(final List<LinkedHashMap<?, ?>> parsed) {
+    final List<BitbucketServerTask> bitbucketServerTasks = new ArrayList<>();
 
-    for (LinkedHashMap<?, ?> parsedTask : parsed) {
+    for (final LinkedHashMap<?, ?> parsedTask : parsed) {
       bitbucketServerTasks.add(toBitbucketServerTask(parsedTask));
     }
 
     return bitbucketServerTasks;
   }
 
-  private BitbucketServerTask toBitbucketServerTask(LinkedHashMap<?, ?> parsed) {
+  private BitbucketServerTask toBitbucketServerTask(final LinkedHashMap<?, ?> parsed) {
     final Integer id = (Integer) parsed.get("id");
     final String text = (String) parsed.get("text");
     return new BitbucketServerTask(id, text);