From aa4738bf255876a89a2869b8705e5241c78b6e3b Mon Sep 17 00:00:00 2001 From: rschoene <rene.schoene@tu-dresden.de> Date: Tue, 25 Jul 2023 12:04:44 +0200 Subject: [PATCH] merged RestClientServerHandler into RestClientHandler --- .../jastadd/ragconnect/compiler/Compiler.java | 2 +- .../main/resources/RestClientHandler.mustache | 48 +++++-------------- 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/ragconnect.base/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java b/ragconnect.base/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java index 9581177..173404c 100644 --- a/ragconnect.base/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java +++ b/ragconnect.base/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java @@ -343,7 +343,7 @@ public class Compiler extends AbstractCompiler { ragConnect.addHandler(new Handler("JavaHandler", "java", optionProtocols.hasValue(OPTION_PROTOCOL_JAVA))); ragConnect.addHandler(new Handler("MqttServerHandler", "mqtt", optionProtocols.hasValue(OPTION_PROTOCOL_MQTT))); ragConnect.addHandler(new Handler("RestServerHandler", "rest", optionProtocols.hasValue(OPTION_PROTOCOL_REST))); - ragConnect.addHandler(new Handler("RestClientServerHandler", "restClient", + ragConnect.addHandler(new Handler("RestClientHandler", "restClient", optionProtocols.hasValue(OPTION_PROTOCOL_REST_CLIENT))); } diff --git a/ragconnect.base/src/main/resources/RestClientHandler.mustache b/ragconnect.base/src/main/resources/RestClientHandler.mustache index 563dbee..3ffe5fb 100644 --- a/ragconnect.base/src/main/resources/RestClientHandler.mustache +++ b/ragconnect.base/src/main/resources/RestClientHandler.mustache @@ -1,39 +1,6 @@ -// dispatch depending on URI. might not be necessary -public class RestClientServerHandler { - public RestClientServerHandler(String name) { - // empty - } - - RestClientHandler singleton = new RestClientHandler(); - // TODO create handler based on URI - public RagConnectReceiver newReceiverFor(RagConnectToken connectToken, java.util.function.BiConsumer<String, byte[]> callback) { - return singleton.newReceiverFor(connectToken, callback); - } - - public RestClientPreparedRequest preparePut(java.net.URI uri) { - return singleton.preparePut(uri); - } - - void sendRequestAsync(RestClientPreparedRequest preparedRequest, byte[] message) { - singleton.sendRequestAsync(preparedRequest, message); - } - - public void close() { - // empty - } -} - -public class RestClientPreparedRequest { - java.net.http.HttpRequest.Builder builder; - RestClientPreparedRequest(java.net.http.HttpRequest.Builder builder) { - this.builder = builder; - } -} - public class RestClientHandler { private java.net.http.HttpClient httpClient; - - RestClientHandler() { + public RestClientHandler(String name) { httpClient = java.net.http.HttpClient.newHttpClient(); } @@ -58,7 +25,7 @@ public class RestClientHandler { return httpClient.send(httpRequest, java.net.http.HttpResponse.BodyHandlers.ofByteArray()).body(); } - RestClientPreparedRequest preparePut(java.net.URI uri) { + public RestClientPreparedRequest preparePut(java.net.URI uri) { java.net.URI target = java.net.URI.create(uri.toString().replaceFirst("restClient", "http")); java.net.http.HttpRequest.Builder httpRequestBuilder = java.net.http.HttpRequest.newBuilder(target); return new RestClientPreparedRequest(httpRequestBuilder); @@ -84,4 +51,15 @@ public class RestClientHandler { {{logException}}("Exception while sending {{log_}}: {{log_}}", httpRequest, e); } } + + public void close() { + // empty + } +} + +public class RestClientPreparedRequest { + java.net.http.HttpRequest.Builder builder; + RestClientPreparedRequest(java.net.http.HttpRequest.Builder builder) { + this.builder = builder; + } } -- GitLab