From 5324436a9601c38e5488cd622bc351801bd724d3 Mon Sep 17 00:00:00 2001 From: Jan Ouwens Date: Tue, 24 Dec 2024 20:30:12 +0100 Subject: [PATCH] Applies OpenRewrite upgrade-to-Java-11 recipes --- .../RecordInstanceCreatorTest.java | 5 ++-- equalsverifier-core/pom.xml | 6 ++-- .../api/SingleTypeEqualsVerifierApi.java | 2 +- .../internal/checkers/ExamplesChecker.java | 2 +- .../internal/checkers/FieldsChecker.java | 2 +- .../internal/checkers/NullChecker.java | 2 +- .../internal/checkers/RecordChecker.java | 3 +- .../internal/checkers/SignatureChecker.java | 2 +- .../instantiation/InstanceCreator.java | 6 ++-- .../instantiation/SubjectCreator.java | 2 +- .../factories/AbstractGenericFactory.java | 2 +- .../factories/SimpleGenericFactory.java | 5 ++-- .../reflection/RecordObjectAccessor.java | 2 +- .../internal/reflection/FieldIterable.java | 8 ++--- .../internal/reflection/PackageScanner.java | 2 +- .../internal/reflection/TypeTag.java | 4 +-- .../annotations/AnnotationCacheBuilder.java | 2 +- .../internal/util/FieldNameExtractor.java | 2 +- .../internal/util/ListBuilders.java | 6 ++-- .../internal/util/PrimitiveMappers.java | 4 +-- .../coverage/CoverageWithInheritanceTest.java | 2 +- .../operational/RecursionTest.java | 2 +- .../WithPrefabValuesForFieldTest.java | 9 ++++-- .../exceptions/RecursionExceptionTest.java | 2 +- .../instantiation/InstanceCreatorTest.java | 7 ++--- .../factories/MapFactoryTest.java | 2 +- .../JavaFxFactoryProviderTest.java | 7 ++--- .../internal/reflection/FieldCacheTest.java | 3 +- .../reflection/FieldIterableTest.java | 30 +++++++++---------- .../reflection/PackageScannerTest.java | 3 +- .../reflection/SuperclassIterableTest.java | 7 ++--- .../internal/reflection/UtilTest.java | 2 +- .../AnnotationCacheBuilderTest.java | 4 +-- pom.xml | 4 +-- 34 files changed, 73 insertions(+), 80 deletions(-) diff --git a/equalsverifier-16/src/test/java/nl/jqno/equalsverifier/internal/instantiation/RecordInstanceCreatorTest.java b/equalsverifier-16/src/test/java/nl/jqno/equalsverifier/internal/instantiation/RecordInstanceCreatorTest.java index 709dbfdf4..8ecdf97b1 100644 --- a/equalsverifier-16/src/test/java/nl/jqno/equalsverifier/internal/instantiation/RecordInstanceCreatorTest.java +++ b/equalsverifier-16/src/test/java/nl/jqno/equalsverifier/internal/instantiation/RecordInstanceCreatorTest.java @@ -4,7 +4,6 @@ import java.lang.reflect.Field; import java.util.HashMap; -import java.util.Map; import nl.jqno.equalsverifier.internal.reflection.ClassProbe; import org.junit.jupiter.api.Test; @@ -15,11 +14,11 @@ class RecordInstanceCreatorTest { @Test void instanceCreator() throws NoSuchFieldException { ClassProbe probe = ClassProbe.of(SomeRecord.class); - InstanceCreator sut = new InstanceCreator<>(probe, new ObjenesisStd()); + var sut = new InstanceCreator(probe, new ObjenesisStd()); Field x = SomeRecord.class.getDeclaredField("x"); Field z = SomeRecord.class.getDeclaredField("z"); - Map values = new HashMap<>(); + var values = new HashMap(); values.put(x, 42); values.put(z, "42"); diff --git a/equalsverifier-core/pom.xml b/equalsverifier-core/pom.xml index d90c9fd97..506461c2d 100644 --- a/equalsverifier-core/pom.xml +++ b/equalsverifier-core/pom.xml @@ -123,9 +123,9 @@ test - javax.annotation - javax.annotation-api - ${version.javax-annotation-api} + jakarta.annotation + jakarta.annotation-api + ${version.jakarta-annotation-api} test diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/api/SingleTypeEqualsVerifierApi.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/api/SingleTypeEqualsVerifierApi.java index 9bf75f027..47fbb6d32 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/api/SingleTypeEqualsVerifierApi.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/api/SingleTypeEqualsVerifierApi.java @@ -410,7 +410,7 @@ private void performVerification() { Validations.validateClassCanBeVerified(type); Configuration config = buildConfig(); - Context context = new Context<>(config, factoryCache, fieldCache, objenesis); + var context = new Context(config, factoryCache, fieldCache, objenesis); Validations .validateProcessedAnnotations( type, diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/ExamplesChecker.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/ExamplesChecker.java index ffec65775..2fc30b979 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/ExamplesChecker.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/ExamplesChecker.java @@ -57,7 +57,7 @@ private List ensureEnoughExamples(List examples) { return examples; } - List result = new ArrayList<>(); + var result = new ArrayList(); result.add(subjectCreator.plain()); result.add(subjectCreator.withAllFieldsChanged()); return result; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/FieldsChecker.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/FieldsChecker.java index 4199ecfd2..2e850b287 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/FieldsChecker.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/FieldsChecker.java @@ -55,7 +55,7 @@ public FieldsChecker(Context context) { @Override public void check() { - FieldInspector inspector = new FieldInspector<>(context.getType()); + var inspector = new FieldInspector(context.getType()); if (!context.getClassProbe().isEqualsInheritedFromObject()) { inspector.check(arrayFieldCheck); diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/NullChecker.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/NullChecker.java index 736a06c6a..0f0e4b6d6 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/NullChecker.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/NullChecker.java @@ -18,7 +18,7 @@ public void check() { return; } - FieldInspector inspector = new FieldInspector<>(context.getType()); + var inspector = new FieldInspector(context.getType()); inspector.check(new NullPointerExceptionFieldCheck<>(context)); } } diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/RecordChecker.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/RecordChecker.java index 50ad28add..26bfe2be7 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/RecordChecker.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/RecordChecker.java @@ -7,7 +7,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.List; import java.util.stream.Collectors; import nl.jqno.equalsverifier.internal.instantiation.SubjectCreator; @@ -46,7 +45,7 @@ private void verifyRecordPrecondition(T original) { return; } - List failedFields = new ArrayList<>(); + var failedFields = new ArrayList(); for (FieldProbe p : FieldIterable.of(type)) { Method accessorMethod = getAccessorMethodFor(type, p.getField()); try { diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/SignatureChecker.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/SignatureChecker.java index 8542cc5d3..bb3401bff 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/SignatureChecker.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/SignatureChecker.java @@ -38,7 +38,7 @@ public void check() { } private List getEqualsMethods() { - List result = new ArrayList<>(); + var result = new ArrayList(); for (Method method : type.getDeclaredMethods()) { if ("equals".equals(method.getName()) && !Modifier.isStatic(method.getModifiers())) { diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/InstanceCreator.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/InstanceCreator.java index 16ad9f29e..95f7a8408 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/InstanceCreator.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/InstanceCreator.java @@ -48,7 +48,7 @@ public T instantiate(Map values) { * @return A copy of the given original. */ public T copy(Object original) { - Map values = new HashMap<>(); + var values = new HashMap(); for (FieldProbe p : fields(original.getClass())) { Object value = p.getValue(original); values.put(p.getField(), value); @@ -57,9 +57,9 @@ public T copy(Object original) { } private T createRecordInstance(Map values) { - List params = new ArrayList<>(); + var params = new ArrayList(); traverseFields(values, (p, v) -> params.add(v)); - RecordProbe recordProbe = new RecordProbe<>(type); + var recordProbe = new RecordProbe(type); return recordProbe.callRecordConstructor(params); } diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/SubjectCreator.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/SubjectCreator.java index 9f504db23..acbc6f6e8 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/SubjectCreator.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/SubjectCreator.java @@ -201,7 +201,7 @@ private T createInstance(Map givens) { } private Map determineValues(Map givens) { - Map values = new HashMap<>(givens); + var values = new HashMap(givens); for (FieldProbe p : fields()) { Field f = p.getField(); boolean fieldIsAbsent = !values.containsKey(f); diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/AbstractGenericFactory.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/AbstractGenericFactory.java index 303a0349c..db7a9802d 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/AbstractGenericFactory.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/AbstractGenericFactory.java @@ -26,7 +26,7 @@ protected LinkedHashSet cloneWith(LinkedHashSet typeStack, Typ } protected TypeTag copyGenericTypesInto(Class type, TypeTag source) { - List genericTypes = new ArrayList<>(); + var genericTypes = new ArrayList(); for (TypeTag tag : source.getGenericTypes()) { genericTypes.add(tag); } diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/SimpleGenericFactory.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/SimpleGenericFactory.java index 2a3578f7e..d3edd9e48 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/SimpleGenericFactory.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/SimpleGenericFactory.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.LinkedHashSet; -import java.util.List; import java.util.function.Supplier; import nl.jqno.equalsverifier.Func; @@ -24,8 +23,8 @@ public SimpleGenericFactory(Func factory, Supplier emptyFactory) { public Tuple createValues(TypeTag tag, VintageValueProvider valueProvider, LinkedHashSet typeStack) { LinkedHashSet clone = cloneWith(typeStack, tag); - List redValues = new ArrayList<>(); - List blueValues = new ArrayList<>(); + var redValues = new ArrayList(); + var blueValues = new ArrayList(); boolean useEmpty = false; int n = tag.getType().getTypeParameters().length; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/reflection/RecordObjectAccessor.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/reflection/RecordObjectAccessor.java index 5db4926c9..cfef68ea4 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/reflection/RecordObjectAccessor.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/instantiation/vintage/reflection/RecordObjectAccessor.java @@ -54,7 +54,7 @@ private ObjectAccessor makeAccessor(Function determineVal } private T callRecordConstructor(List params) { - RecordProbe p = new RecordProbe<>(type()); + var p = new RecordProbe(type()); return p.callRecordConstructor(params); } diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldIterable.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldIterable.java index a68d78735..dad620298 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldIterable.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldIterable.java @@ -76,7 +76,7 @@ public Iterator iterator() { } private List createFieldList() { - List result = new ArrayList<>(); + var result = new ArrayList(); result.addAll(addFieldsFor(type)); @@ -90,8 +90,8 @@ private List createFieldList() { } private List addFieldsFor(Class c) { - List fields = new ArrayList<>(); - List statics = new ArrayList<>(); + var fields = new ArrayList(); + var statics = new ArrayList(); for (Field field : c.getDeclaredFields()) { if (!field.isSynthetic() @@ -109,7 +109,7 @@ private List addFieldsFor(Class c) { } } - List result = new ArrayList<>(); + var result = new ArrayList(); result.addAll(fields); result.addAll(statics); return result; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/PackageScanner.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/PackageScanner.java index 96d5512e7..a9fe2d51d 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/PackageScanner.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/PackageScanner.java @@ -65,7 +65,7 @@ private static List> getClassesInDir( classes = getClassesInDir(packageName + "." + f.getName(), f, mustExtend, scanRecursively); } else { - classes = Collections.singletonList(fileToClass(packageName, f)); + classes = List.of(fileToClass(packageName, f)); } return classes.stream(); }) diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/TypeTag.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/TypeTag.java index 3cc21adda..011ff1a8a 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/TypeTag.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/TypeTag.java @@ -56,7 +56,7 @@ private static TypeTag resolve( Class typeAsClass, TypeTag enclosingType, boolean shortCircuitRecursiveTypeBound) { - List nestedTags = new ArrayList<>(); + var nestedTags = new ArrayList(); if (type instanceof Class) { return processClass((Class) type, nestedTags); } @@ -151,7 +151,7 @@ private static TypeTag processTypeVariable( private static Map buildLookup(TypeTag enclosingType) { TypeVariable[] typeParameters = enclosingType.getType().getTypeParameters(); - Map lookup = new HashMap<>(); + var lookup = new HashMap(); if (enclosingType.getGenericTypes().size() == 0) { return lookup; } diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/annotations/AnnotationCacheBuilder.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/annotations/AnnotationCacheBuilder.java index bc2f24cc7..7eb2354b3 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/annotations/AnnotationCacheBuilder.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/annotations/AnnotationCacheBuilder.java @@ -187,7 +187,7 @@ private void addEnumProperties(Object val, String name, AnnotationProperties pro private void addArrayProperties(Object val, String name, AnnotationProperties props) { if (val.getClass().isArray() && !val.getClass().getComponentType().isPrimitive()) { Object[] array = (Object[]) val; - Set values = new HashSet<>(); + var values = new HashSet(); for (Object obj : array) { if (obj instanceof TypeDescription) { values.add(((TypeDescription) obj).getName()); diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/FieldNameExtractor.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/FieldNameExtractor.java index 1f7a1e6d2..439cdd5b6 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/FieldNameExtractor.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/FieldNameExtractor.java @@ -12,7 +12,7 @@ public final class FieldNameExtractor { private FieldNameExtractor() {} public static Set extractFieldNames(Class type) { - Set actualFieldNames = new HashSet<>(); + var actualFieldNames = new HashSet(); for (FieldProbe p : FieldIterable.of(type)) { String name = p.getName(); actualFieldNames.add(name); diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/ListBuilders.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/ListBuilders.java index 873ced2a0..84299c3bc 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/ListBuilders.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/ListBuilders.java @@ -23,7 +23,7 @@ public static List buildListOfAtLeastOne(T first, T... more) { throw new IllegalArgumentException("First example is null."); } - List result = new ArrayList<>(); + var result = new ArrayList(); result.add(first); addArrayElementsToList(result, more); @@ -48,7 +48,7 @@ public static List buildListOfAtLeastTwo(T first, T second, T... more) { throw new IllegalArgumentException("Second example is null."); } - List result = new ArrayList<>(); + var result = new ArrayList(); result.add(first); result.add(second); addArrayElementsToList(result, more); @@ -76,7 +76,7 @@ private static void addArrayElementsToList(List list, T... more) { * @return A list with the elements of the Iterable. */ public static List fromIterable(Iterable iterable) { - List result = new ArrayList<>(); + var result = new ArrayList(); for (T t : iterable) { result.add(t); } diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/PrimitiveMappers.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/PrimitiveMappers.java index cf1e8ec27..2ec0b566a 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/PrimitiveMappers.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/PrimitiveMappers.java @@ -15,7 +15,7 @@ private PrimitiveMappers() {} public static final Collection ZEROS = DEFAULT_WRAPPED_VALUE_MAPPER.values(); private static Map, Class> createPrimitiveObjectMapper() { - Map, Class> result = new HashMap<>(); + var result = new HashMap, Class>(); result.put(boolean.class, Boolean.class); result.put(byte.class, Byte.class); result.put(char.class, Character.class); @@ -28,7 +28,7 @@ private static Map, Class> createPrimitiveObjectMapper() { } private static Map, Object> createDefaultValueMapper(boolean includeWrapped) { - Map, Object> result = new HashMap<>(); + var result = new HashMap, Object>(); result.put(boolean.class, false); result.put(byte.class, Byte.valueOf((byte) 0)); result.put(char.class, Character.valueOf((char) 0)); diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/coverage/CoverageWithInheritanceTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/coverage/CoverageWithInheritanceTest.java index cea899911..3e4d15736 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/coverage/CoverageWithInheritanceTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/coverage/CoverageWithInheritanceTest.java @@ -63,7 +63,7 @@ public static Arguments of(Class containerType) { Class superType = find(containingTypes, "Point"); Class subType = find(containingTypes, "ColorPoint"); Class endpointType = find(containingTypes, "EndPoint"); - Classes result = new Classes<>(containerType, superType, subType, endpointType); + var result = new Classes(containerType, superType, subType, endpointType); return Arguments.of(result); } diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/RecursionTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/RecursionTest.java index f88b31dc5..bedaf5aee 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/RecursionTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/RecursionTest.java @@ -29,7 +29,7 @@ void createSomeNodes() { red = new Node(null); blue = new Node(new Node(null)); redTree = new Tree(Collections.emptyList()); - blueTree = new Tree(Collections.singletonList(new Tree(Collections.emptyList()))); + blueTree = new Tree(List.of(new Tree(Collections.emptyList()))); } @Test diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/WithPrefabValuesForFieldTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/WithPrefabValuesForFieldTest.java index 3cf6835d5..f7799d792 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/WithPrefabValuesForFieldTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/WithPrefabValuesForFieldTest.java @@ -2,7 +2,10 @@ import java.time.LocalDate; import java.time.Month; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -143,7 +146,7 @@ void succeed_whenPrefabForArrayIsOverridden() { void succeed_whenClassContainsSomethingThatAllowsSubclassesAndASubclassIsGiven() { EqualsVerifier .forClass(ListContainer.class) - .withPrefabValuesForField("list", Collections.singletonList("x"), Collections.singletonList("y")) + .withPrefabValuesForField("list", List.of("x"), List.of("y")) .verify(); } @@ -153,7 +156,7 @@ void succeed_whenClassContainsAGenericInterfaceThatRefersToItself() { DifficultGeneric two = new DifficultGeneric(null); EqualsVerifier .forClass(DifficultGeneric.class) - .withPrefabValuesForField("list", Collections.singletonList(one), Collections.singletonList(two)) + .withPrefabValuesForField("list", List.of(one), List.of(two)) .verify(); } diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/exceptions/RecursionExceptionTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/exceptions/RecursionExceptionTest.java index c231232b4..59c7bebb8 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/exceptions/RecursionExceptionTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/exceptions/RecursionExceptionTest.java @@ -12,7 +12,7 @@ class RecursionExceptionTest { @Test void descriptionContainsAllTypes() { - LinkedHashSet stack = new LinkedHashSet<>(); + var stack = new LinkedHashSet(); stack.add(new TypeTag(String.class)); stack.add(new TypeTag(Point.class)); stack.add(new TypeTag(Object.class)); diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/InstanceCreatorTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/InstanceCreatorTest.java index 1463d2e48..2bd631115 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/InstanceCreatorTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/InstanceCreatorTest.java @@ -4,7 +4,6 @@ import java.lang.reflect.Field; import java.util.HashMap; -import java.util.Map; import nl.jqno.equalsverifier.internal.reflection.ClassProbe; import org.junit.jupiter.api.Test; @@ -17,11 +16,11 @@ class InstanceCreatorTest { void instantiate() throws NoSuchFieldException { ClassProbe probe = ClassProbe.of(SomeClass.class); Objenesis objenesis = new ObjenesisStd(); - InstanceCreator sut = new InstanceCreator<>(probe, objenesis); + var sut = new InstanceCreator(probe, objenesis); Field x = SomeClass.class.getDeclaredField("x"); Field z = SomeClass.class.getDeclaredField("z"); - Map values = new HashMap<>(); + var values = new HashMap(); values.put(x, 42); values.put(z, "42"); @@ -36,7 +35,7 @@ void instantiate() throws NoSuchFieldException { void copy() throws NoSuchFieldException { ClassProbe probe = ClassProbe.of(SomeSubClass.class); Objenesis objenesis = new ObjenesisStd(); - InstanceCreator sut = new InstanceCreator<>(probe, objenesis); + var sut = new InstanceCreator(probe, objenesis); SomeClass original = new SomeClass(42, 1337, "yeah"); SomeSubClass copy = sut.copy(original); diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/MapFactoryTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/MapFactoryTest.java index 5a3faf30c..abd0fca6a 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/MapFactoryTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factories/MapFactoryTest.java @@ -76,7 +76,7 @@ void createMapOfOneElementEnumKey() { } private Map mapOf(K key, V value) { - Map result = new HashMap<>(); + var result = new HashMap(); result.put(key, value); return result; } diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factoryproviders/JavaFxFactoryProviderTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factoryproviders/JavaFxFactoryProviderTest.java index 7d010f555..5b07b2a8c 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factoryproviders/JavaFxFactoryProviderTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/prefabvalues/factoryproviders/JavaFxFactoryProviderTest.java @@ -7,7 +7,6 @@ import nl.jqno.equalsverifier.internal.instantiation.JavaApiPrefabValues; import nl.jqno.equalsverifier.internal.instantiation.vintage.VintageValueProvider; -import nl.jqno.equalsverifier.internal.instantiation.vintage.prefabvalues.factories.PrefabValueFactory; import nl.jqno.equalsverifier.internal.instantiation.vintage.prefabvalues.factoryproviders.JavaFxFactoryProvider.PropertyFactory; import nl.jqno.equalsverifier.internal.reflection.Tuple; import nl.jqno.equalsverifier.internal.reflection.TypeTag; @@ -36,8 +35,7 @@ void createInstancesWithCorrectSingleGenericParameter() { TypeTag tag = new TypeTag(GenericContainer.class, new TypeTag(String.class)); TypeTag listTag = new TypeTag(List.class, new TypeTag(String.class)); - PrefabValueFactory factory = - new PropertyFactory<>(GenericContainer.class.getName(), List.class); + var factory = new PropertyFactory(GenericContainer.class.getName(), List.class); Tuple tuple = factory.createValues(tag, valueProvider, null); assertThat(tuple.getRed().t).isEqualTo(valueProvider.giveRed(listTag)); @@ -50,8 +48,7 @@ void createInstancesWithCorrectMultipleGenericParameter() { TypeTag tag = new TypeTag(GenericMultiContainer.class, new TypeTag(String.class), new TypeTag(Point.class)); TypeTag mapTag = new TypeTag(Map.class, new TypeTag(String.class), new TypeTag(Point.class)); - PrefabValueFactory factory = - new PropertyFactory<>(GenericMultiContainer.class.getName(), Map.class); + var factory = new PropertyFactory(GenericMultiContainer.class.getName(), Map.class); Tuple tuple = factory.createValues(tag, valueProvider, null); assertThat(tuple.getRed().t).isEqualTo(valueProvider.giveRed(mapTag)); diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FieldCacheTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FieldCacheTest.java index f44a53ec5..86117495a 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FieldCacheTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FieldCacheTest.java @@ -4,7 +4,6 @@ import java.util.Collections; import java.util.HashSet; -import java.util.Set; import org.junit.jupiter.api.Test; @@ -55,7 +54,7 @@ void getFieldNames() { assertThat(cache.getFieldNames()).isEqualTo(Collections.emptySet()); cache.put(stringField, stringValues); - Set expected = new HashSet<>(); + var expected = new HashSet(); expected.add(stringField); assertThat(cache.getFieldNames()).isEqualTo(expected); } diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FieldIterableTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FieldIterableTest.java index 0b81f07af..b62f8c12b 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FieldIterableTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/FieldIterableTest.java @@ -18,7 +18,7 @@ class FieldIterableTest { @Test void simpleFields() { - Set actual = new HashSet<>(); + var actual = new HashSet(); for (FieldProbe probe : FieldIterable.of(DifferentAccessModifiersFieldContainer.class)) { actual.add(probe.getField()); } @@ -28,7 +28,7 @@ void simpleFields() { @Test void simpleFieldsWithoutStatics() { - Set actual = new HashSet<>(); + var actual = new HashSet(); for (FieldProbe probe : FieldIterable.ofIgnoringStatic(DifferentAccessModifiersFieldContainer.class)) { actual.add(probe.getField()); } @@ -38,7 +38,7 @@ void simpleFieldsWithoutStatics() { @Test void subAndSuperClassFields() { - Set actual = new HashSet<>(); + var actual = new HashSet(); for (FieldProbe probe : FieldIterable.of(DifferentAccessModifiersSubFieldContainer.class)) { actual.add(probe.getField()); } @@ -48,7 +48,7 @@ void subAndSuperClassFields() { @Test void onlySubClassFields() { - Set actual = new HashSet<>(); + var actual = new HashSet(); for (FieldProbe probe : FieldIterable.ofIgnoringSuper(DifferentAccessModifiersSubFieldContainer.class)) { actual.add(probe.getField()); } @@ -64,10 +64,10 @@ void noFields() { @Test void superHasNoFields() throws NoSuchFieldException { - Set expected = new HashSet<>(); + var expected = new HashSet(); expected.add(NoFieldsSubWithFields.class.getField("field")); - Set actual = new HashSet<>(); + var actual = new HashSet(); for (FieldProbe probe : FieldIterable.of(NoFieldsSubWithFields.class)) { actual.add(probe.getField()); } @@ -77,7 +77,7 @@ void superHasNoFields() throws NoSuchFieldException { @Test void subHasNoFields() { - Set actual = new HashSet<>(); + var actual = new HashSet(); for (FieldProbe probe : FieldIterable.of(EmptySubFieldContainer.class)) { actual.add(probe.getField()); } @@ -87,11 +87,11 @@ void subHasNoFields() { @Test void classInTheMiddleHasNoFields() throws NoSuchFieldException { - Set expected = new HashSet<>(); + var expected = new HashSet(); expected.addAll(FIELD_CONTAINER_FIELDS); expected.add(SubEmptySubFieldContainer.class.getDeclaredField("field")); - Set actual = new HashSet<>(); + var actual = new HashSet(); for (FieldProbe probe : FieldIterable.of(SubEmptySubFieldContainer.class)) { actual.add(probe.getField()); } @@ -102,7 +102,7 @@ void classInTheMiddleHasNoFields() throws NoSuchFieldException { @Test void orderingTest() { FieldIterable iterable = FieldIterable.of(UnorderedFieldContainer.class); - List actual = new ArrayList<>(); + var actual = new ArrayList(); for (FieldProbe probe : iterable) { actual.add(probe.getName()); } @@ -141,7 +141,7 @@ void ignoreSyntheticFields() { @Test void ignoreNonSyntheticCoberturaFields() { FieldIterable iterable = FieldIterable.of(CoberturaContainer.class); - List fields = new ArrayList<>(); + var fields = new ArrayList(); for (FieldProbe probe : iterable) { fields.add(probe.getField()); } @@ -150,7 +150,7 @@ void ignoreNonSyntheticCoberturaFields() { } private static Set createFieldContainerFields() { - Set result = new HashSet<>(); + var result = new HashSet(); Class type = DifferentAccessModifiersFieldContainer.class; try { result.add(type.getDeclaredField("i")); @@ -169,7 +169,7 @@ private static Set createFieldContainerFields() { } private static Set createNonStaticFieldContainerFields() { - Set result = new HashSet<>(); + var result = new HashSet(); Class type = DifferentAccessModifiersFieldContainer.class; try { result.add(type.getDeclaredField("i")); @@ -184,7 +184,7 @@ private static Set createNonStaticFieldContainerFields() { } private static Set createSubFieldContainerFields() { - Set result = new HashSet<>(); + var result = new HashSet(); Class type = DifferentAccessModifiersSubFieldContainer.class; try { result.add(type.getDeclaredField("a")); @@ -199,7 +199,7 @@ private static Set createSubFieldContainerFields() { } private static Set createFieldAndSubFieldContainerFields() { - Set result = new HashSet<>(); + var result = new HashSet(); result.addAll(FIELD_CONTAINER_FIELDS); result.addAll(SUB_FIELD_CONTAINER_FIELDS); return result; diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/PackageScannerTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/PackageScannerTest.java index 519a2d916..8a44b409a 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/PackageScannerTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/PackageScannerTest.java @@ -114,8 +114,7 @@ void anonymousAndLocalClassesAreSkipped() { List> classes = PackageScanner.getClassesIn("nl.jqno.equalsverifier.testhelpers.packages.anonymous", null, false); - assertThat(classes) - .isEqualTo(Collections.singletonList(nl.jqno.equalsverifier.testhelpers.packages.anonymous.A.class)); + assertThat(classes).isEqualTo(List.of(nl.jqno.equalsverifier.testhelpers.packages.anonymous.A.class)); } private void sort(List> classes) { diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/SuperclassIterableTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/SuperclassIterableTest.java index 63f5cb470..eccabf10c 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/SuperclassIterableTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/SuperclassIterableTest.java @@ -2,7 +2,6 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -33,7 +32,7 @@ void simpleClassIncludeSelf() { for (Class type : SuperclassIterable.ofIncludeSelf(SimpleClass.class)) { actual.add(type); } - assertThat(actual).isEqualTo(singletonList(SimpleClass.class)); + assertThat(actual).isEqualTo(List.of(SimpleClass.class)); } @Test @@ -65,7 +64,7 @@ void interfaceIncludeSelf() { for (Class type : SuperclassIterable.ofIncludeSelf(SimpleInterface.class)) { actual.add(type); } - assertThat(actual).isEqualTo(singletonList(SimpleInterface.class)); + assertThat(actual).isEqualTo(List.of(SimpleInterface.class)); } @Test @@ -81,7 +80,7 @@ void subInterfaceIncludeSelf() { for (Class type : SuperclassIterable.ofIncludeSelf(SimpleSubInterface.class)) { actual.add(type); } - assertThat(actual).isEqualTo(singletonList(SimpleSubInterface.class)); + assertThat(actual).isEqualTo(List.of(SimpleSubInterface.class)); } static class SimpleClass {} diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/UtilTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/UtilTest.java index 7d8ba0760..9694d14f5 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/UtilTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/UtilTest.java @@ -60,7 +60,7 @@ void objectsReturnsItsArguments() { @Test void setOfReturnsItsArguments() { - Set expected = new HashSet<>(); + var expected = new HashSet(); expected.add("one"); expected.add("two"); diff --git a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/annotations/AnnotationCacheBuilderTest.java b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/annotations/AnnotationCacheBuilderTest.java index e4adc39ea..0c62ffc7a 100644 --- a/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/annotations/AnnotationCacheBuilderTest.java +++ b/equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/reflection/annotations/AnnotationCacheBuilderTest.java @@ -250,7 +250,7 @@ void annotationsArrayParametersAreFoundOnClass() { assertTypeHasAnnotation(AnnotationWithValuesContainer.class, annotation); - Set annotations = new HashSet<>(annotation.properties.getArrayValues("annotations")); + var annotations = new HashSet(annotation.properties.getArrayValues("annotations")); assertThat(annotations).contains("javax.annotation.Nonnull"); assertThat(annotations).contains("nl.jqno.equalsverifier.testhelpers.annotations.NotNull"); } @@ -320,7 +320,7 @@ private static final class AnnotationWithClassValuesAnnotation implements Annota @Override public Set partialClassNames() { - Set result = new HashSet<>(); + var result = new HashSet(); result.add(AnnotationWithValues.class.getSimpleName()); return result; } diff --git a/pom.xml b/pom.xml index 467e66c1b..585406582 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ - 11 + 11 UTF-8 UTF-8 @@ -85,7 +85,7 @@ 0.2 33.4.0-jre 3.0.0 - 1.3.2 + 1.3.5 1.0 2.13.0 5.11.4