Allows final entities with @GeneratedValue

jqno · Mar 1, 2024 · 346c69b · 346c69b
1 parent aad009a
commit 346c69b
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Final entities with @GeneratedValue could not be verified. ([Issue 929](https://github.com/jqno/equalsverifier/issues/929))
+
 ## [3.15.7] - 2024-02-23
 
 ### Fixed

diff --git a/...in/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/JpaLazyGetterFieldCheck.java b/...in/java/nl/jqno/equalsverifier/internal/checkers/fieldchecks/JpaLazyGetterFieldCheck.java
@@ -4,6 +4,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static nl.jqno.equalsverifier.internal.util.Assert.assertTrue;
 
+import java.lang.reflect.Modifier;
 import java.util.function.Function;
 import nl.jqno.equalsverifier.Warning;
 import nl.jqno.equalsverifier.internal.exceptions.EqualsVerifierInternalBugException;
@@ -49,7 +50,8 @@ public void execute(
 
         if (
             !fieldIsUsed(referenceAccessor, copyAccessor, fieldAccessor, true) ||
-            !fieldIsLazy(fieldAccessor)
+            !fieldIsLazy(fieldAccessor) ||
+            Modifier.isFinal(type.getModifiers())
         ) {
             return;
         }

diff --git a/...rc/test/java/nl/jqno/equalsverifier/integration/extra_features/JakartaLazyEntityTest.java b/...rc/test/java/nl/jqno/equalsverifier/integration/extra_features/JakartaLazyEntityTest.java
@@ -176,6 +176,11 @@ public void gettersAreUsedAndProtected() {
         EqualsVerifier.forClass(ProtectedJakartaLazyFieldContainer.class).verify();
     }
 
+    @Test
+    public void finalEntitiesArentLazy() {
+        EqualsVerifier.forClass(FinalEntity.class).verify();
+    }
+
     private void getterNotUsed(Class<?> type, String method, Warning... additionalWarnings) {
         ExpectedException
             .when(() -> EqualsVerifier.forClass(type).suppress(additionalWarnings).verify())
@@ -718,4 +723,29 @@ public int hashCode() {
             return Objects.hash(getBasic());
         }
     }
+
+    @Entity
+    static final class FinalEntity {
+
+        @GeneratedValue // which is considered lazy
+        private int id;
+
+        public int getId() {
+            return id;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof FinalEntity)) {
+                return false;
+            }
+            FinalEntity other = (FinalEntity) obj;
+            return Objects.equals(getId(), other.getId());
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(getId());
+        }
+    }
 }
diff --git a/...re/src/test/java/nl/jqno/equalsverifier/integration/extra_features/JpaLazyEntityTest.java b/...re/src/test/java/nl/jqno/equalsverifier/integration/extra_features/JpaLazyEntityTest.java
@@ -166,6 +166,11 @@ public void gettersAreUsedAndProtected() {
         EqualsVerifier.forClass(ProtectedJpaLazyFieldContainer.class).verify();
     }
 
+    @Test
+    public void finalEntitiesArentLazy() {
+        EqualsVerifier.forClass(FinalEntity.class).verify();
+    }
+
     private void getterNotUsed(Class<?> type, String method, Warning... additionalWarnings) {
         ExpectedException
             .when(() -> EqualsVerifier.forClass(type).suppress(additionalWarnings).verify())
@@ -705,4 +710,29 @@ public int hashCode() {
             return Objects.hash(getBasic());
         }
     }
+
+    @Entity
+    static final class FinalEntity {
+
+        @GeneratedValue // which is considered lazy
+        private int id;
+
+        public int getId() {
+            return id;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof FinalEntity)) {
+                return false;
+            }
+            FinalEntity other = (FinalEntity) obj;
+            return Objects.equals(getId(), other.getId());
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(getId());
+        }
+    }
 }