5 2 fix hibernate issue

DragFAQ · DragFAQ · commit cc455f2092d9 · 2017-04-21T11:38:59.000+03:00
diff --git a/src/main/java/ru/javawebinar/topjava/model/BaseEntity.java b/src/main/java/ru/javawebinar/topjava/model/BaseEntity.java
@@ -1,7 +1,13 @@
 package ru.javawebinar.topjava.model;
 
+import org.hibernate.Hibernate;
+
 import javax.persistence.*;
 
+/**
+ * Do not manipulate new (transient) entries in HashSet/HashMap without overriding hashCode
+ * http://stackoverflow.com/questions/5031614
+ */
 @MappedSuperclass
 
 // http://stackoverflow.com/questions/594597/hibernate-annotations-which-is-better-field-or-property-access
@@ -12,7 +18,9 @@ public class BaseEntity {
     @Id
     @SequenceGenerator(name = "global_seq", sequenceName = "global_seq", allocationSize = 1, initialValue = START_SEQ)
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "global_seq")
-    protected Integer id;
+    // PROPERTY access for id due to bug: https://hibernate.atlassian.net/browse/HHH-3718
+    @Access(value = AccessType.PROPERTY)
+    private Integer id;
 
     protected BaseEntity() {
     }
@@ -30,28 +38,28 @@ public Integer getId() {
     }
 
     public boolean isNew() {
-        return (this.id == null);
+        return (getId() == null);
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (o == null || !getClass().equals(Hibernate.getClass(o))) {
             return false;
         }
         BaseEntity that = (BaseEntity) o;
-        return id != null && id.equals(that.id);
+        return getId() != null && getId().equals(that.getId());
     }
 
     @Override
     public int hashCode() {
-        return (id == null) ? 0 : id;
+        return (getId() == null) ? 0 : getId();
     }
 
     @Override
     public String toString() {
-        return String.format("Entity %s (%s)", getClass().getName(), id);
+        return String.format("Entity %s (%s)", getClass().getName(), getId());
     }
 }
diff --git a/src/main/java/ru/javawebinar/topjava/model/Meal.java b/src/main/java/ru/javawebinar/topjava/model/Meal.java
@@ -99,7 +99,7 @@ public void setUser(User user) {
     @Override
     public String toString() {
         return "Meal{" +
-                "id=" + id +
+                "id=" + getId() +
                 ", dateTime=" + dateTime +
                 ", description='" + description + '\'' +
                 ", calories=" + calories +
diff --git a/src/main/java/ru/javawebinar/topjava/model/NamedEntity.java b/src/main/java/ru/javawebinar/topjava/model/NamedEntity.java
@@ -31,6 +31,6 @@ public String getName() {
 
     @Override
     public String toString() {
-        return String.format("Entity %s (%s, '%s')", getClass().getName(), id, name);
+        return String.format("Entity %s (%s, '%s')", getClass().getName(), getId(), name);
     }
 }
diff --git a/src/main/java/ru/javawebinar/topjava/model/User.java b/src/main/java/ru/javawebinar/topjava/model/User.java
@@ -118,7 +118,7 @@ public String getPassword() {
     @Override
     public String toString() {
         return "User{" +
-                "id=" + id +
+                "id=" + getId() +
                 ", email=" + email +
                 ", name=" + name +
                 ", enabled=" + enabled +

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,13 @@`
`1`	`1`	`package ru.javawebinar.topjava.model;`
`2`	`2`
	`3`	`+import org.hibernate.Hibernate;`
	`4`	`+`
`3`	`5`	`import javax.persistence.*;`
`4`	`6`
	`7`	`+/**`
	`8`	`+ * Do not manipulate new (transient) entries in HashSet/HashMap without overriding hashCode`
	`9`	`+ * http://stackoverflow.com/questions/5031614`
	`10`	`+ */`
`5`	`11`	`@MappedSuperclass`
`6`	`12`
`7`	`13`	`// http://stackoverflow.com/questions/594597/hibernate-annotations-which-is-better-field-or-property-access`
`@@ -12,7 +18,9 @@ public class BaseEntity {`
`12`	`18`	`@Id`
`13`	`19`	`@SequenceGenerator(name = "global_seq", sequenceName = "global_seq", allocationSize = 1, initialValue = START_SEQ)`
`14`	`20`	`@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "global_seq")`
`15`		`- protected Integer id;`
	`21`	`+ // PROPERTY access for id due to bug: https://hibernate.atlassian.net/browse/HHH-3718`
	`22`	`+ @Access(value = AccessType.PROPERTY)`
	`23`	`+ private Integer id;`
`16`	`24`
`17`	`25`	`protected BaseEntity() {`
`18`	`26`	`}`
`@@ -30,28 +38,28 @@ public Integer getId() {`
`30`	`38`	`}`
`31`	`39`
`32`	`40`	`public boolean isNew() {`
`33`		`- return (this.id == null);`
	`41`	`+ return (getId() == null);`
`34`	`42`	`}`
`35`	`43`
`36`	`44`	`@Override`
`37`	`45`	`public boolean equals(Object o) {`
`38`	`46`	`if (this == o) {`
`39`	`47`	`return true;`
`40`	`48`	`}`
`41`		`- if (o == null \|\| getClass() != o.getClass()) {`
	`49`	`+ if (o == null \|\| !getClass().equals(Hibernate.getClass(o))) {`
`42`	`50`	`return false;`
`43`	`51`	`}`
`44`	`52`	`BaseEntity that = (BaseEntity) o;`
`45`		`- return id != null && id.equals(that.id);`
	`53`	`+ return getId() != null && getId().equals(that.getId());`
`46`	`54`	`}`
`47`	`55`
`48`	`56`	`@Override`
`49`	`57`	`public int hashCode() {`
`50`		`- return (id == null) ? 0 : id;`
	`58`	`+ return (getId() == null) ? 0 : getId();`
`51`	`59`	`}`
`52`	`60`
`53`	`61`	`@Override`
`54`	`62`	`public String toString() {`
`55`		`- return String.format("Entity %s (%s)", getClass().getName(), id);`
	`63`	`+ return String.format("Entity %s (%s)", getClass().getName(), getId());`
`56`	`64`	`}`
`57`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ public String getName() {`
`31`	`31`
`32`	`32`	`@Override`
`33`	`33`	`public String toString() {`
`34`		`- return String.format("Entity %s (%s, '%s')", getClass().getName(), id, name);`
	`34`	`+ return String.format("Entity %s (%s, '%s')", getClass().getName(), getId(), name);`
`35`	`35`	`}`
`36`	`36`	`}`