From 4c13c7324a920f5cca9601154e5224e5d7484fa9 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 12 Dec 2014 18:09:27 +0000
Subject: [PATCH] #2140 fix - Many changes related with cahce and JPA cycling relationships
---
securis/src/main/java/net/curisit/securis/db/Application.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 49dd65c..b70867e 100644
--- a/securis/src/main/java/net/curisit/securis/db/Application.java
+++ b/securis/src/main/java/net/curisit/securis/db/Application.java
@@ -22,6 +22,7 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
@@ -56,13 +57,14 @@
@JsonProperty("creation_timestamp")
private Date creationTimestamp;
- @JsonIgnore
// We don't include the referenced entities to limit the size of each row at
- // the listing
+ // // the listing
+ @JsonIgnore
@OneToMany(fetch = FetchType.LAZY, mappedBy = "application")
private Set<LicenseType> licenseTypes;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "application")
+ @JsonManagedReference
private Set<ApplicationMetadata> metadata;
public Integer getId() {
@@ -90,7 +92,6 @@
}
public Date getCreationTimestamp() {
- LOG.info("APP {} TS: {}", this.id, this.creationTimestamp);
return creationTimestamp;
}
@@ -98,16 +99,9 @@
this.creationTimestamp = creationTimestamp;
}
- public Set<LicenseType> getLicenseTypes() {
- return licenseTypes;
- }
-
- public void setLicenseTypes(Set<LicenseType> licenseTypes) {
- this.licenseTypes = licenseTypes;
- }
-
@JsonProperty("metadata")
public Set<ApplicationMetadata> getApplicationMetadata() {
+ LOG.info("Getting metadata from app: {}", metadata);
return metadata;
}
@@ -137,4 +131,13 @@
public void setLicenseFilename(String licenseFilename) {
this.licenseFilename = licenseFilename;
}
+
+ public Set<LicenseType> getLicenseTypes() {
+ LOG.info("Getting list license types!!!!");
+ return licenseTypes;
+ }
+
+ public void setLicenseTypes(Set<LicenseType> licenseTypes) {
+ this.licenseTypes = licenseTypes;
+ }
}
--
Gitblit v1.3.2