Mercurial > lada > lada-server
annotate src/main/java/de/intevation/lada/rest/LProbeService.java @ 189:e9e83fa2a4ae
Fixed URL parameters.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Mon, 01 Jul 2013 14:15:00 +0200 |
parents | bc8e6d6f5eb1 |
children | fe05c016cdb6 |
rev | line source |
---|---|
29
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
1 package de.intevation.lada.rest; |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
2 |
182
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
3 import java.util.ArrayList; |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
4 import java.util.List; |
17
4ed66a87c0c4
Added missing import.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
15
diff
changeset
|
5 import java.util.logging.Logger; |
15
624611a29348
Provide GET method to load a list of proben.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
8
diff
changeset
|
6 |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
7 import javax.enterprise.context.RequestScoped; |
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
8 import javax.inject.Inject; |
131
4e181a4aaab0
Refactored the entity repositories.
Raimund Renkert <rrenkert@intevation.de>
parents:
107
diff
changeset
|
9 import javax.inject.Named; |
66
54ff6ded05b2
New service to create a LProbe.
Raimund Renkert <rrenkert@intevation.de>
parents:
62
diff
changeset
|
10 import javax.ws.rs.Consumes; |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
11 import javax.ws.rs.GET; |
66
54ff6ded05b2
New service to create a LProbe.
Raimund Renkert <rrenkert@intevation.de>
parents:
62
diff
changeset
|
12 import javax.ws.rs.POST; |
73
354deea8e738
Fixed generating return value for Create and Update.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
70
diff
changeset
|
13 import javax.ws.rs.PUT; |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
14 import javax.ws.rs.Path; |
35
f425150ea2b5
New filter option in LProbe GET request.
Raimund Renkert <rrenkert@intevation.de>
parents:
29
diff
changeset
|
15 import javax.ws.rs.PathParam; |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
16 import javax.ws.rs.Produces; |
35
f425150ea2b5
New filter option in LProbe GET request.
Raimund Renkert <rrenkert@intevation.de>
parents:
29
diff
changeset
|
17 import javax.ws.rs.core.Context; |
182
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
18 import javax.ws.rs.core.HttpHeaders; |
35
f425150ea2b5
New filter option in LProbe GET request.
Raimund Renkert <rrenkert@intevation.de>
parents:
29
diff
changeset
|
19 import javax.ws.rs.core.MultivaluedMap; |
f425150ea2b5
New filter option in LProbe GET request.
Raimund Renkert <rrenkert@intevation.de>
parents:
29
diff
changeset
|
20 import javax.ws.rs.core.UriInfo; |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
21 |
182
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
22 import de.intevation.lada.authentication.Authentication; |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
23 import de.intevation.lada.authentication.AuthenticationException; |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
24 import de.intevation.lada.authentication.AuthenticationResponse; |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
25 import de.intevation.lada.data.QueryBuilder; |
131
4e181a4aaab0
Refactored the entity repositories.
Raimund Renkert <rrenkert@intevation.de>
parents:
107
diff
changeset
|
26 import de.intevation.lada.data.Repository; |
29
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
27 import de.intevation.lada.model.LProbe; |
139
fda177c59d1f
Updated service and repository to use the extended LProbeInfo object.
Raimund Renkert <rrenkert@intevation.de>
parents:
131
diff
changeset
|
28 import de.intevation.lada.model.LProbeInfo; |
15
624611a29348
Provide GET method to load a list of proben.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
8
diff
changeset
|
29 |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
30 /** |
77
8af2a920f974
Formatting.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
75
diff
changeset
|
31 * This class produces a RESTful service to read the contents of LProbe table. |
8af2a920f974
Formatting.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
75
diff
changeset
|
32 * |
8af2a920f974
Formatting.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
75
diff
changeset
|
33 * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a> |
8af2a920f974
Formatting.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
75
diff
changeset
|
34 */ |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
35 @Path("/proben") |
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
36 @RequestScoped |
45
a5ee8d69c0b4
Renamed existing rest services and make use of the generic repository.
Raimund Renkert <rrenkert@intevation.de>
parents:
39
diff
changeset
|
37 public class LProbeService { |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
38 |
39 | 39 /** |
40 * The Repository for LProbe. | |
41 */ | |
29
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
42 @Inject |
131
4e181a4aaab0
Refactored the entity repositories.
Raimund Renkert <rrenkert@intevation.de>
parents:
107
diff
changeset
|
43 @Named("lproberepository") |
4e181a4aaab0
Refactored the entity repositories.
Raimund Renkert <rrenkert@intevation.de>
parents:
107
diff
changeset
|
44 private Repository repository; |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
45 |
39 | 46 /** |
47 * The logger for this class. | |
48 */ | |
29
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
49 @Inject |
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
50 private Logger log; |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
51 |
182
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
52 @Inject |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
53 @Named("ldapauth") |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
54 private Authentication authentication; |
188
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
55 |
39 | 56 /** |
57 * Request a LProbe via its id. | |
58 * | |
59 * @param id The LProbe id | |
60 * @return JSON Object via REST service. | |
61 */ | |
29
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
62 @GET |
36
8155d2ed5cb8
Use String for lprobe id.
Raimund Renkert <rrenkert@intevation.de>
parents:
35
diff
changeset
|
63 @Path("/{id}") |
8155d2ed5cb8
Use String for lprobe id.
Raimund Renkert <rrenkert@intevation.de>
parents:
35
diff
changeset
|
64 @Produces("text/json") |
188
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
65 public Response findById( |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
66 @PathParam("id") String id, |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
67 @Context HttpHeaders header |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
68 ) { |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
69 try { |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
70 AuthenticationResponse auth = |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
71 authentication.authorizedGroups(header); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
72 Response response = |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
73 repository.findById(LProbeInfo.class, id); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
74 List<LProbeInfo> probe = (List<LProbeInfo>)response.getData(); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
75 if (probe.isEmpty()) { |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
76 return new Response(false, 601, new ArrayList<LProbeInfo>()); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
77 } |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
78 String nbId = probe.get(0).getNetzbetreiberId(); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
79 String mstId = probe.get(0).getMstId(); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
80 if (auth.getNetzbetreiber().contains(nbId)) { |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
81 if (auth.getMst().contains(mstId)) { |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
82 //TODO: Test if probe has a messung that has status 'ready'. |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
83 return response; |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
84 } |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
85 response.setReadonly(true); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
86 return response; |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
87 } |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
88 return new Response(false, 698, new ArrayList<LProbe>()); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
89 } |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
90 catch(AuthenticationException ae) { |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
91 return new Response(false, 699, new ArrayList<LProbe>()); |
bc8e6d6f5eb1
Use authentication in lprobe 'findById'.
Raimund Renkert <rrenkert@intevation.de>
parents:
182
diff
changeset
|
92 } |
29
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
93 } |
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
94 |
80
75d42f8063f8
Formatting
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
77
diff
changeset
|
95 /** |
39 | 96 * Request LProbe via a filter. |
97 * | |
98 * Query parameters are used for the filter in form of key-value pairs. | |
99 * This filter can take the three parameters | |
100 * mst=$MSTID (String) | |
101 * uwb=$UWBID (String) | |
102 * begin=$PROBEENTNAHMEBEGIN (Timestamp) | |
103 * | |
104 * @param info The URL query parameters. | |
105 * @return JSON Object via Rest service. | |
106 */ | |
29
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
107 @GET |
35
f425150ea2b5
New filter option in LProbe GET request.
Raimund Renkert <rrenkert@intevation.de>
parents:
29
diff
changeset
|
108 @Produces("text/json") |
182
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
109 public Response filter( |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
110 @Context UriInfo info, |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
111 @Context HttpHeaders header |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
112 ) { |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
113 try { |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
114 AuthenticationResponse auth = |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
115 authentication.authorizedGroups(header); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
116 QueryBuilder<LProbeInfo> builder = |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
117 new QueryBuilder<LProbeInfo>( |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
118 repository.getEntityManager(), |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
119 LProbeInfo.class); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
120 builder.or("netzbetreiberId", auth.getNetzbetreiber()); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
121 MultivaluedMap<String, String> params = info.getQueryParameters(); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
122 if (params.isEmpty()) { |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
123 return repository.filter(builder.getQuery()); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
124 } |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
125 QueryBuilder<LProbeInfo> mstBuilder = builder.getEmptyBuilder(); |
189
e9e83fa2a4ae
Fixed URL parameters.
Raimund Renkert <rrenkert@intevation.de>
parents:
188
diff
changeset
|
126 if (params.keySet().contains("mstId")) { |
e9e83fa2a4ae
Fixed URL parameters.
Raimund Renkert <rrenkert@intevation.de>
parents:
188
diff
changeset
|
127 String[] paramValues = params.getFirst("mstId").split(","); |
182
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
128 for (String pv: paramValues) { |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
129 mstBuilder.or("mstId", pv); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
130 } |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
131 builder.and(mstBuilder); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
132 } |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
133 QueryBuilder<LProbeInfo> umwBuilder = builder.getEmptyBuilder(); |
189
e9e83fa2a4ae
Fixed URL parameters.
Raimund Renkert <rrenkert@intevation.de>
parents:
188
diff
changeset
|
134 if (params.keySet().contains("umwId")) { |
e9e83fa2a4ae
Fixed URL parameters.
Raimund Renkert <rrenkert@intevation.de>
parents:
188
diff
changeset
|
135 String[] paramValues = params.getFirst("umwId").split(","); |
182
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
136 for (String pv: paramValues) { |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
137 umwBuilder.or("umwId", pv); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
138 } |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
139 builder.and(umwBuilder); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
140 } |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
141 QueryBuilder<LProbeInfo> beginBuilder = builder.getEmptyBuilder(); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
142 if (params.keySet().contains("bedin")) { |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
143 String[] paramValues = params.getFirst("begin").split(","); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
144 for (String pv: paramValues) { |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
145 beginBuilder.or("probeentnahmeBegin", pv); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
146 } |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
147 builder.and(beginBuilder); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
148 } |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
149 builder.distinct(); |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
150 return repository.filter(builder.getQuery()); |
35
f425150ea2b5
New filter option in LProbe GET request.
Raimund Renkert <rrenkert@intevation.de>
parents:
29
diff
changeset
|
151 } |
182
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
152 catch(AuthenticationException ae) { |
a2e04ab2cd44
Use the new filter and query builder and have authentication for LProbeInfo objects.
Raimund Renkert <rrenkert@intevation.de>
parents:
169
diff
changeset
|
153 return new Response(false, 699, new ArrayList<LProbe>()); |
35
f425150ea2b5
New filter option in LProbe GET request.
Raimund Renkert <rrenkert@intevation.de>
parents:
29
diff
changeset
|
154 } |
29
c5930d01e0ab
Package renaming and code cosmetics.
Raimund Renkert <rrenkert@intevation.de>
parents:
24
diff
changeset
|
155 } |
62
0b3f58cbbd75
Added comment on expected return values.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
55
diff
changeset
|
156 |
73
354deea8e738
Fixed generating return value for Create and Update.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
70
diff
changeset
|
157 @PUT |
354deea8e738
Fixed generating return value for Create and Update.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
70
diff
changeset
|
158 @Path("/{id}") |
354deea8e738
Fixed generating return value for Create and Update.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
70
diff
changeset
|
159 @Produces("text/json") |
354deea8e738
Fixed generating return value for Create and Update.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
70
diff
changeset
|
160 @Consumes("application/json") |
169
1613ab50d6d0
LProbeService uses LProbeInfo objects to deserialize JSON and extracts a LProbe object.
Raimund Renkert <rrenkert@intevation.de>
parents:
139
diff
changeset
|
161 public Response update(LProbeInfo probe) { |
104
ba35b1f642ec
Call update method of repository.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
100
diff
changeset
|
162 return repository.update(probe); |
73
354deea8e738
Fixed generating return value for Create and Update.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
70
diff
changeset
|
163 } |
354deea8e738
Fixed generating return value for Create and Update.
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
70
diff
changeset
|
164 |
66
54ff6ded05b2
New service to create a LProbe.
Raimund Renkert <rrenkert@intevation.de>
parents:
62
diff
changeset
|
165 @POST |
54ff6ded05b2
New service to create a LProbe.
Raimund Renkert <rrenkert@intevation.de>
parents:
62
diff
changeset
|
166 @Produces("text/json") |
54ff6ded05b2
New service to create a LProbe.
Raimund Renkert <rrenkert@intevation.de>
parents:
62
diff
changeset
|
167 @Consumes("application/json") |
169
1613ab50d6d0
LProbeService uses LProbeInfo objects to deserialize JSON and extracts a LProbe object.
Raimund Renkert <rrenkert@intevation.de>
parents:
139
diff
changeset
|
168 public Response create(LProbeInfo probe) { |
1613ab50d6d0
LProbeService uses LProbeInfo objects to deserialize JSON and extracts a LProbe object.
Raimund Renkert <rrenkert@intevation.de>
parents:
139
diff
changeset
|
169 LProbe p = probe.toLProbe(); |
1613ab50d6d0
LProbeService uses LProbeInfo objects to deserialize JSON and extracts a LProbe object.
Raimund Renkert <rrenkert@intevation.de>
parents:
139
diff
changeset
|
170 return repository.create(p); |
66
54ff6ded05b2
New service to create a LProbe.
Raimund Renkert <rrenkert@intevation.de>
parents:
62
diff
changeset
|
171 } |
8
1016bcc08bb3
Added stub for REST service for Proben
Torsten Irländer <torsten.irlaender@intevation.de>
parents:
diff
changeset
|
172 } |