You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2012/03/14 18:28:42 UTC

svn commit: r1300654 - in /incubator/stanbol/trunk/factstore/factstore/src: main/java/org/apache/stanbol/factstore/web/resource/ test/java/org/apache/stanbol/factstore/ test/java/org/apache/stanbol/factstore/web/resource/

Author: fchrist
Date: Wed Mar 14 17:28:42 2012
New Revision: 1300654

URL: http://svn.apache.org/viewvc?rev=1300654&view=rev
Log:
STANBOL-105 Implemented CORS support for FactStore

Added:
    incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java
Modified:
    incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java
    incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/QueryResource.java
    incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/FactsResourceTest.java
    incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/QueryResourceTest.java

Modified: incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java?rev=1300654&r1=1300653&r2=1300654&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java (original)
+++ incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/FactsResource.java Wed Mar 14 17:28:42 2012
@@ -16,6 +16,10 @@
  */
 package org.apache.stanbol.factstore.web.resource;
 
+import static javax.ws.rs.HttpMethod.GET;
+import static javax.ws.rs.HttpMethod.POST;
+import static javax.ws.rs.HttpMethod.PUT;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.HashMap;
@@ -25,14 +29,17 @@ import java.util.Set;
 import javax.servlet.ServletContext;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
+import javax.ws.rs.OPTIONS;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 
 import org.apache.stanbol.commons.jsonld.JsonLd;
@@ -40,6 +47,7 @@ import org.apache.stanbol.commons.jsonld
 import org.apache.stanbol.commons.jsonld.JsonLdProfile;
 import org.apache.stanbol.commons.jsonld.JsonLdProfileParser;
 import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.stanbol.commons.web.base.CorsHelper;
 import org.apache.stanbol.factstore.api.FactStore;
 import org.apache.stanbol.factstore.model.Fact;
 import org.apache.stanbol.factstore.model.FactSchema;
@@ -59,17 +67,115 @@ public class FactsResource extends BaseF
         this.factStore = ContextHelper.getServiceFromContext(FactStore.class, context);
     }
     
+    @OPTIONS
+    public Response handleCorsPreflightFacts(@Context HttpHeaders requestHeaders) {
+        ResponseBuilder res = Response.ok();
+        CorsHelper.enableCORS(servletContext, res, requestHeaders, GET, POST);
+        return res.build();
+    }
+    
     @GET
     @Produces(MediaType.TEXT_HTML)
