lada/lada-server: src/main/java/de/intevation/lada/rest/ProbeService.java comparison

comparison src/main/java/de/intevation/lada/rest/ProbeService.java @ 1028:1c41c7b8f7c2 schema-update

Updated server application to new database model. THIS IS STILL WIP!!!

author	Raimund Renkert <raimund.renkert@intevation.de>
date	Fri, 08 Jul 2016 15:32:36 +0200
parents	2c927b3edb97
children	61354a9fa58d

comparison

equal deleted inserted replaced

-:9971471d562c
+:1c41c7b8f7c2
 import de.intevation.lada.factory.ProbeFactory;
 import de.intevation.lada.lock.LockConfig;
 import de.intevation.lada.lock.LockType;
 import de.intevation.lada.lock.ObjectLocker;
-import de.intevation.lada.model.land.LProbe;
+import de.intevation.lada.model.land.Probe;
-import de.intevation.lada.model.land.ProbeTranslation;
 import de.intevation.lada.query.QueryTools;
 import de.intevation.lada.util.annotation.AuthorizationConfig;
 import de.intevation.lada.util.annotation.RepositoryConfig;
 import de.intevation.lada.util.auth.Authorization;
 import de.intevation.lada.util.auth.AuthorizationType;
 @Context UriInfo info,
 @Context HttpServletRequest request
 ) {
 MultivaluedMap<String, String> params = info.getQueryParameters();
 if (params.isEmpty() || !params.containsKey("qid")) {
-return repository.getAll(LProbe.class, "land");
+return repository.getAll(Probe.class, "land");
 }
 Integer id = null;
 try {
 id = Integer.valueOf(params.getFirst("qid"));
 }
 end = result.size();
 }
 result = result.subList(start, end);
 }
-QueryBuilder<LProbe> pBuilder = new QueryBuilder<LProbe>(
+QueryBuilder<Probe> pBuilder = new QueryBuilder<Probe>(
-repository.entityManager("land"), LProbe.class);
+repository.entityManager("land"), Probe.class);
 for (Map<String, Object> entry: result) {
 pBuilder.or("id", (Integer)entry.get("id"));
 }
 Response r = repository.filter(pBuilder.getQuery(), "land");
-r = authorization.filter(request, r, LProbe.class);
+r = authorization.filter(request, r, Probe.class);
-List<LProbe> proben = (List<LProbe>)r.getData();
+List<Probe> proben = (List<Probe>)r.getData();
 for (Map<String, Object> entry: result) {
 Integer pId = Integer.valueOf(entry.get("id").toString());
 setAuthData(proben, entry, pId);
 }
 return new Response(true, 200, result, size);
 }
 private void setAuthData(
-List<LProbe> proben,
+List<Probe> proben,
 Map<String, Object> entry,
 Integer id
 ) {
 for (int i = 0; i < proben.size(); i++) {
 if (id.equals(proben.get(i).getId())) {
-entry.put("readonly", proben.get(i).getReadonly());
+entry.put("readonly", proben.get(i).isReadonly());
-entry.put("owner", proben.get(i).getOwner());
+entry.put("owner", proben.get(i).isOwner());
 return;
 }
 }
 }
 @Context HttpHeaders headers,
 @PathParam("id") String id,
 @Context HttpServletRequest request
 ) {
 Response response =
-repository.getById(LProbe.class, Integer.valueOf(id), "land");
+repository.getById(Probe.class, Integer.valueOf(id), "land");
 Violation violation = validator.validate(response.getData());
 if (violation.hasWarnings()) {
 response.setWarnings(violation.getWarnings());
 }
-return this.authorization.filter(request, response, LProbe.class);
+return this.authorization.filter(request, response, Probe.class);
 }
 /**
 * Create a new Probe object.
 * <p>
 @Path("/")
 @Produces(MediaType.APPLICATION_JSON)
 public Response create(
 @Context HttpHeaders headers,
 @Context HttpServletRequest request,
-LProbe probe
+Probe probe
 ) {
 if (!authorization.isAuthorized(
 request,
 probe,
 RequestMethod.POST,
-LProbe.class)
+Probe.class)
 ) {
 return new Response(false, 699, null);
 }
 Violation violation = validator.validate(probe);
 if (violation.hasErrors()) {
 probe = factory.findUmweltId(probe);
 }
 probe = factory.findMediaDesk(probe);
 /* Persist the new probe object*/
 Response newProbe = repository.create(probe, "land");
-LProbe ret = (LProbe)newProbe.getData();
+Probe ret = (Probe)newProbe.getData();
 /* Create and persist a new probe translation object*/
-ProbeTranslation trans = new ProbeTranslation();
-trans.setProbeId(ret);
-repository.create(trans, "land");
-/* Get and return the new probe object*/
-Response response =
-repository.getById(LProbe.class, ret.getId(), "land");
 if(violation.hasWarnings()) {
-response.setWarnings(violation.getWarnings());
+newProbe.setWarnings(violation.getWarnings());
 }
 return authorization.filter(
 request,
-response,
+newProbe,
-LProbe.class);
+Probe.class);
 }
 /**
 * Create new Probe objects from a messprogramm.
 * <p>
 JsonObject object
 ) {
 String id = object.get("id").toString();
 long start = object.getJsonNumber("start").longValue();
 long end = object.getJsonNumber("end").longValue();
-List<LProbe> proben = factory.create(
+List<Probe> proben = factory.create(
 id,
 start,
 end);
 return new Response(true, 200, proben);
 }
 @Path("/{id}")
 @Produces(MediaType.APPLICATION_JSON)
 public Response update(
 @Context HttpHeaders headers,
 @Context HttpServletRequest request,
-LProbe probe
+Probe probe
 ) {
 if (!authorization.isAuthorized(
 request,
 probe,
 RequestMethod.PUT,
-LProbe.class)
+Probe.class)
 ) {
 return new Response(false, 699, null);
 }
 if (lock.isLocked(probe)) {
 return new Response(false, 697, null);
 Response response = repository.update(probe, "land");
 if (!response.getSuccess()) {
 return response;
 }
 Response updated = repository.getById(
-LProbe.class,
+Probe.class,
-((LProbe)response.getData()).getId(), "land");
+((Probe)response.getData()).getId(), "land");
 if (violation.hasWarnings()) {
 updated.setWarnings(violation.getWarnings());
 }
 return authorization.filter(
 request,
 updated,
-LProbe.class);
+Probe.class);
 }
 /**
 * Delete an existing Probe object by id.
 * <p>
 @Context HttpServletRequest request,
 @PathParam("id") String id
 ) {
 /* Get the probe object by id*/
 Response probe =
-repository.getById(LProbe.class, Integer.valueOf(id), "land");
+repository.getById(Probe.class, Integer.valueOf(id), "land");
-LProbe probeObj = (LProbe)probe.getData();
+Probe probeObj = (Probe)probe.getData();
 if (!authorization.isAuthorized(
 request,
 probeObj,
 RequestMethod.DELETE,
-LProbe.class)
+Probe.class)
 ) {
 return new Response(false, 699, null);
 }
 /* Delete the probe object*/
 try {

Mercurial > lada > lada-server

comparison src/main/java/de/intevation/lada/rest/ProbeService.java @ 1028:1c41c7b8f7c2 schema-update