use DistributedExecutor libs from ISPN to get FixityResults

fcrepo · Jun 7, 2013 · 5ce14e8 · 5ce14e8
1 parent b54a904
commit 5ce14e8
Show file tree

Hide file tree

Showing 19 changed files with 914 additions and 405 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java
@@ -199,23 +199,16 @@ public Collection<FixityResult> runFixityAndFixProblems(final Datastream datastr
         Set<FixityResult> goodEntries;
         final URI digestUri = datastream.getContentDigest();
         final long size = datastream.getContentSize();
-        MessageDigest digest;
 
         fixityCheckCounter.inc();
 
-        try {
-            digest = getInstance(ContentDigest.getAlgorithm(digestUri));
-        } catch (final NoSuchAlgorithmException e) {
-            throw new RepositoryException(e.getMessage(), e);
-        }
-
         final Timer.Context context = timer.time();
 
         try {
             fixityResults =
                 copyOf(getFixity(datastream.getNode().
                                  getNode(JcrConstants.JCR_CONTENT),
-                                 digest, digestUri, size));
+                                 digestUri, size));
 
             goodEntries = ImmutableSet.copyOf(Collections2.filter(fixityResults, new Predicate<FixityResult>() {
                 @Override
@@ -246,7 +239,7 @@ public boolean apply(org.fcrepo.utils.FixityResult input) {
                 result.getEntry()
                     .storeValue(anyGoodCacheEntry.getInputStream());
                 final FixityResult newResult =
-                    result.getEntry().checkFixity(digestUri, size, digest);
+                    result.getEntry().checkFixity(digestUri, size);
                 if (newResult.isSuccess()) {
                     result.setRepaired();
                     fixityRepairedCounter.inc();
@@ -267,20 +260,18 @@ public boolean apply(org.fcrepo.utils.FixityResult input) {
      *
      * @param resource
      * @param digest
-     * @param dsChecksum
+     * @param dsChecksum -the checksum and algorithm represented as a URI
      * @param dsSize
      * @return
      * @throws RepositoryException
      */
     public Collection<FixityResult> getFixity(final Node resource,
-                                              final MessageDigest digest,
                                               final URI dsChecksum,
                                               final long dsSize)
         throws RepositoryException {
         logger.debug("Checking resource: " + resource.getPath());
         Function<LowLevelCacheEntry, FixityResult> checkCacheFunc =
-            ServiceHelpers.getCheckCacheFixityFunction(digest,
-                                                       dsChecksum, dsSize);
+            ServiceHelpers.getCheckCacheFixityFunction(dsChecksum, dsSize);
         return llStoreService.
             transformLowLevelCacheEntries(resource, checkCacheFunc);
     }