damage/JPushover11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactorings

Browse Source
This commit is contained in:
Sven Kubiak 2021-06-21 08:39:31 +02:00
parent a61fcc53c1
commit 232a358bcd
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java
View File

@ -10,9 +10,10 @@ import java.net.http.WebSocket.Builder;
import java.time.Duration; import java.time.Duration;
import java.util.Objects; import java.util.Objects;
import de.svenkubiak.jpushover.enums.Url;
import de.svenkubiak.jpushover.exceptions.JPushoverException; import de.svenkubiak.jpushover.exceptions.JPushoverException;
import de.svenkubiak.jpushover.http.PushoverResponse; import de.svenkubiak.jpushover.http.PushoverResponse;
import de.svenkubiak.jpushover.interfaces.MessageListener; import de.svenkubiak.jpushover.listener.MessageListener;
import de.svenkubiak.jpushover.listener.WebSocketListener; import de.svenkubiak.jpushover.listener.WebSocketListener;
/** /**
@ -21,12 +22,6 @@ import de.svenkubiak.jpushover.listener.WebSocketListener;
* *
*/ */
public class OpenClient { public class OpenClient {
private static final String LOGIN_URL = "https://api.pushover.net/1/users/login.json";
private static final String DEVICE_URL = "https://api.pushover.net/1/devices.json";
private static final String MESSAGES_URL = "https://api.pushover.net/1/messages.json";
private static final String DELETE_URL = "https://api.pushover.net/1/devices/###DEVICE_ID###/update_highest_message.json";
private static final String WEBSOCKET_URL = "wss://client.pushover.net/push";
/** /**
* Performs a Pushover login; required once for working with the Open Client API * Performs a Pushover login; required once for working with the Open Client API
* *
@ -60,7 +55,7 @@ public class OpenClient {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(LOGIN_URL)) .uri(URI.create(Url.LOGIN.toString()))
.timeout(Duration.ofSeconds(5)) .timeout(Duration.ofSeconds(5))
.header("Content-Type", "application/json") .header("Content-Type", "application/json")
.POST(HttpRequest.BodyPublishers.ofString(params.toString())) .POST(HttpRequest.BodyPublishers.ofString(params.toString()))
@ -117,7 +112,7 @@ public class OpenClient {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(MESSAGES_URL + params.toString())) .uri(URI.create(Url.MESSAGES.toString() + params.toString()))
.timeout(Duration.ofSeconds(5)) .timeout(Duration.ofSeconds(5))
.header("Content-Type", "application/json") .header("Content-Type", "application/json")
.build(); .build();
@ -159,7 +154,7 @@ public class OpenClient {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(DELETE_URL.replace("###DEVICE_ID###", deviceId))) .uri(URI.create(Url.DELETE.toString().replace("###DEVICE_ID###", deviceId)))
.timeout(Duration.ofSeconds(5)) .timeout(Duration.ofSeconds(5))
.header("Content-Type", "application/json") .header("Content-Type", "application/json")
.POST(HttpRequest.BodyPublishers.ofString(params.toString())) .POST(HttpRequest.BodyPublishers.ofString(params.toString()))
@ -195,7 +190,7 @@ public class OpenClient {
HttpClient httpClient = HttpClient.newBuilder().build(); HttpClient httpClient = HttpClient.newBuilder().build();
Builder webSocketBuilder = httpClient.newWebSocketBuilder(); Builder webSocketBuilder = httpClient.newWebSocketBuilder();
WebSocket webSocket = webSocketBuilder.buildAsync(URI.create(WEBSOCKET_URL), new WebSocketListener(messageListener)).join(); WebSocket webSocket = webSocketBuilder.buildAsync(URI.create(Url.WEBSOCKET.toString()), new WebSocketListener(messageListener)).join();
StringBuilder params = new StringBuilder() StringBuilder params = new StringBuilder()
.append("login") .append("login")
@ -235,7 +230,7 @@ public class OpenClient {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(DEVICE_URL)) .uri(URI.create(Url.DELETE.toString()))
.POST(HttpRequest.BodyPublishers.ofString(params.toString())) .POST(HttpRequest.BodyPublishers.ofString(params.toString()))
.build(); .build();

6
src/main/java/de/svenkubiak/jpushover/enums/Url.java
View File

@ -6,9 +6,13 @@ package de.svenkubiak.jpushover.enums;
* *
*/ */
public enum Url { public enum Url {
DELETE("https://api.pushover.net/1/devices/###DEVICE_ID###/update_highest_message.json"),
DEVICE("https://api.pushover.net/1/devices.json"),
GLANCES("https://api.pushover.net/1/glances.json"), GLANCES("https://api.pushover.net/1/glances.json"),
LOGIN("https://api.pushover.net/1/users/login.json"),
MESSAGES("https://api.pushover.net/1/messages.json"), MESSAGES("https://api.pushover.net/1/messages.json"),
VALIDATE("https://api.pushover.net/1/users/validate.json"); VALIDATE("https://api.pushover.net/1/users/validate.json"),
WEBSOCKET("wss://client.pushover.net/push");
private final String value; private final String value;

2
src/main/java/de/svenkubiak/jpushover/interfaces/MessageListener.java → src/main/java/de/svenkubiak/jpushover/listener/MessageListener.java
View File

@ -1,4 +1,4 @@
package de.svenkubiak.jpushover.interfaces; package de.svenkubiak.jpushover.listener;
/** /**
* *

2
src/main/java/de/svenkubiak/jpushover/listener/WebSocketListener.java
View File

@ -7,8 +7,6 @@ import java.nio.charset.StandardCharsets;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletionStage;
import de.svenkubiak.jpushover.interfaces.MessageListener;
/** /**
* *
* @author svenkubiak * @author svenkubiak