diff --git a/curlstatements.txt b/curlstatements.txt index 806d124..befe4bd 100644 --- a/curlstatements.txt +++ b/curlstatements.txt @@ -1,3 +1,4 @@ curl -w "\n" http://localhost:8080/mocktail/barkeeper/getrecipesall curl --header "Content-Type: application/json" --request POST --data "{\"id\":\"0\",\"name\":\"Peter\",\"ingredients\":\"guelle\",\"recipe\":\"ruehren\"}" http://localhost:8080/mocktail/barkeeper/create -curl --header "Content-Type: application/json" --request PUT --data "{\"id\":\"4\",\"name\":\"Peter\",\"ingredients\":\"guelle\",\"recipe\":\"ruehren\"}" http://localhost:8080/mocktail/barkeeper/update \ No newline at end of file +curl --header "Content-Type: application/json" --request PUT --data "{\"id\":\"4\",\"name\":\"Peter\",\"ingredients\":\"guelle\",\"recipe\":\"ruehren\"}" http://localhost:8080/mocktail/barkeeper/update +curl --header "Content-Type: application/json" --request DELETE --data "{\"id\":\"4\"}" http://localhost:8080/mocktail/barkeeper/delete diff --git a/src/main/java/de/hsos/swa/ma/api/al/Barkeeper.java b/src/main/java/de/hsos/swa/ma/api/al/Barkeeper.java index 79e4f80..973aad5 100644 --- a/src/main/java/de/hsos/swa/ma/api/al/Barkeeper.java +++ b/src/main/java/de/hsos/swa/ma/api/al/Barkeeper.java @@ -15,7 +15,7 @@ import javax.ws.rs.core.MediaType; import org.jboss.resteasy.annotations.jaxrs.PathParam; @Path("/mocktail/barkeeper") -public class Barkeeper implements ISearch, ICreate { +public class Barkeeper implements ISearch, ICreate, IDelete{ @Inject StorageTransport st; @@ -49,5 +49,16 @@ public class Barkeeper implements ISearch, ICreate { return "nichsogeil"; } + @DELETE + @Consumes (MediaType.APPLICATION_JSON) + @Path("/delete") + public String deleteMocktail(Mocktail mocktail) { + System.out.println("index: "+ mocktail.id); + if(this.st.deleteMocktail(mocktail.id)){ + return "objekt wurde entfernt"; + } + return "Objekt konnte nicht entfernt werden..."; + } + } \ No newline at end of file diff --git a/src/main/java/de/hsos/swa/ma/api/al/IDelete.java b/src/main/java/de/hsos/swa/ma/api/al/IDelete.java new file mode 100644 index 0000000..8314939 --- /dev/null +++ b/src/main/java/de/hsos/swa/ma/api/al/IDelete.java @@ -0,0 +1,9 @@ +package de.hsos.swa.ma.api.al; + +/** + * IDelete + */ +public interface IDelete { + + public String deleteMocktail(Mocktail mocktail); +} \ No newline at end of file diff --git a/src/main/java/de/hsos/swa/ma/api/al/Mocktail.java b/src/main/java/de/hsos/swa/ma/api/al/Mocktail.java index faf0736..89c8080 100644 --- a/src/main/java/de/hsos/swa/ma/api/al/Mocktail.java +++ b/src/main/java/de/hsos/swa/ma/api/al/Mocktail.java @@ -48,4 +48,8 @@ public class Mocktail { public void setRecipe(String recipe){ this.recipe = recipe; } + + public String toString() { + return "ID: " + this.id + "\nName: " + this.name + "\nZutaten: " + this.ingredients + "\nRezept: " + this.recipe; + } } \ No newline at end of file diff --git a/src/main/java/de/hsos/swa/ma/api/al/StorageTransport.java b/src/main/java/de/hsos/swa/ma/api/al/StorageTransport.java index 3476a6c..e93bb90 100644 --- a/src/main/java/de/hsos/swa/ma/api/al/StorageTransport.java +++ b/src/main/java/de/hsos/swa/ma/api/al/StorageTransport.java @@ -61,4 +61,9 @@ public class StorageTransport { return true; } + public boolean deleteMocktail(long index) { + System.out.println("Test... :D"); + return this.mocktails.remove(this.mocktails.get((int)index)); + } + } \ No newline at end of file diff --git a/src/main/java/org/acme/resteasy/ExampleResource.java b/src/main/java/org/acme/resteasy/ExampleResource.java deleted file mode 100644 index 2c8e5f3..0000000 --- a/src/main/java/org/acme/resteasy/ExampleResource.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.acme.resteasy; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -@Path("/resteasy/hello") -public class ExampleResource { - - @GET - @Produces(MediaType.TEXT_PLAIN) - public String hello() { - return "hello"; - } -} \ No newline at end of file diff --git a/src/test/java/org/acme/resteasy/ExampleResourceTest.java b/src/test/java/org/acme/resteasy/ExampleResourceTest.java index d1e2b2f..8b02bda 100644 --- a/src/test/java/org/acme/resteasy/ExampleResourceTest.java +++ b/src/test/java/org/acme/resteasy/ExampleResourceTest.java @@ -1,12 +1,17 @@ package org.acme.resteasy; import io.quarkus.test.junit.QuarkusTest; +import jdk.internal.jline.internal.TestAccessible; + import org.junit.jupiter.api.Test; +import de.hsos.swa.ma.api.al.Mocktail; + import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; @QuarkusTest +@Path("/mocktail/barkeeper") public class ExampleResourceTest { @Test @@ -16,6 +21,6 @@ public class ExampleResourceTest { .then() .statusCode(200) .body(is("hello")); - } + } } \ No newline at end of file