annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java @ 31:9f653697437e

annotationbrowser
author dwinter
date Tue, 25 Sep 2012 21:47:58 +0200
parents b1fb0d117877
children 8427930c5f88
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
1 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
2 * Implements the "annotations" uri of the Annotator API. see
47b53ae385d1 merging old code
casties
parents:
diff changeset
3 * <https://github.com/okfn/annotator/wiki/Storage>
47b53ae385d1 merging old code
casties
parents:
diff changeset
4 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
5 package de.mpiwg.itgroup.annotations.restlet;
47b53ae385d1 merging old code
casties
parents:
diff changeset
6
47b53ae385d1 merging old code
casties
parents:
diff changeset
7 import java.io.IOException;
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
8 import java.util.ArrayList;
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
9 import java.util.List;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
10
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
11 import org.json.JSONArray;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
12 import org.json.JSONException;
47b53ae385d1 merging old code
casties
parents:
diff changeset
13 import org.json.JSONObject;
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
14 import org.restlet.data.Form;
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
15 import org.restlet.data.Parameter;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
16 import org.restlet.data.Status;
47b53ae385d1 merging old code
casties
parents:
diff changeset
17 import org.restlet.ext.json.JsonRepresentation;
47b53ae385d1 merging old code
casties
parents:
diff changeset
18 import org.restlet.representation.Representation;
47b53ae385d1 merging old code
casties
parents:
diff changeset
19 import org.restlet.resource.Delete;
47b53ae385d1 merging old code
casties
parents:
diff changeset
20 import org.restlet.resource.Get;
47b53ae385d1 merging old code
casties
parents:
diff changeset
21 import org.restlet.resource.Post;
47b53ae385d1 merging old code
casties
parents:
diff changeset
22 import org.restlet.resource.Put;
47b53ae385d1 merging old code
casties
parents:
diff changeset
23
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
24 import de.mpiwg.itgroup.annotations.Annotation;
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
25 import de.mpiwg.itgroup.annotations.Person;
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
26 import de.mpiwg.itgroup.annotations.Tag;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
27 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
28 import de.mpiwg.itgroup.annotations.restlet.utils.JSONObjectComparator;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
29
47b53ae385d1 merging old code
casties
parents:
diff changeset
30 /**
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
31 * Implements the "annotations" uri of the Annotator API. see
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
32 * <https://github.com/okfn/annotator/wiki/Storage>
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
33 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
34 * @author dwinter, casties
47b53ae385d1 merging old code
casties
parents:
diff changeset
35 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
36 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
37 public class AnnotatorAnnotations extends AnnotatorResourceImpl {
47b53ae385d1 merging old code
casties
parents:
diff changeset
38
47b53ae385d1 merging old code
casties
parents:
diff changeset
39 protected String getAllowedMethodsForHeader() {
47b53ae385d1 merging old code
casties
parents:
diff changeset
40 return "OPTIONS,GET,POST,PUT,DELETE";
47b53ae385d1 merging old code
casties
parents:
diff changeset
41 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
42
47b53ae385d1 merging old code
casties
parents:
diff changeset
43 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
44 * GET with JSON content-type.
47b53ae385d1 merging old code
casties
parents:
diff changeset
45 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
46 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
47 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
48 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
49 @Get("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
50 public Representation doGetJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
51 logger.debug("AnnotatorAnnotations doGetJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
52 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
53 // id from URI /annotations/{id}
47b53ae385d1 merging old code
casties
parents:
diff changeset
54 String jsonId = (String) getRequest().getAttributes().get("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
55 String id = decodeJsonId(jsonId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
56 logger.debug("annotation-id=" + id);
47b53ae385d1 merging old code
casties
parents:
diff changeset
57
22
b1fb0d117877 adding and listing groups via html works now.
casties
parents: 20
diff changeset
58 if (id == null) {
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
59
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
60 return getAllAnnotations();
22
b1fb0d117877 adding and listing groups via html works now.
casties
parents: 20
diff changeset
61 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
62
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
63 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
64 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
65 logger.debug("request authenticated=" + authUser);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
66
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
67 AnnotationStore store = getAnnotationStore();
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
68 Annotation annot = store.getAnnotationById(id);
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
69 if (annot != null) {
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
70 if (! annot.isActionAllowed("read", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
71 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
72 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
73 }
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
74 JSONObject result = createAnnotatorJson(annot, (authUser == null));
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
75 logger.debug("sending:");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
76 logger.debug(result);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
77 return new JsonRepresentation(result);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
78 } else {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
79 // not found
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
80 setStatus(Status.CLIENT_ERROR_NOT_FOUND);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
81 return null;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
82 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
83 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
84
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
85 private Representation getAllAnnotations() {
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
86
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
87 Form form = getRequest().getResourceRef().getQueryAsForm();
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
88 String sortBy=null;
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
89 for (Parameter parameter : form) {
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
90 if (parameter.getName().equals("sortBy")){
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
91 sortBy = parameter.getValue();
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
92 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
93 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
94
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
95 AnnotationStore store = getAnnotationStore();
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
96 ArrayList<JSONObject> results = new ArrayList<JSONObject>();
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
97
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
98 List<Annotation> annotations = store.getAnnotations(null, null);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
99 for (Annotation annotation : annotations) {
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
100
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
101 JSONObject jo = createAnnotatorJson(annotation,false);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
102 results.add(jo);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
103
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
104 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
105
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
106 if (sortBy!=null){
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
107 JSONObjectComparator.sortAnnotations(results,sortBy);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
108 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
109
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
110 JSONArray resultsJa = new JSONArray();
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
111 for (JSONObject result:results){
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
112 resultsJa.put(result);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
113 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
114
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
115 // assemble result object
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
116 JSONObject result = new JSONObject();
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
117 try {
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
118 result.put("rows", resultsJa);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
119 result.put("total", resultsJa.length());
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
120 } catch (JSONException e) {
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
121 setStatus(Status.SERVER_ERROR_INTERNAL, "JSON Error");
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
122 return null;
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
123 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
124 logger.debug("sending:");
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
125 logger.debug(result);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
126 return new JsonRepresentation(result);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
127 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
128
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
129
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
130
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
131
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
132
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
133 /**
20
715aa11d138b fixes in permission handling: admin and delete default to creator.
casties
parents: 16
diff changeset
134 * POST with JSON content-type. Creates a new Annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
135 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
136 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
137 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
138 @Post("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
139 public Representation doPostJson(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
140 logger.debug("AnnotatorAnnotations doPostJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
141 // set headers
47b53ae385d1 merging old code
casties
parents:
diff changeset
142 setCorsHeaders();
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
143
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
144 // do authentication TODO: who's allowed to create?
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
145 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
146 logger.debug("request authenticated=" + authUser);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
147 if (authUser == null) {
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
148 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
149 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
150 }
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
151
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
152 Annotation annot = null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
153 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
154 JsonRepresentation jrep = new JsonRepresentation(entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
155 JSONObject jo = jrep.getJsonObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
156 if (jo == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
157 setStatus(Status.SERVER_ERROR_INTERNAL);
47b53ae385d1 merging old code
casties
parents:
diff changeset
158 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
159 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
160 // make sure id is not set for POST
47b53ae385d1 merging old code
casties
parents:
diff changeset
161 jo.remove("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
162 // get Annotation object from posted JSON
47b53ae385d1 merging old code
casties
parents:
diff changeset
163 annot = createAnnotation(jo, entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
164 } catch (IOException e1) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
165 setStatus(Status.SERVER_ERROR_INTERNAL);
47b53ae385d1 merging old code
casties
parents:
diff changeset
166 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
167 } catch (JSONException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
168 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
169 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
170 }
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
171 if (annot == null) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
172 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
173 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
174 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
175 Annotation storedAnnot;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
176 // store Annotation
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
177 storedAnnot = getAnnotationStore().storeAnnotation(annot);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
178 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
179 * according to https://github.com/okfn/annotator/wiki/Storage we should
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
180 * return 303: see other. For now we return the annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
181 */
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
182 JSONObject jo = createAnnotatorJson(storedAnnot, (authUser == null));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
183 JsonRepresentation retRep = new JsonRepresentation(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
184 return retRep;
47b53ae385d1 merging old code
casties
parents:
diff changeset
185 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
186
47b53ae385d1 merging old code
casties
parents:
diff changeset
187 /**
20
715aa11d138b fixes in permission handling: admin and delete default to creator.
casties
parents: 16
diff changeset
188 * PUT with JSON content-type. Modifies an Annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
189 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
190 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
191 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
192 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
193 @Put("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
194 public Representation doPutJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
195 logger.debug("AnnotatorAnnotations doPutJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
196 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
197 // id from URI /annotations/{id}
47b53ae385d1 merging old code
casties
parents:
diff changeset
198 String jsonId = (String) getRequest().getAttributes().get("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
199 String id = decodeJsonId(jsonId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
200 logger.debug("annotation-id=" + id);
47b53ae385d1 merging old code
casties
parents:
diff changeset
201
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
202 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
203 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
204 logger.debug("request authenticated=" + authUser);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
205
47b53ae385d1 merging old code
casties
parents:
diff changeset
206 Annotation annot = null;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
207 AnnotationStore store = getAnnotationStore();
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
208 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
209 JsonRepresentation jrep = new JsonRepresentation(entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
210 JSONObject jo = jrep.getJsonObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
211 if (jo == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
212 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
213 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
214 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
215 // get stored Annotation
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
216 Annotation storedAnnot = store.getAnnotationById(id);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
217 if (storedAnnot == null) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
218 setStatus(Status.CLIENT_ERROR_NOT_FOUND);
47b53ae385d1 merging old code
casties
parents:
diff changeset
219 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
220 }
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
221 if (! storedAnnot.isActionAllowed("update", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
222 setStatus(Status.CLIENT_ERROR_FORBIDDEN);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
223 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
224 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
225 // update from posted JSON
47b53ae385d1 merging old code
casties
parents:
diff changeset
226 annot = updateAnnotation(storedAnnot, jo, entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
227 // store Annotation
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
228 storedAnnot = store.storeAnnotation(annot);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
229 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
230 * according to https://github.com/okfn/annotator/wiki/Storage we
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
231 * should return 303: see other. but the client doesn't like it
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
232 * setStatus(Status.REDIRECTION_SEE_OTHER); // go to same URL as
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
233 * this one Reference thisUrl = this.getReference();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
234 * this.getResponse().setLocationRef(thisUrl);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
235 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
236 // return new annotation
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
237 jo = createAnnotatorJson(storedAnnot, (authUser == null));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
238 JsonRepresentation retRep = new JsonRepresentation(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
239 return retRep;
47b53ae385d1 merging old code
casties
parents:
diff changeset
240 } catch (JSONException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
241 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
242 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
243 } catch (IOException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
244 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
245 setStatus(Status.SERVER_ERROR_INTERNAL, "Other Error");
47b53ae385d1 merging old code
casties
parents:
diff changeset
246 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
247 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
248 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
249
47b53ae385d1 merging old code
casties
parents:
diff changeset
250 /**
20
715aa11d138b fixes in permission handling: admin and delete default to creator.
casties
parents: 16
diff changeset
251 * DELETE with JSON content-type. Deletes an Annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
252 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
253 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
254 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
255 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
256 @Delete("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
257 public Representation doDeleteJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
258 logger.debug("AnnotatorAnnotations doDeleteJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
259 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
260 // id from URI /annotations/{id}
47b53ae385d1 merging old code
casties
parents:
diff changeset
261 String jsonId = (String) getRequest().getAttributes().get("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
262 String id = decodeJsonId(jsonId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
263 logger.debug("annotation-id=" + id);
47b53ae385d1 merging old code
casties
parents:
diff changeset
264
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
265 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
266 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
267 logger.debug("request authenticated=" + authUser);
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
268 AnnotationStore store = getAnnotationStore();
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
269 Annotation annot = store.getAnnotationById(id);
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
270 if (annot != null) {
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
271 if (! annot.isActionAllowed("delete", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
272 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
273 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
274 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
275 }
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
276
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
277 // delete annotation
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
278 store.deleteById(id);
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
279 setStatus(Status.SUCCESS_NO_CONTENT);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
280 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
281 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
282
47b53ae385d1 merging old code
casties
parents:
diff changeset
283 }