[UPDATE]

- adds annotation @JsonIgnoreProperties to every 'Portable' object class
- adds annotation @JsonIgnore to getters in LocalizedString.java and Portable.java

git-svn-id: https://svn.libreccm.org/ccm/trunk@4525 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/src/com/arsdigita/portation/Portable.java

@@ -18,11 +18,14 @@
  */
 package com.arsdigita.portation;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 5/9/16
  */
 public interface Portable {
 
+    @JsonIgnore
     AbstractMarshaller<? extends Portable> getMarshaller();
 }

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

@@ -23,6 +23,7 @@ import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.core.CcmObject;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
  * Association class describing the association between a category and an
@@ -32,6 +33,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Categorization implements Portable {
 
     private long categorizationId;

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

@@ -26,6 +26,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.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
@@ -44,6 +45,7 @@ import java.util.Locale;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Category extends CcmObject implements Portable {
 
     private String uniqueId;

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

@@ -23,6 +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.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
@@ -46,6 +47,7 @@ import java.util.UUID;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class CcmObject {
 
     private long objectId;

ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddress.java

@@ -18,10 +18,13 @@
  */
 package com.arsdigita.portation.modules.core.core;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class EmailAddress {
 
     private String address;

ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedString.java

@@ -18,6 +18,9 @@
  */
 package com.arsdigita.portation.modules.core.l10n;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
@@ -33,6 +36,7 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class LocalizedString {
 
     private Map<Locale, String> values;
@@ -75,6 +79,7 @@ public class LocalizedString {
      *         application is running on. In most cases this is not what you
      *         want. Use {@link #getValue(java.util.Locale)} instead.
      */
+    @JsonIgnore
     public String getValue() {
         return getValue(Locale.getDefault());
     }
@@ -87,6 +92,7 @@ public class LocalizedString {
      * @return The localised for the {@code locale} or {@code null} if there is
      *         no value for the provided locale.
      */
+    @JsonIgnore
     public String getValue(final Locale locale) {
         return values.get(locale);
     }
@@ -129,6 +135,7 @@ public class LocalizedString {
      * @return A {@link Set} containing all locales for which this localised
      *         string has values.
      */
+    @JsonIgnore
     public Set<Locale> getAvailableLocales() {
         return values.keySet();
     }

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

@@ -21,6 +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.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.HashSet;
@@ -30,6 +31,7 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 31.05.16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Group extends Party implements Portable {
 
     @JsonManagedReference

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

@@ -22,11 +22,13 @@ 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.JsonIgnoreProperties;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class GroupMembership implements Portable {
 
     private long membershipId;

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

@@ -19,6 +19,7 @@
 package com.arsdigita.portation.modules.core.security;
 
 import com.arsdigita.portation.conversion.NgCollection;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.HashSet;
@@ -28,6 +29,7 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 01.06.16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Party {
 
     private long partyId;

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

@@ -24,6 +24,7 @@ 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.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -32,6 +33,7 @@ import java.util.Date;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Permission implements Portable {
 
     private long permissionId;

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

@@ -23,6 +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.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
@@ -35,6 +36,7 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Role implements Portable {
 
     private long roleId;

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

@@ -22,11 +22,13 @@ 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.JsonIgnoreProperties;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class RoleMembership implements Portable {
 
     private long membershipId;

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

@@ -22,6 +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.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
@@ -34,6 +35,7 @@ import java.util.Set;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 31.05.16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class User extends Party implements Portable {
 
     private String givenName;

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

@@ -22,6 +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.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
@@ -32,6 +33,7 @@ import java.util.List;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class AssignableTask extends Task implements Portable {
 
     private boolean locked;

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

@@ -23,6 +23,7 @@ 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.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import java.util.ArrayList;
@@ -34,6 +35,7 @@ import java.util.UUID;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Task {
 
     private long taskId;

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

@@ -23,11 +23,13 @@ import com.arsdigita.portation.Portable;
 import com.arsdigita.portation.conversion.NgCollection;
 import com.arsdigita.portation.modules.core.security.Role;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class TaskAssignment implements Portable {
 
     private long taskAssignmentId;

ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskComment.java

@@ -19,6 +19,7 @@
 package com.arsdigita.portation.modules.core.workflow;
 
 import com.arsdigita.portation.modules.core.security.User;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.util.UUID;
 
@@ -26,6 +27,7 @@ import java.util.UUID;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/18/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class TaskComment {
 
     private long commentId;

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

@@ -24,6 +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.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import java.util.ArrayList;
@@ -35,6 +36,7 @@ import java.util.UUID;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class Workflow implements Portable {
 
     private long workflowId;
@@ -45,7 +47,7 @@ public class Workflow implements Portable {
     private LocalizedString name;
     private LocalizedString description;
 
-    private WorkflowState workflowState;
+    private WorkflowState state;
     private boolean active;
     private TaskState tasksState;
 
@@ -68,7 +70,7 @@ public class Workflow implements Portable {
         this.description.addValue(Locale.getDefault(),
                 trunkWorkFlow.getDescription());
 
-        this.workflowState = StateMapper.mapWorkflowState(trunkWorkFlow
+        this.state = StateMapper.mapWorkflowState(trunkWorkFlow
                 .getProcessState());
         this.active = trunkWorkFlow.isActive();
         this.tasksState = StateMapper.mapTaskState(trunkWorkFlow.getState());
@@ -126,12 +128,12 @@ public class Workflow implements Portable {
         this.description = description;
     }
 
-    public WorkflowState getWorkflowState() {
-        return workflowState;
+    public WorkflowState getState() {
+        return state;
     }
 
-    public void setWorkflowState(final WorkflowState workflowState) {
-        this.workflowState = workflowState;
+    public void setState(final WorkflowState state) {
+        this.state = state;
     }
 
     public boolean isActive() {

ccm-core/src/com/arsdigita/portation/modules/core/workflow/WorkflowTemplate.java

@@ -19,17 +19,19 @@
 package com.arsdigita.portation.modules.core.workflow;
 
 import com.arsdigita.portation.conversion.NgCollection;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/18/16
  */
+@JsonIgnoreProperties(ignoreUnknown=true)
 public class WorkflowTemplate extends Workflow {
 
+
     public WorkflowTemplate(com.arsdigita.workflow.simple.WorkflowTemplate
                                      trunkWorkFlowTemplate) {
         super(trunkWorkFlowTemplate, true);
-
         NgCollection.workflowTemplates.put(this.getWorkflowId(), this);
     }
 }