Mercurial > lada > lada-server
changeset 556:4017d2c8dd24
Renamed all 'messungId' url parameters to 'messungsId'.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Fri, 13 Mar 2015 16:42:12 +0100 |
| parents | 7a0e3d49ae33 |
| children | 61ce3ce0100e |
| files | src/main/java/de/intevation/lada/model/KommentarM.java src/main/java/de/intevation/lada/rest/KommentarMService.java src/main/java/de/intevation/lada/rest/MesswertService.java src/main/java/de/intevation/lada/rest/StatusService.java |
| diffstat | 4 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/model/KommentarM.java Tue Feb 24 15:15:44 2015 +0100 +++ b/src/main/java/de/intevation/lada/model/KommentarM.java Fri Mar 13 16:42:12 2015 +0100 @@ -27,7 +27,7 @@ private static final long serialVersionUID = 1L; @Column(name="messungs_id") - private Integer messungId; + private Integer messungsId; private Timestamp datum; @@ -75,11 +75,11 @@ this.text = text; } - public Integer getMessungId() { - return this.messungId; + public Integer getMessungsId() { + return this.messungsId; } - public void setMessungId(Integer messungId) { - this.messungId = messungId; + public void setMessungsId(Integer messungsId) { + this.messungsId = messungsId; } }
--- a/src/main/java/de/intevation/lada/rest/KommentarMService.java Tue Feb 24 15:15:44 2015 +0100 +++ b/src/main/java/de/intevation/lada/rest/KommentarMService.java Fri Mar 13 16:42:12 2015 +0100 @@ -77,15 +77,15 @@ return new Response(false, 699, null); } MultivaluedMap<String, String> params = info.getQueryParameters(); - if (params.isEmpty() || !params.containsKey("messungId")) { + if (params.isEmpty() || !params.containsKey("messungsId")) { return defaultRepo.getAll(LKommentarM.class, "land"); } - String messungId = params.getFirst("messungId"); + String messungId = params.getFirst("messungsId"); QueryBuilder<LKommentarM> builder = new QueryBuilder<LKommentarM>( defaultRepo.entityManager("land"), LKommentarM.class); - builder.and("messungId", messungId); + builder.and("messungsId", messungId); return defaultRepo.filter(builder.getQuery(), "land"); }
--- a/src/main/java/de/intevation/lada/rest/MesswertService.java Tue Feb 24 15:15:44 2015 +0100 +++ b/src/main/java/de/intevation/lada/rest/MesswertService.java Fri Mar 13 16:42:12 2015 +0100 @@ -77,11 +77,11 @@ return new Response(false, 699, null); } MultivaluedMap<String, String> params = info.getQueryParameters(); - if (params.isEmpty() || !params.containsKey("messungId")) { + if (params.isEmpty() || !params.containsKey("messungsId")) { logger.debug("get all"); return defaultRepo.getAll(LMesswert.class, "land"); } - String messungId = params.getFirst("messungId"); + String messungId = params.getFirst("messungsId"); QueryBuilder<LMesswert> builder = new QueryBuilder<LMesswert>( defaultRepo.entityManager("land"),
--- a/src/main/java/de/intevation/lada/rest/StatusService.java Tue Feb 24 15:15:44 2015 +0100 +++ b/src/main/java/de/intevation/lada/rest/StatusService.java Fri Mar 13 16:42:12 2015 +0100 @@ -77,10 +77,10 @@ return new Response(false, 699, null); } MultivaluedMap<String, String> params = info.getQueryParameters(); - if (params.isEmpty() || !params.containsKey("messungId")) { + if (params.isEmpty() || !params.containsKey("messungsId")) { return defaultRepo.getAll(LStatus.class, "land"); } - String messungId = params.getFirst("messungId"); + String messungId = params.getFirst("messungsId"); QueryBuilder<LStatus> builder = new QueryBuilder<LStatus>( defaultRepo.entityManager("land"),