don't wire in things that we can get out of the AbstractResource

fcrepo · May 23, 2013 · ae68bf4 · ae68bf4
1 parent 4db6e03
commit ae68bf4
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 101 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraContent.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraContent.java
@@ -33,10 +33,7 @@
 import org.fcrepo.AbstractResource;
 import org.fcrepo.Datastream;
 import org.fcrepo.exception.InvalidChecksumException;
-import org.fcrepo.services.DatastreamService;
-import org.fcrepo.services.LowLevelStorageService;
 import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -45,12 +42,6 @@ public class FedoraContent extends AbstractResource {
 
     private final Logger logger = getLogger(FedoraContent.class);
 
-    @Autowired
-    private DatastreamService datastreamService;
-
-    @Autowired
-    private LowLevelStorageService llStoreService;
-
     /**
      * Create an anonymous DS with a newly minted name
      * and content from request body
@@ -170,24 +161,5 @@ public Response getContent(
 			session.logout();
 		}
 	}
-
-    public DatastreamService getDatastreamService() {
-        return datastreamService;
-    }
-
-
-    public void setDatastreamService(DatastreamService datastreamService) {
-        this.datastreamService = datastreamService;
-    }
-
-
-    public LowLevelStorageService getLlStoreService() {
-        return llStoreService;
-    }
-
-
-    public void setLlStoreService(LowLevelStorageService llStoreService) {
-        this.llStoreService = llStoreService;
-    }
 
 }
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraDatastreams.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraDatastreams.java
@@ -12,7 +12,6 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -149,7 +148,6 @@ public Response deleteDatastreams(@PathParam("path")
      * @throws NoSuchAlgorithmException
      */
     @GET
-    @Path("/__content__")
     @Produces("multipart/mixed")
     @Timed
     public Response getDatastreamsContents(@PathParam("path")

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
@@ -26,8 +26,6 @@
 import org.fcrepo.AbstractResource;
 import org.fcrepo.Datastream;
 import org.fcrepo.api.rdf.HttpGraphSubjects;
-import org.fcrepo.services.DatastreamService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.codahale.metrics.annotation.Timed;
@@ -36,9 +34,6 @@
 @Path("/rest/{path: .*}/fcr:fixity")
 public class FedoraFixity extends AbstractResource {
 
-	@Autowired
-	private DatastreamService datastreamService;
-
 	@GET
 	@Timed
     @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON, NTRIPLES, TEXT_HTML})
@@ -59,12 +54,4 @@ public Dataset getDatastreamFixity(@PathParam("path") List<PathSegment> pathList
 		}
 	}
 
-	public DatastreamService getDatastreamService() {
-		return datastreamService;
-	}
-
-	public void setDatastreamService(final DatastreamService datastreamService) {
-		this.datastreamService = datastreamService;
-	}
-
 }
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
@@ -49,13 +49,9 @@
 import org.fcrepo.FedoraResource;
 import org.fcrepo.api.rdf.HttpGraphSubjects;
 import org.fcrepo.exception.InvalidChecksumException;
-import org.fcrepo.services.DatastreamService;
-import org.fcrepo.services.LowLevelStorageService;
-import org.fcrepo.services.ObjectService;
 import org.fcrepo.utils.FedoraJcrTypes;
 import org.modeshape.common.collection.Problems;
 import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.codahale.metrics.annotation.Timed;
@@ -68,9 +64,6 @@ public class FedoraNodes extends AbstractResource {
 
     private static final Logger logger = getLogger(FedoraNodes.class);
 
-    @Autowired
-    private LowLevelStorageService llStoreService;
-
     @GET
     @Produces({N3, N3_ALT1, N3_ALT2, TURTLE, RDF_XML, RDF_JSON,
             NTRIPLES, TEXT_HTML})
@@ -266,29 +259,4 @@ public Response deleteObject(@PathParam("path")
         }
     }
 
-    public ObjectService getObjectService() {
-        return objectService;
-    }
-
-    @Override
-    public void setObjectService(final ObjectService objectService) {
-        this.objectService = objectService;
-    }
-
-    public DatastreamService getDatastreamService() {
-        return datastreamService;
-    }
-
-    public void setDatastreamService(final DatastreamService datastreamService) {
-        this.datastreamService = datastreamService;
-    }
-
-    public LowLevelStorageService getLlStoreService() {
-        return llStoreService;
-    }
-
-    public void setLlStoreService(final LowLevelStorageService llStoreService) {
-        this.llStoreService = llStoreService;
-    }
-
 }
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraSitemap.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraSitemap.java
@@ -28,10 +28,8 @@
 import org.fcrepo.jaxb.responses.sitemap.SitemapEntry;
 import org.fcrepo.jaxb.responses.sitemap.SitemapIndex;
 import org.fcrepo.jaxb.responses.sitemap.SitemapUrlSet;
-import org.fcrepo.services.ObjectService;
 import org.modeshape.jcr.api.JcrConstants;
 import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.codahale.metrics.annotation.Timed;
