rsanchez
2014-10-15 973ee9056995d1c9e7a533d9999329a70f0d2b2d
securis/src/main/java/net/curisit/securis/db/PackMetadata.java
....@@ -32,27 +32,18 @@
3232 private static final long serialVersionUID = 1L;
3333
3434 @Id
35
- @GeneratedValue
36
- private int id;
35
+ @JsonIgnore
36
+ @ManyToOne
37
+ @JoinColumn(name = "pack_id")
38
+ private Pack pack;
3739
40
+ @Id
3841 private String key;
3942
4043 private String value;
4144
4245 private boolean readonly;
4346
44
- @JsonIgnore
45
- @ManyToOne
46
- @JoinColumn(name = "pack_id")
47
- private Pack pack;
48
-
49
- public int getId() {
50
- return id;
51
- }
52
-
53
- public void setId(int id) {
54
- this.id = id;
55
- }
5647
5748 @JsonProperty("pack_id")
5849 public Integer getPackId() {
....@@ -100,5 +91,19 @@
10091 public void setReadonly(boolean readonly) {
10192 this.readonly = readonly;
10293 }
94
+
95
+ @Override
96
+ public boolean equals(Object obj) {
97
+ if (!(obj instanceof PackMetadata))
98
+ return false;
99
+ PackMetadata other = (PackMetadata)obj;
100
+ return key.equals(other.key) && (pack == null || pack.equals(other.pack));
101
+ }
102
+
103
+ @Override
104
+ public int hashCode() {
105
+
106
+ return key.hashCode() + (pack == null ? 0 : pack.hashCode());
107
+ }
103108
104109 }