Exception logging in build job log

Author: tomasbjerre

build.gradle

@@ -19,7 +19,7 @@ apply from: project.buildscript.classLoader.getResource('release.gradle').toURI(
 
 
 dependencies {
- compile 'se.bjurr.violations:violation-comments-lib:1.69'
+ compile 'se.bjurr.violations:violation-comments-lib:1.70'
  compile 'com.jayway.jsonpath:json-path:2.0.0'
  compile 'com.google.code.gson:gson:2.8.0'
  compile 'com.google.guava:guava:20.0'

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

@@ -4,14 +4,13 @@
 import static com.google.common.base.Suppliers.memoizeWithExpiration;
 import static com.google.common.collect.Lists.newArrayList;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.logging.Level.SEVERE;
 import static se.bjurr.violations.comments.bitbucketserver.lib.client.model.DIFFTYPE.ADDED;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Supplier;
 import java.util.ArrayList;
 import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.BitbucketServerClient;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerComment;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerDiff;
@@ -28,8 +27,6 @@
 
 public class BitbucketServerCommentsProvider implements CommentsProvider {
 
-  private static final Logger LOG = LoggerFactory.getLogger(BitbucketServerCommentsProvider.class);
-
   private final BitbucketServerClient client;
 
   private final Supplier<BitbucketServerDiffResponse> diffResponse =
@@ -44,16 +41,19 @@ public BitbucketServerDiffResponse get() {
           SECONDS);
 
   private final ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi;
+  private final ViolationsLogger violationsLogger;
 
   @VisibleForTesting
   BitbucketServerCommentsProvider() {
     client = null;
     violationCommentsToBitbucketApi = null;
+    violationsLogger = null;
   }
 
   public BitbucketServerCommentsProvider(
       final ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi,
       final ViolationsLogger violationsLogger) {
+    this.violationsLogger = violationsLogger;
     final String bitbucketServerBaseUrl = violationCommentsToBitbucketApi.getBitbucketServerUrl();
     final String bitbucketServerProject = violationCommentsToBitbucketApi.getProjectKey();
     final String bitbucketServerRepo = violationCommentsToBitbucketApi.getRepoSlug();
@@ -137,7 +137,8 @@ public void removeComments(final List<Comment> comments) {
         commentVersion = Integer.valueOf(comment.getSpecifics().get(0));
         client.pullRequestRemoveComment(commentId, commentVersion);
       } catch (final Exception e) {
-        LOG.warn("Was unable to remove comment " + commentId + " " + commentVersion, e);
+        violationsLogger.log(
+            SEVERE, "Was unable to remove comment " + commentId + " " + commentVersion, e);
       }
     }
   }

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

@@ -7,7 +7,8 @@
 import static se.bjurr.violations.lib.util.Utils.isNullOrEmpty;
 
 import java.util.List;
-import org.slf4j.LoggerFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import se.bjurr.violations.comments.lib.CommentsProvider;
 import se.bjurr.violations.comments.lib.ViolationsLogger;
 import se.bjurr.violations.lib.model.Violation;
@@ -48,8 +49,13 @@ public static ViolationCommentsToBitbucketServerApi violationCommentsToBitbucket
   private ViolationsLogger violationsLogger =
       new ViolationsLogger() {
         @Override
-        public void log(final String string) {
-          LoggerFactory.getLogger(ViolationsLogger.class).info(string);
+        public void log(final Level level, final String string) {
+          Logger.getLogger(ViolationsLogger.class.getSimpleName()).log(level, string);
+        }
+
+        @Override
+        public void log(final Level level, final String string, final Throwable t) {
+          Logger.getLogger(ViolationsLogger.class.getSimpleName()).log(level, string, t);
         }
       };
 

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

@@ -3,6 +3,7 @@
 import static com.google.common.base.Charsets.UTF_8;
 import static com.google.common.collect.Lists.newArrayList;
 import static java.net.URLEncoder.encode;
+import static java.util.logging.Level.INFO;
 import static se.bjurr.violations.lib.util.Utils.isNullOrEmpty;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -102,6 +103,7 @@ public List<String> pullRequestChanges() {
       List<String> response = JsonPath.read(json, jsonPath);
       if (response.isEmpty()) {
         violationsLogger.log(
+            INFO,
             "Found no changed files from "
                 + url
                 + " with JSONPath "
@@ -179,12 +181,13 @@ public List<BitbucketServerComment> pullRequestComments(final String changedFile
 
       if (parsed.isEmpty()) {
         violationsLogger.log(
+            INFO,
             "Found no comments from " + url + " with JSONPath " + jsonPath + " in JSON:\n" + json);
       }
 
       return toBitbucketServerComments(parsed);
     } catch (final UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
+      throw new RuntimeException(e.getMessage(), e);
     }
   }
 
@@ -195,7 +198,7 @@ public BitbucketServerDiffResponse pullRequestDiff() {
       final BitbucketServerDiffResponse diff =
           new Gson().fromJson(json, BitbucketServerDiffResponse.class);
       if (diff.getDiffs().isEmpty()) {
-        violationsLogger.log("Found no diffs from " + url + " in JSON:\n" + json);
+        violationsLogger.log(INFO, "Found no diffs from " + url + " in JSON:\n" + json);
       }
       return diff;
     } catch (final Exception e) {

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

@@ -3,7 +3,6 @@
 import static com.google.common.base.Charsets.UTF_8;
 import static com.google.common.base.Strings.isNullOrEmpty;
 
-import com.google.common.base.Throwables;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -129,7 +128,7 @@ private String doInvokeUrl(
         }
 
       } catch (final IOException e) {
-        throw Throwables.propagate(e);
+        throw new RuntimeException(e.getMessage(), 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.Level;
 import java.util.logging.Logger;
 import org.junit.Before;
 import org.junit.Test;
@@ -27,9 +28,15 @@ public class BitbucketServerClientTest {
       new BitbucketServerClient(
           new ViolationsLogger() {
             @Override
-            public void log(final String string) {
+            public void log(final Level level, final String string) {
               Logger.getLogger(BitbucketServerClientTest.class.getSimpleName()).info(string);
             }
+
+            @Override
+            public void log(final Level level, final String string, final Throwable t) {
+              Logger.getLogger(BitbucketServerClientTest.class.getSimpleName())
+                  .log(Level.SEVERE, string, t);
+            }
           },
           "bitbucketServerBaseUrl",
           "bitbucketServerProject",