@@ -44,9 +42,6 @@ public class FedoraSitemap extends AbstractResource {
 
     public static final long entriesPerPage = 50000;
 
-    @Autowired
-    private ObjectService objectService;
-
     @GET
 	@Timed
     @Produces(TEXT_XML)
@@ -134,9 +129,5 @@ private SitemapEntry getSitemapEntry(final Row r)
                 .build(r.getNode().getName()), lastKnownDate);
     }
 
-
-    public void setObjectService(ObjectService objectService) {
-        this.objectService = objectService;
-    }
 
 }
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraTransactions.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraTransactions.java
@@ -25,17 +25,12 @@
 
 import org.fcrepo.AbstractResource;
 import org.fcrepo.Transaction;
-import org.fcrepo.services.ObjectService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 @Path("/rest/fcr:tx")
 public class FedoraTransactions extends AbstractResource {
 
-    @Autowired
-    private ObjectService objectService;
-
     /*
      * TODO: since transactions have to be available on all nodes, they have to
      * be either persisted or written to a

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraContentTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraContentTest.java
@@ -43,10 +43,6 @@ public class FedoraContentTest {
 
     DatastreamService mockDatastreams;
 
-    LowLevelStorageService mockLow;
-
-    Repository mockRepo;
-
     Session mockSession;
 
     SecurityContext mockSecurityContext;
@@ -64,13 +60,11 @@ public void setUp() throws LoginException, RepositoryException {
         mockPrincipal = mock(Principal.class);
         //Function<HttpServletRequest, Session> mockFunction = mock(Function.class);
         mockDatastreams = mock(DatastreamService.class);
-        mockLow = mock(LowLevelStorageService.class);
 
         testObj = new FedoraContent();
         testObj.setDatastreamService(mockDatastreams);
         testObj.setSecurityContext(mockSecurityContext);
         testObj.setHttpServletRequest(mockServletRequest);
-        testObj.setLlStoreService(mockLow);
         //mockRepo = mock(Repository.class);
         final SessionFactory mockSessions = mock(SessionFactory.class);
         testObj.setSessionFactory(mockSessions);

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraNodesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraNodesTest.java
@@ -58,8 +58,6 @@ public class FedoraNodesTest {
 
     Session mockSession;
 
-    LowLevelStorageService mockLow;
-
     Request mockRequest;
     private UriInfo uriInfo;
 
@@ -69,13 +67,11 @@ public void setUp() throws LoginException, RepositoryException {
         mockObjects = mock(ObjectService.class);
         mockDatastreams = mock(DatastreamService.class);
         mockNodes = mock(NodeService.class);
-        mockLow = mock(LowLevelStorageService.class);
         testObj = new FedoraNodes();
         mockSession = TestHelpers.mockSession(testObj);
         testObj.setObjectService(mockObjects);
         testObj.setNodeService(mockNodes);
         testObj.setDatastreamService(mockDatastreams);
-        testObj.setLlStoreService(mockLow);
         mockRepo = mock(Repository.class);
         uriInfo = TestHelpers.getUriInfoImpl();
         testObj.setUriInfo(uriInfo);

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraDatastreamsIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraDatastreamsIT.java
@@ -123,7 +123,7 @@ public void testRetrieveMultipartDatastreams() throws Exception {
         // TODO: we should actually evaluate the multipart response for the things we're expecting
         final HttpGet getDSesMethod =
                 new HttpGet(serverAddress +
-                        "objects/FedoraDatastreamsTest9/fcr:datastreams/__content__");
+                        "objects/FedoraDatastreamsTest9/fcr:datastreams");
         final HttpResponse response = client.execute(getDSesMethod);
         assertEquals(200, response.getStatusLine().getStatusCode());
         final String content = EntityUtils.toString(response.getEntity());
@@ -156,7 +156,7 @@ public void testRetrieveFIlteredMultipartDatastreams() throws Exception {
         // TODO: we should actually evaluate the multipart response for the things we're expecting
         final HttpGet getDSesMethod =
                 new HttpGet(serverAddress +
-                        "objects/FedoraDatastreamsTest10/fcr:datastreams/__content__?dsid=ds1");
+                        "objects/FedoraDatastreamsTest10/fcr:datastreams?dsid=ds1");
         final HttpResponse response = client.execute(getDSesMethod);
         assertEquals(200, response.getStatusLine().getStatusCode());
         final String content = EntityUtils.toString(response.getEntity());

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/AbstractResource.java b/fcrepo-http-commons/src/main/java/org/fcrepo/AbstractResource.java
@@ -238,4 +238,8 @@ public void setNodeService(final NodeService nodeService) {
     public void setObjectService(final ObjectService objectService) {
         this.objectService = objectService;
     }
+
+    public void setDatastreamService(final DatastreamService datastreamService) {
+        this.datastreamService = datastreamService;
+    }
 }