#396 fix - Supporting MySQL, changed "persist()" by "merge()"

rsanchez

2014-11-17 04f9a9d2dbd2d79bfffea9c5a6b7ba1b32c5f42b

 securis/src/main/java/net/curisit/securis/db/LicenseHistory.java
..
..
@@ -3,6 +3,7 @@
3
3
 import java.io.Serializable;
4
4
 import java.util.Date;
5
5
 
6
+import javax.persistence.Column;
6
7
 import javax.persistence.Entity;
7
8
 import javax.persistence.GeneratedValue;
8
9
 import javax.persistence.Id;
..
..
@@ -52,7 +53,9 @@
52
53
     private String action;
53
54
     private String comments;
54
55
 
55
-    private Date timestamp;
56
+    @Column(name = "creation_timestamp")
57
+    @JsonProperty("creation_timestamp")
58
+    private Date creationTimestamp;
56
59
 
57
60
     public int getId() {
58
61
         return id;
..
..
@@ -95,18 +98,18 @@
95
98
         this.comments = comments;
96
99
     }
97
100
 
98
-    public Date getTimestamp() {
99
-        return timestamp;
100
-    }
101
-
102
-    public void setTimestamp(Date timestamp) {
103
-        this.timestamp = timestamp;
104
-    }
105
-
106
101
     public void setId(int id) {
107
102
         this.id = id;
108
103
     }
109
104
 
105
+    public Date getCreationTimestamp() {
106
+        return creationTimestamp;
107
+    }
108
+
109
+    public void setCreationTimestamp(Date creationTimestamp) {
110
+        this.creationTimestamp = creationTimestamp;
111
+    }
112
+
110
113
     public static class Actions {
111
114
         public static final String CREATE = "creation";
112
115
         public static final String ADD_REQUEST = "request";