Use SpecimenType as key for caching map

Refs: #89

Author: akutschera

src/main/java/com/github/nylle/javafixture/Context.java

@@ -5,7 +5,7 @@
 
 public class Context {
     private final Configuration configuration;
-    private final Map<Integer, Object> cache;
+    private final Map<SpecimenType<?>, Object> cache;
 
     public Context(Configuration configuration) {
 
@@ -17,7 +17,7 @@ public Context(Configuration configuration) {
         this.cache = new ConcurrentHashMap<>();
     }
 
-    public Context(Configuration configuration, Map<Integer, Object> predefinedInstances) {
+    public Context(Configuration configuration, Map<SpecimenType<?>, Object> predefinedInstances) {
 
         if (configuration == null) {
             throw new IllegalArgumentException("configuration: null");
@@ -32,25 +32,25 @@ public Configuration getConfiguration() {
     }
 
     public boolean isCached(SpecimenType<?> type) {
-        return cache.containsKey(type.hashCode());
+        return cache.containsKey(type);
     }
 
     public <T> T overwrite(SpecimenType<?> type, T instance) {
-        cache.put(type.hashCode(), instance);
-        return (T) cache.get(type.hashCode());
+        cache.put(type, instance);
+        return (T) cache.get(type);
     }
 
     public <T> T cached(SpecimenType<?> type, T instance) {
-        cache.putIfAbsent(type.hashCode(), instance);
-        return (T) cache.get(type.hashCode());
+        cache.putIfAbsent(type, instance);
+        return (T) cache.get(type);
     }
 
     public <T> T cached(SpecimenType<T> type) {
-        return (T) cache.get(type.hashCode());
+        return (T) cache.get(type);
     }
 
     public <T> T preDefined(SpecimenType<T> type, T instance) {
-        return cache.containsKey(type.hashCode()) ? (T) cache.get(type.hashCode()) : instance;
+        return cache.containsKey(type) ? (T) cache.get(type) : instance;
     }
 
 }

src/main/java/com/github/nylle/javafixture/SpecimenBuilder.java

@@ -15,7 +15,7 @@ public class SpecimenBuilder<T> implements ISpecimenBuilder<T> {
     private final List<Consumer<T>> functions = new LinkedList<>();
     private final List<String> ignoredFields = new LinkedList<>();
     private final Map<String, Object> customFields = new HashMap<>();
-    private final Map<Integer, Object> predefinedInstances = new ConcurrentHashMap<>();
+    private final Map<SpecimenType<?>, Object> predefinedInstances = new ConcurrentHashMap<>();
 
     private final SpecimenType<T> type;
     private final Configuration configuration;
@@ -98,7 +98,7 @@ public ISpecimenBuilder<T> with(final String fieldName, Object value) {
      */
     @Override
     public <U> ISpecimenBuilder<T> with(final Class<U> type, final U value) {
-        predefinedInstances.putIfAbsent(SpecimenType.fromClass(type).hashCode(), value);
+        predefinedInstances.putIfAbsent(SpecimenType.fromClass(type), value);
         return this;
     }
 
@@ -112,7 +112,7 @@ public <U> ISpecimenBuilder<T> with(final Class<U> type, final U value) {
      */
     @Override
     public <U> ISpecimenBuilder<T> with(final SpecimenType<U> type, final U value) {
-        predefinedInstances.putIfAbsent(type.hashCode(), value);
+        predefinedInstances.putIfAbsent(type, value);
         return this;
     }
 

src/main/java/com/github/nylle/javafixture/SpecimenType.java

@@ -10,7 +10,6 @@
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAdjuster;
 import java.time.temporal.TemporalAmount;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -220,19 +219,11 @@ public boolean equals(final Object o) {
             return true;
         }
 
-        if (o == null || getClass() != o.getClass()) {
-            return false;
+        if (o instanceof SpecimenType<?>) {
+            SpecimenType<?> that = (SpecimenType<?>) o;
+            return this.type.equals(that.type);
         }
-
-        final SpecimenType that = (SpecimenType) o;
-
-        if (isParameterized() != that.isParameterized()) {
-            return false;
-        }
-
-        return isParameterized() && that.isParameterized()
-                ? Objects.equals(type, that.type) && Arrays.equals(getGenericTypeArguments(), that.getGenericTypeArguments())
-                : Objects.equals(type, that.type);
+        return false;
     }
 
     @Override

src/test/java/com/github/nylle/javafixture/SpecimenTypeTest.java

@@ -11,6 +11,7 @@
 import com.github.nylle.javafixture.testobjects.TestObjectWithStaticMethods;
 import com.github.nylle.javafixture.testobjects.TestWildCardType;
 import com.github.nylle.javafixture.testobjects.withconstructor.TestObjectWithAllConstructors;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -489,4 +490,40 @@ void castToClass_CanHandleWildcardTypesWithoutBounds() {
 
         assertThat(SpecimenType.castToClass(wildcardType)).isEqualTo(Object.class);
     }
+
+    @Nested
+    class EqualsTests {
+
+        @Test
+        void objectIsEqualToItself() {
+            var sut = SpecimenType.fromClass(String.class);
+            assertThat(sut.equals(sut)).isTrue();
+        }
+
+        @Test
+        void objectIsNotEqualToNull() {
+            var sut = SpecimenType.fromClass(String.class);
+            assertThat(sut.equals(null)).isFalse();
+        }
+
+        @Test
+        void objectIsNotEqualToOtherClass() {
+            var sut = SpecimenType.fromClass(String.class);
+            assertThat(sut.equals(String.class)).isFalse();
+        }
+
+        @Test
+        void objectIsEqualToSpecimenTypeOfSameClass() {
+            var sut = SpecimenType.fromClass(String.class);
+            var other = SpecimenType.fromClass(String.class);
+            assertThat(sut.equals(other)).isTrue();
+        }
+
+        @Test
+        void objectIsNotEqualToSpecimenTypeOfOtherClass() {
+            var sut = new SpecimenType<List<TestObject>>() {};
+            var other = new SpecimenType<List<List<TestObject>>>() {};
+            assertThat(sut.equals(other)).isFalse();
+        }
+    }
 }

src/test/java/com/github/nylle/javafixture/specimen/EnumSpecimenTest.java

@@ -52,7 +52,7 @@ void createEnum() {
     void canBePredefined() {
         var expected = fixture().create(TestEnum.class);
 
-        var context = new Context(Configuration.configure(), Map.of(SpecimenType.fromClass(TestEnum.class).hashCode(), expected));
+        var context = new Context(Configuration.configure(), Map.of(SpecimenType.fromClass(TestEnum.class), expected));
 
         var sut = new EnumSpecimen<>(SpecimenType.fromClass(TestEnum.class), context);
 

src/test/java/com/github/nylle/javafixture/specimen/PrimitiveSpecimenTest.java

@@ -143,7 +143,7 @@ void createDouble(boolean positiveOnly, double min, double max) {
     void canBePredefined(Class type) {
         var expected = fixture().create(type);
 
-        var context = new Context(Configuration.configure(), Map.of(SpecimenType.fromClass(type).hashCode(), expected));
+        var context = new Context(Configuration.configure(), Map.of(SpecimenType.fromClass(type), expected));
 
         var sut = new PrimitiveSpecimen<>(SpecimenType.fromClass(type), context);
 

src/test/java/com/github/nylle/javafixture/specimen/TimeSpecimenTest.java

@@ -155,7 +155,7 @@ void createWithClock() {
     void canBePredefined(Class type) {
         var expected = fixture().create(type);
 
-        var context = new Context(Configuration.configure(), Map.of(SpecimenType.fromClass(type).hashCode(), expected));
+        var context = new Context(Configuration.configure(), Map.of(SpecimenType.fromClass(type), expected));
 
         var sut = new TimeSpecimen<>(SpecimenType.fromClass(type), context);