use the new, on-demand repository calculation.

fcrepo · Mar 22, 2013 · dc6fe90 · dc6fe90
1 parent 559e8ff
commit dc6fe90
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraRepositoryIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraRepositoryIT.java
@@ -70,6 +70,7 @@ public void testDescribeSize() throws Exception {
         }
 
         assertEquals(201, getStatus(postObjMethod("fdhgsldfhg")));
+        assertEquals(201, getStatus(postDSMethod("fdhgsldfhg", "asdf", "1234")));
 
         HttpGet newDescribeMethod = new HttpGet(serverAddress + "describe");
         newDescribeMethod.addHeader("Accept", TEXT_XML);

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/AbstractResource.java b/fcrepo-http-commons/src/main/java/org/fcrepo/AbstractResource.java
@@ -20,6 +20,7 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.fcrepo.identifiers.PidMinter;
+import org.fcrepo.services.ObjectService;
 import org.modeshape.jcr.api.JcrTools;
 import org.modeshape.jcr.api.Repository;
 import org.slf4j.Logger;
@@ -49,6 +50,14 @@ public abstract class AbstractResource {
     @Inject
     protected Repository repo;
 
+
+    /**
+     * The fcrepo object service
+     */
+    @Inject
+    protected ObjectService objectService;
+
+
     /**
      * A resource that can mint new Fedora PIDs.
      */
@@ -144,7 +153,7 @@ protected void updateRepositorySize(Long change, Session session)
 
     protected Long getRepositorySize(Session session) {
         try {
-            return session.getNode("/objects").getProperty("fedora:size").getLong();
+            return objectService.getAllObjectsDatastreamSize();
         } catch(RepositoryException e) {
             logger.warn(e.toString());
             return -1L;

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/ObjectService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/ObjectService.java
@@ -123,9 +123,9 @@ public Set<String> getObjectNames() throws RepositoryException {
      * @return a double of the size of the fedora:datastream binary content
      * @throws RepositoryException
      */
-    public double getAllObjectsDatastreamSize() throws RepositoryException {
+    public long getAllObjectsDatastreamSize() throws RepositoryException {
 
-        double sum = 0;
+        long sum = 0;
         javax.jcr.query.QueryManager queryManager = readOnlySession.getWorkspace().getQueryManager();
 
         String querystring = "\n" +
@@ -142,7 +142,7 @@ public double getAllObjectsDatastreamSize() throws RepositoryException {
             final Row row = rows.nextRow();
             final Value value = row.getValue("fedora:size");
 
-            sum = sum + value.getDouble();
+            sum = sum + value.getLong();
         }
 
         return sum;

diff --git a/fcrepo-legacy-api/src/test/java/org/fcrepo/integration/api/legacy/FedoraRepositoryIT.java b/fcrepo-legacy-api/src/test/java/org/fcrepo/integration/api/legacy/FedoraRepositoryIT.java
@@ -92,6 +92,8 @@ public void testDescribeSize() throws Exception {
         }
 
         assertEquals(201, getStatus(postObjMethod("fdhgsldfhg")));
+        assertEquals(201, getStatus(postDSMethod("fdhgsldfhg", "asdf", "1234")));
+
 
         HttpGet newDescribeMethod = new HttpGet(serverAddress + "describe");
         newDescribeMethod.addHeader("Accept", TEXT_XML);