Changes from PR feedback.

NationalSecurityAgency · Dec 5, 2024 · 784dff4 · 784dff4
1 parent 95149a6
commit 784dff4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/emissary/core/BaseDataObject.java b/src/main/java/emissary/core/BaseDataObject.java
@@ -56,11 +56,13 @@ public class BaseDataObject implements Serializable, Cloneable, Remote, IBaseDat
      * Original name of the input data. Can only be set in the constructor of the DataObject. returned via the
      * {@link #getFilename()} method. Also used in constructing the {@link #shortName()} of the document.
      */
+    @Nullable
     protected String theFileName;
 
     /**
      * Terminal portion of theFileName
      */
+    @Nullable
     protected String shortName;
 
     /**
@@ -77,6 +79,7 @@ public class BaseDataObject implements Serializable, Cloneable, Remote, IBaseDat
     /**
      * History of processing errors. Lines of text are accumulated from String and returned in-toto as a String.
      */
+    @Nullable
     protected StringBuilder procError;
 
     /**
@@ -727,16 +730,17 @@ public String printMeta() {
         return PayloadUtil.printFormattedMetadata(this);
     }
 
+    @Override
+    public void clearProcessingError() {
+        this.procError = null;
+    }
+
     @Override
     public void addProcessingError(final String err) {
-        if (err == null) {
-            this.procError = null;
-        } else {
-            if (this.procError == null) {
-                this.procError = new StringBuilder();
-            }
-            this.procError.append(err).append("\n");
+        if (this.procError == null) {
+            this.procError = new StringBuilder();
         }
+        this.procError.append(err).append("\n");
     }
 
     @Override

diff --git a/src/main/java/emissary/core/IBaseDataObject.java b/src/main/java/emissary/core/IBaseDataObject.java
@@ -686,6 +686,11 @@ enum MergePolicy {
     String toString();
 
 
+    /**
+     * Clears the processing error
+     */
+    void clearProcessingError();
+
     /**
      * Record a processing error
      * 

diff --git a/src/main/java/emissary/core/IBaseDataObjectHelper.java b/src/main/java/emissary/core/IBaseDataObjectHelper.java
@@ -153,7 +153,7 @@ public static void copy(final BaseDataObject fromBdo, final BaseDataObject toBdo
             toBdo.setFilename(filename);
         }
 
-        toBdo.addProcessingError(null);
+        toBdo.clearProcessingError();
         final String processingError = fromBdo.getProcessingError();
         if (processingError != null) {
             toBdo.addProcessingError(processingError.substring(0, processingError.length() - 1));