#396 fix - Corrected cancel action and added Settings entity

rsanchez

2014-11-18 fdbc8ca146b8e3aff0425e2faf94c0b4a6e3dd28

 securis/src/main/java/net/curisit/securis/db/License.java
..
..
@@ -8,6 +8,7 @@
8
8
 
9
9
 import javax.persistence.Column;
10
10
 import javax.persistence.Entity;
11
+import javax.persistence.EntityListeners;
11
12
 import javax.persistence.EntityManager;
12
13
 import javax.persistence.FetchType;
13
14
 import javax.persistence.GeneratedValue;
..
..
@@ -23,6 +24,10 @@
23
24
 import javax.persistence.TypedQuery;
24
25
 
25
26
 import net.curisit.integrity.commons.Utils;
27
+import net.curisit.securis.db.common.CreationTimestampEntity;
28
+import net.curisit.securis.db.common.ModificationTimestampEntity;
29
+import net.curisit.securis.db.listeners.CreationTimestampListener;
30
+import net.curisit.securis.db.listeners.ModificationTimestampListener;
26
31
 import net.curisit.securis.services.exception.SeCurisServiceException;
27
32
 import net.curisit.securis.services.exception.SeCurisServiceException.ErrorCodes;
28
33
 
..
..
@@ -33,16 +38,20 @@
33
38
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
34
39
 import com.fasterxml.jackson.annotation.JsonIgnore;
35
40
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
41
+import com.fasterxml.jackson.annotation.JsonInclude;
42
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
36
43
 import com.fasterxml.jackson.annotation.JsonProperty;
37
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
38
44
 
39
45
 /**
40
46
  * Entity implementation class for Entity: license
41
47
  * 
42
48
  */
43
49
 @JsonAutoDetect
44
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
50
+@JsonInclude(Include.NON_NULL)
45
51
 @Entity
52
+@EntityListeners({
53
+        CreationTimestampListener.class, ModificationTimestampListener.class
54
+})
46
55
 @Table(name = "license")
47
56
 @JsonIgnoreProperties(ignoreUnknown = true)
48
57
 @NamedQueries({
..
..
@@ -50,7 +59,8 @@
50
59
         @NamedQuery(name = "list-licenses-by-req-data", query = "SELECT l FROM License l where l.reqDataHash = :hash"),
51
60
         @NamedQuery(name = "list-active-licenses-by-req-data", query = "SELECT l FROM License l where l.reqDataHash = :hash and l.status in ('AC', 'PA')")
52
61
 })
53
-public class License implements Serializable {
62
+public class License implements CreationTimestampEntity, ModificationTimestampEntity, Serializable {
63
+
54
64
     private static final long serialVersionUID = 2700310404904877227L;
55
65
 
56
66
     private static final Logger LOG = LogManager.getLogger(License.class);
..
..
@@ -134,10 +144,12 @@
134
144
         this.code = code;
135
145
     }
136
146
 
147
+    @Override
137
148
     public Date getCreationTimestamp() {
138
149
         return creationTimestamp;
139
150
     }
140
151
 
152
+    @Override
141
153
     public void setCreationTimestamp(Date creationTimestamp) {
142
154
         this.creationTimestamp = creationTimestamp;
143
155
     }
..
..
@@ -216,10 +228,12 @@
216
228
         this.status = status;
217
229
     }
218
230
 
231
+    @Override
219
232
     public Date getModificationTimestamp() {
220
233
         return modificationTimestamp;
221
234
     }
222
235
 
236
+    @Override
223
237
     public void setModificationTimestamp(Date modificationTimestamp) {
224
238
         this.modificationTimestamp = modificationTimestamp;
225
239
     }