From fb1b6755a9ecd43601dc4fbef9166d11d8a86f24 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Tue, 14 Oct 2014 16:25:10 +0000
Subject: [PATCH] #2021 config - Added application Metadata management
---
securis/src/main/java/net/curisit/securis/db/Application.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/Application.java b/securis/src/main/java/net/curisit/securis/db/Application.java
index 055a12a..71f2c4c 100644
--- a/securis/src/main/java/net/curisit/securis/db/Application.java
+++ b/securis/src/main/java/net/curisit/securis/db/Application.java
@@ -16,7 +16,9 @@
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
+
/**
* Entity implementation class for Entity: application
@@ -35,7 +37,7 @@
@Id
@GeneratedValue
- private int id;
+ private Integer id;
private String name;
private String description;
@@ -49,9 +51,6 @@
@OneToMany(fetch = FetchType.LAZY, mappedBy = "application")
private Set<LicenseType> licenseTypes;
- @JsonIgnore
- // We don't include the referenced entities to limit the size of each row at
- // the listing
@OneToMany(fetch = FetchType.LAZY, mappedBy = "application")
private Set<ApplicationMetadata> metadata;
@@ -95,12 +94,27 @@
this.licenseTypes = licenseTypes;
}
+ @JsonProperty("metadata")
public Set<ApplicationMetadata> getApplicationMetadata() {
return metadata;
}
+ @JsonProperty("metadata")
public void setApplicationMetadata(Set<ApplicationMetadata> metadata) {
this.metadata = metadata;
}
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof Application))
+ return false;
+ Application other = (Application)obj;
+ return id.equals(other.id);
+ }
+
+ @Override
+ public int hashCode() {
+
+ return (id == null ? 0 : id.hashCode());
+ }
}
--
Gitblit v1.3.2