rsanchez
2014-10-23 bc2cedc83f6353259ea1364f98ce60bf11d7ecf4
securis/src/main/java/net/curisit/securis/db/LicenseType.java
....@@ -18,24 +18,26 @@
1818
1919 import org.apache.logging.log4j.LogManager;
2020 import org.apache.logging.log4j.Logger;
21
-import org.codehaus.jackson.annotate.JsonAutoDetect;
22
-import org.codehaus.jackson.annotate.JsonIgnore;
23
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
24
-import org.codehaus.jackson.annotate.JsonProperty;
25
-import org.codehaus.jackson.map.annotate.JsonSerialize;
21
+
22
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
23
+import com.fasterxml.jackson.annotation.JsonIgnore;
24
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
25
+import com.fasterxml.jackson.annotation.JsonInclude;
26
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
27
+import com.fasterxml.jackson.annotation.JsonProperty;
2628
2729 /**
2830 * Entity implementation class for Entity: license_type
2931 *
3032 */
3133 @JsonAutoDetect
32
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
34
+@JsonInclude(Include.NON_NULL)
3335 @JsonIgnoreProperties(ignoreUnknown = true)
3436 @Entity
3537 @Table(name = "license_type")
3638 @NamedQueries({
37
- @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt"),
38
- @NamedQuery(name = "list-application-license_types", query = "SELECT lt FROM LicenseType lt where lt.application.id = :appId")
39
+ @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt"),
40
+ @NamedQuery(name = "list-application-license_types", query = "SELECT lt FROM LicenseType lt where lt.application.id = :appId")
3941 })
4042 public class LicenseType implements Serializable {
4143
....@@ -62,7 +64,7 @@
6264
6365 @OneToMany(fetch = FetchType.LAZY, mappedBy = "licenseType")
6466 private Set<LicenseTypeMetadata> metadata;
65
-
67
+
6668 public Set<LicenseTypeMetadata> getMetadata() {
6769 return metadata;
6870 }
....@@ -143,13 +145,13 @@
143145 public boolean equals(Object obj) {
144146 if (!(obj instanceof LicenseType))
145147 return false;
146
- LicenseType other = (LicenseType)obj;
148
+ LicenseType other = (LicenseType) obj;
147149 return id.equals(other.id);
148150 }
149
-
151
+
150152 @Override
151153 public int hashCode() {
152
-
154
+
153155 return (id == null ? 0 : id.hashCode());
154156 }
155157 }