diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java index 7fad52e..dfd7da7 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java @@ -4,13 +4,13 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable public class TListEntityId implements Serializable { @@ -24,22 +24,4 @@ public class TListEntityId implements Serializable { @Column(name = "sid", nullable = false) private Integer sid; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TListEntityId entity = (TListEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.sid, entity.sid); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, sid); - } - } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java index 1f0dbc6..ec22a99 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java @@ -4,13 +4,13 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable public class TListHeaderEntityId implements Serializable { @@ -31,22 +31,4 @@ public class TListHeaderEntityId implements Serializable { return id; } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TListHeaderEntityId entity = (TListHeaderEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.listHderId, entity.listHderId); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, listHderId); - } - } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java index 8f3e3d0..2223b8f 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java @@ -4,13 +4,13 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable public class TListItemEntityId implements Serializable { @@ -28,23 +28,4 @@ public class TListItemEntityId implements Serializable { @Column(name = "list_hder_id", nullable = false) private Integer listHderId; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TListItemEntityId entity = (TListItemEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.listHderId, entity.listHderId) && - Objects.equals(this.sid, entity.sid); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, listHderId, sid); - } - } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java new file mode 100644 index 0000000..6a786ee --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; +import java.io.Serializable; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@Embeddable +public class TListItemFileEntityId implements Serializable { + + private static final long serialVersionUID = -8073832649114843758L; + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") + private Long prjctIdx; + + @NotNull + @Column(name = "sid", nullable = false) + private Integer sid; + + @NotNull + @Column(name = "list_hder_id", nullable = false) + private Integer listHderId; + +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java deleted file mode 100644 index 4998995..0000000 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.kri.contact.server.persistence.entity; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.Objects; -import lombok.Getter; -import lombok.Setter; -import org.hibernate.Hibernate; - -@Getter -@Setter -@Embeddable -public class TListItemUploadEntityId implements Serializable { - - private static final long serialVersionUID = -8073832649114843758L; - - @NotNull - @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") - private Long prjctIdx; - - @NotNull - @Column(name = "sid", nullable = false) - private Integer sid; - - @NotNull - @Column(name = "list_hder_id", nullable = false) - private Integer listHderId; - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TListItemUploadEntityId entity = (TListItemUploadEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.listHderId, entity.listHderId) && - Objects.equals(this.sid, entity.sid); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, listHderId, sid); - } - -} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java index b505a2c..4e91bd5 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java @@ -5,16 +5,16 @@ import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.io.Serializable; -import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable @Builder @NoArgsConstructor @@ -39,21 +39,4 @@ public class TPrjctAssignEntityId implements Serializable { .build(); } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TPrjctAssignEntityId entity = (TPrjctAssignEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.userId, entity.userId); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, userId); - } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java index b12af57..9732e00 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java @@ -4,16 +4,16 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable @Builder @NoArgsConstructor @@ -36,21 +36,4 @@ public class TPrjctMainTmplatEntityId implements Serializable { .build(); } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TPrjctMainTmplatEntityId entity = (TPrjctMainTmplatEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.chnnlTy, entity.chnnlTy); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, chnnlTy); - } } diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java index e9dbedf..42a3012 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java @@ -7,16 +7,16 @@ import jakarta.persistence.Convert; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable @Builder @NoArgsConstructor @@ -47,22 +47,4 @@ public class TResultCodeEntityId implements Serializable { .build(); } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TResultCodeEntityId entity = (TResultCodeEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.resultCdTy, entity.resultCdTy) && - Objects.equals(this.resultCd, entity.resultCd); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, resultCdTy, resultCd); - } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java index b147e24..1b6571f 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java @@ -4,13 +4,13 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable public class TRoleFuncMapEntityId implements Serializable { @@ -24,22 +24,4 @@ public class TRoleFuncMapEntityId implements Serializable { @Column(name = "func_cd", nullable = false) private Long funcCd; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TRoleFuncMapEntityId entity = (TRoleFuncMapEntityId) o; - return Objects.equals(this.roleCd, entity.roleCd) && - Objects.equals(this.funcCd, entity.funcCd); - } - - @Override - public int hashCode() { - return Objects.hash(roleCd, funcCd); - } - } \ No newline at end of file