Removes FieldAccessor

jqno · Sep 16, 2024 · 8891f46 · 8891f46
1 parent 1e51de8
commit 8891f46
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 265 deletions.
diff --git a/...-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/FieldAccessor.java b/...-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/FieldAccessor.java
diff --git a/...-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/FieldModifier.java b/...-core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/FieldModifier.java
@@ -6,6 +6,7 @@
 import java.util.LinkedHashSet;
 import nl.jqno.equalsverifier.internal.exceptions.ReflectionException;
 import nl.jqno.equalsverifier.internal.prefabvalues.TypeTag;
+import nl.jqno.equalsverifier.internal.reflection.FieldProbe;
 import nl.jqno.equalsverifier.internal.util.PrimitiveMappers;
 
 public final class FieldModifier {
@@ -122,11 +123,11 @@ public void changeField(
     }
 
     private void change(FieldChanger changer, boolean includeStatic) {
-        FieldAccessor accessor = FieldAccessor.of(field);
-        if (!accessor.canBeModifiedReflectively()) {
+        FieldProbe probe = FieldProbe.of(field);
+        if (!probe.canBeModifiedReflectively()) {
             return;
         }
-        if (!includeStatic && accessor.fieldIsStatic()) {
+        if (!includeStatic && probe.isStatic()) {
             return;
         }
 

diff --git a/...core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/ObjectAccessor.java b/...core/src/main/java/nl/jqno/equalsverifier/internal/reflection/vintage/ObjectAccessor.java
@@ -4,6 +4,7 @@
 import java.util.LinkedHashSet;
 import java.util.function.Predicate;
 import nl.jqno.equalsverifier.internal.prefabvalues.TypeTag;
+import nl.jqno.equalsverifier.internal.reflection.FieldProbe;
 import nl.jqno.equalsverifier.internal.reflection.RecordsHelper;
 
 /**
@@ -77,7 +78,7 @@ public Class<T> type() {
      */
     @SuppressWarnings("unchecked")
     public T getField(Field field) {
-        return (T) FieldAccessor.of(field).get(object);
+        return (T) FieldProbe.of(field).getValue(object);
     }
 
     /**

diff --git a/...ier-core/src/test/java/nl/jqno/equalsverifier/internal/architecture/ArchitectureTest.java b/...ier-core/src/test/java/nl/jqno/equalsverifier/internal/architecture/ArchitectureTest.java
@@ -8,7 +8,6 @@
 import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageSubjectCreator;
 import nl.jqno.equalsverifier.internal.reflection.instantiation.VintageValueProvider;
 import nl.jqno.equalsverifier.internal.reflection.vintage.ClassAccessor;
-import nl.jqno.equalsverifier.internal.reflection.vintage.FieldAccessor;
 import nl.jqno.equalsverifier.internal.reflection.vintage.FieldModifier;
 import nl.jqno.equalsverifier.internal.reflection.vintage.ObjectAccessor;
 import nl.jqno.equalsverifier.internal.reflection.vintage.PrefabValues;
@@ -47,9 +46,6 @@ public final class ArchitectureTest {
         .areAssignableTo(ObjectAccessor.class)
         .orShould()
         .accessClassesThat()
-        .areAssignableTo(FieldAccessor.class)
-        .orShould()
-        .accessClassesThat()
         .areAssignableTo(FieldModifier.class)
         .orShould()
         .accessClassesThat()

diff --git a/...e/src/test/java/nl/jqno/equalsverifier/internal/reflection/vintage/FieldAccessorTest.java b/...e/src/test/java/nl/jqno/equalsverifier/internal/reflection/vintage/FieldAccessorTest.java