Updating fmt-plugin

tomasbjerre · Aug 31, 2018 · d8a31bd · d8a31bd
1 parent 6e0cf42
commit d8a31bd
Show file tree

Hide file tree

Showing 50 changed files with 165 additions and 269 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,10 @@ before_install:
   - ./setup-atlassian-sdk.sh `pwd`
   - export PATH=opt/atlassian-plugin-sdk/bin:opt/atlassian-plugin-sdk/apache-maven-*/bin:$PATH
 install:
-  - atlas-mvn -q install -Dbitbucket.version=5.1.0
-  - atlas-mvn -q install
+  - atlas-mvn install -Dbitbucket.version=5.1.0
+  - atlas-mvn install
 script:
-  - atlas-package -q -Dbitbucket.version=5.1.0
-  - atlas-package -q
+  - atlas-package -Dbitbucket.version=5.1.0
+  - atlas-package
 notifications:
   email: false
diff --git a/pom.xml b/pom.xml
@@ -243,7 +243,7 @@ Changelog of Pull Request Notifier for Bitbucket.
    <plugin>
     <groupId>com.coveo</groupId>
     <artifactId>fmt-maven-plugin</artifactId>
-    <version>1.3.0</version>
+    <version>2.5.1</version>
     <executions>
      <execution>
       <goals>
@@ -327,7 +327,7 @@ Changelog of Pull Request Notifier for Bitbucket.
  </profiles>
 
  <properties>
-  <bitbucket.version>5.7.0</bitbucket.version>
+  <bitbucket.version>5.13.1</bitbucket.version>
   <bitbucket.data.version>${bitbucket.version}</bitbucket.data.version>
   <quick.reload.version>2.0.0</quick.reload.version>
   <amps.version>6.3.6</amps.version>

diff --git a/src/main/java/se/bjurr/prnfb/http/ClientKeyStore.java b/src/main/java/se/bjurr/prnfb/http/ClientKeyStore.java
@@ -2,15 +2,13 @@
 
 import static com.google.common.base.Optional.fromNullable;
 
+import com.google.common.base.Optional;
 import java.io.File;
 import java.io.FileInputStream;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
-
 import se.bjurr.prnfb.settings.PrnfbSettingsData;
 
