Merge remote-tracking branch 'origin/master' into stefan
This commit is contained in:
		| @@ -11,11 +11,11 @@ public interface IRestAPI { | ||||
|  | ||||
| 	// region Get | ||||
|  | ||||
| 	void get(String controllerName); | ||||
| 	String get(String controllerName); | ||||
|  | ||||
| 	void get (String controllerName, int id); | ||||
| 	String get (String controllerName, int id); | ||||
|  | ||||
| 	void get (String controllerName, int id, boolean bezahlt); | ||||
| 	String get (String controllerName, int id, boolean bezahlt); | ||||
|  | ||||
| 	//endregion | ||||
|  | ||||
|   | ||||
| @@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets; | ||||
|  | ||||
| import Logik.ElternAccount; | ||||
| import Logik.Kind; | ||||
| import com.google.gson.Gson; | ||||
| import com.google.gson.*; | ||||
|  | ||||
| /** | ||||
|  * noch nicht getestet | ||||
| @@ -32,8 +32,8 @@ public class RestApiClient implements IRestAPI{ | ||||
|  | ||||
| 		RestApiClient client1 = new RestApiClient(); | ||||
|  | ||||
| 		client1.post("Gericht", "{\"name\" : \"Svens Beine\", \"69.69\", \"beschreibung\" : \"Muss net schmegge, muss wirge\"}"); | ||||
|  | ||||
| 		System.out.println(client1.nextId("Benutzer")); | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| @@ -42,7 +42,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 	 * @param controllerName Name des aufzurufenden Controllers | ||||
| 	 */ | ||||
| 	@Override | ||||
| 	public void get(String controllerName) { | ||||
| 	public String get(String controllerName) { | ||||
| 		URI apiUri = URI.create(String.format("%s/%s", urlBase, controllerName)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| @@ -54,13 +54,13 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			// Send the request and get the response | ||||
| 			HttpResponse<String> 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: " + test.getName()); | ||||
| 			System.out.println("Response Body: " + httpResponse.body()); | ||||
| 			return httpResponse.body(); | ||||
| 		} catch (Exception e) { | ||||
| 			e.printStackTrace(); | ||||
| 			return null; | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| @@ -71,7 +71,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 	 * @param id Id der Aufzurufenden Zeile | ||||
| 	 */ | ||||
| 	@Override | ||||
| 	public void get(String controllerName, int id) { | ||||
| 	public String get(String controllerName, int id) { | ||||
| 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase, controllerName, id)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| @@ -86,9 +86,12 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			// Print the response status code and body | ||||
| 			System.out.println("Status Code: " + httpResponse.statusCode() + httpResponse.body()); | ||||
|  | ||||
| 			return httpResponse.body(); | ||||
|  | ||||
| 			//System.out.println("Response Body: " + test); | ||||
| 		} catch (Exception e) { | ||||
| 			e.printStackTrace(); | ||||
| 			return null; | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| @@ -100,7 +103,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 	 * @param bezahlt TODO Warum ist das hier? | ||||
| 	 */ | ||||
| 	@Override | ||||
| 	public void get(String controllerName, int id, boolean bezahlt) { | ||||
| 	public String get(String controllerName, int id, boolean bezahlt) { | ||||
| 		URI apiUri = URI.create(String.format("%s/%s?%s&%s", urlBase, controllerName, id, bezahlt)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| @@ -115,8 +118,10 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			// Print the response status code and body | ||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||
| 			System.out.println("Response Body: " + httpResponse.body()); | ||||
| 			return httpResponse.body(); | ||||
| 		} catch (Exception e) { | ||||
| 			e.printStackTrace(); | ||||
| 			return null; | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| @@ -210,4 +215,34 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
|  | ||||
| 	public int nextId(String controllerName){ | ||||
| 		URI apiUri = URI.create(String.format("%s/%s/nextId", urlBase, controllerName)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .uri(apiUri) | ||||
| 											 .GET() | ||||
| 											 .build(); | ||||
|  | ||||
| 		try { | ||||
| 			// Send the request and get the response | ||||
| 			HttpResponse<String> 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()); | ||||
|  | ||||
| 			JsonElement jsonElement = JsonParser.parseString(httpResponse.body()); | ||||
| 			JsonArray jsonArray = jsonElement.getAsJsonArray(); | ||||
|  | ||||
| 			JsonObject json = jsonArray.get(0).getAsJsonObject(); | ||||
|  | ||||
| 			return json.get("auto_increment").getAsInt(); | ||||
|  | ||||
| 		} catch (Exception e) { | ||||
| 			e.printStackTrace(); | ||||
| 			return -1; | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Avapox
					Avapox