Centralize data normalization logic, in prep for adding more.

Author: sowerstl

src/main/java/gov/osti/services/Metadata.java

@@ -1356,7 +1356,7 @@ private Response doSave(String json, InputStream file, FormDataContentDispositio
 
             em.getTransaction().begin();
 
-            removeRiDups(md);
+            performDataNormalization(md);
 
             md.setWorkflowStatus(Status.Saved); // default to this
             md.setOwner(user.getEmail()); // this User should OWN it
@@ -1462,7 +1462,7 @@ private Response doSubmit(String json, InputStream file, FormDataContentDisposit
 
             em.getTransaction().begin();
 
-            removeRiDups(md);
+            performDataNormalization(md);
 
             // set the ownership and workflow status
             md.setOwner(user.getEmail());
@@ -1650,7 +1650,7 @@ private Response doAnnounce(String json, InputStream file, FormDataContentDispos
 
             em.getTransaction().begin();
 
-            removeRiDups(md);
+            performDataNormalization(md);
 
             // set the OWNER
             md.setOwner(user.getEmail());
@@ -2160,6 +2160,15 @@ private void removeRiDups(DOECodeMetadata md) {
         }
     }
 
+    /**
+     * Normalize certain aspects of the data prior to storage.
+     *
+     * @param md the Metadata to normalize
+     */
+    private void performDataNormalization(DOECodeMetadata md) {
+        removeRiDups(md);
+    }
+
     /**
      * Store a File to a specific directory location. All files associated with
      * a CODEID are stored in the same folder.