From 916b622a36a7f1db1fb05a8406e593f680587687 Mon Sep 17 00:00:00 2001
From: tosmers <tosmers@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 20 Dec 2016 19:37:21 +0000
Subject: [PATCH] [UPDATE] - switches json's back-managed references on every
 attribute in each exportable class

git-svn-id: https://svn.libreccm.org/ccm/trunk@4497 8810af33-2d31-482b-a856-94f89814c4df
---
 .../modules/core/categorization/Categorization.java       | 6 +++---
 .../portation/modules/core/categorization/Category.java   | 6 +++---
 .../arsdigita/portation/modules/core/core/CcmObject.java  | 6 +++---
 .../arsdigita/portation/modules/core/security/Group.java  | 4 ++--
 .../portation/modules/core/security/GroupMembership.java  | 6 +++---
 .../arsdigita/portation/modules/core/security/Party.java  | 4 ++--
 .../portation/modules/core/security/Permission.java       | 6 +++---
 .../arsdigita/portation/modules/core/security/Role.java   | 8 ++++----
 .../portation/modules/core/security/RoleMembership.java   | 6 +++---
 .../arsdigita/portation/modules/core/security/User.java   | 4 ++--
 .../portation/modules/core/workflow/AssignableTask.java   | 4 ++--
 .../arsdigita/portation/modules/core/workflow/Task.java   | 6 +++---
 .../portation/modules/core/workflow/TaskAssignment.java   | 6 +++---
 .../portation/modules/core/workflow/Workflow.java         | 4 ++--
 14 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java
