Merge pull request #3051 from nscuro/fix-transient-fields-jsonignore

Fix `@JsonIgnore` having no effect on `transient` fields
DependencyTrack · Sep 23, 2023 · fb28926 · fb28926
2 parents ec6b704 + 9ca5f79
commit fb28926
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/org/dependencytrack/model/Component.java b/src/main/java/org/dependencytrack/model/Component.java
@@ -357,12 +357,8 @@ public enum FetchGroup {
     private transient DependencyMetrics metrics;
     private transient RepositoryMetaComponent repositoryMeta;
     private transient int usedBy;
-
-    @JsonIgnore
     private transient JsonObject cacheResult;
-
     private transient Set<String> dependencyGraph;
-
     private transient boolean expandDependencyGraph;
 
     public long getId() {
@@ -778,10 +774,12 @@ public void setUsedBy(int usedBy) {
         this.usedBy = usedBy;
     }
 
+    @JsonIgnore
     public JsonObject getCacheResult() {
         return cacheResult;
     }
 
+    @JsonIgnore
     public void setCacheResult(JsonObject cacheResult) {
         this.cacheResult = cacheResult;
     }

diff --git a/src/main/java/org/dependencytrack/model/Project.java b/src/main/java/org/dependencytrack/model/Project.java
@@ -258,10 +258,7 @@ public enum FetchGroup {
     private List<ExternalReference> externalReferences;
 
     private transient ProjectMetrics metrics;
-
     private transient List<ProjectVersion> versions;
-
-    @JsonIgnore
     private transient List<Component> dependencyGraph;
 
     public long getId() {
@@ -484,10 +481,12 @@ public void addAccessTeam(Team accessTeam) {
         this.accessTeams.add(accessTeam);
     }
 
+    @JsonIgnore
     public List<Component> getDependencyGraph() {
         return dependencyGraph;
     }
 
+    @JsonIgnore
     public void setDependencyGraph(List<Component> dependencyGraph) {
         this.dependencyGraph = dependencyGraph;
     }