From d61efd3d30b2f0e542ad3a32ebdc06ad137ba6fc Mon Sep 17 00:00:00 2001
From: tosmers <tosmers@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 15 Mar 2017 19:08:45 +0000
Subject: [PATCH] [UPDATE] - adds @JsonIdentityInfo annotations for export -
 implements IdGenerators and IdResolvers for the use of @JsonIdentityInfo

git-svn-id: https://svn.libreccm.org/ccm/trunk@4632 8810af33-2d31-482b-a856-94f89814c4df
---
 .../modules/core/categorization/Categorization.java        | 3 +++
 .../portation/modules/core/categorization/Category.java    | 6 +++++-
 .../arsdigita/portation/modules/core/core/CcmObject.java   | 5 +++++
 .../arsdigita/portation/modules/core/security/Group.java   | 5 +++++
 .../portation/modules/core/security/GroupMembership.java   | 3 +++
 .../arsdigita/portation/modules/core/security/Party.java   | 5 +++++
 .../portation/modules/core/security/Permission.java        | 4 ++++
 .../arsdigita/portation/modules/core/security/Role.java    | 5 +++++
 .../portation/modules/core/security/RoleMembership.java    | 3 +++
 .../arsdigita/portation/modules/core/security/User.java    | 7 +++++--
 .../portation/modules/core/workflow/AssignableTask.java    | 5 +++++
 .../arsdigita/portation/modules/core/workflow/Task.java    | 5 +++++
 .../portation/modules/core/workflow/TaskAssignment.java    | 3 +++
 .../portation/modules/core/workflow/Workflow.java          | 5 +++++
 14 files changed, 61 insertions(+), 3 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 e6d7c0eac..f4061baa7 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
@@ -23,6 +23,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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 
 /**
@@ -33,6 +34,8 @@ import com.fasterxml.jackson.annotation.JsonIdentityReference;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = CategorizationIdGenerator.class,
+                  property = "customCatId")
 public class Categorization implements Portable {
 
     private long categorizationId;
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 096ff9356..28eeb1210 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
@@ -25,9 +25,10 @@ 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.l10n.LocalizedString;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +46,9 @@ import java.util.Locale;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = CategoryIdResolver.class,
+                  property = "uuid")
 public class Category extends CcmObject implements Portable {
 
     private String uniqueId;
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 c66a8eca0..877928a75 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,9 @@ 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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,6 +48,9 @@ import java.util.UUID;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = CcmObjectIdResolver.class,
+                  property = "uuid")
 public class CcmObject {
 
     private long objectId;
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 3bc1cde54..46d09875e 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,9 @@ 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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -30,6 +32,9 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 31.05.16
  */
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = GroupIdResolver.class,
+                  property = "name")
 public class Group extends Party implements Portable {
 
     @JsonIgnore
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 549bc3266..46257dce8 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
@@ -22,12 +22,15 @@ import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = GroupMembershipIdGenerator.class,
+                  property = "customMemId")
 public class GroupMembership implements Portable {
 
     private long membershipId;
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 754011a63..16d912c64 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,9 @@
 package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.conversion.NgCollection;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -28,6 +30,9 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 01.06.16
  */
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = PartyIdResolver.class,
+                  property = "name")
 public class Party {
 
     private long partyId;
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 6c0057fc4..0c5e04e3f 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
@@ -24,6 +24,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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 
 import java.math.BigDecimal;
@@ -33,6 +34,9 @@ import java.util.Date;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = PermissionIdGenerator.class,
+                  resolver = PermissionIdResolver.class,
+                  property = "customPermId")
 public class Permission implements Portable {
 
     private long permissionId;
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 a871aa0f3..5182505be 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,9 @@ 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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -35,6 +37,9 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = RoleIdResolver.class,
+                  property = "name")
 public class Role implements Portable {
 
     private long roleId;
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 72e317243..8c3c0f8df 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
@@ -22,12 +22,15 @@ import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.portation.AbstractMarshaller;
 import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = RoleMembershipIdGenerator.class,
+                  property = "customMemId")
 public class RoleMembership implements Portable {
 
     private long membershipId;
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 92f54e311..ca0819306 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,8 +22,9 @@ 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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -35,7 +36,9 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 31.05.16
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = UserIdResolver.class,
+                  property = "name")
 public class User extends Party implements Portable {
 
     private String givenName;
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 6b0d249fd..12bd4919b 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,9 @@ 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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -32,6 +34,9 @@ import java.util.List;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = AssignableTaskIdResolver.class,
+                  property = "uuid")
 public class AssignableTask extends Task implements Portable {
 
     private boolean locked;
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 f3269f376..6eb6fb6c7 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
@@ -21,8 +21,10 @@ package com.arsdigita.portation.modules.core.workflow;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.l10n.LocalizedString;
 import com.arsdigita.portation.modules.core.workflow.util.StateMapper;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,6 +35,9 @@ import java.util.UUID;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = TaskIdResolver.class,
+                  property = "uuid")
 public class Task {
 
     private long taskId;
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 3c7eacc9b..bcdba4488 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
@@ -23,12 +23,15 @@ 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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = TaskAssignmentIdGenerator.class,
+                  property = "customAssignId")
 public class TaskAssignment implements Portable {
 
     private long taskAssignmentId;
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 8a6a39625..b428c29f9 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,9 @@ 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.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +37,9 @@ import java.util.UUID;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
+                  resolver = WorkflowIdResolver.class,
+                  property = "uuid")
 public class Workflow implements Portable {
 
     private long workflowId;