Changeset 91:cf44d9e1a4a7 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

Timestamp:

Feb 8, 2015, 5:09:00 PM (9 years ago)

Author:

casties

Branch:

default

Children:

92:aadf8760216d, 94:fcb6fe10e08c

Message:

let CORS be handled by Restlet 2.3 CorsFilter?.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java (modified) (3 diffs)

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -45 +45 @@
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.restlet.data.Header;
 import org.restlet.data.Status;
-import org.restlet.data.Header;
 import org.restlet.representation.Representation;
-import org.restlet.resource.Options;
 import org.restlet.resource.ServerResource;
 import org.restlet.util.Series;
@@ -77 +76 @@
     private AnnotationStore store;
 
-    protected String getAllowedMethodsForHeader() {
-        return "OPTIONS,GET,POST";
-    }
-
     protected AnnotationStore getAnnotationStore() {
         if (store == null) {
@@ -106 +101 @@
             return null;
         }
-    }
-
-    /**
-     * Handle options request to allow CORS for AJAX.
-     * 
-     * @param entity
-     */
-    @Options
-    public void doOptions(Representation entity) {
-        logger.fine("AnnotatorResourceImpl doOptions!");
-        setCorsHeaders();
-    }
-
-    /**
-     * set headers to allow CORS for AJAX.
-     */
-    protected void setCorsHeaders() {
-        Series<Header> responseHeaders = (Series<Header>) getResponse().getHeaders();
-        if (responseHeaders == null) {
-            responseHeaders = new Series<Header>(Header.class);
-            getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
-        }
-        responseHeaders.add("Access-Control-Allow-Methods", getAllowedMethodsForHeader());
-        // echo back Origin and Request-Headers
-        @SuppressWarnings("unchecked")
-        Series<Header> requestHeaders = (Series<Header>) getRequest().getAttributes().get("org.restlet.http.headers");
-        String origin = requestHeaders.getFirstValue("Origin", true);
-        if (origin == null) {
-            responseHeaders.add("Access-Control-Allow-Origin", "*");
-        } else {
-            responseHeaders.add("Access-Control-Allow-Origin", origin);
-        }
-        String allowHeaders = requestHeaders.getFirstValue("Access-Control-Request-Headers", true);
-        if (allowHeaders != null) {
-            responseHeaders.add("Access-Control-Allow-Headers", allowHeaders);
-        }
-        responseHeaders.add("Access-Control-Allow-Credentials", "true");
-        responseHeaders.add("Access-Control-Max-Age", "60");
     }