rsanchez
2014-10-23 bc2cedc83f6353259ea1364f98ce60bf11d7ecf4
securis/src/main/java/net/curisit/securis/db/PackMetadata.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,17 +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.JsonProperty;
17
-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;
1818
1919 /**
2020 * Entity implementation class for Entity: pack_metadata
2121 *
2222 */
2323 @JsonAutoDetect
24
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
24
+@JsonInclude(Include.NON_NULL)
2525 @Entity
2626 @Table(name = "pack_metadata")
2727 @NamedQueries({
....@@ -92,18 +92,18 @@
9292 public void setReadonly(boolean readonly) {
9393 this.readonly = readonly;
9494 }
95
-
95
+
9696 @Override
9797 public boolean equals(Object obj) {
9898 if (!(obj instanceof PackMetadata))
9999 return false;
100
- PackMetadata other = (PackMetadata)obj;
100
+ PackMetadata other = (PackMetadata) obj;
101101 return key.equals(other.key) && (pack == null || pack.equals(other.pack));
102102 }
103
-
103
+
104104 @Override
105105 public int hashCode() {
106
-
106
+
107107 return key.hashCode() + (pack == null ? 0 : pack.hashCode());
108108 }
109109