diff --git a/src/main/java/de/svenkubiak/jpushover/JPushover.java b/src/main/java/de/svenkubiak/jpushover/JPushover.java
index 74d7f75..6010dd3 100644
--- a/src/main/java/de/svenkubiak/jpushover/JPushover.java
+++ b/src/main/java/de/svenkubiak/jpushover/JPushover.java
@@ -21,16 +21,16 @@ import de.svenkubiak.jpushover.enums.Sound;
public class JPushover {
private static final Logger LOG = LoggerFactory.getLogger(JPushover.class);
- private String token;
- private String user;
- private String message;
- private String device;
- private String title;
- private String url;
- private String urlTitle;
- private String timestamp;
- private Priority priority;
- private Sound sound;
+ private String pushoverToken;
+ private String pushoverUser;
+ private String pushoverMessage;
+ private String pushoverDevice;
+ private String pushoverTitle;
+ private String pushoverUrl;
+ private String pushoverUrlTitle;
+ private String pushoverTimestamp;
+ private Priority pushoverPriority;
+ private Sound pushoverSound;
public JPushover(){
}
@@ -43,7 +43,7 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover token(String token) {
- this.token = token;
+ this.pushoverToken = token;
return this;
}
@@ -56,7 +56,7 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover user(String user) {
- this.user = user;
+ this.pushoverUser = user;
return this;
}
@@ -68,7 +68,7 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover message(String message) {
- this.message = message;
+ this.pushoverMessage = message;
return this;
}
@@ -81,7 +81,7 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover device(String device) {
- this.device = device;
+ this.pushoverDevice = device;
return this;
}
@@ -93,7 +93,7 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover title(String title) {
- this.title = title;
+ this.pushoverTitle = title;
return this;
}
@@ -105,7 +105,7 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover url(String url) {
- this.url = url;
+ this.pushoverUrl = url;
return this;
}
@@ -116,7 +116,7 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover urlTitle(String urlTitle) {
- this.urlTitle = urlTitle;
+ this.pushoverUrlTitle = urlTitle;
return this;
}
@@ -128,22 +128,19 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover timestamp(String timestamp) {
- this.timestamp = timestamp;
+ this.pushoverTimestamp = timestamp;
return this;
}
/**
- * Send as LOWESET to generate no notification/alert,
- * LOW to always send as a quiet notification,
- * NORMAL to display as high-priority and bypass the user's quiet hours,
- * or emergence to also require confirmation from the user
+ * Priority of the message based on the @see documentation
* (optional)
*
* @param priority
* @return JPushover instance
*/
public JPushover priority(Priority priority) {
- this.priority = priority;
+ this.pushoverPriority = priority;
return this;
}
@@ -156,7 +153,7 @@ public class JPushover {
* @return JPushover instance
*/
public JPushover sound(Sound sound) {
- this.sound = sound;
+ this.pushoverSound = sound;
return this;
}
@@ -164,27 +161,27 @@ public class JPushover {
* Send the message to pushover
*/
public JPushoverResponse push() {
- Preconditions.checkNotNull(this.token, "Token is required");
- Preconditions.checkNotNull(this.user, "User is required");
- Preconditions.checkNotNull(this.message, "Message is required");
+ Preconditions.checkNotNull(this.pushoverToken, "Token is required");
+ Preconditions.checkNotNull(this.pushoverUser, "User is required");
+ Preconditions.checkNotNull(this.pushoverMessage, "Message is required");
List params = Form.form()
- .add(Constants.TOKEN.value(), this.token)
- .add(Constants.USER.value(), this.user)
- .add(Constants.MESSAGE.value(), this.message)
- .add(Constants.DEVICE.value(), this.device)
- .add(Constants.TITLE.value(), this.title)
- .add(Constants.URL.value(), this.url)
- .add(Constants.URLTITLE.value(), this.urlTitle)
- .add(Constants.PRIORITY.value(), this.priority.value())
- .add(Constants.TIMESTAMP.value(), this.timestamp)
- .add(Constants.SOUND.value(), this.sound.value())
+ .add(Constants.TOKEN.get(), this.pushoverToken)
+ .add(Constants.USER.get(), this.pushoverUser)
+ .add(Constants.MESSAGE.get(), this.pushoverMessage)
+ .add(Constants.DEVICE.get(), this.pushoverDevice)
+ .add(Constants.TITLE.get(), this.pushoverTitle)
+ .add(Constants.URL.get(), this.pushoverUrl)
+ .add(Constants.URLTITLE.get(), this.pushoverUrlTitle)
+ .add(Constants.PRIORITY.get(), this.pushoverPriority.get())
+ .add(Constants.TIMESTAMP.get(), this.pushoverTimestamp)
+ .add(Constants.SOUND.get(), this.pushoverSound.get())
.build();
HttpResponse httpResponse = null;
JPushoverResponse jPushoverResponse = null;
try {
- httpResponse = Request.Post(Constants.PUSHOVER_URL.value()).bodyForm(params, Consts.UTF_8).execute().returnResponse();
+ httpResponse = Request.Post(Constants.PUSHOVER_URL.get()).bodyForm(params, Consts.UTF_8).execute().returnResponse();
if (httpResponse != null) {
int status = httpResponse.getStatusLine().getStatusCode();
diff --git a/src/main/java/de/svenkubiak/jpushover/JPushoverResponse.java b/src/main/java/de/svenkubiak/jpushover/JPushoverResponse.java
index 5dd6669..d3b060b 100644
--- a/src/main/java/de/svenkubiak/jpushover/JPushoverResponse.java
+++ b/src/main/java/de/svenkubiak/jpushover/JPushoverResponse.java
@@ -1,25 +1,25 @@
package de.svenkubiak.jpushover;
public class JPushoverResponse {
- private String response;
- private int httpStatus;
- private boolean successful;
+ private String pushoverResponse;
+ private int pushoverHttpStatus;
+ private boolean pushoverSuccessful;
public JPushoverResponse(){
}
public JPushoverResponse response(String response) {
- this.response = response;
+ this.pushoverResponse = response;
return this;
}
public JPushoverResponse httpStatus(int httpStatus) {
- this.httpStatus = httpStatus;
+ this.pushoverHttpStatus = httpStatus;
return this;
}
public JPushoverResponse isSuccessful(boolean successful) {
- this.successful = successful;
+ this.pushoverSuccessful = successful;
return this;
}
@@ -28,7 +28,7 @@ public class JPushoverResponse {
* @return String
*/
public String getResponse() {
- return response;
+ return pushoverResponse;
}
/**
@@ -36,7 +36,7 @@ public class JPushoverResponse {
* @return int
*/
public int getHttpStatus() {
- return httpStatus;
+ return pushoverHttpStatus;
}
/**
@@ -44,6 +44,6 @@ public class JPushoverResponse {
* @return boolen
*/
public boolean isSuccessful() {
- return successful;
+ return pushoverSuccessful;
}
}
\ No newline at end of file
diff --git a/src/main/java/de/svenkubiak/jpushover/enums/Constants.java b/src/main/java/de/svenkubiak/jpushover/enums/Constants.java
index 8a56410..7571645 100644
--- a/src/main/java/de/svenkubiak/jpushover/enums/Constants.java
+++ b/src/main/java/de/svenkubiak/jpushover/enums/Constants.java
@@ -11,7 +11,7 @@ public enum Constants {
PRIORITY("priority"),
TIMESTAMP("timestamp"),
URL("url"),
- URLTITLE("urltile");
+ URLTITLE("urltitle");
private final String value;
@@ -19,7 +19,7 @@ public enum Constants {
this.value = value;
}
- public String value() {
+ public String get() {
return this.value;
}
}
\ No newline at end of file
diff --git a/src/main/java/de/svenkubiak/jpushover/enums/Priority.java b/src/main/java/de/svenkubiak/jpushover/enums/Priority.java
index f91c0fc..94c3ef7 100644
--- a/src/main/java/de/svenkubiak/jpushover/enums/Priority.java
+++ b/src/main/java/de/svenkubiak/jpushover/enums/Priority.java
@@ -13,7 +13,7 @@ public enum Priority {
this.value = value;
}
- public String value() {
+ public String get() {
return this.value;
}
}
\ No newline at end of file
diff --git a/src/main/java/de/svenkubiak/jpushover/enums/Sound.java b/src/main/java/de/svenkubiak/jpushover/enums/Sound.java
index 6cec88a..f1fca5c 100644
--- a/src/main/java/de/svenkubiak/jpushover/enums/Sound.java
+++ b/src/main/java/de/svenkubiak/jpushover/enums/Sound.java
@@ -30,7 +30,7 @@ public enum Sound {
this.value = value;
}
- public String value() {
+ public String get() {
return this.value;
}
}