#2140 fix - Many changes related with cahce and JPA cycling relationships

rsanchez

2014-12-12 4c13c7324a920f5cca9601154e5224e5d7484fa9

 securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java
..
..
@@ -16,7 +16,7 @@
16
16
 import org.apache.logging.log4j.Logger;
17
17
 
18
18
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
19
-import com.fasterxml.jackson.annotation.JsonIgnore;
19
+import com.fasterxml.jackson.annotation.JsonBackReference;
20
20
 import com.fasterxml.jackson.annotation.JsonInclude;
21
21
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
22
22
 import com.fasterxml.jackson.annotation.JsonProperty;
..
..
@@ -38,10 +38,10 @@
38
38
 
39
39
     private static final long serialVersionUID = 1L;
40
40
 
41
-    @JsonIgnore
42
41
     @Id
43
42
     @ManyToOne
44
43
     @JoinColumn(name = "application_id")
44
+    @JsonBackReference
45
45
     private Application application;
46
46
 
47
47
     @Id
..
..
@@ -65,6 +65,7 @@
65
65
     }
66
66
 
67
67
     public Application getApplication() {
68
+        LOG.info("Getting application from app metadata: {}", application);
68
69
         return application;
69
70
     }
70
71
 
..
..
@@ -73,27 +74,11 @@
73
74
     }
74
75
 
75
76
     public Date getCreationTimestamp() {
76
-        LOG.info("APP_MD (app: {}) {} TS: {}", this.application.getId(), this.key, this.creationTimestamp);
77
77
         return creationTimestamp;
78
78
     }
79
79
 
80
80
     public void setCreationTimestamp(Date creationTimestamp) {
81
81
         this.creationTimestamp = creationTimestamp;
82
-    }
83
-
84
-    @JsonProperty("application_id")
85
-    public Integer getApplicationId() {
86
-        return application == null ? null : application.getId();
87
-    }
88
-
89
-    @JsonProperty("application_id")
90
-    public void setApplicationId(Integer idApplication) {
91
-        if (idApplication == null) {
92
-            application = null;
93
-        } else {
94
-            application = new Application();
95
-            application.setId(idApplication);
96
-        }
97
82
     }
98
83
 
99
84
     public String getValue() {
..
..
@@ -129,7 +114,7 @@
129
114
     @Override
130
115
     public String toString() {
131
116
 
132
-        return String.format("ApplicationMetadata (%s - %s)", this.application == null ? null : application.getId(), this.key);
117
+        return String.format("ApplicationMetadata (%s)", this.key);
133
118
     }
134
119
 
135
120
 }