Re-organizes vintage packages

jqno · Nov 27, 2024 · 9513ed2 · 9513ed2
1 parent 6c836e6
commit 9513ed2
Show file tree

Hide file tree

Showing 45 changed files with 92 additions and 98 deletions.
diff --git a/...st/java/nl/jqno/equalsverifier/internal/reflection/vintage/RecordFallbackFactoryTest.java b/...st/java/nl/jqno/equalsverifier/internal/reflection/vintage/RecordFallbackFactoryTest.java
@@ -8,7 +8,6 @@
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.CachedValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.FallbackFactory;
 import nl.jqno.equalsverifier.internal.testhelpers.TestValueProviders;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...tage/RecordObjectAccessorCopyingTest.java → ...tion/RecordObjectAccessorCopyingTest.java b/...tage/RecordObjectAccessorCopyingTest.java → ...tion/RecordObjectAccessorCopyingTest.java
@@ -1,4 +1,4 @@
-package nl.jqno.equalsverifier.internal.reflection.vintage;
+package nl.jqno.equalsverifier.internal.reflection.vintage.mutation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotSame;

diff --git a/...e/RecordObjectAccessorScramblingTest.java → ...n/RecordObjectAccessorScramblingTest.java b/...e/RecordObjectAccessorScramblingTest.java → ...n/RecordObjectAccessorScramblingTest.java
@@ -1,4 +1,4 @@
-package nl.jqno.equalsverifier.internal.reflection.vintage;
+package nl.jqno.equalsverifier.internal.reflection.vintage.mutation;
 
 import static nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.Factories.values;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -9,7 +9,8 @@
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.CachedValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.testhelpers.TestValueProviders;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...ion/vintage/RecordObjectAccessorTest.java → ...ge/mutation/RecordObjectAccessorTest.java b/...ion/vintage/RecordObjectAccessorTest.java → ...ge/mutation/RecordObjectAccessorTest.java
@@ -1,4 +1,4 @@
-package nl.jqno.equalsverifier.internal.reflection.vintage;
+package nl.jqno.equalsverifier.internal.reflection.vintage.mutation;
 
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -11,7 +11,7 @@
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.CachedValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.testhelpers.ExpectedException;
 import nl.jqno.equalsverifier.internal.testhelpers.TestValueProviders;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...va/nl/jqno/equalsverifier/internal/reflection/vintage/SealedTypesFallbackFactoryTest.java b/...va/nl/jqno/equalsverifier/internal/reflection/vintage/SealedTypesFallbackFactoryTest.java
@@ -9,7 +9,6 @@
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.CachedValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.FallbackFactory;
 import nl.jqno.equalsverifier.internal.testhelpers.TestValueProviders;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/ConfiguredEqualsVerifier.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/ConfiguredEqualsVerifier.java
@@ -11,8 +11,8 @@
 import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import nl.jqno.equalsverifier.internal.reflection.PackageScanner;
 import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
+import nl.jqno.equalsverifier.internal.reflection.vintage.PrefabValuesApi;
 import nl.jqno.equalsverifier.internal.util.ListBuilders;
-import nl.jqno.equalsverifier.internal.util.PrefabValuesApi;
 import nl.jqno.equalsverifier.internal.util.Validations;
 import org.objenesis.Objenesis;
 import org.objenesis.ObjenesisStd;

diff --git a/...lsverifier-core/src/main/java/nl/jqno/equalsverifier/api/SingleTypeEqualsVerifierApi.java b/...lsverifier-core/src/main/java/nl/jqno/equalsverifier/api/SingleTypeEqualsVerifierApi.java
@@ -11,6 +11,7 @@
 import nl.jqno.equalsverifier.internal.checkers.*;
 import nl.jqno.equalsverifier.internal.exceptions.MessagingException;
 import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
+import nl.jqno.equalsverifier.internal.reflection.vintage.PrefabValuesApi;
 import nl.jqno.equalsverifier.internal.util.*;
 import nl.jqno.equalsverifier.internal.util.Formatter;
 import org.objenesis.Objenesis;

diff --git a/...er-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/JavaApiPrefabValues.java b/...er-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/JavaApiPrefabValues.java
@@ -9,17 +9,18 @@
 import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.io.PrintStream;
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.*;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URL;
 import java.nio.*;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
+import java.text.*;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -28,12 +29,9 @@
 import java.util.concurrent.locks.StampedLock;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
-import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.EnumMapFactory;
-import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.EnumSetFactory;
-import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.ExternalFactory;
-import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.PrefabValueFactory;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.*;
 
 /**
  * Creates instances of classes for use in a {@link VintageValueProvider} object.

diff --git a/...r-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/FactoryCache.java b/...r-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/FactoryCache.java
@@ -3,7 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.PrefabValueFactory;
 
 /** Contains a cache of factories, for {@link VintageValueProvider}. */

