Roberto Sánchez
2014-01-23 cbfe9207ad7c9bba96b39c550d250d12097fd06f
securis/src/main/java/net/curisit/securis/db/License.java
....@@ -15,6 +15,7 @@
1515
1616 import org.codehaus.jackson.annotate.JsonAutoDetect;
1717 import org.codehaus.jackson.annotate.JsonIgnore;
18
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
1819 import org.codehaus.jackson.annotate.JsonProperty;
1920 import org.codehaus.jackson.map.annotate.JsonSerialize;
2021
....@@ -26,8 +27,9 @@
2627 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
2728 @Entity
2829 @Table(name = "license")
30
+@JsonIgnoreProperties(ignoreUnknown = true)
2931 @NamedQueries(
30
- { @NamedQuery(name = "list-licenses", query = "SELECT l FROM License l") })
32
+ { @NamedQuery(name = "list-licenses-by-pack", query = "SELECT l FROM License l where l.pack.id = :packId") })
3133 public class License implements Serializable {
3234
3335 private static final long serialVersionUID = 1L;
....@@ -56,9 +58,18 @@
5658 private int status;
5759
5860 @Column(name = "full_name")
61
+ @JsonProperty("full_name")
5962 private String fullName;
6063
6164 private String email;
65
+
66
+ @Column(name = "request_data")
67
+ @JsonProperty("request_data")
68
+ private String requestData;
69
+
70
+ @Column(name = "license_data")
71
+ @JsonProperty("license_data")
72
+ private String licenseData;
6273
6374 @Column(name = "creation_timestamp")
6475 private Date creationTimestamp;
....@@ -77,6 +88,8 @@
7788
7889 @Column(name = "last_access_timestamp")
7990 private Date lastAccessTimestamp;
91
+
92
+ private String comments;
8093
8194 public int getId() {
8295 return id;
....@@ -240,6 +253,30 @@
240253 this.lastAccessTimestamp = lastAccessTimestamp;
241254 }
242255
256
+ public String getRequestData() {
257
+ return requestData;
258
+ }
259
+
260
+ public void setRequestData(String requestData) {
261
+ this.requestData = requestData;
262
+ }
263
+
264
+ public String getLicenseData() {
265
+ return licenseData;
266
+ }
267
+
268
+ public void setLicenseData(String licenseData) {
269
+ this.licenseData = licenseData;
270
+ }
271
+
272
+ public String getComments() {
273
+ return comments;
274
+ }
275
+
276
+ public void setComments(String comments) {
277
+ this.comments = comments;
278
+ }
279
+
243280 public static class Status {
244281 public static final int CREATED = 0;
245282 public static final int SENT = 1;