More logging

Author: tomasbjerre

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

@@ -21,6 +21,7 @@
 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.CommentsProvider;
+import se.bjurr.violations.comments.lib.ViolationsLogger;
 import se.bjurr.violations.comments.lib.model.ChangedFile;
 import se.bjurr.violations.comments.lib.model.Comment;
 import se.bjurr.violations.lib.util.Optional;
@@ -51,7 +52,8 @@ public BitbucketServerDiffResponse get() {
   }
 
   public BitbucketServerCommentsProvider(
-      final ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi) {
+      final ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi,
+      final ViolationsLogger violationsLogger) {
     final String bitbucketServerBaseUrl = violationCommentsToBitbucketApi.getBitbucketServerUrl();
     final String bitbucketServerProject = violationCommentsToBitbucketApi.getProjectKey();
     final String bitbucketServerRepo = violationCommentsToBitbucketApi.getRepoSlug();
@@ -66,6 +68,7 @@ public BitbucketServerCommentsProvider(
     final String proxyPassword = violationCommentsToBitbucketApi.getProxyPassword();
     client =
         new BitbucketServerClient(
+            violationsLogger,
             bitbucketServerBaseUrl,
             bitbucketServerProject,
             bitbucketServerRepo,

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

@@ -180,7 +180,8 @@ private void populateFromEnvironmentVariables() {
   public void toPullRequest() throws Exception {
     populateFromEnvironmentVariables();
     checkState();
-    final CommentsProvider commentsProvider = new BitbucketServerCommentsProvider(this);
+    final CommentsProvider commentsProvider =
+        new BitbucketServerCommentsProvider(this, violationsLogger);
     createComments(violationsLogger, violations, BITBUCKET_MAX_COMMENT_SIZE, commentsProvider);
   }
 

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

@@ -15,9 +15,11 @@
 import se.bjurr.violations.comments.bitbucketserver.lib.client.BitbucketServerInvoker.Method;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerComment;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerDiffResponse;
+import se.bjurr.violations.comments.lib.ViolationsLogger;
 
 public class BitbucketServerClient {
   private static BitbucketServerInvoker bitbucketServerInvoker = new BitbucketServerInvoker();
+  private final ViolationsLogger violationsLogger;
 
   @VisibleForTesting
   public static void setBitbucketServerInvoker(
@@ -36,6 +38,7 @@ public static void setBitbucketServerInvoker(
   private final ProxyConfig proxyInformation;
 
   public BitbucketServerClient(
+      final ViolationsLogger violationsLogger,
       final String bitbucketServerBaseUrl,
       final String bitbucketServerProject,
       final String bitbucketServerRepo,
@@ -47,6 +50,7 @@ public BitbucketServerClient(
       final Integer proxyHostPort,
       final String proxyUser,
       final String proxyPassword) {
+    this.violationsLogger = violationsLogger;
     if (bitbucketServerBaseUrl.endsWith("/")) {
       this.bitbucketServerBaseUrl =
           bitbucketServerBaseUrl.substring(0, bitbucketServerBaseUrl.length() - 1);
@@ -90,11 +94,26 @@ private <T> T invokeAndParse(
   }
 
   public List<String> pullRequestChanges() {
-    return invokeAndParse(
-        getBitbucketServerPullRequestBase() + "/changes?limit=999999",
-        Method.GET,
-        null,
-        "$..path.toString");
+    String url = getBitbucketServerPullRequestBase() + "/changes?limit=999999";
+    final String json = doInvokeUrl(url, Method.GET, null);
+
+    String jsonPath = "$..path.toString";
+    try {
+      List<String> response = JsonPath.read(json, jsonPath);
+      if (response.isEmpty()) {
+        violationsLogger.log(
+            "Found no changed files from "
+                + url
+                + " with JSONPath "
+                + jsonPath
+                + " in JSON:\n"
+                + json);
+      }
+      return response;
+    } catch (final Exception e) {
+      throw new RuntimeException(
+          "Unable to parse diff response from " + url + " using " + jsonPath + "\n\n" + json, e);
+    }
   }
 
   public void pullRequestComment(final String message) {
@@ -142,15 +161,27 @@ public BitbucketServerComment pullRequestComment(
   public List<BitbucketServerComment> pullRequestComments(final String changedFile) {
     try {
       final String encodedChangedFile = encode(changedFile, UTF_8.name());
-      final List<LinkedHashMap<?, ?>> parsed =
-          invokeAndParse(
-              getBitbucketServerPullRequestBase()
-                  + "/comments?path="
-                  + encodedChangedFile
-                  + "&limit=999999",
-              Method.GET,
-              null,
-              "$.values[*]");
+      String url =
+          getBitbucketServerPullRequestBase()
+              + "/comments?path="
+              + encodedChangedFile
+              + "&limit=999999";
+      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(
+            "Found no comments from " + url + " with JSONPath " + jsonPath + " in JSON:\n" + json);
+      }
+
       return toBitbucketServerComments(parsed);
     } catch (final UnsupportedEncodingException e) {
       throw new RuntimeException(e);
@@ -161,7 +192,12 @@ public BitbucketServerDiffResponse pullRequestDiff() {
     final String url = getBitbucketServerPullRequestBase() + "/diff?limit=999999";
     final String json = doInvokeUrl(url, BitbucketServerInvoker.Method.GET, null);
     try {
-      return new Gson().fromJson(json, BitbucketServerDiffResponse.class);
+      final BitbucketServerDiffResponse diff =
+          new Gson().fromJson(json, BitbucketServerDiffResponse.class);
+      if (diff.getDiffs().isEmpty()) {
+        violationsLogger.log("Found no diffs from " + url + " in JSON:\n" + json);
+      }
+      return diff;
     } catch (final Exception e) {
       throw new RuntimeException("Unable to parse diff response from " + url + "\n\n" + json, e);
     }

src/test/java/se/bjurr/violations/comments/bitbucketserver/lib/client/BitbucketServerClientTest.java

@@ -10,6 +10,7 @@
 import com.google.common.io.Resources;
 import java.io.IOException;
 import java.util.List;
+import java.util.logging.Logger;
 import org.junit.Before;
 import org.junit.Test;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerComment;
@@ -18,11 +19,18 @@
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.DIFFTYPE;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.DiffHunk;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.Segment;
+import se.bjurr.violations.comments.lib.ViolationsLogger;
 
 public class BitbucketServerClientTest {
   private String mockedJson = null;
   private final BitbucketServerClient sut =
       new BitbucketServerClient(
+          new ViolationsLogger() {
+            @Override
+            public void log(final String string) {
+              Logger.getLogger(BitbucketServerClientTest.class.getSimpleName()).info(string);
+            }
+          },
           "bitbucketServerBaseUrl",
           "bitbucketServerProject",
           "bitbucketServerRepo",