[TFW2-1421] Refactor bugfix implementation for automatic violation comment removal.

Author: Frederik Boster

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

@@ -142,11 +142,9 @@ public void removeComments(final List<Comment> comments) {
         commentId = Integer.valueOf(comment.getIdentifier());
         commentVersion = Integer.valueOf(comment.getSpecifics().get(0));
 
-        BitbucketServerComment bitbucketServerComment = client.pullRequestComment((long) commentId);
-        removeAllSubCommentsAndTasksOfComment(bitbucketServerComment);
-
-        removeAllTasksOfComment(bitbucketServerComment);
-        client.pullRequestRemoveComment(commentId, commentVersion);
+        final BitbucketServerComment bitbucketServerComment =
+            client.pullRequestComment((long) commentId);
+        removeComment(bitbucketServerComment);
       } catch (final Exception e) {
         violationsLogger.log(
             SEVERE, "Was unable to remove comment " + commentId + " " + commentVersion, e);
@@ -223,33 +221,35 @@ public boolean shouldKeepOldComments() {
     return violationCommentsToBitbucketApi.getShouldKeepOldComments();
   }
 
-  private void removeAllTasksOfComment(final BitbucketServerComment bitbucketServerComment) {
-    List<BitbucketServerTask> bitbucketServerTasks = bitbucketServerComment.getTasks();
-
-    for (BitbucketServerTask bitbucketServerTask : bitbucketServerTasks) {
-      client.removeTask(bitbucketServerTask);
-    }
-  }
-
-  private void removeAllSubCommentsAndTasksOfComment(
-      final BitbucketServerComment bitbucketServerComment) {
+  private void removeComment(final BitbucketServerComment comment) {
     final Deque<BitbucketServerComment> commentStack = new ArrayDeque<>();
-    Collection<BitbucketServerComment> subComments = bitbucketServerComment.getComments();
+    commentStack.add(comment);
+
+    Collection<BitbucketServerComment> subComments = comment.getComments();
     while (subComments != null && !subComments.isEmpty()) {
       commentStack.addAll(subComments);
-      final Collection<BitbucketServerComment> currentSubComments = subComments;
 
+      final Collection<BitbucketServerComment> currentSubComments = subComments;
       subComments = new ArrayList<>();
       for (final BitbucketServerComment subComment : currentSubComments) {
         subComments.addAll(subComment.getComments());
       }
     }
 
-    final Iterator<BitbucketServerComment> commentIt = commentStack.descendingIterator();
-    while (commentIt.hasNext()) {
-      final BitbucketServerComment comment = commentIt.next();
-      removeAllTasksOfComment(comment);
-      client.pullRequestRemoveComment(comment.getId(), comment.getVersion());
+    final Iterator<BitbucketServerComment> commentStackIt = commentStack.descendingIterator();
+    while (commentStackIt.hasNext()) {
+      final BitbucketServerComment stackComment = commentStackIt.next();
+
+      removeTasks(stackComment);
+      client.pullRequestRemoveComment(stackComment.getId(), stackComment.getVersion());
+    }
+  }
+
+  private void removeTasks(final BitbucketServerComment comment) {
+    List<BitbucketServerTask> bitbucketServerTasks = comment.getTasks();
+
+    for (BitbucketServerTask bitbucketServerTask : bitbucketServerTasks) {
+      client.removeTask(bitbucketServerTask);
     }
   }
 }

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

@@ -12,6 +12,7 @@
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import net.minidev.json.JSONArray;
@@ -285,35 +286,21 @@ private BitbucketServerComment toBitbucketServerComment(LinkedHashMap<?, ?> pars
     final JSONArray jsonArrayTasks = (JSONArray) parsed.get("tasks");
     final JSONArray jsonArraySubComments = (JSONArray) parsed.get("comments");
 
-    List<LinkedHashMap<?, ?>> tasks = new ArrayList<>();
-    List<LinkedHashMap<?, ?>> subComments = new ArrayList<>();
-
-    for (Object jsonArrayTask : jsonArrayTasks) {
-      LinkedHashMap<?, ?> linkedHashMap = (LinkedHashMap<?, ?>) jsonArrayTask;
-      tasks.add(linkedHashMap);
-    }
-
-    for (Object jsonArraySubComment : jsonArraySubComments) {
-      LinkedHashMap<?, ?> linkedHashMap = (LinkedHashMap<?, ?>) jsonArraySubComment;
-      subComments.add(linkedHashMap);
-    }
+    final List<LinkedHashMap<?, ?>> tasks =
+        Arrays.asList(jsonArrayTasks.toArray(new LinkedHashMap<?, ?>[0]));
+    final List<LinkedHashMap<?, ?>> subComments =
+        Arrays.asList(jsonArraySubComments.toArray(new LinkedHashMap<?, ?>[0]));
 
     final List<BitbucketServerTask> bitbucketServerTasks = toBitbucketServerTasks(tasks);
     final List<BitbucketServerComment> bitbucketServerSubComments =
         toBitbucketServerComments(subComments);
 
-    BitbucketServerComment constructedComment = new BitbucketServerComment(version, text, id);
+    final BitbucketServerComment comment = new BitbucketServerComment(version, text, id);
 
-    constructedComment.setTasks(bitbucketServerTasks);
-    constructedComment.setComments(bitbucketServerSubComments);
+    comment.setTasks(bitbucketServerTasks);
+    comment.setComments(bitbucketServerSubComments);
 
-    return constructedComment;
-  }
-
-  private BitbucketServerTask toBitbucketServerTask(LinkedHashMap<?, ?> parsed) {
-    final Integer id = (Integer) parsed.get("id");
-    final String text = (String) parsed.get("text");
-    return new BitbucketServerTask(id, text);
+    return comment;
   }
 
   private List<BitbucketServerTask> toBitbucketServerTasks(List<LinkedHashMap<?, ?>> parsed) {
@@ -325,4 +312,10 @@ private List<BitbucketServerTask> toBitbucketServerTasks(List<LinkedHashMap<?, ?
 
     return bitbucketServerTasks;
   }
+
+  private BitbucketServerTask toBitbucketServerTask(LinkedHashMap<?, ?> parsed) {
+    final Integer id = (Integer) parsed.get("id");
+    final String text = (String) parsed.get("text");
+    return new BitbucketServerTask(id, text);
+  }
 }