fixed bug due to the dereference() method getting removed from the AbstractCurationTask class

Author: nwoodward

src/main/java/org/dspace/ctask/replicate/BagItRestoreFromAIP.java

@@ -179,7 +179,12 @@ public int perform(Context ctx, String id) throws IOException {
     private void recover(Context ctx, ReplicaManager repMan, String id) throws IOException {
         final String objId = repMan.storageId(ctx, id, archFmt);
         final File archive = repMan.fetchObject(ctx, storeGroupName, objId);
-        final DSpaceObject dso = dereference(ctx, id);
+        DSpaceObject dso;
+        try {
+            dso = dspaceObjectUtils.findDSpaceObject(ctx,id);
+        }  catch (SQLException sqlE) {
+            throw new IOException(sqlE.getMessage(), sqlE);
+        }
         if (archive != null && dso == null) {
             final BagItAipReader reader = new BagItAipReader(archive.toPath());
             final Properties props = reader.readProperties();
@@ -197,7 +202,7 @@ private void recover(Context ctx, ReplicaManager repMan, String id) throws IOExc
             // discard bag when done
             reader.clean();
         } else if (dso != null) {
-            log.warn("Unable to restore object for " + id + ". Object already exists!");
+            log.warn("Unable to restore object for {}. Object already exists!", id);
         }
     }
 
@@ -232,10 +237,8 @@ private void recoverItem(Context ctx, File archive, String objId, Properties pro
                 itemService.withdraw(ctx, item);
             }
             embargoService.setEmbargo(ctx, item);
-        } catch (AuthorizeException authE) {
+        } catch (AuthorizeException | SQLException authE) {
             throw new IOException(authE);
-        } catch (SQLException sqlE) {
-            throw new IOException(sqlE);
         }
     }
 
@@ -259,10 +262,8 @@ private void recoverCollection(Context ctx, File archive, String collId, String
             // update with AIP data
             Packer packer = PackerFactory.instance(ctx, coll);
             packer.unpack(archive);
-        } catch (AuthorizeException authE) {
+        } catch (AuthorizeException | SQLException authE) {
             throw new IOException(authE);
-        } catch (SQLException sqlE) {
-            throw new IOException(sqlE);
         }
     }
 
@@ -287,10 +288,8 @@ private void recoverCommunity(Context ctx, File archive, String commId, String p
             // update with AIP data
             Packer packer = PackerFactory.instance(ctx, comm);
             packer.unpack(archive);
-        } catch (AuthorizeException authE) {
+        } catch (AuthorizeException | SQLException authE) {
             throw new IOException(authE);
-        } catch (SQLException sqlE) {
-            throw new IOException(sqlE);
         }
     }
 

src/main/java/org/dspace/ctask/replicate/checkm/RemoveManifest.java

@@ -138,10 +138,16 @@ private void remove(Context context, ReplicaManager repMan, DSpaceObject dso) th
      */
     @Override
     public int perform(Context ctx, String id) throws IOException {
-        DSpaceObject dso = dereference(ctx, id);
-        if (dso != null) {
-            return perform(dso);
+        DSpaceObject dso;
+        try {
+            dso = dspaceObjectUtils.findDSpaceObject(ctx,id);
+            if (dso != null) {
+                return perform(dso);
+            }
+        }  catch (SQLException sqlE) {
+            throw new IOException(sqlE.getMessage(), sqlE);
         }
+
         ReplicaManager repMan = ReplicaManager.instance();
         deleteManifest(ctx, repMan, repMan.storageId(ctx, id, TransmitManifest.MANIFEST_EXTENSION));
         setResult("Manifest for '" + id + "' has been removed");