Personal Access Tokens #47

Author: tomasbjerre

CHANGELOG.md

@@ -3,13 +3,50 @@
 
 Changelog of Violation comments to bitbucket server lib.
 
-## Unreleased
+## 1.45
 ### No issue
 
+**Stepping version to fix faulty release**
+
+
+[eff118305ad7ca8](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/eff118305ad7ca8) Tomas Bjerre *2018-02-06 18:04:41*
+
+**Setting timeout to 30s**
+
+
+[3173d02da2df549](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/3173d02da2df549) Tomas Bjerre *2018-02-06 17:59:33*
+
+
+## 1.43
+### No issue
+
+**Google error-prone**
+
+
+[b39df0b7481f4f8](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/b39df0b7481f4f8) Tomas Bjerre *2018-01-14 11:53:49*
+
+
+## 1.42
+### No issue
+
+**Relocating to correct Java identifier**
+
+
+[9daaa06247f67a0](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/9daaa06247f67a0) Tomas Bjerre *2017-12-31 11:47:43*
+
+
+## 1.41
+### No issue
+
+**Fixing encoding issues**
+
+
+[272f1623e559a54](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/272f1623e559a54) Tomas Bjerre *2017-12-25 19:45:51*
+
 **Using UTF-8, instead of default**
 
 
-[79a5a8b0869c4d7](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/79a5a8b0869c4d7) Tomas Bjerre *2017-12-24 22:03:10*
+[65dacc19718859e](https://github.com/tomasbjerre/violation-comments-to-bitbucket-server-lib/commit/65dacc19718859e) Tomas Bjerre *2017-12-25 16:12:52*
 
 
 ## 1.40

build.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-./gradlew --refresh-dependencies clean gitChangelogTask eclipse build install -i
+./gradlew clean gitChangelogTask eclipse build install -i

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

@@ -52,31 +52,35 @@ public BitbucketServerDiffResponse get() {
   }
 
   public BitbucketServerCommentsProvider(
-      ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi) {
+      final ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketApi) {
     final String bitbucketServerBaseUrl = violationCommentsToBitbucketApi.getBitbucketServerUrl();
     final String bitbucketServerProject = violationCommentsToBitbucketApi.getProjectKey();
     final String bitbucketServerRepo = violationCommentsToBitbucketApi.getRepoSlug();
     final Integer bitbucketServerPullRequestId = violationCommentsToBitbucketApi.getPullRequestId();
     final String bitbucketServerUser = violationCommentsToBitbucketApi.getUsername();
     final String bitbucketServerPassword = violationCommentsToBitbucketApi.getPassword();
+    final String bitbucketPersonalAccessToken =
+        violationCommentsToBitbucketApi.getPersonalAccessToken();
     client =
         new BitbucketServerClient(
             bitbucketServerBaseUrl,
             bitbucketServerProject,
             bitbucketServerRepo,
             bitbucketServerPullRequestId,
             bitbucketServerUser,
-            bitbucketServerPassword);
+            bitbucketServerPassword,
+            bitbucketPersonalAccessToken);
     this.violationCommentsToBitbucketApi = violationCommentsToBitbucketApi;
   }
 
   @Override
