From 232a358bcd6803008c6b35b1a30ceb45d3fa337a Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Mon, 21 Jun 2021 08:39:31 +0200 Subject: [PATCH] Refactorings --- .../svenkubiak/jpushover/apis/OpenClient.java | 19 +++++++------------ .../de/svenkubiak/jpushover/enums/Url.java | 8 ++++++-- .../MessageListener.java | 2 +- .../jpushover/listener/WebSocketListener.java | 2 -- 4 files changed, 14 insertions(+), 17 deletions(-) rename src/main/java/de/svenkubiak/jpushover/{interfaces => listener}/MessageListener.java (86%) diff --git a/src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java b/src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java index 26fb094..a22f15e 100644 --- a/src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java +++ b/src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java @@ -10,9 +10,10 @@ import java.net.http.WebSocket.Builder; import java.time.Duration; import java.util.Objects; +import de.svenkubiak.jpushover.enums.Url; import de.svenkubiak.jpushover.exceptions.JPushoverException; import de.svenkubiak.jpushover.http.PushoverResponse; -import de.svenkubiak.jpushover.interfaces.MessageListener; +import de.svenkubiak.jpushover.listener.MessageListener; import de.svenkubiak.jpushover.listener.WebSocketListener; /** @@ -21,12 +22,6 @@ import de.svenkubiak.jpushover.listener.WebSocketListener; * */ 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 * @@ -60,7 +55,7 @@ public class OpenClient { HttpClient client = HttpClient.newHttpClient(); HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(LOGIN_URL)) + .uri(URI.create(Url.LOGIN.toString())) .timeout(Duration.ofSeconds(5)) .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(params.toString())) @@ -117,7 +112,7 @@ public class OpenClient { HttpClient client = HttpClient.newHttpClient(); HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(MESSAGES_URL + params.toString())) + .uri(URI.create(Url.MESSAGES.toString() + params.toString())) .timeout(Duration.ofSeconds(5)) .header("Content-Type", "application/json") .build(); @@ -159,7 +154,7 @@ public class OpenClient { HttpClient client = HttpClient.newHttpClient(); 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)) .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(params.toString())) @@ -195,7 +190,7 @@ public class OpenClient { HttpClient httpClient = HttpClient.newBuilder().build(); 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() .append("login") @@ -235,7 +230,7 @@ public class OpenClient { HttpClient client = HttpClient.newHttpClient(); HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(DEVICE_URL)) + .uri(URI.create(Url.DELETE.toString())) .POST(HttpRequest.BodyPublishers.ofString(params.toString())) .build(); diff --git a/src/main/java/de/svenkubiak/jpushover/enums/Url.java b/src/main/java/de/svenkubiak/jpushover/enums/Url.java index d722923..31c4dc0 100644 --- a/src/main/java/de/svenkubiak/jpushover/enums/Url.java +++ b/src/main/java/de/svenkubiak/jpushover/enums/Url.java @@ -6,10 +6,14 @@ package de.svenkubiak.jpushover.enums; * */ 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"), + LOGIN("https://api.pushover.net/1/users/login.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; Url (String value) { diff --git a/src/main/java/de/svenkubiak/jpushover/interfaces/MessageListener.java b/src/main/java/de/svenkubiak/jpushover/listener/MessageListener.java similarity index 86% rename from src/main/java/de/svenkubiak/jpushover/interfaces/MessageListener.java rename to src/main/java/de/svenkubiak/jpushover/listener/MessageListener.java index 42d01a2..7148e1d 100644 --- a/src/main/java/de/svenkubiak/jpushover/interfaces/MessageListener.java +++ b/src/main/java/de/svenkubiak/jpushover/listener/MessageListener.java @@ -1,4 +1,4 @@ -package de.svenkubiak.jpushover.interfaces; +package de.svenkubiak.jpushover.listener; /** * diff --git a/src/main/java/de/svenkubiak/jpushover/listener/WebSocketListener.java b/src/main/java/de/svenkubiak/jpushover/listener/WebSocketListener.java index d2e634f..48ba31b 100644 --- a/src/main/java/de/svenkubiak/jpushover/listener/WebSocketListener.java +++ b/src/main/java/de/svenkubiak/jpushover/listener/WebSocketListener.java @@ -7,8 +7,6 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.concurrent.CompletionStage; -import de.svenkubiak.jpushover.interfaces.MessageListener; - /** * * @author svenkubiak