Three tests for multiple-datastream update and projected node still f…

…ailing
fcrepo · May 17, 2013 · 731ecad · 731ecad
1 parent fdcce01
commit 731ecad
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
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
@@ -29,7 +29,7 @@
 
 import org.fcrepo.AbstractResource;
 import org.fcrepo.FedoraResource;
-import org.fcrepo.responses.GraphStreamingOutput;
+import org.fcrepo.responses.GraphStoreStreamingOutput;
 import org.slf4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -53,7 +53,7 @@ public Response getVersionList(@PathParam("path")
         try {
             final FedoraResource resource = nodeService.getObject(session, path);
 
-            return Response.ok(new GraphStreamingOutput(resource.getVersionGraphStore(),
+            return Response.ok(new GraphStoreStreamingOutput(resource.getVersionGraphStore(),
                                                                   bestPossibleResponse.getMediaType())).build();
 
         } finally {
@@ -98,7 +98,7 @@ public Response getVersion(@PathParam("path")
                 return Response.status(Response.Status.NOT_FOUND).build();
             } else {
 
-                return Response.ok(new GraphStreamingOutput(resource.getGraphStore(),
+                return Response.ok(new GraphStoreStreamingOutput(resource.getGraphStore(),
                                                                bestPossibleResponse.getMediaType())).build();
             }
 

diff --git a/fcrepo-http-api/src/test/resources/spring-test/rest.xml b/fcrepo-http-api/src/test/resources/spring-test/rest.xml
@@ -14,7 +14,7 @@
   <context:annotation-config/>
 
   <context:component-scan
-    base-package="org.fcrepo.api, org.fcrepo.serialization, org.fcrepo.responses"/>
+    base-package="org.fcrepo.api, org.fcrepo.serialization, org.fcrepo.responses, org.fcrepo.exceptionhandlers"/>
 
   <util:map id="serializers" key-type="java.lang.String" map-class="java.util.HashMap"
     value-type="org.fcrepo.serialization.FedoraObjectSerializer">

diff --git a/fcrepo-http-api/src/test/resources/spring-test/test-container.xml b/fcrepo-http-api/src/test/resources/spring-test/test-container.xml
@@ -10,6 +10,6 @@
   <bean id="containerWrapper" class="org.fcrepo.test.util.ContainerWrapper" init-method="start" destroy-method="stop" >
     <property name="port" value="${test.port:8080}"/>
     <property name="contextConfigLocations" value="classpath:spring-test/master.xml" />
-    <property name="packagesToScan" value="org.fcrepo.api, org.fcrepo.responses"/>
+    <property name="packagesToScan" value="org.fcrepo.api, org.fcrepo.responses, org.fcrepo.exceptionhandlers"/>
   </bean>
 </beans>
diff --git a/...crepo/responses/GraphStreamingOutput.java → .../responses/GraphStoreStreamingOutput.java b/...crepo/responses/GraphStreamingOutput.java → .../responses/GraphStoreStreamingOutput.java
@@ -14,16 +14,16 @@
 
 import com.hp.hpl.jena.update.GraphStore;
 
-public class GraphStreamingOutput implements StreamingOutput {
+public class GraphStoreStreamingOutput implements StreamingOutput {
 
     private final static Logger LOGGER = LoggerFactory
-            .getLogger(GraphStreamingOutput.class);
+            .getLogger(GraphStoreStreamingOutput.class);
 
     private final GraphStore m_graphStore;
 
     private final String m_format;
 
-    public GraphStreamingOutput(final GraphStore graphStore,
+    public GraphStoreStreamingOutput(final GraphStore graphStore,
             final MediaType mediaType) {
         m_graphStore = graphStore;
         m_format =

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/responses/RdfProvider.java b/fcrepo-http-commons/src/main/java/org/fcrepo/responses/RdfProvider.java
@@ -27,18 +27,18 @@
 import org.springframework.stereotype.Component;
 
 import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.update.GraphStore;
+import com.hp.hpl.jena.sparql.modify.GraphStoreBasic;
 
 @Provider
 @Component
-public class RdfProvider implements MessageBodyWriter<GraphStore> {
+public class RdfProvider implements MessageBodyWriter<Dataset> {
 
     private static final Set<String> rdfMimeTypes = copyOf(new String[] {
             TEXT_HTML, N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON,
             NTRIPLES});
 
     @Override
-    public void writeTo(final GraphStore t, final Class<?> type,
+    public void writeTo(final Dataset rdf, final Class<?> type,
             final Type genericType, final Annotation[] annotations,
             final MediaType mediaType,
             final MultivaluedMap<String, Object> httpHeaders,
@@ -48,7 +48,8 @@ public void writeTo(final GraphStore t, final Class<?> type,
         // add a Content-type header
         httpHeaders.put("Content-type", of((Object) mediaType.toString()));
 
-        new GraphStreamingOutput(t, mediaType).write(entityStream);
+        new GraphStoreStreamingOutput(new GraphStoreBasic(rdf), mediaType)
+                .write(entityStream);
 
     }
 
@@ -57,12 +58,11 @@ public boolean isWriteable(final Class<?> type, final Type genericType,
             final Annotation[] annotations, final MediaType mediaType) {
 
         return rdfMimeTypes.contains(mediaType.toString()) &&
-                (type.equals(Dataset.class) || genericType.getClass().equals(
-                        Dataset.class));
+                Dataset.class.isAssignableFrom(type);
     }
 
     @Override
-    public long getSize(final GraphStore t, final Class<?> type,
+    public long getSize(final Dataset rdf, final Class<?> type,
             final Type genericType, final Annotation[] annotations,
             final MediaType mediaType) {
         // we don't know in advance how large the result might be

diff --git a/fcrepo-http-commons/src/test/java/org/fcrepo/responses/GraphStreamingOutputTest.java b/fcrepo-http-commons/src/test/java/org/fcrepo/responses/GraphStreamingOutputTest.java
@@ -11,7 +11,7 @@
 import javax.jcr.RepositoryException;
 import javax.ws.rs.WebApplicationException;
 
-import org.fcrepo.responses.GraphStreamingOutput;
+import org.fcrepo.responses.GraphStoreStreamingOutput;
 import org.junit.Test;
 import org.slf4j.Logger;
 
@@ -38,8 +38,8 @@ public void testStuff() throws WebApplicationException, IOException,
         g.add(new Triple(createURI("test:subject"),
                 createURI("test:predicate"), createURI("test:object")));
         graphStore.setDefaultGraph(g);
-        final GraphStreamingOutput test =
-                new GraphStreamingOutput(graphStore, NTRIPLES_TYPE);
+        final GraphStoreStreamingOutput test =
+                new GraphStoreStreamingOutput(graphStore, NTRIPLES_TYPE);
         try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
             test.write(out);
             final String serialized = out.toString();