annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java @ 88:b406507a953d

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