diff --git a/...rifier/internal/util/PrefabValuesApi.java → ...l/reflection/vintage/PrefabValuesApi.java b/...rifier/internal/util/PrefabValuesApi.java → ...l/reflection/vintage/PrefabValuesApi.java
@@ -1,4 +1,4 @@
-package nl.jqno.equalsverifier.internal.util;
+package nl.jqno.equalsverifier.internal.reflection.vintage;
 
 import static nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.Factories.simple;
 import static nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.Factories.values;
@@ -7,9 +7,9 @@
 import nl.jqno.equalsverifier.Func.Func1;
 import nl.jqno.equalsverifier.Func.Func2;
 import nl.jqno.equalsverifier.internal.reflection.SuperclassIterable;
-import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
-import nl.jqno.equalsverifier.internal.reflection.vintage.ObjectAccessor;
+import nl.jqno.equalsverifier.internal.reflection.vintage.mutation.ObjectAccessor;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.PrefabValueFactory;
+import nl.jqno.equalsverifier.internal.util.Validations;
 import org.objenesis.Objenesis;
 
 public final class PrefabValuesApi {

diff --git a/...n/instantiation/VintageValueProvider.java → ...lection/vintage/VintageValueProvider.java b/...n/instantiation/VintageValueProvider.java → ...lection/vintage/VintageValueProvider.java
@@ -1,12 +1,14 @@
-package nl.jqno.equalsverifier.internal.reflection.instantiation;
+package nl.jqno.equalsverifier.internal.reflection.vintage;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Optional;
 import nl.jqno.equalsverifier.internal.exceptions.RecursionException;
 import nl.jqno.equalsverifier.internal.exceptions.ReflectionException;
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
-import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
+import nl.jqno.equalsverifier.internal.reflection.instantiation.CachedValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.FallbackFactory;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.PrefabValueFactory;
 import nl.jqno.equalsverifier.internal.util.PrimitiveMappers;

diff --git a/...nal/reflection/vintage/ClassAccessor.java → ...ction/vintage/mutation/ClassAccessor.java b/...nal/reflection/vintage/ClassAccessor.java → ...ction/vintage/mutation/ClassAccessor.java
@@ -1,9 +1,9 @@
-package nl.jqno.equalsverifier.internal.reflection.vintage;
+package nl.jqno.equalsverifier.internal.reflection.vintage.mutation;
 
 import nl.jqno.equalsverifier.internal.reflection.Instantiator;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import org.objenesis.Objenesis;
 
 /**

diff --git a/...nal/reflection/vintage/FieldModifier.java → ...ction/vintage/mutation/FieldModifier.java b/...nal/reflection/vintage/FieldModifier.java → ...ction/vintage/mutation/FieldModifier.java
@@ -1,4 +1,4 @@
-package nl.jqno.equalsverifier.internal.reflection.vintage;
+package nl.jqno.equalsverifier.internal.reflection.vintage.mutation;
 
 import static nl.jqno.equalsverifier.internal.util.Rethrow.rethrow;
 
@@ -7,7 +7,7 @@
 import nl.jqno.equalsverifier.internal.reflection.FieldProbe;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 public final class FieldModifier {
 

diff --git a/...ection/vintage/InPlaceObjectAccessor.java → ...ntage/mutation/InPlaceObjectAccessor.java b/...ection/vintage/InPlaceObjectAccessor.java → ...ntage/mutation/InPlaceObjectAccessor.java
@@ -1,11 +1,11 @@
-package nl.jqno.equalsverifier.internal.reflection.vintage;
+package nl.jqno.equalsverifier.internal.reflection.vintage.mutation;
 
 import java.lang.reflect.Field;
 import nl.jqno.equalsverifier.internal.reflection.FieldIterable;
 import nl.jqno.equalsverifier.internal.reflection.Instantiator;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import org.objenesis.Objenesis;
 
 /**

diff --git a/...al/reflection/vintage/ObjectAccessor.java → ...tion/vintage/mutation/ObjectAccessor.java b/...al/reflection/vintage/ObjectAccessor.java → ...tion/vintage/mutation/ObjectAccessor.java
@@ -1,9 +1,9 @@
-package nl.jqno.equalsverifier.internal.reflection.vintage;
+package nl.jqno.equalsverifier.internal.reflection.vintage.mutation;
 
 import nl.jqno.equalsverifier.internal.reflection.RecordsHelper;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import org.objenesis.Objenesis;
 
 /**

diff --git a/...lection/vintage/RecordObjectAccessor.java → ...intage/mutation/RecordObjectAccessor.java b/...lection/vintage/RecordObjectAccessor.java → ...intage/mutation/RecordObjectAccessor.java
@@ -1,4 +1,4 @@
-package nl.jqno.equalsverifier.internal.reflection.vintage;
+package nl.jqno.equalsverifier.internal.reflection.vintage.mutation;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -8,7 +8,7 @@
 import nl.jqno.equalsverifier.internal.reflection.RecordProbe;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import org.objenesis.Objenesis;
 
 /**

diff --git a/...lsverifier/internal/reflection/vintage/prefabvalues/factories/AbstractGenericFactory.java b/...lsverifier/internal/reflection/vintage/prefabvalues/factories/AbstractGenericFactory.java
@@ -8,7 +8,7 @@
 import nl.jqno.equalsverifier.internal.exceptions.ReflectionException;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 /**
  * Abstract implementation of {@link PrefabValueFactory} that provides helper functions for dealing

diff --git a/...l/jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/CopyFactory.java b/...l/jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/CopyFactory.java
@@ -4,7 +4,7 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 public class CopyFactory<T, S> extends AbstractGenericFactory<T> {
 

diff --git a/...qno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/EnumMapFactory.java b/...qno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/EnumMapFactory.java
@@ -6,7 +6,7 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 @SuppressWarnings({ "unchecked", "rawtypes" })
 public final class EnumMapFactory<T> extends AbstractGenericFactory<T> {

diff --git a/...qno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/EnumSetFactory.java b/...qno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/EnumSetFactory.java
@@ -6,7 +6,7 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 /**
  * Implementation of {@link PrefabValueFactory} that instantiates EnumSets using reflection, while

diff --git a/...no/equalsverifier/internal/reflection/vintage/prefabvalues/factories/ExternalFactory.java b/...no/equalsverifier/internal/reflection/vintage/prefabvalues/factories/ExternalFactory.java
@@ -7,8 +7,8 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factoryproviders.FactoryProvider;
 
 public class ExternalFactory<T> implements PrefabValueFactory<T> {

diff --git a/...no/equalsverifier/internal/reflection/vintage/prefabvalues/factories/FallbackFactory.java b/...no/equalsverifier/internal/reflection/vintage/prefabvalues/factories/FallbackFactory.java
@@ -6,8 +6,8 @@
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.InstanceCreator;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
-import nl.jqno.equalsverifier.internal.reflection.vintage.ClassAccessor;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.mutation.ClassAccessor;
 import org.objenesis.Objenesis;
 
 /**

diff --git a/...nl/jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/MapFactory.java b/...nl/jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/MapFactory.java
@@ -5,7 +5,7 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 /**
  * Implementation of {@link PrefabValueFactory} that specializes in creating implementations of

diff --git a/...equalsverifier/internal/reflection/vintage/prefabvalues/factories/PrefabValueFactory.java b/...equalsverifier/internal/reflection/vintage/prefabvalues/factories/PrefabValueFactory.java
@@ -3,7 +3,7 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 /**
  * Creates instances of generic types for use as prefab value.

diff --git a/...jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/SimpleFactory.java b/...jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/SimpleFactory.java
@@ -3,7 +3,7 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 /**
  * Implementation of {@link PrefabValueFactory} that holds on to two instances that have already

diff --git a/...ualsverifier/internal/reflection/vintage/prefabvalues/factories/SimpleGenericFactory.java b/...ualsverifier/internal/reflection/vintage/prefabvalues/factories/SimpleGenericFactory.java
@@ -7,7 +7,7 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 
 public class SimpleGenericFactory<T> extends AbstractGenericFactory<T> {
 

diff --git a/...ifier/internal/reflection/vintage/prefabvalues/factoryproviders/GuavaFactoryProvider.java b/...ifier/internal/reflection/vintage/prefabvalues/factoryproviders/GuavaFactoryProvider.java
@@ -9,12 +9,9 @@
 import nl.jqno.equalsverifier.internal.reflection.Tuple;
 import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
-import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.AbstractGenericFactory;
-import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.EnumMapFactory;
-import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.EnumSetFactory;
-import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.Factories;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.*;
 
 public final class GuavaFactoryProvider implements FactoryProvider {
 

diff --git a/...fier/internal/reflection/vintage/prefabvalues/factoryproviders/JavaFxFactoryProvider.java b/...fier/internal/reflection/vintage/prefabvalues/factoryproviders/JavaFxFactoryProvider.java
@@ -5,12 +5,16 @@
 import static nl.jqno.equalsverifier.internal.reflection.Util.objects;
 import static nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.Factories.copy;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
-import nl.jqno.equalsverifier.internal.reflection.*;
+import nl.jqno.equalsverifier.internal.reflection.ConditionalInstantiator;
+import nl.jqno.equalsverifier.internal.reflection.Tuple;
+import nl.jqno.equalsverifier.internal.reflection.TypeTag;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider.Attributes;
-import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.AbstractGenericFactory;
 import nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.PrefabValueFactory;
 

diff --git a/...rifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/DefaultValueProviders.java b/...rifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/DefaultValueProviders.java
@@ -1,7 +1,10 @@
 package nl.jqno.equalsverifier.internal.util;
 
-import nl.jqno.equalsverifier.internal.reflection.instantiation.*;
+import nl.jqno.equalsverifier.internal.reflection.instantiation.CachedValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.instantiation.ChainedValueProvider;
+import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.FactoryCache;
+import nl.jqno.equalsverifier.internal.reflection.vintage.VintageValueProvider;
 import org.objenesis.Objenesis;
 
 public final class DefaultValueProviders {