make turtle the default RDF serialization

fcrepo · Jul 22, 2013 · a6b8ff1 · a6b8ff1
1 parent 60f4f8d
commit a6b8ff1
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 8 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFieldSearch.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFieldSearch.java
@@ -128,7 +128,7 @@ public Dataset searchSubmitHtml(@QueryParam("q")
      */
     @GET
     @Timed
-    @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON, NTRIPLES})
+    @Produces({TURTLE, N3, N3_ALT1, N3_ALT2, RDF_XML, RDF_JSON, NTRIPLES})
     public Dataset searchSubmitRdf(@QueryParam("q")
             final String terms,
             @QueryParam("offset")

diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFixity.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFixity.java
@@ -75,7 +75,7 @@ public class FedoraFixity extends AbstractResource {
      */
     @GET
     @Timed
-    @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON, NTRIPLES,
+    @Produces({TURTLE, N3, N3_ALT1, N3_ALT2, RDF_XML, RDF_JSON, NTRIPLES,
             TEXT_HTML})
     public Dataset getDatastreamFixity(@PathParam("path")
             final List<PathSegment> pathList,

diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraIdentifiers.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraIdentifiers.java
@@ -83,7 +83,7 @@ public class FedoraIdentifiers extends AbstractResource {
      */
     @POST
     @Timed
-    @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON, NTRIPLES,
+    @Produces({TURTLE, N3, N3_ALT1, N3_ALT2, RDF_XML, RDF_JSON, NTRIPLES,
             TEXT_HTML})
     public Dataset getNextPid(@PathParam("path")
             final List<PathSegment> pathList,

diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraNodes.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraNodes.java
@@ -108,7 +108,7 @@ public class FedoraNodes extends AbstractResource {
      * @throws IOException
      */
     @GET
-    @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON, NTRIPLES,
+    @Produces({TURTLE, N3, N3_ALT1, N3_ALT2, RDF_XML, RDF_JSON, NTRIPLES,
             TEXT_HTML})
     public Dataset describe(@PathParam("path")
             final List<PathSegment> pathList,

diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraVersions.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraVersions.java
@@ -82,7 +82,7 @@ public class FedoraVersions extends AbstractResource {
      * @throws RepositoryException
      */
     @GET
-    @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON, NTRIPLES})
+    @Produces({TURTLE, N3, N3_ALT1, N3_ALT2, RDF_XML, RDF_JSON, NTRIPLES})
     public Response getVersionList(@PathParam("path")
             final List<PathSegment> pathList,
             @Context
@@ -150,7 +150,7 @@ public Response addVersionLabel(@PathParam("path")
      */
     @Path("/{versionLabel}")
     @GET
-    @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON, NTRIPLES})
+    @Produces({TURTLE, N3, N3_ALT1, N3_ALT2, RDF_XML, RDF_JSON, NTRIPLES})
     public Dataset getVersion(@PathParam("path")
             final List<PathSegment> pathList,
             @PathParam("versionLabel")

diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/repository/FedoraRepositoryNamespaces.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/repository/FedoraRepositoryNamespaces.java
@@ -98,7 +98,7 @@ public Response updateNamespaces(final InputStream requestBodyStream)
      */
     @GET
     @Timed
-    @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON, NTRIPLES,
+    @Produces({TURTLE, N3, N3_ALT1, N3_ALT2, RDF_XML, RDF_JSON, NTRIPLES,
             TEXT_HTML})
     @HtmlTemplate("jcr:namespaces")
     public Dataset getNamespaces() throws RepositoryException, IOException {

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraFixityIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraFixityIT.java
@@ -43,6 +43,7 @@ public void testCheckDatastreamFixity() throws Exception {
         final HttpGet method2 =
                 new HttpGet(serverAddress +
                         "objects/FedoraDatastreamsTest11/zxc/fcr:fixity");
+        method2.setHeader("Accept", "application/n3");
         final HttpResponse response = execute(method2);
         assertEquals(200, response.getStatusLine().getStatusCode());
         final HttpEntity entity = response.getEntity();

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraIdentifiersIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraIdentifiersIT.java
@@ -46,6 +46,7 @@ public void testGetNextPidResponds() throws Exception {
     @Test
     public void testGetNextHasAPid() throws IOException {
         final HttpPost method = new HttpPost(serverAddress + "fcr:pid");
+        method.setHeader("Accept", "application/n3");
         final HttpResponse response = client.execute(method);
         logger.debug("Executed testGetNextHasAPid()");
         final GraphStore graphStore =
@@ -61,6 +62,7 @@ public void testGetNextHasAPid() throws IOException {
     public void testGetNextHasTwoPids() throws IOException {
         final HttpPost method =
                 new HttpPost(serverAddress + "fcr:pid?numPids=2");
+        method.setHeader("Accept", "application/n3");
         final HttpResponse response = client.execute(method);
         logger.debug("Executed testGetNextHasTwoPids()");
         final GraphStore graphStore =
@@ -82,6 +84,7 @@ public void testGetNextPidRespondsWithPath() throws Exception {
     @Test
     public void testGetNextHasAPidWithPath() throws IOException {
         final HttpPost method = new HttpPost(serverAddress + "objects/fcr:pid");
+        method.setHeader("Accept", "application/n3");
         final HttpResponse response = client.execute(method);
         logger.debug("Executed testGetNextHasAPidWithPath()");
         final GraphStore graphStore =
@@ -97,6 +100,7 @@ public void testGetNextHasAPidWithPath() throws IOException {
     public void testGetNextHasTwoPidsWithPath() throws IOException {
         final HttpPost method =
                 new HttpPost(serverAddress + "objects/fcr:pid?numPids=2");
+        method.setHeader("Accept", "application/n3");
         final HttpResponse response = client.execute(method);
         logger.debug("Executed testGetNextHasTwoPidsWithPath()");
         final GraphStore graphStore =

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraNodesIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraNodesIT.java
@@ -30,6 +30,7 @@
 import static org.fcrepo.RdfLexicon.HAS_OBJECT_SIZE;
 import static org.fcrepo.RdfLexicon.HAS_PRIMARY_IDENTIFIER;
 import static org.fcrepo.RdfLexicon.HAS_PRIMARY_TYPE;
+import static org.fcrepo.http.RDFMediaType.TURTLE;
 import static org.fcrepo.test.util.TestHelpers.parseTriples;
 import static org.fcrepo.utils.FedoraJcrTypes.ROOT;
 import static org.junit.Assert.assertEquals;
@@ -124,6 +125,7 @@ public void testGetDatastream() throws Exception {
                         "objects/FedoraDatastreamsTest4/ds1"));
         assertEquals(EntityUtils.toString(response.getEntity()), 200, response
                 .getStatusLine().getStatusCode());
+        assertEquals(TURTLE, response.getFirstHeader("Content-Type").getValue() );
     }
 
     @Test

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraTransactionsIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraTransactionsIT.java
@@ -119,6 +119,7 @@ public void testCreateDoStuffAndRollbackTransaction() throws Exception {
         /* fetch the created tx from the endpoint */
         final HttpGet getTx =
                 new HttpGet(txLocation + "/object-in-tx-rollback");
+        getTx.setHeader("Accept", "application/n3");
         resp = execute(getTx);
         assertEquals(
                 "Expected to find our object within the scope of the transaction",
@@ -168,6 +169,7 @@ public void testCreateDoStuffAndCommitTransaction() throws Exception {
 
         /* fetch the created tx from the endpoint */
         final HttpGet getTx = new HttpGet(txLocation + "/object-in-tx-commit");
+        getTx.setHeader("Accept", "application/n3");
         resp = execute(getTx);
         assertEquals(
                 "Expected to find our object within the scope of the transaction",

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraWorkspacesIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraWorkspacesIT.java
@@ -51,6 +51,7 @@ public void shouldDemonstratePathsAndWorkspaces() throws IOException,
         final HttpGet httpGet =
                 new HttpGet(serverAddress +
                         "workspace:some-workspace/FedoraWorkspacesTest");
+        httpGet.setHeader("Accept", "application/n3");
         final HttpResponse profileResponse = execute(httpGet);
         assertEquals(200, profileResponse.getStatusLine().getStatusCode());
         final GraphStore graphStore =

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/test/util/TestHelpers.java b/fcrepo-http-commons/src/test/java/org/fcrepo/test/util/TestHelpers.java
@@ -233,9 +233,14 @@ public static Datastream mockDatastream(final String pid,
     }
 
     public static GraphStore parseTriples(final InputStream content) {
+        return parseTriples(content, "N3");
+    }
+
+    public static GraphStore parseTriples(final InputStream content,
+                                          final String contentType) {
         final Model model = ModelFactory.createDefaultModel();
 
-        model.read(content, "", "N3");
+        model.read(content, "", contentType);
 
         return GraphStoreFactory.create(model);