#395 feature - Changes in REST API for license system

Roberto Sánchez

2014-01-17 c8eb07e8dc020346aaee0d859040ccabb79349bd

 securis/src/main/java/net/curisit/securis/db/LicenseType.java
..
..
@@ -14,6 +14,7 @@
14
14
 import javax.persistence.Table;
15
15
 
16
16
 import org.codehaus.jackson.annotate.JsonAutoDetect;
17
+import org.codehaus.jackson.annotate.JsonIgnore;
17
18
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
18
19
 import org.codehaus.jackson.annotate.JsonProperty;
19
20
 import org.codehaus.jackson.map.annotate.JsonSerialize;
..
..
@@ -30,7 +31,7 @@
30
31
 @Entity
31
32
 @Table(name = "license_type")
32
33
 @NamedQueries(
33
-	{ @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") })
34
+	{ @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt") })
34
35
 public class LicenseType implements Serializable {
35
36
 
36
37
 	private static final Logger log = LoggerFactory.getLogger(LicenseType.class);
..
..
@@ -47,6 +48,7 @@
47
48
 	@Column(name = "creation_timestamp")
48
49
 	private Date creationTimestamp;
49
50
 
51
+	@JsonIgnore
50
52
 	@ManyToOne
51
53
 	@JoinColumn(name = "application_id")
52
54
 	private Application application;
..
..
@@ -83,6 +85,11 @@
83
85
 		return application;
84
86
 	}
85
87
 
88
+	@JsonProperty("application_name")
89
+	public String getParentOrgName() {
90
+		return application == null ? null : application.getName();
91
+	}
92
+
86
93
 	@JsonProperty("application_id")
87
94
 	public Integer getApplicationId() {
88
95
 		log.info("application  " + application);