index 525a18264..93ea0bb4d 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java
@@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.core.CcmObject;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 
 /**
  * Association class describing the association between a category and an
@@ -36,9 +36,9 @@ public class Categorization implements Portable {
 
     private long categorizationId;
 
-    @JsonManagedReference
+    @JsonBackReference
     private Category category;
-    @JsonManagedReference
+    @JsonBackReference
     private CcmObject categorizedObject;
 
     private boolean index;
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java
index 4d83eb4af..2129a1578 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java
@@ -56,12 +56,12 @@ public class Category extends CcmObject implements Portable {
     private boolean visible;
     private boolean abstractCategory;
 
-    @JsonBackReference
+    @JsonManagedReference
     private List<Categorization> objects;
 
-    @JsonBackReference
-    private List<Category> subCategories;
     @JsonManagedReference
+    private List<Category> subCategories;
+    @JsonBackReference
     private Category parentCategory;
 
     private long categoryOrder;
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java b/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java
index 638d0baff..5ec8116b7 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java
@@ -23,7 +23,7 @@ import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.categorization.Categorization;
 import com.arsdigita.portation.modules.core.categorization.Category;
 import com.arsdigita.portation.modules.core.security.Permission;
-import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,9 +53,9 @@ public class CcmObject {
     private String uuid;
     private String displayName;
 
-    @JsonBackReference
+    @JsonManagedReference
     private List<Permission> permissions;
-    @JsonBackReference
+    @JsonManagedReference
     private List<Categorization> categories;
 
 
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
index c7ecd9427..e96fb92e9 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
@@ -21,7 +21,7 @@ package com.arsdigita.portation.modules.core.security;
 import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
-import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -32,7 +32,7 @@ import java.util.Set;
  */
 public class Group extends Party implements Portable {
 
-    @JsonBackReference
+    @JsonManagedReference
     private Set<GroupMembership> memberships;
 
     public Group(final com.arsdigita.kernel.Group trunkGroup) {
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java
index b267a4fb0..a3621f7f3 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java
@@ -21,7 +21,7 @@ package com.arsdigita.portation.modules.core.security;
 import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
@@ -31,9 +31,9 @@ public class GroupMembership implements Portable {
 
     private long membershipId;
 
-    @JsonManagedReference
+    @JsonBackReference
     private Group group;
-    @JsonManagedReference
+    @JsonBackReference
     private User member;
 
     public GroupMembership(final Group group, final User member) {
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
index 559ff61e2..d65921ac0 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
@@ -19,7 +19,7 @@
 package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.conversion.NgCollection;
-import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -33,7 +33,7 @@ public class Party {
     private long partyId;
     private String name;
 
-    @JsonBackReference
+    @JsonManagedReference
     private Set<RoleMembership> roleMemberships;
 
     public Party(final com.arsdigita.kernel.Party trunkParty) {
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java
index 4e8d6e7e5..e53dbb745 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java
@@ -23,7 +23,7 @@ import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.core.CcmObject;
 import com.arsdigita.portation.modules.core.security.util.PermissionIdMapper;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -37,9 +37,9 @@ public class Permission implements Portable {
     private long permissionId;
     private String grantedPrivilege;
 
-    @JsonManagedReference
+    @JsonBackReference
     private CcmObject object;
-    @JsonManagedReference
+    @JsonBackReference
     private Role grantee;
 
     private User creationUser;
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java
index a6e68a02e..5607bcafa 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java
@@ -23,7 +23,7 @@ import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.l10n.LocalizedString;
 import com.arsdigita.portation.modules.core.workflow.TaskAssignment;
-import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -40,11 +40,11 @@ public class Role implements Portable {
     private long roleId;
     private String name;
 
-    @JsonBackReference
+    @JsonManagedReference
     private Set<RoleMembership> memberships;
-    @JsonBackReference
+    @JsonManagedReference
     private List<Permission> permissions;
-    @JsonBackReference
+    @JsonManagedReference
     private List<TaskAssignment> assignedTasks;
 
     private LocalizedString description;
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java
index cad3f9486..0f8d6521e 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java
@@ -21,7 +21,7 @@ package com.arsdigita.portation.modules.core.security;
 import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
@@ -31,9 +31,9 @@ public class RoleMembership implements Portable {
 
     private long membershipId;
 
-    @JsonManagedReference
+    @JsonBackReference
     private Role role;
-    @JsonManagedReference
+    @JsonBackReference
     private Party member;
 
     public RoleMembership(final Role role, final Party member) {
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
index 1f89dcf15..fe3ac3c31 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
@@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.core.EmailAddress;
-import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -46,7 +46,7 @@ public class User extends Party implements Portable {
     private String password;
     private boolean passwordResetRequired;
 
-    @JsonBackReference
+    @JsonManagedReference
     private Set<GroupMembership> groupMemberships;
 
     public User(final com.arsdigita.kernel.User trunkUser) {
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java
index 76abfc323..bf56bdbed 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java
@@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.security.User;
-import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -43,7 +43,7 @@ public class AssignableTask extends Task implements Portable {
 
     private User notificationSender;
 
-    @JsonBackReference
+    @JsonManagedReference
     private List<TaskAssignment> assignments;
 
     public AssignableTask(final com.arsdigita.workflow.simple.UserTask
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java
index c5233e3a6..dabbd16f6 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java
@@ -44,12 +44,12 @@ public class Task {
     private boolean active;
     private TaskState taskState;
 
-    @JsonManagedReference
+    @JsonBackReference
     private Workflow workflow;
 
-    @JsonBackReference
-    private List<Task> dependentTasks;
     @JsonManagedReference
+    private List<Task> dependentTasks;
+    @JsonBackReference
     private List<Task> dependsOn;
 
     private List<TaskComment> comments;
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java
index 6a7c379dd..da765a988 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java
@@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.security.Role;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
@@ -32,9 +32,9 @@ public class TaskAssignment implements Portable {
 
     private long taskAssignmentId;
 
-    @JsonManagedReference
+    @JsonBackReference
     private AssignableTask task;
-    @JsonManagedReference
+    @JsonBackReference
     private Role role;
 
     public TaskAssignment(final AssignableTask task, final Role role) {
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java
index 07b741d50..f29cd69c2 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java
@@ -24,7 +24,7 @@ import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.core.CcmObject;
 import com.arsdigita.portation.modules.core.l10n.LocalizedString;
 import com.arsdigita.portation.modules.core.workflow.util.StateMapper;
-import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,7 +51,7 @@ public class Workflow implements Portable {
 
     private CcmObject object;
 
-    @JsonBackReference
+    @JsonManagedReference
     private List<Task> tasks;