From c8eb07e8dc020346aaee0d859040ccabb79349bd Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 17 Jan 2014 12:26:05 +0000
Subject: [PATCH] #395 feature - Changes in REST API for license system
---
securis/src/main/java/net/curisit/securis/db/LicenseType.java | 9 ++++++++-
1 files changed, 8 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 a805a98..ecc0253 100644
--- a/securis/src/main/java/net/curisit/securis/db/LicenseType.java
+++ b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
@@ -14,6 +14,7 @@
import javax.persistence.Table;
import org.codehaus.jackson.annotate.JsonAutoDetect;
+import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@@ -30,7 +31,7 @@
@Entity
@Table(name = "license_type")
@NamedQueries(
- { @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") })
+ { @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt") })
public class LicenseType implements Serializable {
private static final Logger log = LoggerFactory.getLogger(LicenseType.class);
@@ -47,6 +48,7 @@
@Column(name = "creation_timestamp")
private Date creationTimestamp;
+ @JsonIgnore
@ManyToOne
@JoinColumn(name = "application_id")
private Application application;
@@ -83,6 +85,11 @@
return application;
}
+ @JsonProperty("application_name")
+ public String getParentOrgName() {
+ return application == null ? null : application.getName();
+ }
+
@JsonProperty("application_id")
public Integer getApplicationId() {
log.info("application " + application);
--
Gitblit v1.3.2