LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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
master
tosmers 2016-12-20 19:37:21 +00:00
parent 339aa9f8d1
commit 916b622a36
14 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java
View File

@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Portable; import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.core.CcmObject; 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 * Association class describing the association between a category and an
@ -36,9 +36,9 @@ public class Categorization implements Portable {
private long categorizationId; private long categorizationId;
@JsonManagedReference @JsonBackReference
private Category category; private Category category;
@JsonManagedReference @JsonBackReference
private CcmObject categorizedObject; private CcmObject categorizedObject;
private boolean index; private boolean index;

6
ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java
View File

@ -56,12 +56,12 @@ public class Category extends CcmObject implements Portable {
private boolean visible; private boolean visible;
private boolean abstractCategory; private boolean abstractCategory;
@JsonBackReference @JsonManagedReference
private List<Categorization> objects; private List<Categorization> objects;
@JsonBackReference
private List<Category> subCategories;
@JsonManagedReference @JsonManagedReference
private List<Category> subCategories;
@JsonBackReference
private Category parentCategory; private Category parentCategory;
private long categoryOrder; private long categoryOrder;

6
ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java
View File

@ -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.Categorization;
import com.arsdigita.portation.modules.core.categorization.Category; import com.arsdigita.portation.modules.core.categorization.Category;
import com.arsdigita.portation.modules.core.security.Permission; 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.ArrayList;
import java.util.List; import java.util.List;
@ -53,9 +53,9 @@ public class CcmObject {
private String uuid; private String uuid;
private String displayName; private String displayName;
@JsonBackReference @JsonManagedReference
private List<Permission> permissions; private List<Permission> permissions;
@JsonBackReference @JsonManagedReference
private List<Categorization> categories; private List<Categorization> categories;

4
ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
View File

@ -21,7 +21,7 @@ package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Portable; import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; 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.HashSet;
import java.util.Set; import java.util.Set;
@ -32,7 +32,7 @@ import java.util.Set;
*/ */
public class Group extends Party implements Portable { public class Group extends Party implements Portable {
@JsonBackReference @JsonManagedReference
private Set<GroupMembership> memberships; private Set<GroupMembership> memberships;
public Group(final com.arsdigita.kernel.Group trunkGroup) { public Group(final com.arsdigita.kernel.Group trunkGroup) {

6
ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java
View File

@ -21,7 +21,7 @@ package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Portable; import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; 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> * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
@ -31,9 +31,9 @@ public class GroupMembership implements Portable {
private long membershipId; private long membershipId;
@JsonManagedReference @JsonBackReference
private Group group; private Group group;
@JsonManagedReference @JsonBackReference
private User member; private User member;
public GroupMembership(final Group group, final User member) { public GroupMembership(final Group group, final User member) {

4
ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
View File

@ -19,7 +19,7 @@
package com.arsdigita.portation.modules.core.security; package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.conversion.NgCollection; 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.HashSet;
import java.util.Set; import java.util.Set;
@ -33,7 +33,7 @@ public class Party {
private long partyId; private long partyId;
private String name; private String name;
@JsonBackReference @JsonManagedReference
private Set<RoleMembership> roleMemberships; private Set<RoleMembership> roleMemberships;
public Party(final com.arsdigita.kernel.Party trunkParty) { public Party(final com.arsdigita.kernel.Party trunkParty) {

6
ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java
View File

@ -23,7 +23,7 @@ import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.core.CcmObject; import com.arsdigita.portation.modules.core.core.CcmObject;
import com.arsdigita.portation.modules.core.security.util.PermissionIdMapper; 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.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -37,9 +37,9 @@ public class Permission implements Portable {
private long permissionId; private long permissionId;
private String grantedPrivilege; private String grantedPrivilege;
@JsonManagedReference @JsonBackReference
private CcmObject object; private CcmObject object;
@JsonManagedReference @JsonBackReference
private Role grantee; private Role grantee;
private User creationUser; private User creationUser;

8
ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java
View File

@ -23,7 +23,7 @@ import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.l10n.LocalizedString; import com.arsdigita.portation.modules.core.l10n.LocalizedString;
import com.arsdigita.portation.modules.core.workflow.TaskAssignment; 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.ArrayList;
import java.util.HashSet; import java.util.HashSet;
@ -40,11 +40,11 @@ public class Role implements Portable {
private long roleId; private long roleId;
private String name; private String name;
@JsonBackReference @JsonManagedReference
private Set<RoleMembership> memberships; private Set<RoleMembership> memberships;
@JsonBackReference @JsonManagedReference
private List<Permission> permissions; private List<Permission> permissions;
@JsonBackReference @JsonManagedReference
private List<TaskAssignment> assignedTasks; private List<TaskAssignment> assignedTasks;
private LocalizedString description; private LocalizedString description;

6
ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java
View File

@ -21,7 +21,7 @@ package com.arsdigita.portation.modules.core.security;
import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Portable; import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; 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> * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
@ -31,9 +31,9 @@ public class RoleMembership implements Portable {
private long membershipId; private long membershipId;
@JsonManagedReference @JsonBackReference
private Role role; private Role role;
@JsonManagedReference @JsonBackReference
private Party member; private Party member;
public RoleMembership(final Role role, final Party member) { public RoleMembership(final Role role, final Party member) {

4
ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
View File

@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Portable; import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.core.EmailAddress; 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.ArrayList;
import java.util.HashSet; import java.util.HashSet;
@ -46,7 +46,7 @@ public class User extends Party implements Portable {
private String password; private String password;
private boolean passwordResetRequired; private boolean passwordResetRequired;
@JsonBackReference @JsonManagedReference
private Set<GroupMembership> groupMemberships; private Set<GroupMembership> groupMemberships;
public User(final com.arsdigita.kernel.User trunkUser) { public User(final com.arsdigita.kernel.User trunkUser) {

4
ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java
View File

@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Portable; import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.security.User; 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.ArrayList;
import java.util.Date; import java.util.Date;
@ -43,7 +43,7 @@ public class AssignableTask extends Task implements Portable {
private User notificationSender; private User notificationSender;
@JsonBackReference @JsonManagedReference
private List<TaskAssignment> assignments; private List<TaskAssignment> assignments;
public AssignableTask(final com.arsdigita.workflow.simple.UserTask public AssignableTask(final com.arsdigita.workflow.simple.UserTask

6
ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java
View File

@ -44,12 +44,12 @@ public class Task {
private boolean active; private boolean active;
private TaskState taskState; private TaskState taskState;
@JsonManagedReference @JsonBackReference
private Workflow workflow; private Workflow workflow;
@JsonBackReference
private List<Task> dependentTasks;
@JsonManagedReference @JsonManagedReference
private List<Task> dependentTasks;
@JsonBackReference
private List<Task> dependsOn; private List<Task> dependsOn;
private List<TaskComment> comments; private List<TaskComment> comments;

6
ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java
View File

@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller;
import com.arsdigita.portation.Portable; import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.security.Role; 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> * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
@ -32,9 +32,9 @@ public class TaskAssignment implements Portable {
private long taskAssignmentId; private long taskAssignmentId;
@JsonManagedReference @JsonBackReference
private AssignableTask task; private AssignableTask task;
@JsonManagedReference @JsonBackReference
private Role role; private Role role;
public TaskAssignment(final AssignableTask task, final Role role) { public TaskAssignment(final AssignableTask task, final Role role) {

4
ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java
View File

@ -24,7 +24,7 @@ import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.core.CcmObject; import com.arsdigita.portation.modules.core.core.CcmObject;
import com.arsdigita.portation.modules.core.l10n.LocalizedString; import com.arsdigita.portation.modules.core.l10n.LocalizedString;
import com.arsdigita.portation.modules.core.workflow.util.StateMapper; 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.ArrayList;
import java.util.List; import java.util.List;
@ -51,7 +51,7 @@ public class Workflow implements Portable {
private CcmObject object; private CcmObject object;
@JsonBackReference @JsonManagedReference
private List<Task> tasks; private List<Task> tasks;