From 71c2c5d005af8232bb08091af3fe01b48624d6ac Mon Sep 17 00:00:00 2001 From: Samuel Wolff Date: Mon, 18 Dec 2023 08:50:46 +0100 Subject: [PATCH 1/4] @author changes --- src/main/java/RestAPISchnittstelle/RestApiClient.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/RestAPISchnittstelle/RestApiClient.java b/src/main/java/RestAPISchnittstelle/RestApiClient.java index 1805d87..8fa5486 100644 --- a/src/main/java/RestAPISchnittstelle/RestApiClient.java +++ b/src/main/java/RestAPISchnittstelle/RestApiClient.java @@ -1,9 +1,3 @@ -/** - * @author Samuel Wolff - * noch nicht getestet - * TODO FERTIG MACHEN - */ - package RestAPISchnittstelle; import java.net.URI; @@ -12,6 +6,11 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.charset.StandardCharsets; +/** + * noch nicht getestet + * TODO FERTIG MACHEN + * @author Samuel Wolff + */ public class RestApiClient implements IRestAPI{ private final String urlBase = "https://pbg2h22awo.web.pb.bib.de/VPR_Schnittstelle/VPR_Schnittstelle/restAPI.php"; From db26bca5a3c486c4862ac19f3052e344a20523d7 Mon Sep 17 00:00:00 2001 From: Samuel Wolff Date: Mon, 18 Dec 2023 09:12:03 +0100 Subject: [PATCH 2/4] GSON dependency --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 8505bb5..9e4eaf5 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,11 @@ ${junit.version} test + + com.google.code.gson + gson + 2.10.1 + From bf9c99672d24d12fccb2307b7ee34c6866fcf874 Mon Sep 17 00:00:00 2001 From: Samuel Wolff Date: Mon, 18 Dec 2023 09:25:08 +0100 Subject: [PATCH 3/4] GSON Test --- src/main/java/RestAPISchnittstelle/RestApiClient.java | 11 +++++++++-- src/main/java/module-info.java | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/RestAPISchnittstelle/RestApiClient.java b/src/main/java/RestAPISchnittstelle/RestApiClient.java index 8fa5486..7f28ca7 100644 --- a/src/main/java/RestAPISchnittstelle/RestApiClient.java +++ b/src/main/java/RestAPISchnittstelle/RestApiClient.java @@ -5,6 +5,10 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.charset.StandardCharsets; +import java.nio.file.WatchEvent; + +import Logik.Kind; +import com.google.gson.Gson; /** * noch nicht getestet @@ -25,7 +29,7 @@ public class RestApiClient implements IRestAPI{ public static void main(String[] args){ - new RestApiClient().get("Kind", 2); + new RestApiClient().get("Kind", 1); } @@ -45,9 +49,12 @@ public class RestApiClient implements IRestAPI{ // Send the request and get the response HttpResponse httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()); + Gson gson = new Gson(); + Kind test = gson.fromJson(httpResponse.body(), Kind.class); + // Print the response status code and body System.out.println("Status Code: " + httpResponse.statusCode()); - System.out.println("Response Body: " + httpResponse.body()); + System.out.println("Response Body: " + test.getName()); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 336a917..a308e0e 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -2,6 +2,7 @@ module de.subway_surfers.vpr_app { requires javafx.controls; requires javafx.fxml; requires java.net.http; + requires com.google.gson; opens de.subway_surfers.vpr_app to javafx.fxml; From 456e55a66e88e8b348bf21ac2537a85234d8d347 Mon Sep 17 00:00:00 2001 From: Samuel Wolff Date: Wed, 20 Dec 2023 09:28:32 +0100 Subject: [PATCH 4/4] GSON works --- src/main/java/Logik/Kind.java | 17 +++++++-- .../RestAPISchnittstelle/RestApiClient.java | 36 +++++++++++++++++-- src/main/java/module-info.java | 3 +- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/main/java/Logik/Kind.java b/src/main/java/Logik/Kind.java index 0d573d1..a84a7c2 100644 --- a/src/main/java/Logik/Kind.java +++ b/src/main/java/Logik/Kind.java @@ -5,9 +5,12 @@ import java.util.ArrayList; public class Kind { // region Felder + + private transient int id; private String name; private String vorname; - private int id; + private int bid; + // TODO Zutat implementieren! // private ArrayList filter; // endregion @@ -37,6 +40,14 @@ public class Kind { this.id = id; } + public int getBid() { + return bid; + } + + public void setBid(int bid) { + this.bid = bid; + } + // TODO Zutat implementieren! /* public ArrayList getFilter() { @@ -50,10 +61,12 @@ public class Kind { // endregion // region Konstruktoren - public Kind(String name, String vorname) { + public Kind(String name, String vorname, int bid) { this.name = name; this.vorname = vorname; + this.bid = bid; } + // endregion } diff --git a/src/main/java/RestAPISchnittstelle/RestApiClient.java b/src/main/java/RestAPISchnittstelle/RestApiClient.java index 7f28ca7..6827f5a 100644 --- a/src/main/java/RestAPISchnittstelle/RestApiClient.java +++ b/src/main/java/RestAPISchnittstelle/RestApiClient.java @@ -21,15 +21,22 @@ public class RestApiClient implements IRestAPI{ private final HttpClient client; + private final Gson gson; + public RestApiClient(){ client = HttpClient.newHttpClient(); + gson = new Gson(); } public static void main(String[] args){ - new RestApiClient().get("Kind", 1); + Kind kind = new Kind("Klein", "Kevin", 2); + + String json = new Gson().toJson(kind); + + new RestApiClient().post("Kind", json); } @@ -49,7 +56,6 @@ public class RestApiClient implements IRestAPI{ // Send the request and get the response HttpResponse httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()); - Gson gson = new Gson(); Kind test = gson.fromJson(httpResponse.body(), Kind.class); // Print the response status code and body @@ -77,9 +83,14 @@ public class RestApiClient implements IRestAPI{ // Send the request and get the response HttpResponse httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()); + Kind[] test = gson.fromJson(httpResponse.body(), Kind[].class); + // Print the response status code and body System.out.println("Status Code: " + httpResponse.statusCode()); - System.out.println("Response Body: " + httpResponse.body()); + for(Kind i : test){ + System.out.println(i.getVorname()); + } + //System.out.println("Response Body: " + test); } catch (Exception e) { e.printStackTrace(); } @@ -143,7 +154,26 @@ public class RestApiClient implements IRestAPI{ */ @Override public void post(String controllerName, String jsonData) { + URI apiUri = URI.create(String.format("%s/%s", urlBase,controllerName)); + System.out.println(apiUri); + + HttpRequest httpRequest = HttpRequest.newBuilder() + .uri(apiUri) + .header("Content-Type", "application/json") + .POST(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) + .build(); + + try { + // Send the request and get the response + HttpResponse httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()); + + // Print the response status code and body + System.out.println("Status Code: " + httpResponse.statusCode()); + System.out.println("Response Body: " + httpResponse.body()); + } catch (Exception e) { + e.printStackTrace(); + } } /** diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index a308e0e..dfa6c61 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -5,6 +5,7 @@ module de.subway_surfers.vpr_app { requires com.google.gson; - opens de.subway_surfers.vpr_app to javafx.fxml; + opens de.subway_surfers.vpr_app to javafx.fxml, com.google.gson; + opens Logik to com.google.gson; exports de.subway_surfers.vpr_app; } \ No newline at end of file