avoid using JsonAnyGetter/Setter; adding missing @JsonIgnore
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/6ae60fca Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/6ae60fca Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/6ae60fca Branch: refs/heads/master Commit: 6ae60fca2dce6dc820537e515d1aab572b98bf90 Parents: ed28ffa Author: fangzhen <[email protected]> Authored: Thu Jul 24 14:55:12 2014 +0800 Committer: fangzhen <[email protected]> Committed: Thu Jul 24 14:55:12 2014 +0800 ---------------------------------------------------------------------- .../ode/bpel/elang/xpath10/obj/OXPath10Expression.java | 4 ++-- .../java/org/apache/ode/bpel/obj/ExtensibleImpl.java | 11 ++++++----- .../src/main/java/org/apache/ode/bpel/obj/OAssign.java | 3 +++ .../src/main/java/org/apache/ode/bpel/obj/OBase.java | 1 - .../main/java/org/apache/ode/bpel/obj/OEventHandler.java | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/6ae60fca/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10Expression.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10Expression.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10Expression.java index 2adf03b..caf6e39 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10Expression.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10Expression.java @@ -246,7 +246,7 @@ public class OXPath10Expression extends OLValueExpression { * Data structure representing the compiled signature of a <code>bpws:getVariableData</code> * invocation. */ - public static final class OSigGetVariableData extends OBase { + public static class OSigGetVariableData extends OBase { private static final String VARIABLE = "variable"; private static final String PART = "part"; @@ -297,7 +297,7 @@ public class OXPath10Expression extends OLValueExpression { * Data structure representing the signature of a <code>bpws:getVariableData</code> * invocation. */ - private static final class SigGetVariableData extends ExtensibleImpl{ + public static class SigGetVariableData extends ExtensibleImpl{ private final String VARNAME = "varname"; private final String PARTNAME = "partname"; http://git-wip-us.apache.org/repos/asf/ode/blob/6ae60fca/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java index a88c047..08b9b2a 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java @@ -3,13 +3,11 @@ package org.apache.ode.bpel.obj; import java.util.LinkedHashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -@JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class, property = "@id") +@JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id") public class ExtensibleImpl implements Extensible<Object>{ /** The wrapper wraps fields. Fields can be deleted, added or updated */ protected Map<String, Object> fieldContainer; @@ -23,12 +21,15 @@ public class ExtensibleImpl implements Extensible<Object>{ fieldContainer = container; } - @JsonAnyGetter +// @JsonAnyGetter public Map<String, Object> getFieldContainer() { return fieldContainer; } + public void setFieldContainer(Map<String, Object> fieldContainer){ + this.fieldContainer = fieldContainer; + } - @JsonAnySetter +// @JsonAnySetter public void addField(String name, Object value) { fieldContainer.put(name, value); } http://git-wip-us.apache.org/repos/asf/ode/blob/6ae60fca/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OAssign.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OAssign.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OAssign.java index cd53151..ec2fc07 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OAssign.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OAssign.java @@ -429,6 +429,7 @@ public class OAssign extends OActivity { return o == null ? null : (Variable)o; } + @JsonIgnore public boolean isHeaderRef() { return getVariable().getType() instanceof OMessageVarType && getHeaderPart() != null && getLocation() == null; } @@ -437,6 +438,7 @@ public class OAssign extends OActivity { * Report whether this is a reference to a whole "message" * @return <code>true</code> if whole-message reference */ + @JsonIgnore public boolean isMessageRef() { return getVariable().getType() instanceof OMessageVarType && getPart() == null && getHeaderPart() == null && getLocation() == null; } @@ -445,6 +447,7 @@ public class OAssign extends OActivity { * Report whether this is a reference to a message part. * @return <code>true</code> if reference to a message part */ + @JsonIgnore public boolean isPartRef() { return getVariable().getType() instanceof OMessageVarType && getPart() != null && getLocation() == null; } http://git-wip-us.apache.org/repos/asf/ode/blob/6ae60fca/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java index 78bf65f..8006946 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators; * base class for compiled BPEL objects. It gives some common fields. * */ -@JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class, property = "@id") public class OBase extends ExtensibleImpl{ /** Our identifier, in terms of our parent. */ private static String ID = "_id"; http://git-wip-us.apache.org/repos/asf/ode/blob/6ae60fca/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OEventHandler.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OEventHandler.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OEventHandler.java index d536465..9241fad 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OEventHandler.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OEventHandler.java @@ -151,6 +151,7 @@ public class OEventHandler extends OAgent { setRoute("one"); } + @JsonIgnore public String getCorrelatorId() { return getPartnerLink().getId() + "." + getOperation().getName(); }
