Getting diff of each file to avoid truncation #7

Author: tomasbjerre

CHANGELOG.md

@@ -130,7 +130,7 @@ Changelog of Violation comments to bitbucket server lib.
 
 
 ## 1.52
-### GitHub [#5](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/pull/5) Add optional creation of Bitbucket tasks for violation comments.
+### GitHub [#5](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/pull/5) Add optional creation of Bitbucket tasks for violation comments.    *enhancement*  
 
 **Formatting after merge**
 
@@ -198,7 +198,7 @@ Changelog of Violation comments to bitbucket server lib.
 
 
 ## 1.46
-### GitHub #47 
+### GitHub #47   
 
 **Personal Access Tokens**
 
@@ -285,7 +285,7 @@ Changelog of Violation comments to bitbucket server lib.
 
 
 ## 1.36
-### Jira JENKINS-48648 
+### Jira JENKINS-48648   
 
 **Using UTF-8 in Bitbucket client**
 
@@ -364,7 +364,7 @@ Changelog of Violation comments to bitbucket server lib.
 
 
 ## 1.28
-### GitHub [#2](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/issues/2) Paths with spaces fail
+### GitHub [#2](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/issues/2) Paths with spaces fail    *bug*  
 
 **URL encoding paths**
 
@@ -468,7 +468,7 @@ Changelog of Violation comments to bitbucket server lib.
 
 
 ## 1.17
-### GitHub [#1](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/issues/1) NullPointerException when running the Jenkins plugin
+### GitHub [#1](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/issues/1) NullPointerException when running the Jenkins plugin  
 
 **Handling deleted files in PR:s**
 

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

@@ -1,14 +1,15 @@
 package se.bjurr.violations.comments.bitbucketserver.lib;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.common.base.Suppliers.memoizeWithExpiration;
+import static com.google.common.cache.CacheBuilder.newBuilder;
 import static com.google.common.collect.Lists.newArrayList;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
 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 com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import java.util.ArrayList;
 import java.util.List;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.BitbucketServerClient;
@@ -29,16 +30,16 @@ public class BitbucketServerCommentsProvider implements CommentsProvider {
 
   private final BitbucketServerClient client;
 
-  private final Supplier<BitbucketServerDiffResponse> diffResponse =
-      memoizeWithExpiration(
-          new Supplier<BitbucketServerDiffResponse>() {
-            @Override
-            public BitbucketServerDiffResponse get() {
-              return client.pullRequestDiff();
-            }
-          },
-          10,
-          SECONDS);
+  private final LoadingCache<String, BitbucketServerDiffResponse> diffResponse =
+      newBuilder()
+          .maximumSize(100)
+          .expireAfterWrite(2, MINUTES)
+          .build(
+              new CacheLoader<String, BitbucketServerDiffResponse>() {
+                public BitbucketServerDiffResponse load(String path) {
+                  return client.pullRequestDiff(path);
+                }
+              });
 
   private final ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi;
   private final ViolationsLogger violationsLogger;
@@ -149,8 +150,14 @@ public boolean shouldComment(final ChangedFile changedFile, final Integer change
       return true;
     }
     final int context = violationCommentsToBitbucketApi.getCommentOnlyChangedContentContext();
-    final List<BitbucketServerDiff> diffs = diffResponse.get().getDiffs();
-    return shouldComment(changedFile, changedLine, context, diffs);
+    try {
+      final List<BitbucketServerDiff> diffs =
+          diffResponse.get(changedFile.getFilename()).getDiffs();
+      return shouldComment(changedFile, changedLine, context, diffs);
+    } catch (Exception e) {
+      violationsLogger.log(SEVERE, "Was unable to get diff from " + changedFile.getFilename(), e);
+      return false;
+    }
   }
 
   @VisibleForTesting

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

@@ -202,8 +202,8 @@ public List<BitbucketServerComment> pullRequestComments(final String changedFile
     }
   }
 
-  public BitbucketServerDiffResponse pullRequestDiff() {
-    final String url = getBitbucketServerPullRequestBase() + "/diff?limit=999999";
+  public BitbucketServerDiffResponse pullRequestDiff(final String path) {
+    final String url = getBitbucketServerPullRequestBase() + "/diff/" + path;
     final String json = doInvokeUrl(url, BitbucketServerInvoker.Method.GET, null);
     try {
       final BitbucketServerDiffResponse diff =

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

@@ -50,6 +50,7 @@ public void log(final Level level, final String string, final Throwable t) {
           null,
           null);
   private String invoked;
+  private String path = "anypath";
 
   @Before
   public void before() {
@@ -143,7 +144,7 @@ public void testPullRequestCommentsOnFileWithSpaces() {
   @Test
   public void testPullRequestDiffDiffDeleted() {
     mockJson("pull-request-changes-3-deleted.json");
-    final BitbucketServerDiffResponse response = sut.pullRequestDiff();
+    final BitbucketServerDiffResponse response = sut.pullRequestDiff(path);
     assertThat(response) //
         .isNotNull();
     assertThat(response.getDiffs()) //
@@ -153,7 +154,7 @@ public void testPullRequestDiffDiffDeleted() {
   @Test
   public void testPullRequestDiffDiffTypes() {
     mockJson("pull-request-changes-2.json");
-    final BitbucketServerDiffResponse response = sut.pullRequestDiff();
+    final BitbucketServerDiffResponse response = sut.pullRequestDiff(path);
     assertThat(response) //
         .isNotNull();
     assertThat(response.getDiffs()) //
@@ -174,7 +175,7 @@ public void testPullRequestDiffDiffTypes() {
   @Test
   public void testPullRequestDiffPerFileTestCpp() {
     mockJson("pull-request-changes-2.json");
-    final BitbucketServerDiffResponse response = sut.pullRequestDiff();
+    final BitbucketServerDiffResponse response = sut.pullRequestDiff(path);
     assertThat(response) //
         .isNotNull();
     final List<BitbucketServerDiff> diffs = filterByFile(response, "cpp/test.cpp");
@@ -192,7 +193,7 @@ public void testPullRequestDiffPerFileTestCpp() {
   @Test
   public void testPullRequestDiffPerFileTravisYml() {
     mockJson("pull-request-changes-2.json");
-    final BitbucketServerDiffResponse response = sut.pullRequestDiff();
+    final BitbucketServerDiffResponse response = sut.pullRequestDiff(path);
     assertThat(response) //
         .isNotNull();
     final List<BitbucketServerDiff> diffs = filterByFile(response, ".travis.yml");