Skip to content
This repository was archived by the owner on Jun 9, 2021. It is now read-only.

Commit d8a31bd

Browse files
tomasbjerretomasbjerre
committed
Updating fmt-plugin
1 parent 6e0cf42 commit d8a31bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+165
-269
lines changed

‎.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ before_install:
77
- ./setup-atlassian-sdk.sh `pwd`
88
- export PATH=opt/atlassian-plugin-sdk/bin:opt/atlassian-plugin-sdk/apache-maven-*/bin:$PATH
99
install:
10-
- atlas-mvn -q install -Dbitbucket.version=5.1.0
11-
- atlas-mvn -q install
10+
- atlas-mvn install -Dbitbucket.version=5.1.0
11+
- atlas-mvn install
1212
script:
13-
- atlas-package -q -Dbitbucket.version=5.1.0
14-
- atlas-package -q
13+
- atlas-package -Dbitbucket.version=5.1.0
14+
- atlas-package
1515
notifications:
1616
email: false

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ Changelog of Pull Request Notifier for Bitbucket.
243243
<plugin>
244244
<groupId>com.coveo</groupId>
245245
<artifactId>fmt-maven-plugin</artifactId>
246-
<version>1.3.0</version>
246+
<version>2.5.1</version>
247247
<executions>
248248
<execution>
249249
<goals>
@@ -327,7 +327,7 @@ Changelog of Pull Request Notifier for Bitbucket.
327327
</profiles>
328328

329329
<properties>
330-
<bitbucket.version>5.7.0</bitbucket.version>
330+
<bitbucket.version>5.13.1</bitbucket.version>
331331
<bitbucket.data.version>${bitbucket.version}</bitbucket.data.version>
332332
<quick.reload.version>2.0.0</quick.reload.version>
333333
<amps.version>6.3.6</amps.version>

‎src/main/java/se/bjurr/prnfb/http/ClientKeyStore.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
import static com.google.common.base.Optional.fromNullable;
44

5+
import com.google.common.base.Optional;
56
import java.io.File;
67
import java.io.FileInputStream;
78
import java.security.KeyStore;
89
import java.security.KeyStoreException;
9-
1010
import se.bjurr.prnfb.settings.PrnfbSettingsData;
1111

