return 0/false of getters for primitive types
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/e25f35bc Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/e25f35bc Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/e25f35bc Branch: refs/heads/ODE-912 Commit: e25f35bc4c68c037e6f2f02b131fddc04515d642 Parents: 2e5f48d Author: fangzhen <[email protected]> Authored: Wed Jul 23 15:24:04 2014 +0800 Committer: fangzhen <[email protected]> Committed: Wed Jul 23 15:24:04 2014 +0800 ---------------------------------------------------------------------- .../ode/bpel/elang/xpath10/obj/OXPath10ExpressionBPEL20.java | 2 +- .../src/main/java/org/apache/ode/bpel/obj/DebugInfo.java | 4 ++-- .../main/java/org/apache/ode/bpel/obj/ExtensibleImpl.java | 3 +++ bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OAssign.java | 8 ++++---- bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java | 2 +- .../main/java/org/apache/ode/bpel/obj/OFailureHandling.java | 6 +++--- .../src/main/java/org/apache/ode/bpel/obj/OForEach.java | 4 ++-- .../main/java/org/apache/ode/bpel/obj/OLValueExpression.java | 2 +- .../src/main/java/org/apache/ode/bpel/obj/OPartnerLink.java | 2 +- .../src/main/java/org/apache/ode/bpel/obj/OPickReceive.java | 2 +- .../src/main/java/org/apache/ode/bpel/obj/OProcess.java | 2 +- bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OReply.java | 2 +- bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java | 8 ++++---- .../main/java/org/apache/ode/bpel/obj/OXsdTypeVarType.java | 2 +- 14 files changed, 26 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10ExpressionBPEL20.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10ExpressionBPEL20.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10ExpressionBPEL20.java index 4a25d3d..192c1a2 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10ExpressionBPEL20.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/elang/xpath10/obj/OXPath10ExpressionBPEL20.java @@ -54,7 +54,7 @@ public class OXPath10ExpressionBPEL20 extends OXPath10Expression { @JsonIgnore public boolean isIsJoinExpression() { Object o = fieldContainer.get(ISJOINEXPRESSION); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java index 3406d8a..c2dd4d4 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/DebugInfo.java @@ -69,7 +69,7 @@ public class DebugInfo extends ExtensibleImpl { @JsonIgnore public int getEndLine() { Object o = fieldContainer.get(ENDLINE); - return o == null ? null : (Integer)o; + return o == null ? 0 : (Integer)o; } @SuppressWarnings("unchecked") @@ -88,7 +88,7 @@ public class DebugInfo extends ExtensibleImpl { @JsonIgnore public int getStartLine() { Object o = fieldContainer.get(STARTLINE); - return o == null ? null : (Integer)o; + return o == null ? 0 : (Integer)o; } public void setDescription(String description) { http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/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 b909b27..a88c047 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 @@ -5,8 +5,11 @@ 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") public class ExtensibleImpl implements Extensible<Object>{ /** The wrapper wraps fields. Fields can be deleted, added or updated */ protected Map<String, Object> fieldContainer; http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/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 841487a..cd53151 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 @@ -110,7 +110,7 @@ public class OAssign extends OActivity { @JsonIgnore public boolean isIgnoreMissingFromData() { Object o = fieldContainer.get(IGNOREMISSINGFROMDATA); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore @@ -122,13 +122,13 @@ public class OAssign extends OActivity { @JsonIgnore public boolean isInsertMissingToData() { Object o = fieldContainer.get(INSERTMISSINGTODATA); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore public boolean isKeepSrcElementName() { Object o = fieldContainer.get(KEEPSRCELEMENTNAME); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore @@ -326,7 +326,7 @@ public class OAssign extends OActivity { @JsonIgnore public boolean isIsMyEndpointReference() { Object o = fieldContainer.get(ISMYENDPOINTREFERENCE); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/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 e38e7ff..78bf65f 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 @@ -67,7 +67,7 @@ public class OBase extends ExtensibleImpl{ @JsonIgnore public int getId() { Object o = fieldContainer.get(ID); - return o == null ? null : (Integer)o; + return o == null ? 0 : (Integer)o; } private void setId(int id) { http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OFailureHandling.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OFailureHandling.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OFailureHandling.java index f1ac32a..28506a9 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OFailureHandling.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OFailureHandling.java @@ -58,19 +58,19 @@ public class OFailureHandling extends ExtensibleImpl{ @JsonIgnore public boolean isFaultOnFailure() { Object o = fieldContainer.get(FAULTONFAILURE); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore public int getRetryDelay() { Object o = fieldContainer.get(RETRYDELAY); - return o == null ? null : (Integer)o; + return o == null ? 0 : (Integer)o; } @JsonIgnore public int getRetryFor() { Object o = fieldContainer.get(RETRYFOR); - return o == null ? null : (Integer)o; + return o == null ? 0 : (Integer)o; } public void setFaultOnFailure(boolean faultOnFailure) { http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OForEach.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OForEach.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OForEach.java index 433e3dc..6788442 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OForEach.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OForEach.java @@ -71,7 +71,7 @@ public class OForEach extends OActivity { @JsonIgnore public boolean isParallel() { Object o = fieldContainer.get(PARALLEL); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore @@ -142,7 +142,7 @@ public class OForEach extends OActivity { @JsonIgnore public boolean isSuccessfulBranchesOnly() { Object o = fieldContainer.get(SUCCESSFULBRANCHESONLY); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } public void setBranchCount(OExpression branchCount) { http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OLValueExpression.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OLValueExpression.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OLValueExpression.java index d4af39b..db024f6 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OLValueExpression.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OLValueExpression.java @@ -46,7 +46,7 @@ public abstract class OLValueExpression extends OExpression { @JsonIgnore public boolean isInsertMissingData() { Object o = fieldContainer.get(INSERTMISSINGDATA); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } public abstract OScope.Variable getVariable(); http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPartnerLink.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPartnerLink.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPartnerLink.java index 8237c87..1dd5d51 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPartnerLink.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPartnerLink.java @@ -130,7 +130,7 @@ public class OPartnerLink extends OBase { @JsonIgnore public boolean isInitializePartnerRole() { Object o = fieldContainer.get(INITIALIZEPARTNERROLE); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } /** http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPickReceive.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPickReceive.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPickReceive.java index 34c443c..a8fe5e9 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPickReceive.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OPickReceive.java @@ -57,7 +57,7 @@ public class OPickReceive extends OActivity { @JsonIgnore public boolean isCreateInstanceFlag() { Object o = fieldContainer.get(CREATEINSTANCEFLAG); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcess.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcess.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcess.java index c3fd100..e291111a 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcess.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OProcess.java @@ -146,7 +146,7 @@ public class OProcess extends OBase { @JsonIgnore int getChildIdCounter() { Object o = fieldContainer.get(CHILDIDCOUNTER); - return o == null ? null : (Integer)o; + return o == null ? 0 : (Integer)o; } @JsonIgnore http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OReply.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OReply.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OReply.java index 534a0ad..fc702ce 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OReply.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OReply.java @@ -95,7 +95,7 @@ public class OReply extends OActivity { @JsonIgnore public boolean isIsFaultReply() { Object o = fieldContainer.get(ISFAULTREPLY); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java index 5e3919c..e3e1a63 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java @@ -141,7 +141,7 @@ public class OScope extends OActivity { @JsonIgnore public boolean isAtomicScope() { Object o = fieldContainer.get(ATOMICSCOPE); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @SuppressWarnings("unchecked") @@ -190,13 +190,13 @@ public class OScope extends OActivity { @JsonIgnore public boolean isImplicitScope() { Object o = fieldContainer.get(IMPLICITSCOPE); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore public boolean isIsolatedScope() { Object o = fieldContainer.get(ISOLATEDSCOPE); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } public OPartnerLink getLocalPartnerLink(String name) { @@ -372,7 +372,7 @@ public class OScope extends OActivity { @JsonIgnore public boolean isHasJoinUseCases() { Object o = fieldContainer.get(HASJOINUSECASES); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore http://git-wip-us.apache.org/repos/asf/ode/blob/e25f35bc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OXsdTypeVarType.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OXsdTypeVarType.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OXsdTypeVarType.java index a973b1a..c54cc56 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OXsdTypeVarType.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OXsdTypeVarType.java @@ -46,7 +46,7 @@ public class OXsdTypeVarType extends OVarType { @JsonIgnore public boolean isSimple() { Object o = fieldContainer.get(SIMPLE); - return o == null ? null : (Boolean)o; + return o == null ? false : (Boolean)o; } @JsonIgnore
