fixing a bug in Datastream not to assign mixins to existing nodes; po…

…rting ObjectService changes to remaining modules; IT passing
fcrepo · Mar 21, 2013 · 618c811 · 618c811
1 parent 5f6fadc
commit 618c811
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/fcrepo-generator-dc/src/main/java/org/fcrepo/generator/DublinCoreGenerator.java b/fcrepo-generator-dc/src/main/java/org/fcrepo/generator/DublinCoreGenerator.java
@@ -3,12 +3,12 @@
 
 import static javax.ws.rs.core.MediaType.TEXT_XML;
 import static javax.ws.rs.core.Response.ok;
-import static org.fcrepo.services.ObjectService.getObjectNode;
 
 import java.io.InputStream;
 import java.util.List;
 
 import javax.annotation.Resource;
+import javax.inject.Inject;
 import javax.jcr.Node;
 import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
@@ -20,19 +20,23 @@
 
 import org.fcrepo.AbstractResource;
 import org.fcrepo.generator.dublincore.DCGenerator;
+import org.fcrepo.services.ObjectService;
 
 @Path("/objects/{pid}/oai_dc")
 public class DublinCoreGenerator extends AbstractResource {
 
     @Resource
     List<DCGenerator> dcgenerators;
+
+    @Inject
+    ObjectService objectService;
 
     @GET
     @Produces(TEXT_XML)
     public Response getObjectAsDublinCore(@PathParam("pid")
     final String pid) throws RepositoryException {
 
-        final Node obj = getObjectNode(pid);
+        final Node obj = objectService.getObjectNode(pid);
 
         for (DCGenerator indexer : dcgenerators) {
             InputStream inputStream = indexer.getStream(obj);

diff --git a/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/RdfGenerator.java b/fcrepo-generator-rdf/src/main/java/org/fcrepo/generator/RdfGenerator.java
@@ -3,12 +3,12 @@
 
 import static javax.ws.rs.core.MediaType.TEXT_XML;
 import static javax.ws.rs.core.Response.ok;
-import static org.fcrepo.services.ObjectService.getObjectNode;
 
 import java.io.ByteArrayOutputStream;
 import java.util.List;
 
 import javax.annotation.Resource;
+import javax.inject.Inject;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.ws.rs.GET;
@@ -18,6 +18,7 @@
 import javax.ws.rs.core.Response;
 
 import org.fcrepo.generator.rdf.TripleGenerator;
+import org.fcrepo.services.ObjectService;
 
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -28,13 +29,16 @@ public class RdfGenerator {
 
     @Resource
     List<TripleGenerator> rdfgenerators;
+
+    @Inject
+    ObjectService objectService;
 
     @GET
     @Produces(TEXT_XML)
     public Response getObjectAsRdfXml(@PathParam("pid")
                                           final String pid) throws RepositoryException {
 
-        final Node obj = getObjectNode(pid);
+        final Node obj = objectService.getObjectNode(pid);
 
 
         final Model model = getObjectAsRdf(obj);

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/Datastream.java b/fcrepo-kernel/src/main/java/org/fcrepo/Datastream.java
@@ -95,15 +95,17 @@ public Datastream(final Session session, String pid, String dsId) throws Reposit
 
     public Datastream(final Session session, final String dsPath) throws RepositoryException {
     	this.node = jcrTools.findOrCreateNode(session, dsPath, NT_FILE);
-        this.node.addMixin(FEDORA_DATASTREAM);
-        this.node.addMixin(FEDORA_OWNED);
-        this.node.setProperty(FEDORA_OWNERID, session.getUserID());
+    	if (this.node.isNew()){
+    		this.node.addMixin(FEDORA_DATASTREAM);
+    		this.node.addMixin(FEDORA_OWNED);
+    		this.node.setProperty(FEDORA_OWNERID, session.getUserID());
 
-        this.node.setProperty("jcr:lastModified", Calendar.getInstance());
+    		this.node.setProperty("jcr:lastModified", Calendar.getInstance());
 
-        // TODO: I guess we should also have the PID + DSID..
-        this.node.setProperty(DC_IDENTIFER, new String[] {this.node.getIdentifier(),
-        		this.node.getParent().getName() + "/" + this.node.getName()});
+    		// TODO: I guess we should also have the PID + DSID..
+    		this.node.setProperty(DC_IDENTIFER, new String[] {this.node.getIdentifier(),
+    				this.node.getParent().getName() + "/" + this.node.getName()});
+    	}
     }
 
     /**

diff --git a/fcrepo-legacy-api/src/main/java/org/fcrepo/api/legacy/FedoraObjects.java b/fcrepo-legacy-api/src/main/java/org/fcrepo/api/legacy/FedoraObjects.java
@@ -8,9 +8,6 @@
 import static javax.ws.rs.core.Response.ok;
 import static org.fcrepo.api.legacy.FedoraDatastreams.getContentSize;
 import static org.fcrepo.jaxb.responses.access.ObjectProfile.ObjectStates.A;
-import static org.fcrepo.services.ObjectService.createObjectNode;
-import static org.fcrepo.services.ObjectService.getObjectNames;
-import static org.fcrepo.services.ObjectService.getObjectNode;
 import static org.fcrepo.services.PathService.getObjectJcrNodePath;
 import static org.fcrepo.utils.FedoraJcrTypes.DC_TITLE;
 import static org.fcrepo.utils.FedoraTypesUtils.map;
@@ -19,6 +16,7 @@
 
 import java.io.IOException;
 
+import javax.inject.Inject;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
@@ -37,6 +35,7 @@
 import org.fcrepo.AbstractResource;
 import org.fcrepo.FedoraObject;
 import org.fcrepo.jaxb.responses.access.ObjectProfile;
+import org.fcrepo.services.ObjectService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,6 +44,9 @@ public class FedoraObjects extends AbstractResource {
 
     private static final Logger logger = LoggerFactory
             .getLogger(FedoraObjects.class);
+
+    @Inject
+    ObjectService objectService;
 
     /**
      * 
@@ -56,7 +58,7 @@ public class FedoraObjects extends AbstractResource {
     @GET
     public Response getObjects() throws RepositoryException {
 
-        return ok(getObjectNames().toString()).build();
+        return ok(objectService.getObjectNames().toString()).build();
 
     }
 
@@ -114,7 +116,7 @@ public Response ingest(@PathParam("pid")
 
         final Session session = repo.login();
         try {
-            final Node obj = createObjectNode(session, pid);
+            final Node obj = objectService.createObjectNode(session, pid);
             session.save();
             /*
              * we save before updating the repo size because the act of
@@ -146,7 +148,7 @@ public Response ingest(@PathParam("pid")
     public ObjectProfile getObject(@PathParam("pid")
     final String pid) throws RepositoryException, IOException {
 
-        final Node obj = getObjectNode(pid);
+        final Node obj = objectService.getObjectNode(pid);
         final ObjectProfile objectProfile = new ObjectProfile();
 
         objectProfile.pid = pid;

diff --git a/fcrepo-rss/src/test/resources/spring-test/repo.xml b/fcrepo-rss/src/test/resources/spring-test/repo.xml
@@ -18,6 +18,6 @@
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-
+    <bean class="org.fcrepo.services.ObjectService" />
 
 </beans>
diff --git a/fcrepo-webhooks/src/test/resources/spring-test/repo.xml b/fcrepo-webhooks/src/test/resources/spring-test/repo.xml
@@ -18,6 +18,6 @@
 
     <bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
 
-
+    <bean class="org.fcrepo.services.ObjectService" />
 
 </beans>