Remove equals/hashCode for OBJECT

Author: Michael-A-McMahon

src/main/java/oracle/r2dbc/impl/OracleReadableImpl.java

@@ -1058,13 +1058,6 @@ private final class OracleR2dbcObjectImpl
 
     private final OracleR2dbcObjectMetadata metadata;
 
-    /**
-     * JDBC readable that backs this object. It is retained with this field to
-     * implement equals and hashcode without having to convert between the
-     * default JDBC object mappings and those of R2DBC.
-     */
-    private final StructJdbcReadable structJdbcReadable;
-
     /**
      * <p>
      * Constructs a new set of out parameters that supplies values of a
@@ -1086,33 +1079,13 @@ private OracleR2dbcObjectImpl(
       super(
         jdbcConnection, dependentCounter, structJdbcReadable, metadata, adapter);
       this.metadata = metadata;
-      this.structJdbcReadable = structJdbcReadable;
     }
 
     @Override
     public OracleR2dbcObjectMetadata getMetadata() {
       return metadata;
     }
 
-    @Override
-    public boolean equals(Object other) {
-      if (!(other instanceof OracleR2dbcObjectImpl))
-        return super.equals(other);
-
-      OracleR2dbcObjectImpl otherObject = (OracleR2dbcObjectImpl) other;
-      if (! readablesMetadata.equals(otherObject.metadata))
-        return false;
-
-      return Arrays.deepEquals(
-        structJdbcReadable.attributes,
-        otherObject.structJdbcReadable.attributes);
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(readablesMetadata, structJdbcReadable);
-    }
-
     @Override
     public String toString() {
       return format(
@@ -1122,6 +1095,7 @@ public String toString() {
     }
   }
 
+  /** A {@code JdbcReadable} backed by a java.sql.Struct */
   private final class StructJdbcReadable implements JdbcReadable {
 
     /** Attributes of the Struct, mapped to their default Java type for JDBC */

src/test/java/oracle/r2dbc/impl/TypeMappingTest.java

@@ -1919,16 +1919,39 @@ else if (expected instanceof OracleR2dbcObject)
         actual = object.get(i, expectedClass);
       }
 
-
       String message = "Mismatch at attribute index " + i;
 
-      if (expected instanceof Object[] && actual instanceof Object[])
+      if (expected instanceof OracleR2dbcObject
+        && actual instanceof OracleR2dbcObject) {
+        // Need to compare default mappings as OracleR2dbcObject does not
+        // implement equals.
+        assertArrayEquals(
+          toArray((OracleR2dbcObject) expected),
+          toArray((OracleR2dbcObject) actual),
+          message);
+      }
+      else if (expected instanceof Object[] && actual instanceof Object[])
         assertArrayEquals((Object[]) expected, (Object[]) actual, message);
       else
         assertEquals(expected, actual, message);
     }
   }
 
+  /** Converts an OBJECT to an Object[] of each attribute's default Java type */
+  private static Object[] toArray(OracleR2dbcObject object) {
+    Object[] array = new Object[
+      object.getMetadata().getAttributeMetadatas().size()];
+
+    for (int i = 0; i < array.length; i++) {
+      array[i] = object.get(i);
+
+      if (array[i] instanceof OracleR2dbcObject)
+        array[i] = toArray((OracleR2dbcObject) array[i]);
+    }
+
+    return array;
+  }
+
   // TODO: More tests for JDBC 4.3 mappings like BigInteger to BIGINT,
   //  java.sql.Date to DATE, java.sql.Blob to BLOB? Oracle R2DBC exposes all
   //  type mappings supported by Oracle JDBC.