Use ProxyUtils in equals methods for entities

wultra · Jun 3, 2024 · 7373d62 · 7373d62
1 parent 48344e4
commit 7373d62
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/com/wultra/security/userdatastore/model/entity/AttachmentEntity.java b/src/main/java/com/wultra/security/userdatastore/model/entity/AttachmentEntity.java
@@ -20,6 +20,7 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.util.ProxyUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -69,7 +70,7 @@ public class AttachmentEntity implements Serializable {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || !this.getClass().equals(ProxyUtils.getUserClass(o))) return false;
         AttachmentEntity that = (AttachmentEntity) o;
         return document.equals(that.document) && attachmentType.equals(that.attachmentType) && timestampCreated.equals(that.timestampCreated);
     }

diff --git a/src/main/java/com/wultra/security/userdatastore/model/entity/DocumentEntity.java b/src/main/java/com/wultra/security/userdatastore/model/entity/DocumentEntity.java
@@ -20,6 +20,7 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.util.ProxyUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -74,7 +75,7 @@ public class DocumentEntity implements Serializable {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || !this.getClass().equals(ProxyUtils.getUserClass(o))) return false;
         DocumentEntity that = (DocumentEntity) o;
         return userId.equals(that.userId) && documentType.equals(that.documentType) && dataType.equals(that.dataType) && documentDataId.equals(that.documentDataId);
     }

diff --git a/src/main/java/com/wultra/security/userdatastore/model/entity/PhotoEntity.java b/src/main/java/com/wultra/security/userdatastore/model/entity/PhotoEntity.java
@@ -20,6 +20,7 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.util.ProxyUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -69,7 +70,7 @@ public class PhotoEntity implements Serializable {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || !this.getClass().equals(ProxyUtils.getUserClass(o))) return false;
         PhotoEntity that = (PhotoEntity) o;
         return document.equals(that.document) && photoType.equals(that.photoType) && timestampCreated.equals(that.timestampCreated);
     }

diff --git a/src/main/java/com/wultra/security/userdatastore/model/entity/UserClaimsEntity.java b/src/main/java/com/wultra/security/userdatastore/model/entity/UserClaimsEntity.java
@@ -20,6 +20,7 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.util.ProxyUtils;
 
 import java.time.LocalDateTime;
 import java.util.Objects;
@@ -56,7 +57,8 @@ public class UserClaimsEntity {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof UserClaimsEntity that)) return false;
+        if (o == null || !this.getClass().equals(ProxyUtils.getUserClass(o))) return false;
+        UserClaimsEntity that = (UserClaimsEntity) o;
         return userId.equals(that.userId);
     }