Merge pull request #303 from RachelTucker/bulk_object_equals

BulkObject equals now handles null InCache and Name variables

Author: Denver

ds3-sdk/src/main/java/com/spectralogic/ds3client/models/BulkObject.java

@@ -143,17 +143,23 @@ public boolean equals(final Object obj) {
 
         final BulkObject bulkObject = (BulkObject) obj;
 
-        return (((this.getId() == null) && (bulkObject.getId() == null))
-                || ((this.getId() != null) && (bulkObject.getId() != null) && this.getId().equals(bulkObject.getId())))
-                && this.getInCache().equals(bulkObject.getInCache())
+        return nullableEquals(this.getId(), bulkObject.getId())
+                && nullableEquals(this.getInCache(), bulkObject.getInCache())
                 && this.getLatest() == bulkObject.getLatest()
                 && this.getLength() == bulkObject.getLength()
-                && this.getName().equals(bulkObject.getName())
+                && nullableEquals(this.getName(), bulkObject.getName())
                 && this.getOffset() == bulkObject.getOffset()
                 && this.getPhysicalPlacement() == bulkObject.getPhysicalPlacement()
                 && this.getVersion() == bulkObject.getVersion();
     }
 
+    /**
+     * Tests if two objects are equal, and handles the case if either or both objects are null
+     */
+    protected static boolean nullableEquals(final Object obj1, final Object obj2) {
+        return obj1 == null && obj2 == null || obj1 != null && obj2 != null && obj1.equals(obj2);
+    }
+
     @Override
     public String toString() {
         return String.format("name = %s, offset = %d, length %d", name, offset, length);

ds3-sdk/src/test/java/com/spectralogic/ds3client/models/ModelFunctionality_Test.java

@@ -0,0 +1,40 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2016 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
+package com.spectralogic.ds3client.models;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class ModelFunctionality_Test {
+
+    @Test
+    public void bulkObjectEqualsEmptyObjects_Test() {
+        final BulkObject obj1 = new BulkObject();
+        final BulkObject obj2 = new BulkObject();
+
+        assertThat(obj1.equals(obj2), is(true));
+    }
+
+    @Test
+    public void bulkObjectNullableEquals_Test() {
+        assertThat(BulkObject.nullableEquals(null, null), is(true));
+        assertThat(BulkObject.nullableEquals("1", null), is(false));
+        assertThat(BulkObject.nullableEquals("1", "1"), is(true));
+        assertThat(BulkObject.nullableEquals("1", 1), is(false));
+    }
+}

ds3-sdk/src/test/java/com/spectralogic/ds3client/models/ModelParsing_Test.java

@@ -1,3 +1,18 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2016 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
 package com.spectralogic.ds3client.models;
 
 import com.spectralogic.ds3client.serializer.XmlOutput;