Rename method 'getEMLMetadataDocFromHashStore' to 'getObjectFromHashStore'

Author: doulikecookiedough

src/main/java/edu/ucsb/nceas/mdqengine/scheduler/RequestReportJob.java

@@ -1,6 +1,5 @@
 package edu.ucsb.nceas.mdqengine.scheduler;
 
-import com.hp.hpl.jena.tdb.store.Hash;
 import edu.ucsb.nceas.mdqengine.MDQconfig;
 import edu.ucsb.nceas.mdqengine.DataONE;
 import edu.ucsb.nceas.mdqengine.exception.MetadigStoreException;
@@ -657,7 +656,7 @@ public void submitReportRequest(MultipartCNode cnNode, MultipartMNode mnNode, Bo
         // Retrieve the EML metadata document for the given pid
         if (hashStore != null) {
             try {
-                objectIS = getEMLMetadataDocFromHashStore(pid, hashStore);
+                objectIS = getObjectFromHashStore(pid, hashStore);
             } catch (Exception e) {
                 // Attempt to retrieve object stream from the API as a backup
                 objectIS = getEMLMetadataDocFromMnOrCn(pid, cnNode, mnNode, isCN, session, objectIS);
@@ -696,13 +695,13 @@ public void submitReportRequest(MultipartCNode cnNode, MultipartMNode mnNode, Bo
     }
 
     /**
-     * Returns an input stream to an eml metadata document for a given pid through a hashstore
+     * Returns an input stream to a data object for a given pid through a hashstore
      *
      * @param pid       Persistent identifier
      * @param hashStore HashStore to check
      * @return Input stream to eml metadata doc
      */
-    public InputStream getEMLMetadataDocFromHashStore(
+    public InputStream getObjectFromHashStore(
         Identifier pid, HashStore hashStore) {
         InputStream objectIS = null;
         try {

src/test/java/edu/ucsb/nceas/mdqengine/scheduler/RequestReportJobTest.java

@@ -209,22 +209,22 @@ public void testGetSystemMetadataFromHashStore_nullHashStore() throws Exception
      * Confirm that an input stream to a data object is returned. No exception should be thrown.
      */
     @Test
-    public void testGetEMLMetadataDocFromHashStore() {
+    public void testGetObjectFromHashStore() {
         RequestReportJob job = new RequestReportJob();
         Identifier pid = new Identifier();
         pid.setValue(testPid);
 
         InputStream objectIS =
-            job.getEMLMetadataDocFromHashStore(pid, hashStore);
+            job.getObjectFromHashStore(pid, hashStore);
         assertInstanceOf(InputStream.class, objectIS, "This should be an InputStream");
     }
 
     /**
-     * Confirm that when a NotAuthorized is thrown after calling the MN API to retrieve an eml
-     * metadata document, this test method does not bubble up the exception and simply returns
+     * Confirm that when a NotAuthorized is thrown after calling the MN API to retrieve a data
+     * object, this test method does not bubble up the exception and simply returns
      */
     @Test
-    public void testGetEMLMetadataDocFromHashStore_NotAuthorized() throws Exception {
+    public void testGetObjectFromHashStore_NotAuthorized() throws Exception {
         RequestReportJob job = new RequestReportJob();
         MultipartMNode mnNode = mock(MultipartMNode.class);
         Session session = mock(Session.class);
@@ -234,7 +234,7 @@ public void testGetEMLMetadataDocFromHashStore_NotAuthorized() throws Exception
         when(mnNode.get(session, pid)).thenThrow(
             new NotAuthorized("8000", "User is not authorized"));
 
-        job.getEMLMetadataDocFromHashStore(pid, hashStore);
+        job.getObjectFromHashStore(pid, hashStore);
     }
 
     /**