DSpace refactored service api

dspace-api/src/main/java/org/dspace/checker/CheckerConsumer.java

@@ -8,6 +8,11 @@
 package org.dspace.checker;
 
 import org.apache.log4j.Logger;
+import org.dspace.checker.factory.CheckerServiceFactory;
+import org.dspace.checker.service.ChecksumHistoryService;
+import org.dspace.content.Bitstream;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.BitstreamService;
 import org.dspace.core.Context;
 import org.dspace.event.Consumer;
 import org.dspace.event.Event;
@@ -22,12 +27,14 @@ public class CheckerConsumer implements Consumer
     /** log4j logger */
     private static Logger log = Logger.getLogger(CheckerConsumer.class);
     
-    private BitstreamInfoDAO bitstreamInfoDAO = new BitstreamInfoDAO();
+    protected ChecksumHistoryService checksumHistoryService = CheckerServiceFactory.getInstance().getChecksumHistoryService();
+    protected BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
     
     /**
      * Initialize - allocate any resources required to operate.
      * Called at the start of ANY sequence of event consume() calls.
      */
+    @Override
     public void initialize() throws Exception
     {
     	// no-op
@@ -40,13 +47,15 @@ public class CheckerConsumer implements Consumer
      *
      * @param event the content event
      */
+    @Override
     public void consume(Context ctx, Event event) throws Exception
     {
         
     	if (event.getEventType() == Event.DELETE)
     	{
+            Bitstream bitstream = bitstreamService.find(ctx, event.getSubjectID());
             log.debug("Attempting to remove Checker Info");
-    	    bitstreamInfoDAO.deleteBitstreamInfoWithHistory(event.getSubjectID());
+            checksumHistoryService.deleteByBitstream(ctx, bitstream);
             log.debug("Completed removing Checker Info");
     	}
     }
@@ -55,6 +64,7 @@ public class CheckerConsumer implements Consumer
      * Signal that there are no more events queued in this
      * event stream.
      */
+    @Override
     public void end(Context ctx) throws Exception
     {
     	// no-op
@@ -64,6 +74,7 @@ public class CheckerConsumer implements Consumer
      * Finish - free any allocated resources.
      * Called when consumer is being released
      */
+    @Override
     public void finish(Context ctx) throws Exception
     {
     	// no-op