# HG changeset patch # User Raimund Renkert # Date 1372691391 -7200 # Node ID b3148356e3730858b79ced260b286478396237ec # Parent 585013ccc96160cb17f1a9edcd2134695f04d5de Implemented 'delete'. diff -r 585013ccc961 -r b3148356e373 src/main/java/de/intevation/lada/rest/LKommentarService.java --- a/src/main/java/de/intevation/lada/rest/LKommentarService.java Mon Jul 01 17:09:17 2013 +0200 +++ b/src/main/java/de/intevation/lada/rest/LKommentarService.java Mon Jul 01 17:09:51 2013 +0200 @@ -1,6 +1,7 @@ package de.intevation.lada.rest; import java.util.ArrayList; +import java.util.List; import java.util.logging.Logger; import javax.enterprise.context.RequestScoped; @@ -60,16 +61,21 @@ @DELETE @Path("/{kId}/{probeId}") @Produces("text/json") - public String delete(@PathParam("kId") String kid, @PathParam("probeId") String probeId) { - return "[{success: true}]"; - //String response = repository.delete(id); - //if (response.isEmpty()) { - // return "[{success: true}]"; - //} - //else { - // return "[{success: false," + - // " error: " + response + "}]"; - //} + public Response delete( + @PathParam("kId") String kId, + @PathParam("probeId") String probeId) { + QueryBuilder builder = + new QueryBuilder( + repository.getEntityManager(), + LKommentarP.class); + builder.and("probeId", probeId).and("kId", kId); + Response response = repository.filter(builder.getQuery()); + List list = (List)response.getData(); + if (!list.isEmpty()) { + repository.delete(list.get(0)); + return new Response(true, 200, null); + } + return new Response(false, 600, null); } @PUT @@ -112,6 +118,7 @@ @POST @Consumes("application/json") + @Produces("text/json") public Response create(LKommentarP kommentar) { return repository.create(kommentar); }