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/ApplicationMetadata.java | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java b/securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java
index fc42d08..c17a3e8 100644
--- a/securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java
+++ b/securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java
@@ -16,7 +16,7 @@
import org.apache.logging.log4j.Logger;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -38,10 +38,10 @@
private static final long serialVersionUID = 1L;
- @JsonIgnore
@Id
@ManyToOne
@JoinColumn(name = "application_id")
+ @JsonBackReference
private Application application;
@Id
@@ -65,6 +65,7 @@
}
public Application getApplication() {
+ LOG.info("Getting application from app metadata: {}", application);
return application;
}
@@ -73,27 +74,11 @@
}
public Date getCreationTimestamp() {
- LOG.info("APP_MD (app: {}) {} TS: {}", this.application.getId(), this.key, this.creationTimestamp);
return creationTimestamp;
}
public void setCreationTimestamp(Date creationTimestamp) {
this.creationTimestamp = creationTimestamp;
- }
-
- @JsonProperty("application_id")
- public Integer getApplicationId() {
- return application == null ? null : application.getId();
- }
-
- @JsonProperty("application_id")
- public void setApplicationId(Integer idApplication) {
- if (idApplication == null) {
- application = null;
- } else {
- application = new Application();
- application.setId(idApplication);
- }
}
public String getValue() {
@@ -129,7 +114,7 @@
@Override
public String toString() {
- return String.format("ApplicationMetadata (%s - %s)", this.application == null ? null : application.getId(), this.key);
+ return String.format("ApplicationMetadata (%s)", this.key);
}
}
--
Gitblit v1.3.2