Skip to content

Commit 261173b

Browse files
osopromadzeosopromadze
committed
added lombok EqualsAndHashCode
1 parent f0088ab commit 261173b

File tree

17 files changed

+62
-152
lines changed

17 files changed

+62
-152
lines changed

‎src/main/java/com/sopromadze/blogapi/model/Album.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sopromadze.blogapi.model.audit.UserDateAudit;
55
import com.sopromadze.blogapi.model.user.User;
66
import lombok.Data;
7+
import lombok.EqualsAndHashCode;
78

89
import javax.persistence.CascadeType;
910
import javax.persistence.Column;
@@ -22,6 +23,7 @@
2223
import java.util.Collections;
2324
import java.util.List;
2425

26+
@EqualsAndHashCode(callSuper = true)
2527
@Entity
2628
@Data
2729
@Table(name = "albums", uniqueConstraints = { @UniqueConstraint(columnNames = { "title" }) })

‎src/main/java/com/sopromadze/blogapi/model/Category.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
55
import com.sopromadze.blogapi.model.audit.UserDateAudit;
66
import lombok.Data;
7+
import lombok.EqualsAndHashCode;
78
import lombok.NoArgsConstructor;
89

910
import javax.persistence.CascadeType;
@@ -18,6 +19,7 @@
1819
import java.util.Collections;
1920
import java.util.List;
2021

22+
@EqualsAndHashCode(callSuper = true)
2123
@Entity
2224
@Data
2325
@NoArgsConstructor

‎src/main/java/com/sopromadze/blogapi/model/Comment.java‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sopromadze.blogapi.model.audit.UserDateAudit;
55
import com.sopromadze.blogapi.model.user.User;
66
import lombok.Data;
7+
import lombok.EqualsAndHashCode;
78
import lombok.NoArgsConstructor;
89

910
import javax.persistence.Column;
@@ -19,52 +20,53 @@
1920
import javax.validation.constraints.NotBlank;
2021
import javax.validation.constraints.Size;
2122

23+
@EqualsAndHashCode(callSuper = true)
2224
@Entity
2325
@Data
2426
@NoArgsConstructor
2527
@Table(name = "comments")
2628
public class Comment extends UserDateAudit {
27-
private static final long serialVersionUID = 1L;
29+
private static final long serialVersionUID = 1L;
2830

29-
@Id
30-
@GeneratedValue(strategy = GenerationType.IDENTITY)
31-
private Long id;
31+
@Id
32+
@GeneratedValue(strategy = GenerationType.IDENTITY)
33+
private Long id;
3234

33-
@Column(name = "name")
34-
@NotBlank
35-
@Size(min = 4, max = 50)
36-
private String name;
35+
@Column(name = "name")
36+
@NotBlank
37+
@Size(min = 4, max = 50)
38+
private String name;
3739

38-
@Column(name = "email")
39-
@NotBlank
40-
@Email
41-
@Size(min = 4, max = 50)
42-
private String email;
40+
@Column(name = "email")
41+
@NotBlank
42+
@Email
43+
@Size(min = 4, max = 50)
44+
private String email;
4345

44-
@Column(name = "body")
45-
@NotBlank
46-
@Size(min = 10, message = "Comment body must be minimum 10 characters")
47-
private String body;
46+
@Column(name = "body")
47+
@NotBlank
48+
@Size(min = 10, message = "Comment body must be minimum 10 characters")
49+
private String body;
4850

49-
@ManyToOne(fetch = FetchType.LAZY)
50-
@JoinColumn(name = "post_id")
51-
private Post post;
51+
@ManyToOne(fetch = FetchType.LAZY)
52+
@JoinColumn(name = "post_id")
53+
private Post post;
5254

53-
@ManyToOne(fetch = FetchType.LAZY)
54-
@JoinColumn(name = "user_id")
55-
private User user;
55+
@ManyToOne(fetch = FetchType.LAZY)
56+
@JoinColumn(name = "user_id")
57+
private User user;
5658

57-
public Comment(@NotBlank @Size(min = 10, message = "Comment body must be minimum 10 characters") String body) {
58-
this.body = body;
59-
}
59+
public Comment(@NotBlank @Size(min = 10, message = "Comment body must be minimum 10 characters") String body) {
60+
this.body = body;
61+
}
6062

61-
@JsonIgnore
62-
public Post getPost() {
63-
return post;
64-
}
63+
@JsonIgnore
64+
public Post getPost() {
65+
return post;
66+
}
6567

66-
@JsonIgnore
67-
public User getUser() {
68-
return user;
69-
}
68+
@JsonIgnore
69+
public User getUser() {
70+
return user;
71+
}
7072
}