12-
import com.google.common.base.Optional;
13-
1412
/**
1513
* A keystore based on the definition from the application properties.<br>
1614
* <br>

‎src/main/java/se/bjurr/prnfb/http/UrlInvoker.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
import static se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD.POST;
1515
import static se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD.PUT;
1616

17+
import com.google.common.annotations.VisibleForTesting;
18+
import com.google.common.base.Optional;
1719
import java.io.ByteArrayInputStream;
1820
import java.io.IOException;
1921
import java.io.InputStream;
2022
import java.net.URI;
2123
import java.net.URISyntaxException;
2224
import java.security.cert.X509Certificate;
2325
import java.util.List;
24-
2526
import javax.net.ssl.SSLContext;
26-
2727
import org.apache.http.HttpEntity;
2828
import org.apache.http.HttpHost;
2929
import org.apache.http.HttpVersion;
@@ -49,10 +49,6 @@
4949
import org.apache.http.ssl.TrustStrategy;
5050
import org.apache.http.util.EntityUtils;
5151
import org.slf4j.Logger;
52-
53-
import com.google.common.annotations.VisibleForTesting;
54-
import com.google.common.base.Optional;
55-
5652
import se.bjurr.prnfb.settings.PrnfbHeader;
5753
import se.bjurr.prnfb.settings.PrnfbNotification;
5854

‎src/main/java/se/bjurr/prnfb/listener/PrnfbPullRequestAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package se.bjurr.prnfb.listener;
22

3-
import se.bjurr.prnfb.settings.PrnfbNotification;
4-
53
import com.atlassian.bitbucket.event.pull.PullRequestEvent;
64
import com.atlassian.bitbucket.event.pull.PullRequestRescopedEvent;
5+
import se.bjurr.prnfb.settings.PrnfbNotification;
76

87
public enum PrnfbPullRequestAction {
98
APPROVED, //

‎src/main/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListener.java

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,6 @@
1313
import static se.bjurr.prnfb.settings.TRIGGER_IF_MERGE.CONFLICTING;
1414
import static se.bjurr.prnfb.settings.TRIGGER_IF_MERGE.NOT_CONFLICTING;
1515

16-
import java.util.concurrent.ExecutorService;
17-
18-
import org.slf4j.Logger;
19-
20-
import se.bjurr.prnfb.http.ClientKeyStore;
21-
import se.bjurr.prnfb.http.HttpResponse;
22-
import se.bjurr.prnfb.http.Invoker;
23-
import se.bjurr.prnfb.http.NotificationResponse;
24-
import se.bjurr.prnfb.http.UrlInvoker;
25-
import se.bjurr.prnfb.service.PrnfbRenderer;
26-
import se.bjurr.prnfb.service.PrnfbRenderer.ENCODE_FOR;
27-
import se.bjurr.prnfb.service.PrnfbRendererFactory;
28-
import se.bjurr.prnfb.service.SettingsService;
29-
import se.bjurr.prnfb.service.VariablesContext;
30-
import se.bjurr.prnfb.service.VariablesContext.VariablesContextBuilder;
31-
import se.bjurr.prnfb.settings.PrnfbHeader;
32-
import se.bjurr.prnfb.settings.PrnfbNotification;
33-
import se.bjurr.prnfb.settings.PrnfbSettingsData;
34-
import se.bjurr.prnfb.settings.TRIGGER_IF_MERGE;
35-
3616
import com.atlassian.bitbucket.ServiceException;
3717
import com.atlassian.bitbucket.event.pull.PullRequestCommentAddedEvent;
3818
import com.atlassian.bitbucket.event.pull.PullRequestCommentDeletedEvent;
@@ -59,6 +39,23 @@
5939
import com.atlassian.event.api.EventListener;
6040
import com.google.common.annotations.VisibleForTesting;
6141
import com.google.common.base.Optional;
42+
import java.util.concurrent.ExecutorService;
43+
import org.slf4j.Logger;
44+
import se.bjurr.prnfb.http.ClientKeyStore;
45+
import se.bjurr.prnfb.http.HttpResponse;
46+
import se.bjurr.prnfb.http.Invoker;
47+
import se.bjurr.prnfb.http.NotificationResponse;
48+
import se.bjurr.prnfb.http.UrlInvoker;
49+
import se.bjurr.prnfb.service.PrnfbRenderer;
50+
import se.bjurr.prnfb.service.PrnfbRenderer.ENCODE_FOR;
51+
import se.bjurr.prnfb.service.PrnfbRendererFactory;
52+
import se.bjurr.prnfb.service.SettingsService;
53+
import se.bjurr.prnfb.service.VariablesContext;
54+
import se.bjurr.prnfb.service.VariablesContext.VariablesContextBuilder;
55+
import se.bjurr.prnfb.settings.PrnfbHeader;
56+
import se.bjurr.prnfb.settings.PrnfbNotification;
57+
import se.bjurr.prnfb.settings.PrnfbSettingsData;
58+
import se.bjurr.prnfb.settings.TRIGGER_IF_MERGE;
6259

6360
public class PrnfbPullRequestEventListener {
6461

‎src/main/java/se/bjurr/prnfb/presentation/ButtonServlet.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22

33
import static com.google.common.base.Strings.isNullOrEmpty;
44
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
5-
import static javax.ws.rs.core.Response.ok;
6-
import static javax.ws.rs.core.Response.status;
75
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
86
import static javax.ws.rs.core.Response.Status.OK;
97
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
8+
import static javax.ws.rs.core.Response.ok;
9+
import static javax.ws.rs.core.Response.status;
1010
import static se.bjurr.prnfb.transformer.ButtonTransformer.toButtonDto;
1111
import static se.bjurr.prnfb.transformer.ButtonTransformer.toButtonDtoList;
1212
import static se.bjurr.prnfb.transformer.ButtonTransformer.toPrnfbButton;
1313
import static se.bjurr.prnfb.transformer.ButtonTransformer.toTriggerResultDto;
1414

15+
import com.atlassian.annotations.security.XsrfProtectionExcluded;
16+
import com.google.common.base.Optional;
17+
import com.google.common.collect.Iterables;
1518
import java.util.Collections;
1619
import java.util.List;
1720
import java.util.UUID;
18-
1921
import javax.servlet.http.HttpServletRequest;
2022
import javax.ws.rs.Consumes;
2123
import javax.ws.rs.DELETE;
@@ -26,7 +28,6 @@
2628
import javax.ws.rs.Produces;
2729
import javax.ws.rs.core.Context;
2830
import javax.ws.rs.core.Response;
29-
3031
import se.bjurr.prnfb.http.NotificationResponse;
3132
import se.bjurr.prnfb.presentation.dto.ButtonDTO;
3233
import se.bjurr.prnfb.presentation.dto.ButtonFormElementDTO;
@@ -39,10 +40,6 @@
3940
import se.bjurr.prnfb.settings.PrnfbButton;
4041
import se.bjurr.prnfb.settings.USER_LEVEL;
4142

42-
import com.atlassian.annotations.security.XsrfProtectionExcluded;
43-
import com.google.common.base.Optional;
44-
import com.google.common.collect.Iterables;
45-
4643
@Path("/settings/buttons")
4744
public class ButtonServlet {
4845

‎src/main/java/se/bjurr/prnfb/presentation/GlobalAdminServlet.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
import static com.google.common.collect.ImmutableMap.of;
77
import static com.google.common.collect.Maps.newHashMap;
88

9-
import java.net.URI;
10-
import java.util.Map;
11-
12-
import javax.servlet.http.HttpServlet;
13-
import javax.servlet.http.HttpServletRequest;
14-
import javax.servlet.http.HttpServletResponse;
15-
169
import com.atlassian.bitbucket.project.Project;
1710
import com.atlassian.bitbucket.project.ProjectService;
1811
import com.atlassian.bitbucket.repository.Repository;
@@ -23,7 +16,11 @@
2316
import com.atlassian.templaterenderer.TemplateRenderer;
2417
import com.google.common.annotations.VisibleForTesting;
2518
import com.google.common.base.Optional;
26-
19+
import java.net.URI;
20+
import java.util.Map;
21+
import javax.servlet.http.HttpServlet;
22+
import javax.servlet.http.HttpServletRequest;
23+
import javax.servlet.http.HttpServletResponse;
2724
import se.bjurr.prnfb.service.UserCheckService;
2825

2926
public class GlobalAdminServlet extends HttpServlet {

‎src/main/java/se/bjurr/prnfb/presentation/NotificationServlet.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import static com.google.common.base.Throwables.propagate;
44
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
5-
import static javax.ws.rs.core.Response.ok;
6-
import static javax.ws.rs.core.Response.status;
75
import static javax.ws.rs.core.Response.Status.OK;
86
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
7+
import static javax.ws.rs.core.Response.ok;
8+
import static javax.ws.rs.core.Response.status;
99
import static se.bjurr.prnfb.transformer.NotificationTransformer.toNotificationDto;
1010
import static se.bjurr.prnfb.transformer.NotificationTransformer.toNotificationDtoList;
1111
import static se.bjurr.prnfb.transformer.NotificationTransformer.toPrnfbNotification;
1212

13+
import com.atlassian.annotations.security.XsrfProtectionExcluded;
1314
import java.util.Collections;
1415
import java.util.List;
1516
import java.util.UUID;
16-
1717
import javax.ws.rs.Consumes;
1818
import javax.ws.rs.DELETE;
1919
import javax.ws.rs.GET;
@@ -22,15 +22,12 @@
2222
import javax.ws.rs.PathParam;
2323
import javax.ws.rs.Produces;
2424
import javax.ws.rs.core.Response;
25-
2625
import se.bjurr.prnfb.presentation.dto.NotificationDTO;
2726
import se.bjurr.prnfb.service.SettingsService;
2827
import se.bjurr.prnfb.service.UserCheckService;
2928
import se.bjurr.prnfb.settings.PrnfbNotification;
3029
import se.bjurr.prnfb.settings.USER_LEVEL;
3130

32-
import com.atlassian.annotations.security.XsrfProtectionExcluded;
33-
3431
@Path("/settings/notifications")
3532
public class NotificationServlet {
3633
private final SettingsService settingsService;

‎src/main/java/se/bjurr/prnfb/presentation/SettingsDataServlet.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11
package se.bjurr.prnfb.presentation;
22

33
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
4+
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
45
import static javax.ws.rs.core.Response.noContent;
56
import static javax.ws.rs.core.Response.ok;
67
import static javax.ws.rs.core.Response.status;
7-
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
88
import static se.bjurr.prnfb.transformer.SettingsTransformer.toDto;
99
import static se.bjurr.prnfb.transformer.SettingsTransformer.toPrnfbSettingsData;
1010

11+
import com.atlassian.annotations.security.XsrfProtectionExcluded;
12+
import com.google.common.base.Optional;
1113
import javax.ws.rs.Consumes;
1214
import javax.ws.rs.GET;
1315
import javax.ws.rs.POST;
1416
import javax.ws.rs.Path;
1517
import javax.ws.rs.Produces;
1618
import javax.ws.rs.core.Response;
17-
1819
import se.bjurr.prnfb.presentation.dto.SettingsDataDTO;
1920
import se.bjurr.prnfb.service.SettingsService;
2021
import se.bjurr.prnfb.service.UserCheckService;
2122
import se.bjurr.prnfb.settings.PrnfbSettingsData;
2223
import se.bjurr.prnfb.settings.Restricted;
2324
import se.bjurr.prnfb.settings.USER_LEVEL;
2425

25-
import com.atlassian.annotations.security.XsrfProtectionExcluded;
26-
import com.google.common.base.Optional;
27-
2826
@Path("/settings")
2927
public class SettingsDataServlet {
3028
private final SettingsService settingsService;

‎src/main/java/se/bjurr/prnfb/presentation/dto/ButtonDTO.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22

33
import static javax.xml.bind.annotation.XmlAccessType.FIELD;
44

5+
import com.google.common.base.Optional;
6+
import com.google.gson.reflect.TypeToken;
57
import java.lang.reflect.Type;
68
import java.util.ArrayList;
79
import java.util.List;
810
import java.util.UUID;
9-
1011
import javax.xml.bind.annotation.XmlAccessorType;
1112
import javax.xml.bind.annotation.XmlRootElement;
12-
13-
import com.google.common.base.Optional;
14-
import com.google.gson.reflect.TypeToken;
15-
1613
import se.bjurr.prnfb.settings.Restricted;
1714
import se.bjurr.prnfb.settings.USER_LEVEL;
1815

‎src/main/java/se/bjurr/prnfb/presentation/dto/ButtonFormElementDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static javax.xml.bind.annotation.XmlAccessType.FIELD;
44

55
import java.util.List;
6-
76
import javax.xml.bind.annotation.XmlAccessorType;
87
import javax.xml.bind.annotation.XmlRootElement;
98

‎src/main/java/se/bjurr/prnfb/presentation/dto/ButtonPressDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static javax.xml.bind.annotation.XmlAccessType.FIELD;
44

55
import java.util.List;
6-
76
import javax.xml.bind.annotation.XmlAccessorType;
87
import javax.xml.bind.annotation.XmlRootElement;
98

‎src/main/java/se/bjurr/prnfb/presentation/dto/NotificationDTO.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
import static javax.xml.bind.annotation.XmlAccessType.FIELD;
44

5+
import com.google.common.base.Optional;
56
import java.util.List;
67
import java.util.UUID;
7-
88
import javax.xml.bind.annotation.XmlAccessorType;
99
import javax.xml.bind.annotation.XmlRootElement;
10-
11-
import com.google.common.base.Optional;
12-
1310
import se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD;
1411
import se.bjurr.prnfb.service.PrnfbRenderer.ENCODE_FOR;
1512
import se.bjurr.prnfb.settings.Restricted;

‎src/main/java/se/bjurr/prnfb/presentation/dto/NotificationResponseDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import java.net.URI;
66
import java.util.UUID;
7-
87
import javax.xml.bind.annotation.XmlAccessorType;
98
import javax.xml.bind.annotation.XmlRootElement;
109

‎src/main/java/se/bjurr/prnfb/presentation/dto/SettingsDataDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import javax.xml.bind.annotation.XmlAccessorType;
66
import javax.xml.bind.annotation.XmlRootElement;
7-
87
import se.bjurr.prnfb.settings.USER_LEVEL;
98

109
@XmlRootElement

‎src/main/java/se/bjurr/prnfb/service/ButtonsService.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
import static java.lang.Boolean.TRUE;
77
import static se.bjurr.prnfb.listener.PrnfbPullRequestAction.BUTTON_TRIGGER;
88

9-
import java.util.List;
10-
import java.util.UUID;
11-
129
import com.atlassian.bitbucket.pull.PullRequest;
1310
import com.atlassian.bitbucket.pull.PullRequestService;
1411
import com.atlassian.bitbucket.repository.Repository;
1512
import com.google.common.annotations.VisibleForTesting;
16-
13+
import java.util.List;
14+
import java.util.UUID;
1715
import se.bjurr.prnfb.http.ClientKeyStore;
1816
import se.bjurr.prnfb.http.NotificationResponse;
1917
import se.bjurr.prnfb.listener.PrnfbPullRequestAction;

0 commit comments

Comments
 (0)