annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java @ 70:2b1e6df5e21a

added lgpl_v3 license information.
author casties
date Thu, 06 Mar 2014 15:09:04 +0100
parents c0dd5314bada
children 25eb2e1df106
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
70
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
7 /*
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
8 * #%L
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
9 * AnnotationManager
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
10 * %%
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
11 * Copyright (C) 2012 - 2014 MPIWG Berlin
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
12 * %%
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
13 * This program is free software: you can redistribute it and/or modify
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
14 * it under the terms of the GNU Lesser General Public License as
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
15 * published by the Free Software Foundation, either version 3 of the
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
16 * License, or (at your option) any later version.
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
17 *
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
18 * This program is distributed in the hope that it will be useful,
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
19 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
21 * GNU General Lesser Public License for more details.
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
22 *
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
23 * You should have received a copy of the GNU General Lesser Public
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
24 * License along with this program. If not, see
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
25 * <http://www.gnu.org/licenses/lgpl-3.0.html>.
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
26 * #L%
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
27 */
2b1e6df5e21a added lgpl_v3 license information.
casties
parents: 65
diff changeset
28
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
29 import java.io.IOException;
65
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
30 import java.io.UnsupportedEncodingException;
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
31 import java.net.URLDecoder;
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
32 import java.util.ArrayList;
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
33 import java.util.List;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
34
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
35 import org.json.JSONArray;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
36 import org.json.JSONException;
47b53ae385d1 merging old code
casties
parents:
diff changeset
37 import org.json.JSONObject;
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
38 import org.restlet.data.Form;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
39 import org.restlet.data.Status;
47b53ae385d1 merging old code
casties
parents:
diff changeset
40 import org.restlet.ext.json.JsonRepresentation;
47b53ae385d1 merging old code
casties
parents:
diff changeset
41 import org.restlet.representation.Representation;
47b53ae385d1 merging old code
casties
parents:
diff changeset
42 import org.restlet.resource.Delete;
47b53ae385d1 merging old code
casties
parents:
diff changeset
43 import org.restlet.resource.Get;
47b53ae385d1 merging old code
casties
parents:
diff changeset
44 import org.restlet.resource.Post;
47b53ae385d1 merging old code
casties
parents:
diff changeset
45 import org.restlet.resource.Put;
47b53ae385d1 merging old code
casties
parents:
diff changeset
46
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
47 import de.mpiwg.itgroup.annotations.Annotation;
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
48 import de.mpiwg.itgroup.annotations.Person;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
49 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
50 import de.mpiwg.itgroup.annotations.restlet.utils.JSONObjectComparator;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
51
47b53ae385d1 merging old code
casties
parents:
diff changeset
52 /**
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
53 * Implements the "annotations" uri of the Annotator API. see
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
54 * <https://github.com/okfn/annotator/wiki/Storage>
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
55 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
56 * @author dwinter, casties
47b53ae385d1 merging old code
casties
parents:
diff changeset
57 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
58 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
59 public class AnnotatorAnnotations extends AnnotatorResourceImpl {
47b53ae385d1 merging old code
casties
parents:
diff changeset
60
47b53ae385d1 merging old code
casties
parents:
diff changeset
61 protected String getAllowedMethodsForHeader() {
47b53ae385d1 merging old code
casties
parents:
diff changeset
62 return "OPTIONS,GET,POST,PUT,DELETE";
47b53ae385d1 merging old code
casties
parents:
diff changeset
63 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
64
47b53ae385d1 merging old code
casties
parents:
diff changeset
65 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
66 * GET with JSON content-type.
47b53ae385d1 merging old code
casties
parents:
diff changeset
67 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
68 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
69 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
70 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
71 @Get("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
72 public Representation doGetJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
73 logger.debug("AnnotatorAnnotations doGetJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
74 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
75 // id from URI /annotations/{id}
65
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
76 String id = null;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
77 String jsonId = (String) getRequest().getAttributes().get("id");
65
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
78 if (jsonId != null) {
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
79 // URL decode
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
80 try {
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
81 jsonId = URLDecoder.decode(jsonId, "UTF-8");
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
82 } catch (UnsupportedEncodingException e) {
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
83 // this shouldn't happen
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
84 }
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
85 id = decodeJsonId(jsonId);
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
86 logger.debug("annotation-id=" + id);
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
87 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
88
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
89 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
90 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
91 logger.debug("request authenticated=" + authUser);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
92
37
34b9d044d0bf authorisation added
dwinter
parents: 34
diff changeset
93 if (id == null) {
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
94 // no id -- send all annotations
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
95 Form form = getRequest().getResourceRef().getQueryAsForm();
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
96 int limit = getInt(form.getFirstValue("limit"));
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
97 int offset = getInt(form.getFirstValue("offset"));
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
98 String sortBy = form.getFirstValue("sortBy");
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
99 return getAllAnnotations(authUser, limit, offset, sortBy);
37
34b9d044d0bf authorisation added
dwinter
parents: 34
diff changeset
100 }
34b9d044d0bf authorisation added
dwinter
parents: 34
diff changeset
101
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
102 // send annotation with id
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
103 AnnotationStore store = getAnnotationStore();
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
104 Annotation annot = store.getAnnotationById(id);
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
105 if (annot != null) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
106 if (!annot.isActionAllowed("read", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
107 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
108 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
109 }
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
110 JSONObject result = createAnnotatorJson(annot, (authUser == null));
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
111 return new JsonRepresentation(result);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
112 } else {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
113 // not found
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
114 setStatus(Status.CLIENT_ERROR_NOT_FOUND);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
115 return null;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
116 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
117 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
118
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
119 private Representation getAllAnnotations(Person authUser, int limit, int offset, String sortBy) {
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
120 AnnotationStore store = getAnnotationStore();
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
121 ArrayList<JSONObject> results = new ArrayList<JSONObject>();
65
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
122
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
123 // read all annotations
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
124 List<Annotation> annotations = store.getAnnotations(null, null);
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
125 for (Annotation annotation : annotations) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
126 // check permission
65
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
127 if (!annotation.isActionAllowed("read", authUser, store))
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
128 continue;
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
129 // add annotation to list
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
130 JSONObject jo = createAnnotatorJson(annotation, false);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
131 results.add(jo);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
132 }
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
133
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
134 // sort if necessary
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
135 if (sortBy != null) {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
136 JSONObjectComparator.sortAnnotations(results, sortBy);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
137 }
65
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
138
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
139 // put in JSON list
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
140 JSONArray rows = new JSONArray();
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
141 int cnt = 0;
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
142 for (JSONObject result : results) {
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
143 cnt += 1;
65
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
144 if (offset > 0 && cnt < offset)
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
145 continue;
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
146 rows.put(result);
65
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
147 if (limit > 0 && cnt >= limit)
c0dd5314bada deal with special characters in urls.
casties
parents: 63
diff changeset
148 break;
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
149 }
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
150
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
151 // assemble result object
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
152 JSONObject result = new JSONObject();
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
153 try {
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
154 result.put("rows", rows);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
155 result.put("total", rows.length());
31
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
156 } catch (JSONException e) {
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
157 setStatus(Status.SERVER_ERROR_INTERNAL, "JSON Error");
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
158 return null;
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
159 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
160 return new JsonRepresentation(result);
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
161 }
9f653697437e annotationbrowser
dwinter
parents: 22
diff changeset
162
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
163 /**
20
715aa11d138b fixes in permission handling: admin and delete default to creator.
casties
parents: 16
diff changeset
164 * POST with JSON content-type. Creates a new Annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
165 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
166 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
167 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
168 @Post("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
169 public Representation doPostJson(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
170 logger.debug("AnnotatorAnnotations doPostJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
171 // set headers
47b53ae385d1 merging old code
casties
parents:
diff changeset
172 setCorsHeaders();
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
173
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
174 // do authentication TODO: who's allowed to create?
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
175 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
176 logger.debug("request authenticated=" + authUser);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
177 if (authUser == null) {
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
178 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
179 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
180 }
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
181
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
182 Annotation annot = null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
183 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
184 JsonRepresentation jrep = new JsonRepresentation(entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
185 JSONObject jo = jrep.getJsonObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
186 if (jo == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
187 setStatus(Status.SERVER_ERROR_INTERNAL);
47b53ae385d1 merging old code
casties
parents:
diff changeset
188 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
189 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
190 // make sure id is not set for POST
47b53ae385d1 merging old code
casties
parents:
diff changeset
191 jo.remove("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
192 // get Annotation object from posted JSON
47b53ae385d1 merging old code
casties
parents:
diff changeset
193 annot = createAnnotation(jo, entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
194 } catch (IOException e1) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
195 setStatus(Status.SERVER_ERROR_INTERNAL);
47b53ae385d1 merging old code
casties
parents:
diff changeset
196 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
197 } catch (JSONException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
198 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
199 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
200 }
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
201 if (annot == null) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
202 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
203 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
204 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
205 Annotation storedAnnot;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
206 // store Annotation
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
207 storedAnnot = getAnnotationStore().storeAnnotation(annot);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
208 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
209 * according to https://github.com/okfn/annotator/wiki/Storage we should
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
210 * return 303: see other. For now we return the annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
211 */
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
212 JSONObject jo = createAnnotatorJson(storedAnnot, (authUser == null));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
213 JsonRepresentation retRep = new JsonRepresentation(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
214 return retRep;
47b53ae385d1 merging old code
casties
parents:
diff changeset
215 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
216
47b53ae385d1 merging old code
casties
parents:
diff changeset
217 /**
20
715aa11d138b fixes in permission handling: admin and delete default to creator.
casties
parents: 16
diff changeset
218 * PUT with JSON content-type. Modifies an Annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
219 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
220 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
221 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
222 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
223 @Put("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
224 public Representation doPutJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
225 logger.debug("AnnotatorAnnotations doPutJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
226 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
227 // id from URI /annotations/{id}
47b53ae385d1 merging old code
casties
parents:
diff changeset
228 String jsonId = (String) getRequest().getAttributes().get("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
229 String id = decodeJsonId(jsonId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
230 logger.debug("annotation-id=" + id);
47b53ae385d1 merging old code
casties
parents:
diff changeset
231
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
232 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
233 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
234 logger.debug("request authenticated=" + authUser);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
235
47b53ae385d1 merging old code
casties
parents:
diff changeset
236 Annotation annot = null;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
237 AnnotationStore store = getAnnotationStore();
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
238 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
239 JsonRepresentation jrep = new JsonRepresentation(entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
240 JSONObject jo = jrep.getJsonObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
241 if (jo == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
242 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
243 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
244 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
245 // get stored Annotation
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
246 Annotation storedAnnot = store.getAnnotationById(id);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
247 if (storedAnnot == null) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
248 setStatus(Status.CLIENT_ERROR_NOT_FOUND);
47b53ae385d1 merging old code
casties
parents:
diff changeset
249 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
250 }
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
251 if (!storedAnnot.isActionAllowed("update", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
252 setStatus(Status.CLIENT_ERROR_FORBIDDEN);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
253 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
254 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
255 // update from posted JSON
47b53ae385d1 merging old code
casties
parents:
diff changeset
256 annot = updateAnnotation(storedAnnot, jo, entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
257 // store Annotation
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
258 storedAnnot = store.storeAnnotation(annot);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
259 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
260 * according to https://github.com/okfn/annotator/wiki/Storage we
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
261 * should return 303: see other. but the client doesn't like it
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
262 * setStatus(Status.REDIRECTION_SEE_OTHER); // go to same URL as
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
263 * this one Reference thisUrl = this.getReference();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
264 * this.getResponse().setLocationRef(thisUrl);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
265 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
266 // return new annotation
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
267 jo = createAnnotatorJson(storedAnnot, (authUser == null));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
268 JsonRepresentation retRep = new JsonRepresentation(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
269 return retRep;
47b53ae385d1 merging old code
casties
parents:
diff changeset
270 } catch (JSONException e) {
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
271 logger.error("Error in doPutJSON", e);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
272 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
273 } catch (IOException e) {
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
274 logger.error("Error in doPutJSON", e);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
275 setStatus(Status.SERVER_ERROR_INTERNAL, "Other Error");
47b53ae385d1 merging old code
casties
parents:
diff changeset
276 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
277 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
278 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
279
47b53ae385d1 merging old code
casties
parents:
diff changeset
280 /**
20
715aa11d138b fixes in permission handling: admin and delete default to creator.
casties
parents: 16
diff changeset
281 * DELETE with JSON content-type. Deletes an Annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
282 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
283 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
284 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
285 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
286 @Delete("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
287 public Representation doDeleteJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
288 logger.debug("AnnotatorAnnotations doDeleteJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
289 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
290 // id from URI /annotations/{id}
47b53ae385d1 merging old code
casties
parents:
diff changeset
291 String jsonId = (String) getRequest().getAttributes().get("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
292 String id = decodeJsonId(jsonId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
293 logger.debug("annotation-id=" + id);
47b53ae385d1 merging old code
casties
parents:
diff changeset
294
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
295 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
296 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
297 logger.debug("request authenticated=" + authUser);
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
298 AnnotationStore store = getAnnotationStore();
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
299 Annotation annot = store.getAnnotationById(id);
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
300 if (annot != null) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 41
diff changeset
301 if (!annot.isActionAllowed("delete", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
302 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
303 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
304 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
305 }
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
306 // delete annotation
32
0731c4549065 UI for editing groups and persons works now. (still no authorisation!)
casties
parents: 22
diff changeset
307 store.deleteAnnotationById(id);
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
308 setStatus(Status.SUCCESS_NO_CONTENT);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
309 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
310 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
311
47b53ae385d1 merging old code
casties
parents:
diff changeset
312 }