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/LicenseTypeMetadata.java | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/LicenseTypeMetadata.java b/securis/src/main/java/net/curisit/securis/db/LicenseTypeMetadata.java
index 350788d..3473d6c 100644
--- a/securis/src/main/java/net/curisit/securis/db/LicenseTypeMetadata.java
+++ b/securis/src/main/java/net/curisit/securis/db/LicenseTypeMetadata.java
@@ -1,9 +1,7 @@
package net.curisit.securis.db;
import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@@ -12,8 +10,6 @@
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-
-import net.curisit.securis.beans.MetadataType;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -39,16 +35,13 @@
@GeneratedValue
private int id;
+ private String key;
+
private String value;
@JsonIgnore
@ManyToOne
- @JoinColumn(name = "metadata_id")
- private ApplicationMetadata metadata;
-
- @JsonIgnore
- @ManyToOne
- @JoinColumn(name = "licensetype_id")
+ @JoinColumn(name = "license_type_id")
private LicenseType licenseType;
public int getId() {
@@ -74,29 +67,6 @@
}
}
- @JsonProperty("metadata_id")
- public Integer getMetadataId() {
- return metadata == null ? null : metadata.getId();
- }
-
- @JsonProperty("metadata_id")
- public void setMetadataId(Integer idMetadata) {
- if (idMetadata == null) {
- metadata = null;
- } else {
- metadata = new ApplicationMetadata();
- metadata.setId(idMetadata);
- }
- }
-
- public ApplicationMetadata getMetadata() {
- return metadata;
- }
-
- public void setMetadata(ApplicationMetadata metadata) {
- this.metadata = metadata;
- }
-
public LicenseType getLicenseType() {
return licenseType;
}
@@ -113,4 +83,12 @@
this.value = value;
}
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
}
--
Gitblit v1.3.2