-import com.google.common.base.Optional;
-
 /**
  * A keystore based on the definition from the application properties.<br>
  * <br>

diff --git a/src/main/java/se/bjurr/prnfb/http/UrlInvoker.java b/src/main/java/se/bjurr/prnfb/http/UrlInvoker.java
@@ -14,16 +14,16 @@
 import static se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD.POST;
 import static se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD.PUT;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Optional;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.cert.X509Certificate;
 import java.util.List;
-
 import javax.net.ssl.SSLContext;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpVersion;
@@ -49,10 +49,6 @@
 import org.apache.http.ssl.TrustStrategy;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
-
 import se.bjurr.prnfb.settings.PrnfbHeader;
 import se.bjurr.prnfb.settings.PrnfbNotification;
 

diff --git a/src/main/java/se/bjurr/prnfb/listener/PrnfbPullRequestAction.java b/src/main/java/se/bjurr/prnfb/listener/PrnfbPullRequestAction.java
@@ -1,9 +1,8 @@
 package se.bjurr.prnfb.listener;
 
-import se.bjurr.prnfb.settings.PrnfbNotification;
-
 import com.atlassian.bitbucket.event.pull.PullRequestEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestRescopedEvent;
+import se.bjurr.prnfb.settings.PrnfbNotification;
 
 public enum PrnfbPullRequestAction {
   APPROVED, //

diff --git a/src/main/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListener.java b/src/main/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListener.java
@@ -13,26 +13,6 @@
 import static se.bjurr.prnfb.settings.TRIGGER_IF_MERGE.CONFLICTING;
 import static se.bjurr.prnfb.settings.TRIGGER_IF_MERGE.NOT_CONFLICTING;
 
-import java.util.concurrent.ExecutorService;
-
-import org.slf4j.Logger;
-
-import se.bjurr.prnfb.http.ClientKeyStore;
-import se.bjurr.prnfb.http.HttpResponse;
-import se.bjurr.prnfb.http.Invoker;
-import se.bjurr.prnfb.http.NotificationResponse;
-import se.bjurr.prnfb.http.UrlInvoker;
-import se.bjurr.prnfb.service.PrnfbRenderer;
-import se.bjurr.prnfb.service.PrnfbRenderer.ENCODE_FOR;
-import se.bjurr.prnfb.service.PrnfbRendererFactory;
-import se.bjurr.prnfb.service.SettingsService;
-import se.bjurr.prnfb.service.VariablesContext;
-import se.bjurr.prnfb.service.VariablesContext.VariablesContextBuilder;
-import se.bjurr.prnfb.settings.PrnfbHeader;
-import se.bjurr.prnfb.settings.PrnfbNotification;
-import se.bjurr.prnfb.settings.PrnfbSettingsData;
-import se.bjurr.prnfb.settings.TRIGGER_IF_MERGE;
-
 import com.atlassian.bitbucket.ServiceException;
 import com.atlassian.bitbucket.event.pull.PullRequestCommentAddedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestCommentDeletedEvent;
@@ -59,6 +39,23 @@
 import com.atlassian.event.api.EventListener;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
+import java.util.concurrent.ExecutorService;
+import org.slf4j.Logger;
+import se.bjurr.prnfb.http.ClientKeyStore;
+import se.bjurr.prnfb.http.HttpResponse;
+import se.bjurr.prnfb.http.Invoker;
+import se.bjurr.prnfb.http.NotificationResponse;
+import se.bjurr.prnfb.http.UrlInvoker;
+import se.bjurr.prnfb.service.PrnfbRenderer;
+import se.bjurr.prnfb.service.PrnfbRenderer.ENCODE_FOR;
+import se.bjurr.prnfb.service.PrnfbRendererFactory;
+import se.bjurr.prnfb.service.SettingsService;
+import se.bjurr.prnfb.service.VariablesContext;
+import se.bjurr.prnfb.service.VariablesContext.VariablesContextBuilder;
+import se.bjurr.prnfb.settings.PrnfbHeader;
+import se.bjurr.prnfb.settings.PrnfbNotification;
+import se.bjurr.prnfb.settings.PrnfbSettingsData;
+import se.bjurr.prnfb.settings.TRIGGER_IF_MERGE;
 
 public class PrnfbPullRequestEventListener {
 

diff --git a/src/main/java/se/bjurr/prnfb/presentation/ButtonServlet.java b/src/main/java/se/bjurr/prnfb/presentation/ButtonServlet.java
@@ -2,20 +2,22 @@
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.Response.ok;
-import static javax.ws.rs.core.Response.status;
 import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 import static javax.ws.rs.core.Response.Status.OK;
 import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static javax.ws.rs.core.Response.ok;
+import static javax.ws.rs.core.Response.status;
 import static se.bjurr.prnfb.transformer.ButtonTransformer.toButtonDto;
 import static se.bjurr.prnfb.transformer.ButtonTransformer.toButtonDtoList;
 import static se.bjurr.prnfb.transformer.ButtonTransformer.toPrnfbButton;
 import static se.bjurr.prnfb.transformer.ButtonTransformer.toTriggerResultDto;
 
+import com.atlassian.annotations.security.XsrfProtectionExcluded;
+import com.google.common.base.Optional;
+import com.google.common.collect.Iterables;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -26,7 +28,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
-
 import se.bjurr.prnfb.http.NotificationResponse;
 import se.bjurr.prnfb.presentation.dto.ButtonDTO;
 import se.bjurr.prnfb.presentation.dto.ButtonFormElementDTO;
@@ -39,10 +40,6 @@
 import se.bjurr.prnfb.settings.PrnfbButton;
 import se.bjurr.prnfb.settings.USER_LEVEL;
 
-import com.atlassian.annotations.security.XsrfProtectionExcluded;
-import com.google.common.base.Optional;
-import com.google.common.collect.Iterables;
-
 @Path("/settings/buttons")
 public class ButtonServlet {
 

diff --git a/src/main/java/se/bjurr/prnfb/presentation/GlobalAdminServlet.java b/src/main/java/se/bjurr/prnfb/presentation/GlobalAdminServlet.java
@@ -6,13 +6,6 @@
 import static com.google.common.collect.ImmutableMap.of;
 import static com.google.common.collect.Maps.newHashMap;
 
-import java.net.URI;
-import java.util.Map;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.atlassian.bitbucket.project.Project;
 import com.atlassian.bitbucket.project.ProjectService;
 import com.atlassian.bitbucket.repository.Repository;
@@ -23,7 +16,11 @@
 import com.atlassian.templaterenderer.TemplateRenderer;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
-
+import java.net.URI;
+import java.util.Map;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import se.bjurr.prnfb.service.UserCheckService;
 
 public class GlobalAdminServlet extends HttpServlet {

diff --git a/src/main/java/se/bjurr/prnfb/presentation/NotificationServlet.java b/src/main/java/se/bjurr/prnfb/presentation/NotificationServlet.java
@@ -2,18 +2,18 @@
 
 import static com.google.common.base.Throwables.propagate;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.Response.ok;
-import static javax.ws.rs.core.Response.status;
 import static javax.ws.rs.core.Response.Status.OK;
 import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static javax.ws.rs.core.Response.ok;
+import static javax.ws.rs.core.Response.status;
 import static se.bjurr.prnfb.transformer.NotificationTransformer.toNotificationDto;
 import static se.bjurr.prnfb.transformer.NotificationTransformer.toNotificationDtoList;
 import static se.bjurr.prnfb.transformer.NotificationTransformer.toPrnfbNotification;
 
+import com.atlassian.annotations.security.XsrfProtectionExcluded;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -22,15 +22,12 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
-
 import se.bjurr.prnfb.presentation.dto.NotificationDTO;
 import se.bjurr.prnfb.service.SettingsService;
 import se.bjurr.prnfb.service.UserCheckService;
 import se.bjurr.prnfb.settings.PrnfbNotification;
 import se.bjurr.prnfb.settings.USER_LEVEL;
 
-import com.atlassian.annotations.security.XsrfProtectionExcluded;
-
 @Path("/settings/notifications")
 public class NotificationServlet {
   private final SettingsService settingsService;

diff --git a/src/main/java/se/bjurr/prnfb/presentation/SettingsDataServlet.java b/src/main/java/se/bjurr/prnfb/presentation/SettingsDataServlet.java
@@ -1,30 +1,28 @@
 package se.bjurr.prnfb.presentation;
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static javax.ws.rs.core.Response.noContent;
 import static javax.ws.rs.core.Response.ok;
 import static javax.ws.rs.core.Response.status;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
 import static se.bjurr.prnfb.transformer.SettingsTransformer.toDto;
 import static se.bjurr.prnfb.transformer.SettingsTransformer.toPrnfbSettingsData;
 
+import com.atlassian.annotations.security.XsrfProtectionExcluded;
+import com.google.common.base.Optional;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
-
 import se.bjurr.prnfb.presentation.dto.SettingsDataDTO;
 import se.bjurr.prnfb.service.SettingsService;
 import se.bjurr.prnfb.service.UserCheckService;
 import se.bjurr.prnfb.settings.PrnfbSettingsData;
 import se.bjurr.prnfb.settings.Restricted;
 import se.bjurr.prnfb.settings.USER_LEVEL;
 
-import com.atlassian.annotations.security.XsrfProtectionExcluded;
-import com.google.common.base.Optional;
-
 @Path("/settings")
 public class SettingsDataServlet {
   private final SettingsService settingsService;

diff --git a/src/main/java/se/bjurr/prnfb/presentation/dto/ButtonDTO.java b/src/main/java/se/bjurr/prnfb/presentation/dto/ButtonDTO.java
@@ -2,17 +2,14 @@
 
 import static javax.xml.bind.annotation.XmlAccessType.FIELD;
 
+import com.google.common.base.Optional;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Optional;
-import com.google.gson.reflect.TypeToken;
-
 import se.bjurr.prnfb.settings.Restricted;
 import se.bjurr.prnfb.settings.USER_LEVEL;
 

diff --git a/src/main/java/se/bjurr/prnfb/presentation/dto/ButtonFormElementDTO.java b/src/main/java/se/bjurr/prnfb/presentation/dto/ButtonFormElementDTO.java
@@ -3,7 +3,6 @@
 import static javax.xml.bind.annotation.XmlAccessType.FIELD;
 
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 

diff --git a/src/main/java/se/bjurr/prnfb/presentation/dto/ButtonPressDTO.java b/src/main/java/se/bjurr/prnfb/presentation/dto/ButtonPressDTO.java
@@ -3,7 +3,6 @@
 import static javax.xml.bind.annotation.XmlAccessType.FIELD;
 
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 

diff --git a/src/main/java/se/bjurr/prnfb/presentation/dto/NotificationDTO.java b/src/main/java/se/bjurr/prnfb/presentation/dto/NotificationDTO.java
@@ -2,14 +2,11 @@
 
 import static javax.xml.bind.annotation.XmlAccessType.FIELD;
 
+import com.google.common.base.Optional;
 import java.util.List;
 import java.util.UUID;
-
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Optional;
-
 import se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD;
 import se.bjurr.prnfb.service.PrnfbRenderer.ENCODE_FOR;
 import se.bjurr.prnfb.settings.Restricted;

diff --git a/src/main/java/se/bjurr/prnfb/presentation/dto/NotificationResponseDTO.java b/src/main/java/se/bjurr/prnfb/presentation/dto/NotificationResponseDTO.java
@@ -4,7 +4,6 @@
 
 import java.net.URI;
 import java.util.UUID;
-
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 

diff --git a/src/main/java/se/bjurr/prnfb/presentation/dto/SettingsDataDTO.java b/src/main/java/se/bjurr/prnfb/presentation/dto/SettingsDataDTO.java
@@ -4,7 +4,6 @@
 
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
-
 import se.bjurr.prnfb.settings.USER_LEVEL;
 
 @XmlRootElement

diff --git a/src/main/java/se/bjurr/prnfb/service/ButtonsService.java b/src/main/java/se/bjurr/prnfb/service/ButtonsService.java
@@ -6,14 +6,12 @@
 import static java.lang.Boolean.TRUE;
 import static se.bjurr.prnfb.listener.PrnfbPullRequestAction.BUTTON_TRIGGER;
 
-import java.util.List;
-import java.util.UUID;
-
 import com.atlassian.bitbucket.pull.PullRequest;
 import com.atlassian.bitbucket.pull.PullRequestService;
 import com.atlassian.bitbucket.repository.Repository;
 import com.google.common.annotations.VisibleForTesting;
-
+import java.util.List;
+import java.util.UUID;
 import se.bjurr.prnfb.http.ClientKeyStore;
 import se.bjurr.prnfb.http.NotificationResponse;
 import se.bjurr.prnfb.listener.PrnfbPullRequestAction;