Fixes transitive module warnings by moving ConfiguredEqualsVerifier i…

…nto api package
jqno · Jan 30, 2025 · fa7a492 · fa7a492
1 parent 1d20f1c
commit fa7a492
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/EqualsVerifier.java b/equalsverifier-core/src/main/java/nl/jqno/equalsverifier/EqualsVerifier.java
@@ -2,10 +2,7 @@
 
 import java.util.List;
 
-import nl.jqno.equalsverifier.api.EqualsVerifierApi;
-import nl.jqno.equalsverifier.api.MultipleTypeEqualsVerifierApi;
-import nl.jqno.equalsverifier.api.RelaxedEqualsVerifierApi;
-import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
+import nl.jqno.equalsverifier.api.*;
 import nl.jqno.equalsverifier.internal.reflection.PackageScanner;
 import nl.jqno.equalsverifier.internal.util.ListBuilders;
 import nl.jqno.equalsverifier.internal.util.Validations;

diff --git a/...alsverifier/ConfiguredEqualsVerifier.java → ...erifier/api/ConfiguredEqualsVerifier.java b/...alsverifier/ConfiguredEqualsVerifier.java → ...erifier/api/ConfiguredEqualsVerifier.java
@@ -1,15 +1,14 @@
-package nl.jqno.equalsverifier;
+package nl.jqno.equalsverifier.api;
 
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.function.Function;
 
+import nl.jqno.equalsverifier.CheckReturnValue;
 import nl.jqno.equalsverifier.Func.Func1;
 import nl.jqno.equalsverifier.Func.Func2;
-import nl.jqno.equalsverifier.api.EqualsVerifierApi;
-import nl.jqno.equalsverifier.api.MultipleTypeEqualsVerifierApi;
-import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
+import nl.jqno.equalsverifier.Warning;
 import nl.jqno.equalsverifier.internal.instantiation.vintage.FactoryCache;
 import nl.jqno.equalsverifier.internal.instantiation.vintage.PrefabValuesApi;
 import nl.jqno.equalsverifier.internal.reflection.PackageScanner;

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
@@ -57,7 +57,7 @@ public SingleTypeEqualsVerifierApi(Class<T> type) {
      * @param type      The class for which the {@code equals} method should be tested.
      * @param objenesis To instantiate non-record classes.
      */
-    public SingleTypeEqualsVerifierApi(Class<T> type, Objenesis objenesis) {
+    private SingleTypeEqualsVerifierApi(Class<T> type, Objenesis objenesis) {
         this.type = type;
         this.actualFields = FieldNameExtractor.extractFieldNames(type);
         this.objenesis = objenesis;
@@ -74,7 +74,7 @@ public SingleTypeEqualsVerifierApi(Class<T> type, Objenesis objenesis) {
      *     equals}            method, instead of an {@code instanceof} check.
      * @param converter          A function that converts from field name to getter name.
      */
-    public SingleTypeEqualsVerifierApi(
+    /* package protected */ SingleTypeEqualsVerifierApi(
             Class<T> type,
             EnumSet<Warning> warningsToSuppress,
             FactoryCache factoryCache,

diff --git a/.../nl/jqno/equalsverifier/integration/operational/ConfiguredEqualsVerifierMultipleTest.java b/.../nl/jqno/equalsverifier/integration/operational/ConfiguredEqualsVerifierMultipleTest.java
@@ -5,22 +5,16 @@
 import java.util.Arrays;
 import java.util.List;
 
-import nl.jqno.equalsverifier.ConfiguredEqualsVerifier;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.EqualsVerifierReport;
 import nl.jqno.equalsverifier.Warning;
+import nl.jqno.equalsverifier.api.ConfiguredEqualsVerifier;
 import nl.jqno.equalsverifier.internal.testhelpers.ExpectedException;
 import nl.jqno.equalsverifier.testhelpers.packages.correct.A;
-import nl.jqno.equalsverifier.testhelpers.types.FinalMethodsPoint;
-import nl.jqno.equalsverifier.testhelpers.types.GetClassPoint;
-import nl.jqno.equalsverifier.testhelpers.types.MutablePoint;
-import nl.jqno.equalsverifier.testhelpers.types.PointContainer;
+import nl.jqno.equalsverifier.testhelpers.types.*;
 import nl.jqno.equalsverifier.testhelpers.types.RecursiveTypeHelper.RecursiveType;
 import nl.jqno.equalsverifier.testhelpers.types.RecursiveTypeHelper.RecursiveTypeContainer;
-import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.DoubleGenericContainer;
-import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.DoubleGenericContainerContainer;
-import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.SingleGenericContainer;
-import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.SingleGenericContainerContainer;
+import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.*;
 import org.junit.jupiter.api.Test;
 
 class ConfiguredEqualsVerifierMultipleTest {

diff --git a/...va/nl/jqno/equalsverifier/integration/operational/ConfiguredEqualsVerifierSingleTest.java b/...va/nl/jqno/equalsverifier/integration/operational/ConfiguredEqualsVerifierSingleTest.java
@@ -1,18 +1,15 @@
 package nl.jqno.equalsverifier.integration.operational;
 
-import nl.jqno.equalsverifier.ConfiguredEqualsVerifier;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
+import nl.jqno.equalsverifier.api.ConfiguredEqualsVerifier;
 import nl.jqno.equalsverifier.internal.testhelpers.ExpectedException;
 import nl.jqno.equalsverifier.testhelpers.types.GetClassPoint;
 import nl.jqno.equalsverifier.testhelpers.types.MutablePoint;
 import nl.jqno.equalsverifier.testhelpers.types.PointContainer;
 import nl.jqno.equalsverifier.testhelpers.types.RecursiveTypeHelper.RecursiveType;
 import nl.jqno.equalsverifier.testhelpers.types.RecursiveTypeHelper.RecursiveTypeContainer;
-import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.DoubleGenericContainer;
-import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.DoubleGenericContainerContainer;
-import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.SingleGenericContainer;
-import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.SingleGenericContainerContainer;
+import nl.jqno.equalsverifier.testhelpers.types.TypeHelper.*;
 import org.junit.jupiter.api.Test;
 
 class ConfiguredEqualsVerifierSingleTest {