Implement hashCode() and equals() on counters.

Author: Gary Gregory

src/main/java/org/apache/commons/io/file/Counters.java

@@ -116,11 +116,11 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if (!(obj instanceof BigIntegerCounter)) {
+            if (!(obj instanceof Counter)) {
                 return false;
             }
-            BigIntegerCounter other = (BigIntegerCounter) obj;
-            return Objects.equals(value, other.value);
+            Counter other = (Counter) obj;
+            return Objects.equals(value, other.getBigInteger());
         }
 
         @Override
@@ -226,11 +226,11 @@ public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            if (!(obj instanceof LongCounter)) {
+            if (!(obj instanceof Counter)) {
                 return false;
             }
-            LongCounter other = (LongCounter) obj;
-            return value == other.value;
+            Counter other = (Counter) obj;
+            return value == other.get();
         }
 
         @Override

src/test/java/org/apache/commons/io/file/CountersEqualsAndHashCodeTest.java

@@ -87,6 +87,12 @@ public void testLongCounterEquals() {
         testEquals(Counters.longCounter(), Counters.longCounter());
     }
 
+    @Test
+    public void testLongCounterMixEquals() {
+        testEquals(Counters.longCounter(), Counters.bigIntegerCounter());
+        testEquals(Counters.bigIntegerCounter(), Counters.longCounter());
+    }
+
     @Test
     public void testLongCounterHashCodes() {
         testHashCodes(Counters.longCounter(), Counters.longCounter());
@@ -111,4 +117,9 @@ public void testLongPathCountersEqualsFileCounters() {
     public void testLongPathCountersHashCodeFileCounters() {
         testHashCodeFileCounters(Counters.longPathCounters(), Counters.longPathCounters());
     }
+
+    @Test
+    public void testMix() {
+        testHashCodeFileCounters(Counters.longPathCounters(), Counters.bigIntegerPathCounters());
+    }
 }