-  public void createCommentWithAllSingleFileComments(String comment) {
+  public void createCommentWithAllSingleFileComments(final String comment) {
     client.pullRequestComment(comment);
   }
 
   @Override
-  public void createSingleFileComment(ChangedFile file, Integer line, String comment) {
+  public void createSingleFileComment(
+      final ChangedFile file, final Integer line, final String comment) {
     client.pullRequestComment(file.getFilename(), line, comment);
   }
 
@@ -109,7 +113,7 @@ public List<ChangedFile> getFiles() {
   }
 
   @Override
-  public void removeComments(List<Comment> comments) {
+  public void removeComments(final List<Comment> comments) {
     for (final Comment comment : comments) {
       Integer commentId = null;
       Integer commentVersion = null;
@@ -124,7 +128,7 @@ public void removeComments(List<Comment> comments) {
   }
 
   @Override
-  public boolean shouldComment(ChangedFile changedFile, Integer changedLine) {
+  public boolean shouldComment(final ChangedFile changedFile, final Integer changedLine) {
     if (!violationCommentsToBitbucketApi.getCommentOnlyChangedContent()) {
       return true;
     }
@@ -135,7 +139,10 @@ public boolean shouldComment(ChangedFile changedFile, Integer changedLine) {
 
   @VisibleForTesting
   boolean shouldComment(
-      ChangedFile changedFile, Integer changedLine, int context, List<BitbucketServerDiff> diffs) {
+      final ChangedFile changedFile,
+      final Integer changedLine,
+      final int context,
+      final List<BitbucketServerDiff> diffs) {
     for (final BitbucketServerDiff diff : diffs) {
       final DiffDestination destination = diff.getDestination();
       if (destination != null) {
@@ -174,7 +181,8 @@ public boolean shouldCreateSingleFileComment() {
   }
 
   @Override
-  public Optional<String> findCommentFormat(ChangedFile changedFile, Violation violation) {
+  public Optional<String> findCommentFormat(
+      final ChangedFile changedFile, final Violation violation) {
     return Optional.absent();
   }
 

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

@@ -1,8 +1,9 @@
 package se.bjurr.violations.comments.bitbucketserver.lib;
 
-import static com.google.common.base.Objects.firstNonNull;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static se.bjurr.violations.comments.lib.CommentsCreator.createComments;
+import static se.bjurr.violations.lib.util.Utils.firstNonNull;
+import static se.bjurr.violations.lib.util.Utils.isNullOrEmpty;
 
 import java.util.List;
 import se.bjurr.violations.comments.lib.model.CommentsProvider;
@@ -12,6 +13,7 @@ public class ViolationCommentsToBitbucketServerApi {
   private static final Integer BITBUCKET_MAX_COMMENT_SIZE = 32767;
   public static final String DEFAULT_PROP_VIOLATIONS_PASSWORD = "VIOLATIONS_PASSWORD";
   public static final String DEFAULT_PROP_VIOLATIONS_USERNAME = "VIOLATIONS_USERNAME";
+  public static final String DEFAULT_PROP_PERSONAL_ACCESS_TOKEN = "VIOLATIONS_PAT";
 
   public static ViolationCommentsToBitbucketServerApi violationCommentsToBitbucketServerApi() {
     return new ViolationCommentsToBitbucketServerApi();
@@ -24,28 +26,38 @@ public static ViolationCommentsToBitbucketServerApi violationCommentsToBitbucket
   private String projectKey;
   private String propPassword = DEFAULT_PROP_VIOLATIONS_PASSWORD;
   private String propUsername = DEFAULT_PROP_VIOLATIONS_USERNAME;
+  private String propPersonalAccessToken = DEFAULT_PROP_PERSONAL_ACCESS_TOKEN;
   private int pullRequestId;
   private String repoSlug;
   private String username;
   private List<Violation> violations;
   private boolean commentOnlyChangedContent = false;
   private int commentOnlyChangedContentContext;
   private boolean shouldKeepOldComments;
+  private String personalAccessToken;
 
   private ViolationCommentsToBitbucketServerApi() {}
 
   private void checkState() {
-    if (username == null || password == null) {
+    final boolean noUsername = isNullOrEmpty(username) || isNullOrEmpty(password);
+    final boolean noPat = isNullOrEmpty(personalAccessToken);
+    if (noUsername && noPat) {
       throw new IllegalStateException(
-          "User and Password must be set! They can be set with the API or by setting properties.\n"
+          "User and Password, or personal access token, must be set! They can be set with the API or by setting properties.\n"
               + //
               "Username/password:\n"
               + //
               "-D"
               + DEFAULT_PROP_VIOLATIONS_USERNAME
               + "=theuser -D"
               + DEFAULT_PROP_VIOLATIONS_PASSWORD
-              + "=thepassword");
+              + "=thepassword"
+              + //
+              "\n\nPersonal access token:\n"
+              + //
+              "-D"
+              + DEFAULT_PROP_PERSONAL_ACCESS_TOKEN
+              + "=asdasd");
     }
     checkNotNull(bitbucketServerUrl, "BitbucketServerURL");
     checkNotNull(pullRequestId, "PullRequestId");
@@ -108,6 +120,10 @@ private void populateFromEnvironmentVariables() {
     if (System.getProperty(propPassword) != null) {
       password = firstNonNull(password, System.getProperty(propPassword));
     }
+    if (System.getProperty(propPassword) != null) {
+      personalAccessToken =
+          firstNonNull(personalAccessToken, System.getProperty(propPersonalAccessToken));
+    }
   }
 
   public void toPullRequest() throws Exception {
@@ -117,80 +133,91 @@ public void toPullRequest() throws Exception {
     createComments(commentsProvider, violations, BITBUCKET_MAX_COMMENT_SIZE);
   }
 
-  public ViolationCommentsToBitbucketServerApi withBitbucketServerUrl(String bitbucketServerUrl) {
+  public ViolationCommentsToBitbucketServerApi withBitbucketServerUrl(
+      final String bitbucketServerUrl) {
     this.bitbucketServerUrl = bitbucketServerUrl;
     return this;
   }
 
   public ViolationCommentsToBitbucketServerApi withCommentOnlyChangedContent(
-      boolean commentOnlyChangedContent) {
+      final boolean commentOnlyChangedContent) {
     this.commentOnlyChangedContent = commentOnlyChangedContent;
     return this;
   }
 
   public ViolationCommentsToBitbucketServerApi withCommentOnlyChangedContentContext(
-      int commentOnlyChangedContentContext) {
+      final int commentOnlyChangedContentContext) {
     this.commentOnlyChangedContentContext = commentOnlyChangedContentContext;
     return this;
   }
 
   public ViolationCommentsToBitbucketServerApi withCreateCommentWithAllSingleFileComments(
-      boolean createCommentWithAllSingleFileComments) {
+      final boolean createCommentWithAllSingleFileComments) {
     this.createCommentWithAllSingleFileComments = createCommentWithAllSingleFileComments;
     return this;
   }
 
   public ViolationCommentsToBitbucketServerApi withCreateSingleFileComments(
-      boolean createSingleFileComments) {
+      final boolean createSingleFileComments) {
     this.createSingleFileComments = createSingleFileComments;
     return this;
   }
 
-  public ViolationCommentsToBitbucketServerApi withPassword(String password) {
+  public ViolationCommentsToBitbucketServerApi withPassword(final String password) {
     this.password = password;
     return this;
   }
 
-  public ViolationCommentsToBitbucketServerApi withProjectKey(String projectKey) {
+  public ViolationCommentsToBitbucketServerApi withProjectKey(final String projectKey) {
     this.projectKey = projectKey;
     return this;
   }
 
-  public void withPropPassword(String envPassword) {
+  public void withPropPassword(final String envPassword) {
     propPassword = envPassword;
   }
 
-  public void withPropUsername(String envUsername) {
+  public void withPropUsername(final String envUsername) {
     propUsername = envUsername;
   }
 
-  public ViolationCommentsToBitbucketServerApi withPullRequestId(int pullRequestId) {
+  public ViolationCommentsToBitbucketServerApi withPropPersonalAccessToken(
+      final String propPersonalAccessToken) {
+    this.propPersonalAccessToken = propPersonalAccessToken;
+    return this;
+  }
+
+  public ViolationCommentsToBitbucketServerApi withPullRequestId(final int pullRequestId) {
     this.pullRequestId = pullRequestId;
     return this;
   }
 
-  public ViolationCommentsToBitbucketServerApi withRepoSlug(String repoSlug) {
+  public ViolationCommentsToBitbucketServerApi withRepoSlug(final String repoSlug) {
     this.repoSlug = repoSlug;
     return this;
   }
 
-  public ViolationCommentsToBitbucketServerApi withUsername(String username) {
+  public ViolationCommentsToBitbucketServerApi withUsername(final String username) {
     this.username = username;
     return this;
   }
 
-  public ViolationCommentsToBitbucketServerApi withViolations(List<Violation> violations) {
+  public ViolationCommentsToBitbucketServerApi withViolations(final List<Violation> violations) {
     this.violations = violations;
     return this;
   }
 
   public ViolationCommentsToBitbucketServerApi withShouldKeepOldComments(
-      boolean shouldKeepOldComments) {
+      final boolean shouldKeepOldComments) {
     this.shouldKeepOldComments = shouldKeepOldComments;
     return this;
   }
 
   public boolean getShouldKeepOldComments() {
     return shouldKeepOldComments;
   }
+
+  public String getPersonalAccessToken() {
+    return personalAccessToken;
+  }
 }