‎src/main/java/com/sopromadze/blogapi/model/Photo.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sopromadze.blogapi.model.Album;
55
import com.sopromadze.blogapi.model.audit.UserDateAudit;
66
import lombok.Data;
7+
import lombok.EqualsAndHashCode;
78
import lombok.NoArgsConstructor;
89

910
import javax.persistence.Column;
@@ -18,6 +19,7 @@
1819
import javax.persistence.UniqueConstraint;
1920
import javax.validation.constraints.NotBlank;
2021

22+
@EqualsAndHashCode(callSuper = true)
2123
@Entity
2224
@Data
2325
@NoArgsConstructor

‎src/main/java/com/sopromadze/blogapi/model/Post.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.sopromadze.blogapi.model.audit.UserDateAudit;
77
import com.sopromadze.blogapi.model.user.User;
88
import lombok.Data;
9+
import lombok.EqualsAndHashCode;
910

1011
import javax.persistence.CascadeType;
1112
import javax.persistence.Column;
@@ -25,6 +26,7 @@
2526
import java.util.Collections;
2627
import java.util.List;
2728

29+
@EqualsAndHashCode(callSuper = true)
2830
@Entity
2931
@Data
3032
@Table(name = "posts", uniqueConstraints = { @UniqueConstraint(columnNames = { "title" }) })

‎src/main/java/com/sopromadze/blogapi/model/Tag.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sopromadze.blogapi.model.audit.UserDateAudit;
55
import com.sopromadze.blogapi.model.Post;
66
import lombok.Data;
7+
import lombok.EqualsAndHashCode;
78
import lombok.NoArgsConstructor;
89

910
import javax.persistence.Column;
@@ -20,6 +21,7 @@
2021
import java.util.Collections;
2122
import java.util.List;
2223

24+
@EqualsAndHashCode(callSuper = true)
2325
@Entity
2426
@Data
2527
@NoArgsConstructor

‎src/main/java/com/sopromadze/blogapi/model/Todo.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sopromadze.blogapi.model.audit.UserDateAudit;
55
import com.sopromadze.blogapi.model.user.User;
66
import lombok.Data;
7+
import lombok.EqualsAndHashCode;
78

89
import javax.persistence.Column;
910
import javax.persistence.Entity;
@@ -17,6 +18,7 @@
1718
import javax.persistence.UniqueConstraint;
1819
import javax.validation.constraints.NotBlank;
1920

21+
@EqualsAndHashCode(callSuper = true)
2022
@Entity
2123
@Data
2224
@Table(name = "todos", uniqueConstraints = { @UniqueConstraint(columnNames = { "title" }) })

‎src/main/java/com/sopromadze/blogapi/model/audit/UserDateAudit.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import lombok.Data;
5+
import lombok.EqualsAndHashCode;
56
import org.springframework.data.annotation.CreatedBy;
67
import org.springframework.data.annotation.LastModifiedBy;
78

89
import javax.persistence.Column;
910
import javax.persistence.MappedSuperclass;
1011

12+
@EqualsAndHashCode(callSuper = true)
1113
@MappedSuperclass
1214
@Data
1315
@JsonIgnoreProperties(

‎src/main/java/com/sopromadze/blogapi/model/user/Address.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sopromadze.blogapi.model.audit.UserDateAudit;
55
import lombok.AllArgsConstructor;
66
import lombok.Data;
7+
import lombok.EqualsAndHashCode;
78
import lombok.NoArgsConstructor;
89

910
import javax.persistence.CascadeType;
@@ -17,6 +18,7 @@
1718
import javax.persistence.Table;
1819
import java.time.Instant;
1920

21+
@EqualsAndHashCode(callSuper = true)
2022
@Entity
2123
@Data
2224
@NoArgsConstructor

‎src/main/java/com/sopromadze/blogapi/model/user/Company.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import com.sopromadze.blogapi.model.audit.UserDateAudit;
55
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
78

89
import javax.persistence.Column;
@@ -14,6 +15,7 @@
1415
import javax.persistence.Table;
1516
import java.time.Instant;
1617

18+
@EqualsAndHashCode(callSuper = true)
1719
@Entity
1820
@Data
1921
@NoArgsConstructor

0 commit comments

Comments
 (0)