Skip to content

Commit 66107d4

Browse files
Merge pull request #1 from mateusz-bajorek/travis_notifications
Travis notifications & maven javadoc plugin
2 parents ca57dc0 + f577296 commit 66107d4

File tree

5 files changed

+58
-20
lines changed

5 files changed

+58
-20
lines changed

.travis.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,27 @@ sudo: false
22

33
cache:
44
directories:
5-
- $HOME/.m2
5+
- "$HOME/.m2"
66

77
language: java
88

99
jdk:
1010
- oraclejdk8
11+
12+
notifications:
13+
slack:
14+
secure: DpNAA/yc3b2J3d916wGj0MYiia8mecFDMMP5U8R2vaRHaCNkQmbTBhF6oCCFUrL+d6hH0lpb4xKDqEiZ2wM5gMznZVTMEeCw2bD1ika2uYdX2GyU0qzfEgiAU4LPyl1fBTtrweQ4D9yTtFTrijV63mG3Nq2XVRm/+9sNhZ/j8ZaudBttsWrIdNSsCyY6pKQLyBLUVWj7H6+1hybbKw6iipOyKsHBVOhl9BOSXXbPz4FZbZ5RuEVZ1aUmc8+Ygd7xxQZUVpGY23UlwaTUUpufds9XzjVZ8JyebbymcK6p7LJwZEAEy2YnNMVDMM8jndyS23soNiRpdxEutSlcHBM10kIeYfDmecq0VnyCBoswtppe6otKcov3isoMEcqMmYD3de9WALQghXOeKLi8Y9Jd7KRIUr3hL0bcAHpawboZxFqqNSJTxb9+plD6EeZCBYVf/49zYrDDBysqHzAALvjAEN4mOHIIiDmzPuyzQCmsSWCDK9hf1HztWn6HDoq2HTsGQGLBZYMC4ZM+kenj3I0BLjW9buQnFCafUV4WzYx36lyXjhJgje323nOM7Ym31gfLK29slnODwaUWL3O/c2hLwdiUbKEX8merzN3NTRruHQgdHgLNPVWmYi4rIOJHJVrSLY0ArquX/DGQjIsMbG3dxkkoxCpWYsbzaXb6hsTWow0=
15+
on_success: change
16+
on_failure: always
17+
email:
18+
recipients:
19+
20+
on_success: change
21+
on_failure: always
22+
23+
env:
24+
global:
25+
# Ex. travis encrypt SONATYPE_USER=your_sonatype_username --add
26+
- secure: UdFsmrAHMJzTND6P7omOByXDmW+qRATl1Kr6oXXrPfdekMtpLgZZpk65gYTF7tpL2ITKc/Kz6WEU0kAkFGAlhaQQCPyjW8TdzxUCs5TtidlbA5cG/Fofn0K3zP5/j7s4QLCLcX8pqv4OG0EDxQbKHH/yTaWLxgHF+ffPwqAhDJXyFYxujqoMjg5XnRIrwmJxzUSyYehWYeAEBCUBnCq3HBX1J7lCR+laD6KI5oXoEHU2XMYWZHcNeduGm2jG2fueI2otP1Qyn1mmEUjnzNeWax8SNOQtRzMWnIZ3enqcUfBpNp/CudaU3tzTP0Xxp+eYMLp/EbgW+7R2KpIjF43g11fwhG9pCLZedJUkL4u2EhVsc80vs5InPFPFk7B4xuD5VQVj9HYKVFqV9F9lx6uEMe3/XOatsGbO4nXp7iCjOGdwo8GYfTRkoa9ICtWfxmPGl4IYCvyG8czZTFFpYAxAG0CMpOrj6MBesW2Xm8cK4/zewuU+YM/T3pLi7im7x58I76fKpt2lQ0doSZK6NXr5MUntHJOanVOT+k3TKZoFySHefsV/zVVE2Mao6P8ui/PC7oJJLdhSGQkT/g97dP6HWyF1SiSJiP2LIhN8Aw+7YfGo+M/RAC8tQwWDLwZVplVrCTiYKDaPMFt38nbwzESXgYYtwm1sH//bE2gNe11fZrA=
27+
# Ex. travis encrypt SONATYPE_PASSWORD=your_sonatype_password --add
28+
- secure: inMzoLUpg5igKAE06WC31NLDBomI7SguPJmYKaH1DRaz7fwIcqOESVUOcG/MSBhHFvPFD6P+mtWwQrbbLUNFBR6zPxh7N0y/pBMhavUqxLaomwrPWeDYubOP7mRv/HdVKjU5R4bl2Bt2UoEkLI2GwgBxGbWjN+KHzWwmSM4X/fmxdSPiulIYRGSXNzKbdBgWZeQCIgjGrnyuNlWevpDKuoD4OIYobeNkrTAUCzK8K7B7TfVXsiQ76htvHNNr16+G4qnm4TTWrdnD1CxsEICmMuJ1vBuyp1KaTUCqbNaOhwZO3VMU9R+1mq3PBTt9OwbG/VrOcrYtDGdt7AooH73Xm/pVolJrgpv3Ux2dE5S9i+HITJws2hy7o7+EZDTnLLxLpsOUzKx+NTDLugZpiTfTqPtjjJIjLyoEnciQoSmgnE9UiPXEng4O2jN12wTZw2qYvSGeUxbSis2EvBEyYs3ohzPd9Zjo69DvgFyTcR5D4C0QLO4GnNtqoHySn39UPkOioetuuYJjdFw7uy0OvacMOINveqGzmiYAD5SGPwbP3Icu8HlykH4eGtBmre2Ey2YODyDjbR1fErPS5ihRRNpxpAtlz4g8EWZ4lQicBbrVAWfZXJWX1b0z7KQFd1DkERBH71oztP9ak6zrMemRHW97tt0t30Et9HWoo9BmQ/sIP7M=

pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
6868
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
6969
<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
70+
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
7071
<animal-sniffer-maven-plugin.version>1.15</animal-sniffer-maven-plugin.version>
7172
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
7273
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
@@ -290,6 +291,7 @@
290291
</plugin>
291292
</plugins>
292293
</pluginManagement>
294+
293295
<plugins>
294296
<plugin>
295297
<artifactId>maven-compiler-plugin</artifactId>
@@ -329,6 +331,24 @@
329331
</configuration>
330332
</plugin>
331333

334+
<plugin>
335+
<groupId>org.apache.maven.plugins</groupId>
336+
<artifactId>maven-javadoc-plugin</artifactId>
337+
<version>${maven-javadoc-plugin.version}</version>
338+
<configuration>
339+
<show>private</show>
340+
</configuration>
341+
<executions>
342+
<execution>
343+
<id>attach-javadoc</id>
344+
<goals>
345+
<goal>jar</goal>
346+
</goals>
347+
<phase>package</phase>
348+
</execution>
349+
</executions>
350+
</plugin>
351+
332352
<plugin>
333353
<groupId>org.codehaus.mojo</groupId>
334354
<artifactId>animal-sniffer-maven-plugin</artifactId>

src/main/java/com/currencyfair/onesignal/OneSignal.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private OneSignal() {
6363
* If a targeting parameter of one type is used, then targeting parameters from other types may not be used.
6464
* For instance, you cannot use the {@link NotificationRequest#includedSegments} parameter (from segments) with
6565
* the {@link NotificationRequest#filters}.
66-
* @param appAuthKey OneSignal App Auth Key, available in Keys & IDs.
66+
* @param appAuthKey OneSignal App Auth Key, available in Keys &amp; IDs.
6767
* @param notificationRequest the notification to create
6868
* @return the response
6969
*/
@@ -73,7 +73,7 @@ public static CreateNotificationResponse createNotification(String appAuthKey, N
7373

7474
/**
7575
* Stop a scheduled or currently outgoing notification.
76-
* @param appAuthKey OneSignal App Auth Key, available in Keys & IDs, unless the notification was created using
76+
* @param appAuthKey OneSignal App Auth Key, available in Keys &amp; IDs, unless the notification was created using
7777
* {@link NotificationRequest#includePlayerIds} and targeting only one user.
7878
* @param appId OneSignal App ID
7979
* @param notificationId the notification ID to cancel
@@ -84,7 +84,7 @@ public static void cancelNotification(String appAuthKey, String appId, String no
8484

8585
/**
8686
* View the details of a single notification.
87-
* @param appAuthKey OneSignal App Auth Key, available in Keys & IDs.
87+
* @param appAuthKey OneSignal App Auth Key, available in Keys &amp; IDs.
8888
* @param appId OneSignal App ID
8989
* @param notificationId the notification ID to retrieve
9090
* @return the matching notifications or error response
@@ -95,7 +95,7 @@ public static ViewNotificationResponse viewNotification(String appAuthKey, Strin
9595

9696
/**
9797
* View the details of multiple notifications.
98-
* @param appAuthKey OneSignal App Auth Key, available in Keys & IDs.
98+
* @param appAuthKey OneSignal App Auth Key, available in Keys &amp; IDs.
9999
* @param appId OneSignal App ID
100100
* @param limit max number of notifications to retrieve, if {@code null} defaults to {@code 50}
101101
* @param offset where to start, if {@code null} defaults to {@code 0}
@@ -116,7 +116,7 @@ public static void trackOpen(String appId, String notificationId) {
116116

117117
/**
118118
* View the details of all of your current OneSignal apps.
119-
* @param userAuthKey OneSignal User Auth Key, available in Keys & IDs.
119+
* @param userAuthKey OneSignal User Auth Key, available in Keys &amp; IDs.
120120
* @return list of all your apps
121121
*/
122122
public static List<AppResponse> viewApps(String userAuthKey) {
@@ -125,7 +125,7 @@ public static List<AppResponse> viewApps(String userAuthKey) {
125125

126126
/**
127127
* View the details of a single OneSignal app.
128-
* @param userAuthKey OneSignal User Auth Key, available in Keys & IDs.
128+
* @param userAuthKey OneSignal User Auth Key, available in Keys &amp; IDs.
129129
* @param appId the app ID
130130
* @return the details of the app
131131
*/
@@ -135,7 +135,7 @@ public static AppResponse viewApp(String userAuthKey, String appId) {
135135

136136
/**
137137
* Creates a new OneSignal app.
138-
* @param userAuthKey OneSignal User Auth Key, available in Keys & IDs.
138+
* @param userAuthKey OneSignal User Auth Key, available in Keys &amp; IDs.
139139
* @param app the app details for creation
140140
* @return the created app
141141
*/
@@ -150,15 +150,15 @@ public static AppResponse createApp(String userAuthKey, App app) {
150150
* <ul>
151151
* <li>To update only your app name, you can pass in only a new app name parameter.</li>
152152
* <li>To update Android, be sure to pass in {@link App#gcmKey}.</li>
153-
* <li>To update Chrome Apps & Extensions, be sure to pass in {@link App#chromeKey}.</li>
153+
* <li>To update Chrome Apps &amp; Extensions, be sure to pass in {@link App#chromeKey}.</li>
154154
* <li>To update Chrome web push, be sure to pass in {@link App#chromeWebOrigin}.</li>
155155
* <li>To update Safari web push, you must pass in all of these parameters: {@link App#safariApnsP12},
156156
* {@link App#safariApnsP12password}, {@link App#siteName}, and {@link App#safariSiteOrigin}. Most users use our
157157
* auto-generated Safari web ID. If you use our auto-generated Safari web ID, please set {@link App#safariApnsP12}
158158
* to {@code ""} and {@link App#safariApnsP12password} to {@code ""}.</li>
159159
* <li>To update iOS, you must pass in {@link App#apnsEnv} and {@link App#apnsP12}.</li>
160160
* </ul>
161-
* @param userAuthKey OneSignal User Auth Key, available in Keys & IDs.</li>
161+
* @param userAuthKey OneSignal User Auth Key, available in Keys &amp; IDs.
162162
* @param app the app details for update
163163
* @return the updated app
164164
*/
@@ -169,11 +169,11 @@ public static AppResponse updateApp(String userAuthKey, App app) {
169169
/**
170170
* View the details of multiple devices in one of your OneSignal apps.
171171
* <p>
172-
* <b>Unavailable for Apps > 100,000 users</b>
172+
* <b>Unavailable for Apps &gt; 100,000 users</b>
173173
* <p>
174174
* For performance reasons, this method is not available for larger apps. Larger apps should use the CSV export API
175175
* endpoint, which is much more performant.
176-
* @param appAuthKey OneSignal App Auth Key, available in Keys & IDs.
176+
* @param appAuthKey OneSignal App Auth Key, available in Keys &amp; IDs.
177177
* @param appId The app ID that you want to view devices from
178178
* @param limit How many devices to return. Max is 300. Default is 300
179179
* @param offset Result offset. Default is 0. Results are sorted by id
@@ -185,7 +185,7 @@ public static ViewDevicesResponse viewDevices(String appAuthKey, String appId, N
185185

186186
/**
187187
* View the details of an existing device in one of your OneSignal apps
188-
* @param appAuthKey OneSignal App Auth Key, available in Keys & IDs.
188+
* @param appAuthKey OneSignal App Auth Key, available in Keys &amp; IDs.
189189
* @param appId Your app_id for this device
190190
* @param deviceId Player's OneSignal ID
191191
* @return details of the given device
@@ -284,7 +284,7 @@ public static SuccessResponse incrementSessionLength(String deviceId, Long activ
284284
* The file will be compressed using GZip.
285285
* <p>
286286
* The file may take several minutes to generate depending on the number of users in your app.
287-
* @param appAuthKey OneSignal App Auth Key, available in Keys & IDs.
287+
* @param appAuthKey OneSignal App Auth Key, available in Keys &amp; IDs.
288288
* @param appId OneSignal App ID
289289
* @param csvExportFileLocationRequest the optional request object
290290
* @return object with the url to the CSV file

src/main/java/com/currencyfair/onesignal/model/notification/Notification.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public class Notification {
9595
// The following are parameters in Create Notifications common to all methods of targeting users.
9696

9797
/**
98-
* REQUIRED Your OneSignal application ID, which can be found in Keys & IDs. It is a UUID and looks similar to
98+
* REQUIRED Your OneSignal application ID, which can be found in Keys &amp; IDs. It is a UUID and looks similar to
9999
* {@code 8250eaf6-1a58-489e-b136-7c74a864b434}.
100100
*/
101101
@JsonProperty("app_id")
@@ -487,7 +487,7 @@ public class Notification {
487487
/**
488488
* Schedule notification for future delivery.
489489
* <p>
490-
* Examples: All examples are the exact same date & time.
490+
* Examples: All examples are the exact same date &amp; time.
491491
* <p>
492492
* {@code "Thu Sep 24 2015 14:00:00 GMT-0700 (PDT)"}
493493
* <p>
@@ -622,7 +622,7 @@ public class Notification {
622622

623623
/**
624624
* Indicates whether to send to all Google Chrome, Chrome on Android, and Mozilla Firefox users registered under
625-
* your Chrome & Firefox web push platform.
625+
* your Chrome &amp; Firefox web push platform.
626626
* <p>
627627
* WEB
628628
*/
@@ -672,9 +672,9 @@ public class Notification {
672672

673673
/**
674674
* THIS FLAG IS NOT USED FOR WEB PUSH Please see {@link #chromeWeb} for sending to web push users. This flag only
675-
* applies to Google Chrome Apps & Extensions.
675+
* applies to Google Chrome Apps &amp; Extensions.
676676
* <p>
677-
* Indicates whether to send to all devices registered under your app's Google Chrome Apps & Extension platform.
677+
* Indicates whether to send to all devices registered under your app's Google Chrome Apps &amp; Extension platform.
678678
* <p>
679679
* CHROMEAPP
680680
*/

src/main/java/com/currencyfair/onesignal/model/player/AddEditDeviceRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
public class AddEditDeviceRequest extends Device {
2828

2929
/**
30-
* REQUIRED Your OneSignal App Id found in Keys & IDs.
30+
* REQUIRED Your OneSignal App Id found in Keys &amp; IDs.
3131
*/
3232
@JsonProperty("app_id")
3333
private String appId;

0 commit comments

Comments
 (0)