rsanchez
2014-10-23 bc2cedc83f6353259ea1364f98ce60bf11d7ecf4
securis/src/main/java/net/curisit/securis/db/LicenseTypeMetadata.java
....@@ -3,7 +3,6 @@
33 import java.io.Serializable;
44
55 import javax.persistence.Entity;
6
-import javax.persistence.GeneratedValue;
76 import javax.persistence.Id;
87 import javax.persistence.JoinColumn;
98 import javax.persistence.ManyToOne;
....@@ -11,18 +10,18 @@
1110 import javax.persistence.NamedQuery;
1211 import javax.persistence.Table;
1312
14
-import org.codehaus.jackson.annotate.JsonAutoDetect;
15
-import org.codehaus.jackson.annotate.JsonIgnore;
16
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
17
-import org.codehaus.jackson.annotate.JsonProperty;
18
-import org.codehaus.jackson.map.annotate.JsonSerialize;
13
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
14
+import com.fasterxml.jackson.annotation.JsonIgnore;
15
+import com.fasterxml.jackson.annotation.JsonInclude;
16
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
17
+import com.fasterxml.jackson.annotation.JsonProperty;
1918
2019 /**
2120 * Entity implementation class for Entity: licensetype_metadata
2221 *
2322 */
2423 @JsonAutoDetect
25
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
24
+@JsonInclude(Include.NON_NULL)
2625 @Entity
2726 @Table(name = "licensetype_metadata")
2827 @NamedQueries({
....@@ -88,13 +87,13 @@
8887 public boolean equals(Object obj) {
8988 if (!(obj instanceof LicenseTypeMetadata))
9089 return false;
91
- LicenseTypeMetadata other = (LicenseTypeMetadata)obj;
90
+ LicenseTypeMetadata other = (LicenseTypeMetadata) obj;
9291 return key.equals(other.key) && (licenseType == null || licenseType.equals(other.licenseType));
9392 }
94
-
93
+
9594 @Override
9695 public int hashCode() {
97
-
96
+
9897 return key.hashCode() + (licenseType == null ? 0 : licenseType.hashCode());
9998 }
10099