From 59cdd2b7ebceae94fbecdb1eeb46a969666dc88f Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 10 Jan 2014 12:25:27 +0000
Subject: [PATCH] #394 feature - Added all catalog resources with refereced fields
---
securis/src/main/java/net/curisit/securis/db/LicenseType.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/LicenseType.java b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
index 675f108..a805a98 100644
--- a/securis/src/main/java/net/curisit/securis/db/LicenseType.java
+++ b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
@@ -14,7 +14,11 @@
import javax.persistence.Table;
import org.codehaus.jackson.annotate.JsonAutoDetect;
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Entity implementation class for Entity: license_type
@@ -22,12 +26,14 @@
*/
@JsonAutoDetect
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
@Entity
@Table(name = "license_type")
@NamedQueries(
- { @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt") })
+ { @NamedQuery(name = "list-license_types", query = "SELECT new map(lt.id as id, lt.code as code, lt.name as name, lt.description as description, lt.creationTimestamp as creationTimestamp, ap.id as application_id, ap.name as application_name) FROM LicenseType lt inner join lt.application ap") })
public class LicenseType implements Serializable {
+ private static final Logger log = LoggerFactory.getLogger(LicenseType.class);
private static final long serialVersionUID = 1L;
@Id
@@ -77,6 +83,19 @@
return application;
}
+ @JsonProperty("application_id")
+ public Integer getApplicationId() {
+ log.info("application " + application);
+ return application == null ? null : application.getId();
+ }
+
+ @JsonProperty("application_id")
+ public void setApplicationId(Integer appId) {
+ log.info("setApplicationId(Integer appId) " + appId);
+ application = new Application();
+ application.setId(appId);
+ }
+
public void setApplication(Application application) {
this.application = application;
}
--
Gitblit v1.3.2