Changed isDataEmpty() to hasContent().

NationalSecurityAgency · Mar 8, 2024 · 973e4ae · 973e4ae
1 parent d9b6590
commit 973e4ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/emissary/core/BaseDataObject.java b/src/main/java/emissary/core/BaseDataObject.java
@@ -468,8 +468,8 @@ public void setData(@Nullable final byte[] newData, final int offset, final int
      * @return if data is undefined or zero length.
      */
     @Override
-    public boolean isDataEmpty() throws IOException {
-        return getDataState() == DataState.NO_DATA || getChannelSize() == 0;
+    public boolean hasContent() throws IOException {
+        return getChannelSize() > 0;
     }
 
     /**

diff --git a/src/main/java/emissary/core/IBaseDataObject.java b/src/main/java/emissary/core/IBaseDataObject.java
@@ -65,7 +65,7 @@ enum MergePolicy {
      * 
      * @return if data is undefined or zero length.
      */
-    boolean isDataEmpty() throws IOException;
+    boolean hasContent() throws IOException;
 
     /**
      * Set the byte channel factory using whichever implementation is providing access to the data.

diff --git a/src/test/java/emissary/core/BaseDataObjectTest.java b/src/test/java/emissary/core/BaseDataObjectTest.java
@@ -200,9 +200,9 @@ void testIsDataEmpty() throws IOException {
         final IBaseDataObject zeroLengthDataIbdo = new BaseDataObject(new byte[0], "zeroLengthDataIbdo");
         final IBaseDataObject nonZeroLengthDataIbdo = new BaseDataObject(new byte[1], "nonZeroLengthDataIbdo");
 
-        assertTrue(nullDataIbdo.isDataEmpty());
-        assertTrue(zeroLengthDataIbdo.isDataEmpty());
-        assertFalse(nonZeroLengthDataIbdo.isDataEmpty());
+        assertFalse(nullDataIbdo.hasContent());
+        assertFalse(zeroLengthDataIbdo.hasContent());
+        assertTrue(nonZeroLengthDataIbdo.hasContent());
     }
 
     @Test