Merge pull request #347 from nstdio/issue-346

Get only instance fields for records.

Author: jqno

src/main/java/nl/jqno/equalsverifier/internal/checkers/RecordChecker.java

@@ -6,9 +6,11 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 import nl.jqno.equalsverifier.internal.reflection.ClassAccessor;
 import nl.jqno.equalsverifier.internal.reflection.FieldAccessor;
@@ -72,12 +74,15 @@ private void verifyRecordPrecondition(
                         failedFields.stream().collect(Collectors.joining(","))));
     }
 
+    private static <T> Stream<Field> instanceFieldFor(Class<T> type) {
+        return StreamSupport.stream(FieldIterable.of(type).spliterator(), false)
+                .filter(field -> !Modifier.isStatic(field.getModifiers()));
+    }
+
     private static <T> Constructor<T> getConstructorFor(Class<T> type) {
         try {
             List<Class<?>> constructorTypes =
-                    StreamSupport.stream(FieldIterable.of(type).spliterator(), false)
-                            .map(Field::getType)
-                            .collect(Collectors.toList());
+                    instanceFieldFor(type).map(Field::getType).collect(Collectors.toList());
             Constructor<T> constructor =
                     type.getConstructor(constructorTypes.toArray(new Class<?>[0]));
             constructor.setAccessible(true);
@@ -91,7 +96,7 @@ private static <T> Constructor<T> getConstructorFor(Class<T> type) {
     private T callConstructor(
             Class<T> type, Constructor<T> constructor, ObjectAccessor<T> accessor) {
         List<?> params =
-                StreamSupport.stream(FieldIterable.of(type).spliterator(), false)
+                instanceFieldFor(type)
                         .map(accessor::fieldAccessorFor)
                         .map(FieldAccessor::get)
                         .collect(Collectors.toList());

src/test/java/nl/jqno/equalsverifier/integration/extended_contract/RecordsTest.java

@@ -101,6 +101,12 @@ public void fail_whenRecordAccessorThrowsNpe() {
         EqualsVerifier.forClass(type).verify();
     }
 
+    @Test
+    public void succeed_whenRecordContainsStaticField() {
+        Class<?> type = compile(STATIC_FIELD_RECORD_CLASS_NAME, STATIC_FIELD_RECORD_CLASS);
+        EqualsVerifier.forClass(type).verify();
+    }
+
     public boolean isRecordsAvailable() {
         if (!isTypeAvailable("java.lang.Record")) {
             return false;
@@ -214,4 +220,9 @@ public boolean isRecordsAvailable() {
                     + "\n        return s;"
                     + "\n    }"
                     + "\n}";
+    private static final String STATIC_FIELD_RECORD_CLASS_NAME = "StaticFieldRecord";
+    private static final String STATIC_FIELD_RECORD_CLASS =
+            "record StaticFieldRecord(int i, String s) {\n"
+                    + "    private static final int X = 0;\n"
+                    + "}";
 }