-    public Response get() {
-        return Response.ok(new Viewable("index", this), MediaType.TEXT_HTML).build();
+    public Response get(@Context HttpHeaders requestHeaders) {
+    	ResponseBuilder rb = Response.ok(new Viewable("index", this), MediaType.TEXT_HTML);
+    	CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+        return rb.build();
+    }
+
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    public Response postFacts(String jsonLdFacts, @Context HttpHeaders requestHeaders) {
+        JsonLd jsonLd = null;
+        try {
+            jsonLd = JsonLdParser.parse(jsonLdFacts);
+        } catch (Exception e) {
+            /* ignore here */
+        }
+
+        if (jsonLd == null) {
+        	ResponseBuilder rb = Response.status(Status.BAD_REQUEST).entity("Could not parse provided JSON-LD structure.")
+                    .type(MediaType.TEXT_PLAIN);
+        	CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
+        }
+
+        int factId = -1;
+        if (jsonLd.getResourceSubjects().size() < 2) {
+            // post a single fact
+            Fact fact = Fact.factFromJsonLd(jsonLd);
+            if (fact != null) {
+                logger.info("Request for posting new fact for {}", fact.getFactSchemaURN());
+                try {
+                    factId = this.factStore.addFact(fact);
+                } catch (Exception e) {
+                    logger.error("Error adding new fact", e);
+                    ResponseBuilder rb = Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage())
+                            .type(MediaType.TEXT_PLAIN);
+                    CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+                    return rb.build();
+                }
+            } else {
+                ResponseBuilder rb = Response.status(Status.BAD_REQUEST)
+                        .entity("Could not extract fact from JSON-LD input.").type(MediaType.TEXT_PLAIN);
+                CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+                return rb.build();
+            }
+            
+            String schemaEncoded = null;
+            try {
+                schemaEncoded = URLEncoder.encode(fact.getFactSchemaURN(), "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                logger.error("Could not encode fact schema URI", e);
+            }
+            
+            ResponseBuilder rb = Response
+                    .status(Status.OK)
+                    .header("Location",
+                        this.getPublicBaseUri() + "factstore/facts/" + schemaEncoded + "/" + factId)
+                    .type(MediaType.TEXT_PLAIN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
+        } else {
+            // post multiple facts
+            Set<Fact> facts = Fact.factsFromJsonLd(jsonLd);
+            if (facts != null) {
+                logger.info("Request for posting a set of new facts");
+                try {
+                    this.factStore.addFacts(facts);
+                } catch (Exception e) {
+                    logger.error("Error adding new facts", e);
+                    ResponseBuilder rb = Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage())
+                            .type(MediaType.TEXT_PLAIN);
+                    CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+                    return rb.build();
+                }
+            } else {
+                ResponseBuilder rb = Response.status(Status.BAD_REQUEST)
+                        .entity("Could not extract facts from JSON-LD input.").type(MediaType.TEXT_PLAIN);
+                CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+                return rb.build();
+            }
+            
+            return Response.status(Status.OK).type(MediaType.TEXT_PLAIN).build();
+        }
+
+    }
+
+    @OPTIONS
+    @Path("/{factSchemaURN}")
+    public Response handleCorsPreflightFactSchema(@Context HttpHeaders requestHeaders){
+        ResponseBuilder res = Response.ok();
+        CorsHelper.enableCORS(servletContext, res, requestHeaders, GET, PUT);
+        return res.build();
     }
 
     @GET
     @Path("/{factSchemaURN}")
     @Produces(MediaType.APPLICATION_JSON)
-    public Response getFactSchemaAsJSON(@PathParam("factSchemaURN") String factSchemaURN) {
-        Response validationResponse = standardValidation(factSchemaURN);
+    public Response getFactSchemaAsJSON(@PathParam("factSchemaURN") String factSchemaURN,
+                                        @Context HttpHeaders requestHeaders) {
+        Response validationResponse = standardValidation(factSchemaURN, requestHeaders);
         if (validationResponse != null) {
             return validationResponse;
         }
@@ -78,18 +184,23 @@ public class FactsResource extends BaseF
 
         FactSchema factSchema = this.factStore.getFactSchema(factSchemaURN);
         if (factSchema == null) {
-            return Response.status(Status.NOT_FOUND).entity("Could not find fact schema " + factSchemaURN)
-                    .type(MediaType.TEXT_PLAIN).build();
+            ResponseBuilder rb = Response.status(Status.NOT_FOUND)
+                    .entity("Could not find fact schema " + factSchemaURN).type(MediaType.TEXT_PLAIN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
 
-        return Response.ok(factSchema.toJsonLdProfile().toString(), MediaType.APPLICATION_JSON).build();
+        ResponseBuilder rb = Response.ok(factSchema.toJsonLdProfile().toString(), MediaType.APPLICATION_JSON);
+        CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+        return rb.build();
     }
 
     @GET
     @Path("/{factSchemaURN}")
     @Produces(MediaType.TEXT_HTML)
-    public Response getFactSchemaAsHtml(@PathParam("factSchemaURN") String factSchemaURN) {
-        Response validationResponse = standardValidation(factSchemaURN);
+    public Response getFactSchemaAsHtml(@PathParam("factSchemaURN") String factSchemaURN,
+                                        @Context HttpHeaders requestHeaders) {
+        Response validationResponse = standardValidation(factSchemaURN, requestHeaders);
         if (validationResponse != null) {
             return validationResponse;
         }
@@ -98,8 +209,10 @@ public class FactsResource extends BaseF
 
         FactSchema factSchema = this.factStore.getFactSchema(factSchemaURN);
         if (factSchema == null) {
-            return Response.status(Status.NOT_FOUND).entity("Could not find fact schema " + factSchemaURN)
-                    .type(MediaType.TEXT_PLAIN).build();
+            ResponseBuilder rb = Response.status(Status.NOT_FOUND).entity("Could not find fact schema " + factSchemaURN)
+                    .type(MediaType.TEXT_PLAIN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
 
         Map<String, Object> model = new HashMap<String,Object>();
@@ -107,15 +220,20 @@ public class FactsResource extends BaseF
         model.put("factSchemaURN", factSchemaURN);
         model.put("factschema", factSchema.toJsonLdProfile().toString(2));
         
-        return Response.ok(new Viewable("factschema", model), MediaType.TEXT_HTML).build();
+        ResponseBuilder rb = Response.ok(new Viewable("factschema", model), MediaType.TEXT_HTML);
+        CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+        return rb.build();
     }
 
     @PUT
     @Path("/{factSchemaURN}")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.TEXT_PLAIN)
-    public Response putFactSchema(String jsonLdProfileString, @PathParam("factSchemaURN") String factSchemaURN) {
-        Response validationResponse = standardValidation(factSchemaURN);
+    public Response putFactSchema(String jsonLdProfileString,
+                                  @PathParam("factSchemaURN") String factSchemaURN,
+                                  @Context HttpHeaders requestHeaders) {
+        
+        Response validationResponse = standardValidation(factSchemaURN,requestHeaders);
         if (validationResponse != null) {
             return validationResponse;
         }
@@ -128,38 +246,51 @@ public class FactsResource extends BaseF
         } catch (Exception e) { /* ignore this exception here - it was logged by the parser */}
 
         if (profile == null) {
-            return Response.status(Status.BAD_REQUEST).entity(
-                "Could not parse provided JSON-LD Profile structure.").type(MediaType.TEXT_PLAIN).build();
+            ResponseBuilder rb = Response.status(Status.BAD_REQUEST)
+                    .entity("Could not parse provided JSON-LD Profile structure.").type(MediaType.TEXT_PLAIN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
 
         try {
             if (this.factStore.existsFactSchema(factSchemaURN)) {
-                return Response.status(Status.CONFLICT).entity(
-                    "The fact schema " + factSchemaURN + " already exists.").type(MediaType.TEXT_PLAIN)
-                        .build();
+                ResponseBuilder rb = Response.status(Status.CONFLICT)
+                        .entity("The fact schema " + factSchemaURN + " already exists.")
+                        .type(MediaType.TEXT_PLAIN);
+                CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+                return rb.build();
             }
         } catch (Exception e) {
-            return Response.status(Status.INTERNAL_SERVER_ERROR).entity(
-                "Error while checking existence of fact schema " + factSchemaURN).type(MediaType.TEXT_PLAIN)
-                    .build();
+            ResponseBuilder rb = Response.status(Status.INTERNAL_SERVER_ERROR)
+                    .entity("Error while checking existence of fact schema " + factSchemaURN)
+                    .type(MediaType.TEXT_PLAIN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
 
         try {
             this.factStore.createFactSchema(FactSchema.fromJsonLdProfile(factSchemaURN, profile));
         } catch (Exception e) {
             logger.error("Error creating new fact schema {}", factSchemaURN, e);
-            return Response.status(Status.INTERNAL_SERVER_ERROR).entity(
-                "Error while creating new fact in database.").type(MediaType.TEXT_PLAIN).build();
+            ResponseBuilder rb = Response.status(Status.INTERNAL_SERVER_ERROR)
+                    .entity("Error while creating new fact in database.").type(MediaType.TEXT_PLAIN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
 
-        return Response.status(Status.CREATED).type(MediaType.TEXT_PLAIN).build();
+        ResponseBuilder rb = Response.status(Status.CREATED).type(MediaType.TEXT_PLAIN);
+        CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+        return rb.build();
     }
     
     @GET
     @Path("/{factSchemaURN}/{factId}")
     @Produces(MediaType.APPLICATION_JSON)
-    public Response getFact(@PathParam("factId") int factId, @PathParam("factSchemaURN") String factSchemaURN) {
-        Response validationResponse = standardValidation(factSchemaURN);
+    public Response getFact(@PathParam("factId") int factId,
+                            @PathParam("factSchemaURN") String factSchemaURN,
+                            @Context HttpHeaders requestHeaders) {
+        
+        Response validationResponse = standardValidation(factSchemaURN, requestHeaders);
         if (validationResponse != null) {
             return validationResponse;
         }
@@ -171,27 +302,38 @@ public class FactsResource extends BaseF
             fact = this.factStore.getFact(factId, factSchemaURN);
         } catch (Exception e) {
             logger.error("Error while loading fact {}", factId, e);
-            return Response.status(Status.INTERNAL_SERVER_ERROR).entity(
-                "Error while loading fact " + factId + " of fact schema " + factSchemaURN + " from database")
-                    .type(MediaType.TEXT_PLAIN).build();
+            ResponseBuilder rb = Response
+                    .status(Status.INTERNAL_SERVER_ERROR)
+                    .entity(
+                        "Error while loading fact " + factId + " of fact schema " + factSchemaURN
+                                + " from database").type(MediaType.TEXT_PLAIN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
         if (fact == null) {
             logger.debug("Fact {} for fact schema {} not found", factId, factSchemaURN);
-            return Response.status(Status.NOT_FOUND).entity(
-                "Could not find fact with ID " + factId + " for fact schema " + factSchemaURN).build();
+            ResponseBuilder rb = Response.status(Status.NOT_FOUND).entity(
+                "Could not find fact with ID " + factId + " for fact schema " + factSchemaURN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
         else {
             JsonLd factAsJsonLd = fact.factToJsonLd();
-            return Response.status(Status.OK).entity(factAsJsonLd.toString())
-                    .type(MediaType.APPLICATION_JSON).build();
+            ResponseBuilder rb = Response.status(Status.OK).entity(factAsJsonLd.toString())
+                    .type(MediaType.APPLICATION_JSON);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
     }
     
     @GET
     @Path("/{factSchemaURN}/{factId}")
     @Produces(MediaType.TEXT_HTML)
-    public Response getFactAsHtml(@PathParam("factId") int factId, @PathParam("factSchemaURN") String factSchemaURN) {
-        Response validationResponse = standardValidation(factSchemaURN);
+    public Response getFactAsHtml(@PathParam("factId") int factId,
+                                  @PathParam("factSchemaURN") String factSchemaURN,
+                                  @Context HttpHeaders requestHeaders) {
+
+        Response validationResponse = standardValidation(factSchemaURN, requestHeaders);
         if (validationResponse != null) {
             return validationResponse;
         }
@@ -203,14 +345,20 @@ public class FactsResource extends BaseF
             fact = this.factStore.getFact(factId, factSchemaURN);
         } catch (Exception e) {
             logger.error("Error while loading fact {}", factId, e);
-            return Response.status(Status.INTERNAL_SERVER_ERROR).entity(
-                "Error while loading fact " + factId + " of fact schema " + factSchemaURN + " from database")
-                    .type(MediaType.TEXT_PLAIN).build();
+            ResponseBuilder rb = Response
+                    .status(Status.INTERNAL_SERVER_ERROR)
+                    .entity(
+                        "Error while loading fact " + factId + " of fact schema " + factSchemaURN
+                                + " from database").type(MediaType.TEXT_PLAIN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
         if (fact == null) {
             logger.debug("Fact {} for fact schema {} not found", factId, factSchemaURN);
-            return Response.status(Status.NOT_FOUND).entity(
-                "Could not find fact with ID " + factId + " for fact schema " + factSchemaURN).build();
+            ResponseBuilder rb = Response.status(Status.NOT_FOUND).entity(
+                "Could not find fact with ID " + factId + " for fact schema " + factSchemaURN);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
         else {
             JsonLd factAsJsonLd = fact.factToJsonLd();
@@ -222,88 +370,32 @@ public class FactsResource extends BaseF
             sb.append("</pre>");
             sb.append("</body></html>");
             
-            return Response.status(Status.OK).entity(sb.toString()).type(MediaType.TEXT_HTML).build();
-        }
-    }
-
-    @POST
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.TEXT_PLAIN)
-    public Response postFacts(String jsonLdFacts) {
-        JsonLd jsonLd = null;
-        try {
-            jsonLd = JsonLdParser.parse(jsonLdFacts);
-        } catch (Exception e) {
-            /* ignore here */
-        }
-
-        if (jsonLd == null) {
-            return Response.status(Status.BAD_REQUEST).entity("Could not parse provided JSON-LD structure.")
-                    .type(MediaType.TEXT_PLAIN).build();
-        }
-
-        int factId = -1;
-        if (jsonLd.getResourceSubjects().size() < 2) {
-            // post a single fact
-            Fact fact = Fact.factFromJsonLd(jsonLd);
-            if (fact != null) {
-                logger.info("Request for posting new fact for {}", fact.getFactSchemaURN());
-                try {
-                    factId = this.factStore.addFact(fact);
-                } catch (Exception e) {
-                    logger.error("Error adding new fact", e);
-                    return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).type(
-                        MediaType.TEXT_PLAIN).build();
-                }
-            } else {
-                return Response.status(Status.BAD_REQUEST).entity(
-                    "Could not extract fact from JSON-LD input.").type(MediaType.TEXT_PLAIN).build();
-            }
-            
-            String schemaEncoded = null;
-            try {
-                schemaEncoded = URLEncoder.encode(fact.getFactSchemaURN(), "UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                logger.error("Could not encode fact schema URI", e);
-            }
-            
-            return Response.status(Status.OK).header("Location", this.getPublicBaseUri() + "factstore/facts/" + schemaEncoded + "/" + factId).type(MediaType.TEXT_PLAIN).build();
-        } else {
-            // post multiple facts
-            Set<Fact> facts = Fact.factsFromJsonLd(jsonLd);
-            if (facts != null) {
-                logger.info("Request for posting a set of new facts");
-                try {
-                    this.factStore.addFacts(facts);
-                } catch (Exception e) {
-                    logger.error("Error adding new facts", e);
-                    return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).type(
-                        MediaType.TEXT_PLAIN).build();
-                }
-            } else {
-                return Response.status(Status.BAD_REQUEST).entity(
-                    "Could not extract facts from JSON-LD input.").type(MediaType.TEXT_PLAIN).build();
-            }
-            
-            return Response.status(Status.OK).type(MediaType.TEXT_PLAIN).build();
+            ResponseBuilder rb = Response.status(Status.OK).entity(sb.toString()).type(MediaType.TEXT_HTML);
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
-
     }
 
-    private Response standardValidation(String factSchemaURN) {
+    private Response standardValidation(String factSchemaURN, HttpHeaders requestHeaders) {
         if (this.factStore == null) {
-            return Response.status(Status.INTERNAL_SERVER_ERROR).entity(
-                "The FactStore is not configured properly").build();
+            ResponseBuilder rb = Response.status(Status.INTERNAL_SERVER_ERROR).entity(
+                    "The FactStore is not configured properly");
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
 
         if (factSchemaURN == null || factSchemaURN.isEmpty()) {
-            return Response.status(Status.BAD_REQUEST).entity("No fact schema URN specified.").build();
+            ResponseBuilder rb = Response.status(Status.BAD_REQUEST).entity("No fact schema URN specified.");
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
 
         if (factSchemaURN.length() > this.factStore.getMaxFactSchemaURNLength()) {
-            return Response.status(Status.BAD_REQUEST).entity(
+            ResponseBuilder rb = Response.status(Status.BAD_REQUEST).entity(
                 "The fact schema URN " + factSchemaURN + " is too long. A maximum of "
-                        + this.factStore.getMaxFactSchemaURNLength() + " characters is allowed").build();
+                        + this.factStore.getMaxFactSchemaURNLength() + " characters is allowed");
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+            return rb.build();
         }
 
         return null;

Modified: incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/QueryResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/QueryResource.java?rev=1300654&r1=1300653&r2=1300654&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/QueryResource.java (original)
+++ incubator/stanbol/trunk/factstore/factstore/src/main/java/org/apache/stanbol/factstore/web/resource/QueryResource.java Wed Mar 14 17:28:42 2012
@@ -16,19 +16,25 @@
 */
 package org.apache.stanbol.factstore.web.resource;
 
+import static javax.ws.rs.HttpMethod.POST;
+
 import javax.servlet.ServletContext;
 import javax.ws.rs.Consumes;
+import javax.ws.rs.OPTIONS;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 
 import org.apache.stanbol.commons.jsonld.JsonLd;
 import org.apache.stanbol.commons.jsonld.JsonLdParser;
 import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.stanbol.commons.web.base.CorsHelper;
 import org.apache.stanbol.factstore.api.FactStore;
 import org.apache.stanbol.factstore.model.FactResultSet;
 import org.apache.stanbol.factstore.model.Query;
@@ -45,21 +51,31 @@ public class QueryResource extends BaseF
     public QueryResource(@Context ServletContext context) {
         this.factStore = ContextHelper.getServiceFromContext(FactStore.class, context);
     }
+
+    @OPTIONS
+    public Response handleCorsPreflightQuery(@Context HttpHeaders requestHeaders) {
+        ResponseBuilder res = Response.ok();
+        CorsHelper.enableCORS(servletContext, res, requestHeaders, POST);
+        return res.build();
+    }
     
 	@POST
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response query(String queryString) {
+	public Response query(String queryString, @Context HttpHeaders requestHeaders) {
         logger.info("Query for fact: {}", queryString);
 		
 		if (this.factStore == null) {
-			return Response.status(Status.INTERNAL_SERVER_ERROR).entity(
-					"The FactStore is not configured properly").build();
+		    ResponseBuilder rb = Response.status(Status.INTERNAL_SERVER_ERROR).entity(
+                    "The FactStore is not configured properly");
+		    CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+			return rb.build();
 		}
 
 		if (queryString == null || queryString.isEmpty()) {
-			return Response.status(Status.BAD_REQUEST).entity("No query sent.")
-					.build();
+		    ResponseBuilder rb = Response.status(Status.BAD_REQUEST).entity("No query sent.");
+		    CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+			return rb.build();
 		}
 
 		JsonLd jsonLdQuery = null;
@@ -67,8 +83,10 @@ public class QueryResource extends BaseF
 			jsonLdQuery = JsonLdParser.parse(queryString);
 		} catch (Exception e) {
 			logger.info("Could not parse query", e);
-			return Response.status(Status.BAD_REQUEST).entity(
-					"Could not parse query: " + e.getMessage()).build();
+			ResponseBuilder rb = Response.status(Status.BAD_REQUEST).entity(
+                "Could not parse query: " + e.getMessage());
+			CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+			return rb.build();
 		}
 
 		Query query = null;
@@ -76,9 +94,10 @@ public class QueryResource extends BaseF
 			query = Query.toQueryFromJsonLd(jsonLdQuery);
 		} catch (Exception e) {
 			logger.info("Could not extract Query from JSON-LD", e);
-			return Response.status(Status.BAD_REQUEST).entity(
-					"Could not extract FactStore query from JSON-LD: "
-							+ e.getMessage()).build();
+            ResponseBuilder rb = Response.status(Status.BAD_REQUEST).entity(
+                "Could not extract FactStore query from JSON-LD: " + e.getMessage());
+            CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+			return rb.build();
 		}
 
 		FactResultSet rs = null;
@@ -86,14 +105,20 @@ public class QueryResource extends BaseF
 			rs = this.factStore.query(query);
 		} catch (Exception e) {
 			logger.info("Error while performing the query.", e);
-			return Response.status(Status.INTERNAL_SERVER_ERROR).entity(
-					"Error while performing the query. " + e.getMessage()).build();
+            ResponseBuilder rb = Response.status(Status.INTERNAL_SERVER_ERROR).entity(
+                "Error while performing the query. " + e.getMessage());
+			CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+			return rb.build();
 		}
 
 		if (rs != null) {
-			return Response.ok(rs.toJSON()).build();
+		    ResponseBuilder rb = Response.ok(rs.toJSON());
+		    CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+			return rb.build();
 		} else {
-			return Response.ok().build();
+		    ResponseBuilder rb = Response.ok();
+		    CorsHelper.addCORSOrigin(servletContext, rb, requestHeaders);
+			return rb.build();
 		}
 	}
 }

Added: incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java?rev=1300654&view=auto
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java (added)
+++ incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java Wed Mar 14 17:28:42 2012
@@ -0,0 +1,56 @@
+package org.apache.stanbol.factstore;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+public class HttpHeadersMock implements HttpHeaders {
+
+    @Override
+    public List<Locale> getAcceptableLanguages() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<MediaType> getAcceptableMediaTypes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Map<String,Cookie> getCookies() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Locale getLanguage() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<String> getRequestHeader(String arg0) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public MultivaluedMap<String,String> getRequestHeaders() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}

Modified: incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/FactsResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/FactsResourceTest.java?rev=1300654&r1=1300653&r2=1300654&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/FactsResourceTest.java (original)
+++ incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/FactsResourceTest.java Wed Mar 14 17:28:42 2012
@@ -25,6 +25,7 @@ import org.apache.stanbol.commons.testin
 import org.apache.stanbol.commons.testing.http.ServletContextMock;
 import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
 import org.apache.stanbol.factstore.FactStoreMock;
+import org.apache.stanbol.factstore.HttpHeadersMock;
 import org.apache.stanbol.factstore.UriInfoMock;
 import org.apache.stanbol.factstore.api.FactStore;
 import org.apache.stanbol.factstore.web.resource.FactsResource;
@@ -50,7 +51,7 @@ public class FactsResourceTest {
     @Test
     public void testGet() {
         FactsResource fr = new FactsResourceWrapper(this.servletContext, this.uriInfoMock);
-        Response response = fr.get();
+        Response response = fr.get(new HttpHeadersMock());
         assertTrue(response.getStatus() == Status.OK.getStatusCode());
     }
 
@@ -58,7 +59,7 @@ public class FactsResourceTest {
     public void testPutFactSchemaNoSchemaURI() {
         FactsResource fr = new FactsResourceWrapper(this.servletContext, this.uriInfoMock);
 
-        Response response = fr.putFactSchema("", null);
+        Response response = fr.putFactSchema("", null, new HttpHeadersMock());
         assertTrue(response.getStatus() == Status.BAD_REQUEST.getStatusCode());
     }
 
@@ -66,7 +67,7 @@ public class FactsResourceTest {
     public void testPutFactSchemaNoJSON() {
         FactsResource fr = new FactsResourceWrapper(this.servletContext, this.uriInfoMock);
 
-        Response response = fr.putFactSchema("no JSON-LD string", "test2");
+        Response response = fr.putFactSchema("no JSON-LD string", "test2", new HttpHeadersMock());
         assertTrue(response.getStatus() == Status.BAD_REQUEST.getStatusCode());
     }
 
@@ -74,7 +75,7 @@ public class FactsResourceTest {
     public void testPutFactSchemaNoJSONSchema() {
         FactsResource fr = new FactsResourceWrapper(this.servletContext, this.uriInfoMock);
 
-        Response response = fr.putFactSchema("{}", "test2");
+        Response response = fr.putFactSchema("{}", "test2", new HttpHeadersMock());
         assertTrue(response.getStatus() == Status.BAD_REQUEST.getStatusCode());
     }
 
@@ -85,7 +86,8 @@ public class FactsResourceTest {
         Response response = fr
                 .putFactSchema(
                     "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"@types\":{\"person\":\"iks:person\",\"organization\":\"iks:organization\"}}}",
-                    "http://www.test.de/this/urn/is/a/bit/too/long/to/be/used/in/this/fact/store/implementation/with/derby");
+                    "http://www.test.de/this/urn/is/a/bit/too/long/to/be/used/in/this/fact/store/implementation/with/derby",
+                    new HttpHeadersMock());
         assertTrue(response.getStatus() == Status.BAD_REQUEST.getStatusCode());
     }
 
@@ -96,7 +98,7 @@ public class FactsResourceTest {
         Response response = fr
                 .putFactSchema(
                     "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"@types\":{\"person\":\"iks:person\",\"organization\":\"iks:organization\"}}}",
-                    "test2");
+                    "test2", new HttpHeadersMock());
         assertTrue(response.getStatus() == Status.CREATED.getStatusCode());
     }
 
@@ -105,7 +107,9 @@ public class FactsResourceTest {
         FactsResource fr = new FactsResourceWrapper(this.servletContext, this.uriInfoMock);
 
         Response response = fr
-                .postFacts("{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@profile\":\"iks:employeeOf\",\"person\":{\"@iri\":\"upb:bnagel\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}}");
+                .postFacts(
+                    "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@profile\":\"iks:employeeOf\",\"person\":{\"@iri\":\"upb:bnagel\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}}",
+                    new HttpHeadersMock());
 
         assertTrue(response.getStatus() == Status.OK.getStatusCode());
         System.out.println(response.getMetadata().get("Location").get(0));
@@ -117,7 +121,9 @@ public class FactsResourceTest {
         FactsResource fr = new FactsResourceWrapper(this.servletContext, this.uriInfoMock);
 
         Response response = fr
-                .postFacts("{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@profile\":\"iks:employeeOf\",\"@subject\":[{\"person\":{\"@iri\":\"upb:bnagel\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}},{\"person\":{\"@iri\":\"upb:fchrist\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}}]}");
+                .postFacts(
+                    "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@profile\":\"iks:employeeOf\",\"@subject\":[{\"person\":{\"@iri\":\"upb:bnagel\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}},{\"person\":{\"@iri\":\"upb:fchrist\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}}]}",
+                    new HttpHeadersMock());
 
         assertTrue(response.getStatus() == Status.OK.getStatusCode());
         assertNull(response.getEntity());
@@ -128,7 +134,9 @@ public class FactsResourceTest {
         FactsResource fr = new FactsResourceWrapper(this.servletContext, this.uriInfoMock);
 
         Response response = fr
-                .postFacts("{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@subject\":[{\"@profile\":\"iks:employeeOf\",\"person\":{\"@iri\":\"upb:bnagel\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}},{\"@profile\":\"iks:friendOf\",\"person\":{\"@iri\":\"upb:bnagel\"},\"friend\":{\"@iri\":\"upb:fchrist\"}}]}");
+                .postFacts(
+                    "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\",\"upb\":\"http://upb.de/persons/\"},\"@subject\":[{\"@profile\":\"iks:employeeOf\",\"person\":{\"@iri\":\"upb:bnagel\"},\"organization\":{\"@iri\":\"http://uni-paderborn.de\"}},{\"@profile\":\"iks:friendOf\",\"person\":{\"@iri\":\"upb:bnagel\"},\"friend\":{\"@iri\":\"upb:fchrist\"}}]}",
+                    new HttpHeadersMock());
 
         assertTrue(response.getStatus() == Status.OK.getStatusCode());
     }

Modified: incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/QueryResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/QueryResourceTest.java?rev=1300654&r1=1300653&r2=1300654&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/QueryResourceTest.java (original)
+++ incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/web/resource/QueryResourceTest.java Wed Mar 14 17:28:42 2012
@@ -24,6 +24,7 @@ import javax.ws.rs.core.Response.Status;
 import org.apache.stanbol.commons.testing.http.BundleContextMock;
 import org.apache.stanbol.commons.testing.http.ServletContextMock;
 import org.apache.stanbol.factstore.FactStoreMock;
+import org.apache.stanbol.factstore.HttpHeadersMock;
 import org.apache.stanbol.factstore.api.FactStore;
 import org.junit.Before;
 import org.junit.Test;
@@ -48,7 +49,7 @@ public class QueryResourceTest {
         
         String queryString = "{\"@context\":{\"iks\":\"http://iks-project.eu/ont/\"},\"select\":[\"person\"],\"from\":\"iks:employeeOf\",\"where\":[{\"=\":{\"organization\":{\"@iri\":\"http://upb.de\"}}}]}";
         
-        Response response = qr.query(queryString);
+        Response response = qr.query(queryString, new HttpHeadersMock());
         assertTrue(response.getStatus() == Status.OK.getStatusCode());
     }
 }