From 973ee9056995d1c9e7a533d9999329a70f0d2b2d Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 15 Oct 2014 07:49:46 +0000
Subject: [PATCH] #2021 config - Added pack and LicenseType Metadata management
---
securis/src/main/java/net/curisit/securis/db/PackMetadata.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/PackMetadata.java b/securis/src/main/java/net/curisit/securis/db/PackMetadata.java
index 7545457..a99a045 100644
--- a/securis/src/main/java/net/curisit/securis/db/PackMetadata.java
+++ b/securis/src/main/java/net/curisit/securis/db/PackMetadata.java
@@ -32,27 +32,18 @@
private static final long serialVersionUID = 1L;
@Id
- @GeneratedValue
- private int id;
+ @JsonIgnore
+ @ManyToOne
+ @JoinColumn(name = "pack_id")
+ private Pack pack;
+ @Id
private String key;
private String value;
private boolean readonly;
- @JsonIgnore
- @ManyToOne
- @JoinColumn(name = "pack_id")
- private Pack pack;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
@JsonProperty("pack_id")
public Integer getPackId() {
@@ -100,5 +91,19 @@
public void setReadonly(boolean readonly) {
this.readonly = readonly;
}
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof PackMetadata))
+ return false;
+ PackMetadata other = (PackMetadata)obj;
+ return key.equals(other.key) && (pack == null || pack.equals(other.pack));
+ }
+
+ @Override
+ public int hashCode() {
+
+ return key.hashCode() + (pack == null ? 0 : pack.hashCode());
+ }
}
--
Gitblit v1.3.2