diff --git a/equalsverifier-core/pom.xml b/equalsverifier-core/pom.xml index 2a565181b..8a04f1f3e 100644 --- a/equalsverifier-core/pom.xml +++ b/equalsverifier-core/pom.xml @@ -86,14 +86,6 @@ ${version.bytebuddy} - - - com.github.spotbugs - spotbugs-annotations - ${version.spotbugs} - provided - - org.junit.jupiter @@ -113,6 +105,12 @@ ${version.commons-lang3} test + + com.github.spotbugs + spotbugs-annotations + ${version.spotbugs} + test + diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/EqualsVerifierReport.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/EqualsVerifierReport.java index f367a1a4b..6fb507982 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/EqualsVerifierReport.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/EqualsVerifierReport.java @@ -1,7 +1,7 @@ package nl.jqno.equalsverifier; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; /** * Contains the results of an {@link nl.jqno.equalsverifier.EqualsVerifier} run. diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/SuppressFBWarnings.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/SuppressFBWarnings.java new file mode 100644 index 000000000..2750319d7 --- /dev/null +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/SuppressFBWarnings.java @@ -0,0 +1,16 @@ +package nl.jqno.equalsverifier.internal; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +// CHECKSTYLE OFF: AbbreviationAsWordInName + +/** + * Copied over from spotbugs-annotations to avoid the dependency; see https://github.com/jqno/equalsverifier/issues/1026. + */ +@Retention(RetentionPolicy.CLASS) +public @interface SuppressFBWarnings { + String[] value() default {}; + + String justification() default ""; +} diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/AbstractDelegationChecker.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/AbstractDelegationChecker.java index 3b5820ab7..41eb3ef35 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/AbstractDelegationChecker.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/AbstractDelegationChecker.java @@ -2,8 +2,8 @@ import static nl.jqno.equalsverifier.internal.util.Assert.fail; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Field; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.ClassProbe; import nl.jqno.equalsverifier.internal.reflection.FieldIterable; import nl.jqno.equalsverifier.internal.reflection.Tuple; 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 fd53331b1..3195e1be8 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 @@ -3,11 +3,11 @@ import static nl.jqno.equalsverifier.internal.util.Assert.*; import static nl.jqno.equalsverifier.internal.util.Rethrow.rethrow; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.exceptions.AssertionException; import nl.jqno.equalsverifier.internal.reflection.FieldIterable; import nl.jqno.equalsverifier.internal.reflection.instantiation.SubjectCreator; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/HierarchyChecker.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/HierarchyChecker.java index 815370e31..fc7de55b4 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/HierarchyChecker.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/HierarchyChecker.java @@ -3,10 +3,10 @@ import static nl.jqno.equalsverifier.internal.util.Assert.*; import static nl.jqno.equalsverifier.internal.util.Rethrow.rethrow; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import nl.jqno.equalsverifier.Warning; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.ClassProbe; import nl.jqno.equalsverifier.internal.reflection.Instantiator; import nl.jqno.equalsverifier.internal.reflection.annotations.SupportedAnnotations; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/NullPointerExceptionFieldCheck.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/NullPointerExceptionFieldCheck.java index 0ad2fd058..ce83a8c38 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/NullPointerExceptionFieldCheck.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/NullPointerExceptionFieldCheck.java @@ -2,8 +2,8 @@ import static nl.jqno.equalsverifier.internal.util.Assert.fail; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Field; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.FieldMutator; import nl.jqno.equalsverifier.internal.reflection.FieldProbe; import nl.jqno.equalsverifier.internal.reflection.instantiation.SubjectCreator; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/StringFieldCheck.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/StringFieldCheck.java index 9377394a0..ee5614ac8 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/StringFieldCheck.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/StringFieldCheck.java @@ -2,7 +2,7 @@ import static nl.jqno.equalsverifier.internal.util.Assert.fail; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.exceptions.ReflectionException; import nl.jqno.equalsverifier.internal.reflection.FieldProbe; import nl.jqno.equalsverifier.internal.reflection.TypeTag; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/SymmetryFieldCheck.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/SymmetryFieldCheck.java index c3611eebc..cad26b78b 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/SymmetryFieldCheck.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/SymmetryFieldCheck.java @@ -2,7 +2,7 @@ import static nl.jqno.equalsverifier.internal.util.Assert.assertTrue; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.FieldProbe; import nl.jqno.equalsverifier.internal.reflection.instantiation.SubjectCreator; import nl.jqno.equalsverifier.internal.util.Formatter; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/TransientFieldsCheck.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/TransientFieldsCheck.java index 261d970a7..c149c2ccc 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/TransientFieldsCheck.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/TransientFieldsCheck.java @@ -2,7 +2,7 @@ import static nl.jqno.equalsverifier.internal.util.Assert.fail; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.FieldProbe; import nl.jqno.equalsverifier.internal.reflection.TypeTag; import nl.jqno.equalsverifier.internal.reflection.annotations.AnnotationCache; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/TransitivityFieldCheck.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/TransitivityFieldCheck.java index 6e20d3991..243c7b91f 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/TransitivityFieldCheck.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/TransitivityFieldCheck.java @@ -2,7 +2,7 @@ import static nl.jqno.equalsverifier.internal.util.Assert.fail; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.FieldProbe; import nl.jqno.equalsverifier.internal.reflection.instantiation.SubjectCreator; import nl.jqno.equalsverifier.internal.util.Formatter; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/exceptions/NoValueException.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/exceptions/NoValueException.java index 182a71572..3ccaa06b4 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/exceptions/NoValueException.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/exceptions/NoValueException.java @@ -1,6 +1,6 @@ package nl.jqno.equalsverifier.internal.exceptions; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.TypeTag; @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "EqualsVerifier doesn't serialize.") diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/exceptions/RecursionException.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/exceptions/RecursionException.java index 1221f1c0b..1b7d590e4 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/exceptions/RecursionException.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/exceptions/RecursionException.java @@ -1,8 +1,8 @@ package nl.jqno.equalsverifier.internal.exceptions; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Iterator; import java.util.LinkedHashSet; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.TypeTag; /** Signals that a recursion has been detected while traversing the fields of a data structure. */ diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/ConditionalInstantiator.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/ConditionalInstantiator.java index b96e779fe..c7fcf7a1f 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/ConditionalInstantiator.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/ConditionalInstantiator.java @@ -2,10 +2,10 @@ import static nl.jqno.equalsverifier.internal.reflection.Util.classForName; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.exceptions.ReflectionException; /** Allows instantiation of classes that may or may not be present on the classpath. */ diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldProbe.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldProbe.java index 56cd194b6..63012e644 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldProbe.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/FieldProbe.java @@ -3,10 +3,10 @@ import static nl.jqno.equalsverifier.internal.reflection.annotations.SupportedAnnotations.*; import static nl.jqno.equalsverifier.internal.util.Rethrow.rethrow; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import nl.jqno.equalsverifier.Warning; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.exceptions.ReflectionException; import nl.jqno.equalsverifier.internal.reflection.annotations.AnnotationCache; import nl.jqno.equalsverifier.internal.util.Configuration; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/JavaApiPrefabValues.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/JavaApiPrefabValues.java index e1db1d3e3..c52ba7ed1 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/JavaApiPrefabValues.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/JavaApiPrefabValues.java @@ -5,21 +5,21 @@ import static nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories.Factories.*; import static nl.jqno.equalsverifier.internal.util.Rethrow.rethrow; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 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,11 +28,9 @@ import java.util.concurrent.locks.StampedLock; import java.util.function.Supplier; import java.util.regex.Pattern; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider; -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.prefabvalues.factories.*; /** * Creates instances of classes for use in a {@link VintageValueProvider} object. diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/instantiation/SubjectCreator.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/instantiation/SubjectCreator.java index 17fc59420..d4f23867f 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/instantiation/SubjectCreator.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/instantiation/SubjectCreator.java @@ -1,9 +1,9 @@ package nl.jqno.equalsverifier.internal.reflection.instantiation; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.exceptions.ModuleException; import nl.jqno.equalsverifier.internal.reflection.*; import nl.jqno.equalsverifier.internal.util.Configuration; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/instantiation/VintageValueProvider.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/instantiation/VintageValueProvider.java index c92154520..c4937e21e 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/instantiation/VintageValueProvider.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/instantiation/VintageValueProvider.java @@ -1,7 +1,7 @@ package nl.jqno.equalsverifier.internal.reflection.instantiation; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.*; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.exceptions.RecursionException; import nl.jqno.equalsverifier.internal.exceptions.ReflectionException; import nl.jqno.equalsverifier.internal.reflection.FactoryCache; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/AbstractGenericFactory.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/AbstractGenericFactory.java index 0058867ad..ef35f58c3 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/AbstractGenericFactory.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/prefabvalues/factories/AbstractGenericFactory.java @@ -1,11 +1,11 @@ package nl.jqno.equalsverifier.internal.reflection.vintage.prefabvalues.factories; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.exceptions.ReflectionException; import nl.jqno.equalsverifier.internal.reflection.TypeTag; import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/testhelpers/ExpectedException.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/testhelpers/ExpectedException.java index 523cc4e97..2749f0320 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/testhelpers/ExpectedException.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/testhelpers/ExpectedException.java @@ -1,6 +1,6 @@ package nl.jqno.equalsverifier.internal.testhelpers; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.exceptions.MessagingException; @SuppressFBWarnings( diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/testhelpers/Util.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/testhelpers/Util.java index 9b67fd1e1..feb7cd492 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/testhelpers/Util.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/testhelpers/Util.java @@ -1,9 +1,9 @@ package nl.jqno.equalsverifier.internal.testhelpers; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.util.Objects; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.FieldIterable; import nl.jqno.equalsverifier.internal.reflection.FieldProbe; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/CachedHashCodeInitializer.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/CachedHashCodeInitializer.java index a45fc40d4..697631262 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/CachedHashCodeInitializer.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/CachedHashCodeInitializer.java @@ -2,10 +2,10 @@ import static nl.jqno.equalsverifier.internal.util.Rethrow.rethrow; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.FieldIterable; import nl.jqno.equalsverifier.internal.reflection.SuperclassIterable; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Configuration.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Configuration.java index 72c06ef98..428a617cf 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Configuration.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Configuration.java @@ -1,11 +1,11 @@ package nl.jqno.equalsverifier.internal.util; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.*; import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; import nl.jqno.equalsverifier.Warning; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.TypeTag; import nl.jqno.equalsverifier.internal.reflection.annotations.*; diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Context.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Context.java index e70f1620d..d7d7a5591 100644 --- a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Context.java +++ b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/internal/util/Context.java @@ -1,6 +1,6 @@ package nl.jqno.equalsverifier.internal.util; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import nl.jqno.equalsverifier.internal.SuppressFBWarnings; import nl.jqno.equalsverifier.internal.reflection.*; import nl.jqno.equalsverifier.internal.reflection.instantiation.SubjectCreator; import nl.jqno.equalsverifier.internal.reflection.instantiation.ValueProvider;