You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2016/01/20 13:27:39 UTC
[1/2] olingo-odata4 git commit: [OLINGO-852] reduced usage of
Serializable and org.apache.commons.lang3 in commons
Repository: olingo-odata4
Updated Branches:
refs/heads/master 58ead74ea -> 36e6dc929
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java
index 111ae22..47d642d 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAbstractEdmItem.java
@@ -18,22 +18,14 @@
*/
package org.apache.olingo.commons.api.edm.provider;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
/**
* Super type of all CsdlEdmItems
*/
-public abstract class CsdlAbstractEdmItem implements Serializable {
-
- private static final long serialVersionUID = 241190986363884784L;
+public abstract class CsdlAbstractEdmItem {
/**
* Gets one by name.
@@ -63,19 +55,4 @@ public abstract class CsdlAbstractEdmItem implements Serializable {
}
return result;
}
-
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java
index ac35691..9f62401 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAction.java
@@ -25,8 +25,6 @@ import java.util.List;
*/
public class CsdlAction extends CsdlOperation {
- private static final long serialVersionUID = 211295197043448841L;
-
@Override
public CsdlAction setName(final String name) {
this.name = name;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java
index d4df8f4..71a97b9 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlActionImport.java
@@ -27,8 +27,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlActionImport extends CsdlOperationImport {
- private static final long serialVersionUID = 9186148718228340987L;
-
private FullQualifiedName action;
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java
index e5d1ddb..eb551aa 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotation.java
@@ -28,8 +28,6 @@ import org.apache.olingo.commons.api.edm.provider.annotation.CsdlExpression;
*/
public class CsdlAnnotation extends CsdlAbstractEdmItem implements CsdlAnnotatable {
- private static final long serialVersionUID = -7137313445729486860L;
-
private String term;
private String qualifier;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java
index 7f65f52..2480dac 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlAnnotations.java
@@ -26,8 +26,6 @@ import java.util.List;
*/
public class CsdlAnnotations extends CsdlAbstractEdmItem implements CsdlAnnotatable {
- private static final long serialVersionUID = 8283036066408166150L;
-
private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>();
private String target;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java
index 67d8f5a..2a748f4 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlBindingTarget.java
@@ -28,8 +28,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public abstract class CsdlBindingTarget extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = -7011724617956042182L;
-
/**
* The Name.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java
index 979a898..19840a2 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlComplexType.java
@@ -27,8 +27,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlComplexType extends CsdlStructuralType {
- private static final long serialVersionUID = 1089771609327713928L;
-
@Override
public CsdlComplexType setName(final String name) {
this.name = name;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java
index 5358f6e..2839510 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityContainer.java
@@ -28,8 +28,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlEntityContainer extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = 5384682515007129458L;
-
private String name;
private FullQualifiedName extendsContainer;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java
index a8d17b2..41380c5 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntitySet.java
@@ -27,8 +27,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlEntitySet extends CsdlBindingTarget {
- private static final long serialVersionUID = 5291570018480936643L;
-
// Default for EntitySets is true
private boolean includeInServiceDocument = true;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java
index 17fb822..af34ef2 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEntityType.java
@@ -27,8 +27,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlEntityType extends CsdlStructuralType {
- private static final long serialVersionUID = -1564752618679704024L;
-
private List<CsdlPropertyRef> key;
private boolean hasStream = false;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java
index bb79b62..61078c4 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumMember.java
@@ -26,8 +26,6 @@ import java.util.List;
*/
public class CsdlEnumMember extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = 5618984420582832094L;
-
private String name;
private String value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java
index ca15607..282e9c2 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlEnumType.java
@@ -28,8 +28,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlEnumType extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = -718032622783883403L;
-
private String name;
private boolean isFlags;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java
index b7364d9..91c2d60 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunction.java
@@ -25,8 +25,6 @@ import java.util.List;
*/
public class CsdlFunction extends CsdlOperation {
- private static final long serialVersionUID = 673858921468578957L;
-
private boolean isComposable = false;
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java
index 1b4e56d..bcab45d 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlFunctionImport.java
@@ -27,8 +27,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlFunctionImport extends CsdlOperationImport {
- private static final long serialVersionUID = 8479762299534736719L;
-
private FullQualifiedName function;
// Default include in service document is false for function imports
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java
index 741d754..eab18fe 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationProperty.java
@@ -28,8 +28,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlNavigationProperty extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = -788021920718310799L;
-
private String name;
private FullQualifiedName type;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java
index 9169ae4..bab72d8 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlNavigationPropertyBinding.java
@@ -23,8 +23,6 @@ package org.apache.olingo.commons.api.edm.provider;
*/
public class CsdlNavigationPropertyBinding extends CsdlAbstractEdmItem {
- private static final long serialVersionUID = 770380971233808502L;
-
private String path;
private String target;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java
index 3b5b746..1a326dd 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOnDelete.java
@@ -23,8 +23,6 @@ package org.apache.olingo.commons.api.edm.provider;
*/
public class CsdlOnDelete extends CsdlAbstractEdmItem {
- private static final long serialVersionUID = -7130889202653716784L;
-
private CsdlOnDeleteAction action = CsdlOnDeleteAction.None;
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java
index bbd5477..e127e4c 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperation.java
@@ -26,8 +26,6 @@ import java.util.List;
*/
public abstract class CsdlOperation extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = -3842411084067064086L;
-
/**
* The Name.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java
index 4e92bd1..f5ac360 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlOperationImport.java
@@ -26,8 +26,6 @@ import java.util.List;
*/
public abstract class CsdlOperationImport extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = -8928186067970681061L;
-
/**
* The Name.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java
index 089acc3..e090b3f 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlParameter.java
@@ -29,8 +29,6 @@ import org.apache.olingo.commons.api.edm.geo.SRID;
*/
public class CsdlParameter extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = -7360900923880732015L;
-
private String name;
private String type;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java
index 1127bde..3878417 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlProperty.java
@@ -29,8 +29,6 @@ import org.apache.olingo.commons.api.edm.geo.SRID;
*/
public class CsdlProperty extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = -4224390853690843450L;
-
private String name;
private String type;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java
index c020850..e609e94 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlPropertyRef.java
@@ -23,8 +23,6 @@ package org.apache.olingo.commons.api.edm.provider;
*/
public class CsdlPropertyRef extends CsdlAbstractEdmItem implements CsdlNamed {
- private static final long serialVersionUID = 9082892362895660037L;
-
private String name;
private String alias;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java
index ab9fa6b..8f77650 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReferentialConstraint.java
@@ -26,8 +26,6 @@ import java.util.List;
*/
public class CsdlReferentialConstraint extends CsdlAbstractEdmItem implements CsdlAnnotatable {
- private static final long serialVersionUID = -7467707499798840075L;
-
private String property;
private String referencedProperty;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java
index 7d1b02d..eb94acc 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlReturnType.java
@@ -26,8 +26,6 @@ import org.apache.olingo.commons.api.edm.geo.SRID;
*/
public class CsdlReturnType extends CsdlAbstractEdmItem {
- private static final long serialVersionUID = 4816954124986010965L;
-
private String type;
private boolean isCollection;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java
index d601005..93067ad 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSchema.java
@@ -26,8 +26,6 @@ import java.util.List;
*/
public class CsdlSchema extends CsdlAbstractEdmItem implements CsdlAnnotatable {
- private static final long serialVersionUID = -1527213201328056750L;
-
private String namespace;
private String alias;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java
index 091f61d..235b240 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlSingleton.java
@@ -27,8 +27,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public class CsdlSingleton extends CsdlBindingTarget {
- private static final long serialVersionUID = -3997943079062565895L;
-
@Override
public CsdlSingleton setName(final String name) {
this.name = name;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java
index 1ae4898..d291f48 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlStructuralType.java
@@ -28,8 +28,6 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName;
*/
public abstract class CsdlStructuralType extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = 8662852373514258646L;
-
/**
* The Name.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java
index 517c190..e140a50 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTerm.java
@@ -28,8 +28,6 @@ import org.apache.olingo.commons.api.edm.geo.SRID;
*/
public class CsdlTerm extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = 3843929000407818103L;
-
private String name;
private String type;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java
index 62b4ac7..2a3ca81 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/CsdlTypeDefinition.java
@@ -29,8 +29,6 @@ import org.apache.olingo.commons.api.edm.geo.SRID;
*/
public class CsdlTypeDefinition extends CsdlAbstractEdmItem implements CsdlNamed, CsdlAnnotatable {
- private static final long serialVersionUID = 3718980071229613048L;
-
private String name;
private FullQualifiedName underlyingType;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlAnnotationPath.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlAnnotationPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlAnnotationPath.java
index ed9b31f..1a9935a 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlAnnotationPath.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlAnnotationPath.java
@@ -22,7 +22,6 @@ package org.apache.olingo.commons.api.edm.provider.annotation;
* Represents an annotation path
*/
public class CsdlAnnotationPath extends CsdlDynamicExpression {
- private static final long serialVersionUID = 1588336268773032932L;
private String value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlApply.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlApply.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlApply.java
index 2c637a5..8bfb596 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlApply.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlApply.java
@@ -24,8 +24,7 @@ import java.util.List;
import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable;
import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
-public class CsdlApply extends CsdlDynamicExpression implements CsdlAnnotatable{
- private static final long serialVersionUID = 3555689860643577136L;
+public class CsdlApply extends CsdlDynamicExpression implements CsdlAnnotatable {
private String function;
private List<CsdlExpression> parameters = new ArrayList<CsdlExpression>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCast.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCast.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCast.java
index 6edbb3d..d3b650c 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCast.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCast.java
@@ -30,7 +30,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
* Casts the value obtained from its single child expression to the specified type
*/
public class CsdlCast extends CsdlDynamicExpression implements CsdlAnnotatable {
- private static final long serialVersionUID = 7664148202663405946L;
private String type;
private Integer maxLength;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCollection.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCollection.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCollection.java
index d1dd9c0..285508b 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCollection.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlCollection.java
@@ -27,7 +27,6 @@ import java.util.List;
* by each of the child expressions.
*/
public class CsdlCollection extends CsdlDynamicExpression {
- private static final long serialVersionUID = 3792880963089015493L;
private List<CsdlExpression> items = new ArrayList<CsdlExpression>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlConstantExpression.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlConstantExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlConstantExpression.java
index c860598..e8090e0 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlConstantExpression.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlConstantExpression.java
@@ -18,11 +18,8 @@
*/
package org.apache.olingo.commons.api.edm.provider.annotation;
-
public class CsdlConstantExpression extends CsdlExpression {
- private static final long serialVersionUID = 5618680702707972904L;
-
private final ConstantExpressionType type;
private String value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlDynamicExpression.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlDynamicExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlDynamicExpression.java
index c298f01..3cbffdc 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlDynamicExpression.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlDynamicExpression.java
@@ -22,8 +22,6 @@ import java.util.Collection;
public abstract class CsdlDynamicExpression extends CsdlExpression {
- private static final long serialVersionUID = 179628476369962030L;
-
/**
* Returns true if the expression is a logical expression
* @return true if the expression is a logical expression
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlExpression.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlExpression.java
index 795e69b..1256690 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlExpression.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlExpression.java
@@ -22,8 +22,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem;
public abstract class CsdlExpression extends CsdlAbstractEdmItem {
- private static final long serialVersionUID = 4731101778893577444L;
-
/**
* Return true if the expression is constant
* @return true if the expression is constant
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIf.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIf.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIf.java
index b010fb7..fa191b3 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIf.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIf.java
@@ -29,8 +29,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
*/
public class CsdlIf extends CsdlDynamicExpression implements CsdlAnnotatable {
- private static final long serialVersionUID = -8571383625077590656L;
-
private CsdlExpression guard;
private CsdlExpression _then;
private CsdlExpression _else;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIsOf.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIsOf.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIsOf.java
index 4236e1a..5785f6b 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIsOf.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlIsOf.java
@@ -31,8 +31,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
*/
public class CsdlIsOf extends CsdlDynamicExpression implements CsdlAnnotatable {
- private static final long serialVersionUID = -893355856129761174L;
-
private String type;
private Integer maxLength;
private Integer precision;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElement.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElement.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElement.java
index dfbd09e..2c31698 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElement.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElement.java
@@ -27,9 +27,7 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
* The edm:LabeledElement expression assigns a name to a child expression. The value of the child expression can
* then be reused elsewhere with an edm:LabeledElementReference (See {@link CsdlLabeledElementReference}) expression.
*/
-public class CsdlLabeledElement extends CsdlDynamicExpression implements CsdlAnnotatable{
-
- private static final long serialVersionUID = -5885321101447070204L;
+public class CsdlLabeledElement extends CsdlDynamicExpression implements CsdlAnnotatable {
private String name;
private CsdlExpression value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElementReference.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElementReference.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElementReference.java
index c8ce8e9..b9b9483 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElementReference.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLabeledElementReference.java
@@ -23,7 +23,6 @@ package org.apache.olingo.commons.api.edm.provider.annotation;
* edm:LabeledElement (see {@link CsdlLabeledElement}) expression.
*/
public class CsdlLabeledElementReference extends CsdlDynamicExpression {
- private static final long serialVersionUID = -4793707024628773226L;
private String value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLogicalOrComparisonExpression.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLogicalOrComparisonExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLogicalOrComparisonExpression.java
index 3fcf6a2..bbf50f4 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLogicalOrComparisonExpression.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlLogicalOrComparisonExpression.java
@@ -26,8 +26,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
public class CsdlLogicalOrComparisonExpression extends CsdlDynamicExpression implements CsdlAnnotatable {
- private static final long serialVersionUID = -8268617065621508270L;
-
private final LogicalOrComparisonExpressionType type;
private CsdlExpression left;
private CsdlExpression right;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNavigationPropertyPath.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNavigationPropertyPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNavigationPropertyPath.java
index a5ee684..f600c0a 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNavigationPropertyPath.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNavigationPropertyPath.java
@@ -23,7 +23,6 @@ package org.apache.olingo.commons.api.edm.provider.annotation;
* built-in abstract type Edm.NavigationPropertyPath
*/
public class CsdlNavigationPropertyPath extends CsdlDynamicExpression {
- private static final long serialVersionUID = -8047231485537503181L;
private String value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNull.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNull.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNull.java
index 5350f2e..b7c85d7 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNull.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlNull.java
@@ -29,8 +29,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
*/
public class CsdlNull extends CsdlDynamicExpression implements CsdlAnnotatable {
- private static final long serialVersionUID = 3696395405429914435L;
-
private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>();
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPath.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPath.java
index 244aa72..4d1d2e1 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPath.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPath.java
@@ -24,7 +24,6 @@ package org.apache.olingo.commons.api.edm.provider.annotation;
* navigation properties of structured types, and properties of structured types.
*/
public class CsdlPath extends CsdlDynamicExpression {
- private static final long serialVersionUID = 6458406537881061846L;
private String value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyPath.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyPath.java
index 9a8689b..f1d562f 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyPath.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyPath.java
@@ -23,7 +23,6 @@ package org.apache.olingo.commons.api.edm.provider.annotation;
* abstract type Edm.PropertyPath.
*/
public class CsdlPropertyPath extends CsdlDynamicExpression {
- private static final long serialVersionUID = -8182384289259575448L;
private String value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyValue.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyValue.java
index 1aec97e..4ee4b79 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyValue.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlPropertyValue.java
@@ -25,15 +25,12 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem;
import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable;
import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
-
/**
* The edm:PropertyValue element supplies a value to a property on the type instantiated by an
* edm:Record expression (See {@link org.apache.olingo.commons.api.edm.annotation.EdmRecord}).
* The value is obtained by evaluating an expression.
*/
-public class CsdlPropertyValue extends CsdlAbstractEdmItem implements CsdlAnnotatable{
-
- private static final long serialVersionUID = -6671376680245613990L;
+public class CsdlPropertyValue extends CsdlAbstractEdmItem implements CsdlAnnotatable {
private String property;
private CsdlExpression value;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlRecord.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlRecord.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlRecord.java
index da9271d..772e97e 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlRecord.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlRecord.java
@@ -30,7 +30,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
*/
public class CsdlRecord extends CsdlDynamicExpression implements CsdlAnnotatable {
- private static final long serialVersionUID = 8557849619469577884L;
private String type;
private List<CsdlPropertyValue> propertyValues = new ArrayList<CsdlPropertyValue>();
private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlUrlRef.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlUrlRef.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlUrlRef.java
index 1d2dc7b..a08a279 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlUrlRef.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/CsdlUrlRef.java
@@ -28,9 +28,8 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
* The edm:UrlRef expression enables a value to be obtained by sending a GET request to the value of
* the UrlRef expression.
*/
-public class CsdlUrlRef extends CsdlDynamicExpression implements CsdlAnnotatable{
+public class CsdlUrlRef extends CsdlDynamicExpression implements CsdlAnnotatable {
- private static final long serialVersionUID = 3781479172952387841L;
private CsdlExpression value;
private List<CsdlAnnotation> annotations = new ArrayList<CsdlAnnotation>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java
index dd0d025..b712f9f 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.Geospatial.Dimension;
@@ -89,15 +88,15 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
final Integer maxLength, final Integer precision, final Integer scale, final Boolean isUnicode)
throws EdmPrimitiveTypeException {
- final String[] pointCoo = StringUtils.split(point, ' ');
- if (pointCoo == null || pointCoo.length != 2) {
+ final List<String> pointCoo = split(point, ' ');
+ if (pointCoo == null || pointCoo.size() != 2) {
throw new EdmPrimitiveTypeException("The literal '" + point + "' has illegal content.");
}
final Point result = new Point(this.dimension, srid);
- result.setX(EdmDouble.getInstance().valueOfString(pointCoo[0],
+ result.setX(EdmDouble.getInstance().valueOfString(pointCoo.get(0),
isNullable, maxLength, precision, scale, isUnicode, Double.class));
- result.setY(EdmDouble.getInstance().valueOfString(pointCoo[1],
+ result.setY(EdmDouble.getInstance().valueOfString(pointCoo.get(1),
isNullable, maxLength, precision, scale, isUnicode, Double.class));
return result;
@@ -118,7 +117,7 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
final Matcher matcher = getMatcher(PATTERN, value);
final List<Point> points = new ArrayList<Point>();
- for (String pointCoo : StringUtils.split(matcher.group(4), ',')) {
+ for (final String pointCoo : split(matcher.group(4), ',')) {
points.add(newPoint(null, pointCoo.substring(1, pointCoo.length() - 1),
isNullable, maxLength, precision, scale, isUnicode));
}
@@ -131,7 +130,7 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
throws EdmPrimitiveTypeException {
final List<Point> points = new ArrayList<Point>();
- for (String pointCoo : StringUtils.split(lineString, ',')) {
+ for (final String pointCoo : split(lineString, ',')) {
points.add(newPoint(null, pointCoo, isNullable, maxLength, precision, scale, isUnicode));
}
@@ -162,7 +161,7 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
lineString = lineString.substring(1);
}
if (lineString.endsWith(")")) {
- lineString = StringUtils.substringBeforeLast(lineString, ")");
+ lineString = lineString.substring(0, lineString.length() - 1);
}
lineStrings.add(newLineString(null, lineString, isNullable, maxLength, precision, scale, isUnicode));
@@ -178,11 +177,11 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
final String[] first = polygon.split("\\),\\(");
final List<Point> interior = new ArrayList<Point>();
- for (String pointCoo : StringUtils.split(first[0].substring(1, first[0].length()), ',')) {
+ for (final String pointCoo : split(first[0].substring(1, first[0].length()), ',')) {
interior.add(newPoint(null, pointCoo, isNullable, maxLength, precision, scale, isUnicode));
}
final List<Point> exterior = new ArrayList<Point>();
- for (String pointCoo : StringUtils.split(first[1].substring(0, first[1].length() - 1), ',')) {
+ for (final String pointCoo : split(first[1].substring(0, first[1].length() - 1), ',')) {
exterior.add(newPoint(null, pointCoo, isNullable, maxLength, precision, scale, isUnicode));
}
@@ -204,15 +203,16 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
final Matcher matcher = getMatcher(PATTERN, value);
final List<Polygon> polygons = new ArrayList<Polygon>();
- for (String coo : matcher.group(4).contains(")),((")
- ? matcher.group(4).split("\\)\\),\\(\\(") : new String[] { matcher.group(4) }) {
+ for (String coo : matcher.group(4).contains(")),((") ?
+ matcher.group(4).split("\\)\\),\\(\\(") :
+ new String[] { matcher.group(4) }) {
String polygon = coo;
if (polygon.startsWith("((")) {
polygon = polygon.substring(1);
}
if (polygon.endsWith("))")) {
- polygon = StringUtils.substringBeforeLast(polygon, ")");
+ polygon = polygon.substring(0, polygon.length() - 1);
}
if (polygon.charAt(0) != '(') {
polygon = "(" + polygon;
@@ -242,7 +242,7 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
case MULTIPOINT:
final List<Point> points = new ArrayList<Point>();
- for (String pointCoo : StringUtils.split(matcher.group(4), ',')) {
+ for (final String pointCoo : split(matcher.group(4), ',')) {
points.add(newPoint(null, pointCoo.substring(1, pointCoo.length() - 1),
isNullable, maxLength, precision, scale, isUnicode));
}
@@ -257,7 +257,7 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
case MULTILINESTRING:
final List<LineString> lineStrings = new ArrayList<LineString>();
- for (String coo : StringUtils.split(matcher.group(4), ',')) {
+ for (final String coo : split(matcher.group(4), ',')) {
lineStrings.add(newLineString(null, coo.substring(1, coo.length() - 1),
isNullable, maxLength, precision, scale, isUnicode));
}
@@ -272,7 +272,7 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
case MULTIPOLYGON:
final List<Polygon> polygons = new ArrayList<Polygon>();
- for (String coo : StringUtils.split(matcher.group(4), ',')) {
+ for (final String coo : split(matcher.group(4), ',')) {
polygons.add(newPolygon(null, coo.substring(1, coo.length() - 1),
isNullable, maxLength, precision, scale, isUnicode));
}
@@ -530,4 +530,21 @@ public abstract class AbstractGeospatialType<T extends Geospatial> extends Singl
return result.append(")'").toString();
}
+
+ private List<String> split(final String input, final char separator) {
+ if (input == null) {
+ return null;
+ }
+ List<String> list = new ArrayList<String>();
+ int start = 0;
+ int end;
+ while ((end = input.indexOf(separator, start)) >= 0) {
+ list.add(input.substring(start, end));
+ start = end + 1;
+ }
+ if (start < input.length()) {
+ list.add(input.substring(start));
+ }
+ return list;
+ }
}
[2/2] olingo-odata4 git commit: [OLINGO-852] reduced usage of
Serializable and org.apache.commons.lang3 in commons
Posted by ch...@apache.org.
[OLINGO-852] reduced usage of Serializable and org.apache.commons.lang3 in commons
Signed-off-by: Christian Amend <ch...@sap.com>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/36e6dc92
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/36e6dc92
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/36e6dc92
Branch: refs/heads/master
Commit: 36e6dc9295399cecd502030b316c20fea13150e2
Parents: 58ead74
Author: Klaus Straubinger <kl...@sap.com>
Authored: Tue Jan 19 15:19:10 2016 +0100
Committer: Christian Amend <ch...@sap.com>
Committed: Wed Jan 20 13:27:21 2016 +0100
----------------------------------------------------------------------
lib/client-api/pom.xml | 4 ++
.../client/core/edm/ClientCsdlXMLMetadata.java | 3 +-
.../client/core/edm/xml/ClientCsdlAction.java | 4 +-
.../core/edm/xml/ClientCsdlActionImport.java | 4 +-
.../core/edm/xml/ClientCsdlAnnotation.java | 3 +-
.../core/edm/xml/ClientCsdlAnnotations.java | 4 +-
.../core/edm/xml/ClientCsdlComplexType.java | 4 +-
.../core/edm/xml/ClientCsdlDataServices.java | 4 +-
.../client/core/edm/xml/ClientCsdlEdmx.java | 4 +-
.../core/edm/xml/ClientCsdlEntityContainer.java | 4 +-
.../core/edm/xml/ClientCsdlEntityKey.java | 4 +-
.../core/edm/xml/ClientCsdlEntitySet.java | 4 +-
.../core/edm/xml/ClientCsdlEntityType.java | 4 +-
.../core/edm/xml/ClientCsdlEnumMember.java | 4 +-
.../client/core/edm/xml/ClientCsdlEnumType.java | 4 +-
.../client/core/edm/xml/ClientCsdlFunction.java | 4 +-
.../core/edm/xml/ClientCsdlFunctionImport.java | 4 +-
.../client/core/edm/xml/ClientCsdlInclude.java | 4 +-
.../edm/xml/ClientCsdlIncludeAnnotations.java | 4 +-
.../edm/xml/ClientCsdlNavigationProperty.java | 4 +-
.../ClientCsdlNavigationPropertyBinding.java | 4 +-
.../client/core/edm/xml/ClientCsdlOnDelete.java | 4 +-
.../core/edm/xml/ClientCsdlParameter.java | 4 +-
.../client/core/edm/xml/ClientCsdlProperty.java | 4 +-
.../core/edm/xml/ClientCsdlPropertyRef.java | 4 +-
.../core/edm/xml/ClientCsdlReference.java | 4 +-
.../xml/ClientCsdlReferentialConstraint.java | 4 +-
.../core/edm/xml/ClientCsdlReturnType.java | 4 +-
.../client/core/edm/xml/ClientCsdlSchema.java | 4 +-
.../core/edm/xml/ClientCsdlSingleton.java | 4 +-
.../client/core/edm/xml/ClientCsdlTerm.java | 4 +-
.../core/edm/xml/ClientCsdlTypeDefinition.java | 4 +-
.../edm/xml/annotation/ClientCsdlApply.java | 3 +-
.../core/edm/xml/annotation/ClientCsdlCast.java | 3 +-
.../xml/annotation/ClientCsdlCollection.java | 3 +-
.../annotation/ClientCsdlDynamicExpression.java | 3 +-
.../core/edm/xml/annotation/ClientCsdlIsOf.java | 3 +-
.../annotation/ClientCsdlLabeledElement.java | 3 +-
.../core/edm/xml/annotation/ClientCsdlNull.java | 3 +-
.../xml/annotation/ClientCsdlPropertyValue.java | 3 +-
.../edm/xml/annotation/ClientCsdlRecord.java | 3 +-
.../edm/xml/annotation/ClientCsdlUrlRef.java | 3 +-
lib/commons-api/pom.xml | 5 --
.../commons/api/data/AbstractODataObject.java | 25 ++++++++++
.../olingo/commons/api/data/Annotatable.java | 30 ------------
.../olingo/commons/api/data/Annotation.java | 18 +++++++
.../olingo/commons/api/data/ComplexValue.java | 17 +++++++
.../apache/olingo/commons/api/data/Delta.java | 17 +++++++
.../olingo/commons/api/data/DeltaLink.java | 25 ++++++++++
.../apache/olingo/commons/api/data/Entity.java | 40 ++++++++++++++++
.../commons/api/data/EntityCollection.java | 27 +++++++++--
.../apache/olingo/commons/api/data/Link.java | 37 +++++++++++++++
.../apache/olingo/commons/api/data/Linked.java | 17 +++++++
.../olingo/commons/api/data/Parameter.java | 18 +++++++
.../olingo/commons/api/data/Property.java | 18 +++++++
.../olingo/commons/api/data/Valuable.java | 30 ++++++++++++
.../api/edm/provider/CsdlAbstractEdmItem.java | 25 +---------
.../commons/api/edm/provider/CsdlAction.java | 2 -
.../api/edm/provider/CsdlActionImport.java | 2 -
.../api/edm/provider/CsdlAnnotation.java | 2 -
.../api/edm/provider/CsdlAnnotations.java | 2 -
.../api/edm/provider/CsdlBindingTarget.java | 2 -
.../api/edm/provider/CsdlComplexType.java | 2 -
.../api/edm/provider/CsdlEntityContainer.java | 2 -
.../commons/api/edm/provider/CsdlEntitySet.java | 2 -
.../api/edm/provider/CsdlEntityType.java | 2 -
.../api/edm/provider/CsdlEnumMember.java | 2 -
.../commons/api/edm/provider/CsdlEnumType.java | 2 -
.../commons/api/edm/provider/CsdlFunction.java | 2 -
.../api/edm/provider/CsdlFunctionImport.java | 2 -
.../edm/provider/CsdlNavigationProperty.java | 2 -
.../provider/CsdlNavigationPropertyBinding.java | 2 -
.../commons/api/edm/provider/CsdlOnDelete.java | 2 -
.../commons/api/edm/provider/CsdlOperation.java | 2 -
.../api/edm/provider/CsdlOperationImport.java | 2 -
.../commons/api/edm/provider/CsdlParameter.java | 2 -
.../commons/api/edm/provider/CsdlProperty.java | 2 -
.../api/edm/provider/CsdlPropertyRef.java | 2 -
.../edm/provider/CsdlReferentialConstraint.java | 2 -
.../api/edm/provider/CsdlReturnType.java | 2 -
.../commons/api/edm/provider/CsdlSchema.java | 2 -
.../commons/api/edm/provider/CsdlSingleton.java | 2 -
.../api/edm/provider/CsdlStructuralType.java | 2 -
.../commons/api/edm/provider/CsdlTerm.java | 2 -
.../api/edm/provider/CsdlTypeDefinition.java | 2 -
.../provider/annotation/CsdlAnnotationPath.java | 1 -
.../api/edm/provider/annotation/CsdlApply.java | 3 +-
.../api/edm/provider/annotation/CsdlCast.java | 1 -
.../edm/provider/annotation/CsdlCollection.java | 1 -
.../annotation/CsdlConstantExpression.java | 3 --
.../annotation/CsdlDynamicExpression.java | 2 -
.../edm/provider/annotation/CsdlExpression.java | 2 -
.../api/edm/provider/annotation/CsdlIf.java | 2 -
.../api/edm/provider/annotation/CsdlIsOf.java | 2 -
.../provider/annotation/CsdlLabeledElement.java | 4 +-
.../annotation/CsdlLabeledElementReference.java | 1 -
.../CsdlLogicalOrComparisonExpression.java | 2 -
.../annotation/CsdlNavigationPropertyPath.java | 1 -
.../api/edm/provider/annotation/CsdlNull.java | 2 -
.../api/edm/provider/annotation/CsdlPath.java | 1 -
.../provider/annotation/CsdlPropertyPath.java | 1 -
.../provider/annotation/CsdlPropertyValue.java | 5 +-
.../api/edm/provider/annotation/CsdlRecord.java | 1 -
.../api/edm/provider/annotation/CsdlUrlRef.java | 3 +-
.../primitivetype/AbstractGeospatialType.java | 49 +++++++++++++-------
105 files changed, 438 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml
index 64a3793..0f14bdf 100644
--- a/lib/client-api/pom.xml
+++ b/lib/client-api/pom.xml
@@ -50,6 +50,10 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientCsdlXMLMetadata.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientCsdlXMLMetadata.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientCsdlXMLMetadata.java
index b4f7743..ac4f3e1 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientCsdlXMLMetadata.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/ClientCsdlXMLMetadata.java
@@ -18,6 +18,7 @@
*/
package org.apache.olingo.client.core.edm;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,7 +33,7 @@ import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
/**
* Entry point for access information about EDM metadata.
*/
-public class ClientCsdlXMLMetadata extends CsdlAbstractEdmItem implements XMLMetadata {
+public class ClientCsdlXMLMetadata extends CsdlAbstractEdmItem implements Serializable, XMLMetadata {
private static final long serialVersionUID = 6025723060298454901L;
protected final Edmx edmx;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAction.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAction.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAction.java
index 4514564..9d5ea15 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAction.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAction.java
@@ -21,15 +21,17 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.provider.CsdlAction;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlAction.ActionDeserializer.class)
-class ClientCsdlAction extends CsdlAction {
+class ClientCsdlAction extends CsdlAction implements Serializable {
private static final long serialVersionUID = 5321541275349234088L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java
index ee6c69d..1ec869a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlActionImport.java
@@ -22,12 +22,14 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
import org.apache.olingo.commons.api.edm.provider.CsdlActionImport;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlActionImport.ActionImportDeserializer.class)
-class ClientCsdlActionImport extends CsdlActionImport {
+class ClientCsdlActionImport extends CsdlActionImport implements Serializable {
private static final long serialVersionUID = 2971468441177647068L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotation.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotation.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotation.java
index 131b6c9..8491626 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotation.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotation.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.annotation.ClientCsdlDynamicExpression;
import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
@@ -29,7 +30,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlAnnotation.AnnotationDeserializer.class)
-public class ClientCsdlAnnotation extends CsdlAnnotation {
+public class ClientCsdlAnnotation extends CsdlAnnotation implements Serializable {
private static final long serialVersionUID = 5464714417411058033L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotations.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotations.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotations.java
index c710a42..b870e48 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotations.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlAnnotations.java
@@ -21,14 +21,16 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.olingo.commons.api.edm.provider.CsdlAnnotations;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlAnnotations.AnnotationsDeserializer.class)
-class ClientCsdlAnnotations extends CsdlAnnotations {
+class ClientCsdlAnnotations extends CsdlAnnotations implements Serializable {
private static final long serialVersionUID = -5961207981571644200L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlComplexType.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlComplexType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlComplexType.java
index 0b59e99..c56d5b9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlComplexType.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlComplexType.java
@@ -21,15 +21,17 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.provider.CsdlComplexType;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlComplexType.ComplexTypeDeserializer.class)
-class ClientCsdlComplexType extends CsdlComplexType {
+class ClientCsdlComplexType extends CsdlComplexType implements Serializable {
private static final long serialVersionUID = 4076944306925840115L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlDataServices.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlDataServices.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlDataServices.java
index 072ad0f..86606fb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlDataServices.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlDataServices.java
@@ -19,12 +19,14 @@
package org.apache.olingo.client.core.edm.xml;
import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.olingo.client.api.edm.xml.DataServices;
import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem;
import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
@@ -32,7 +34,7 @@ import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlDataServices.DataServicesDeserializer.class)
-class ClientCsdlDataServices extends CsdlAbstractEdmItem implements DataServices {
+class ClientCsdlDataServices extends CsdlAbstractEdmItem implements Serializable, DataServices {
private static final long serialVersionUID = 4200317286476885204L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEdmx.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEdmx.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEdmx.java
index ba0d26d..9c675b9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEdmx.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEdmx.java
@@ -19,12 +19,14 @@
package org.apache.olingo.client.core.edm.xml;
import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.olingo.client.api.edm.xml.DataServices;
import org.apache.olingo.client.api.edm.xml.Edmx;
import org.apache.olingo.client.api.edm.xml.Reference;
@@ -33,7 +35,7 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlEdmx.EdmxDeserializer.class)
-public class ClientCsdlEdmx extends CsdlAbstractEdmItem implements Edmx {
+public class ClientCsdlEdmx extends CsdlAbstractEdmItem implements Serializable, Edmx {
private static final long serialVersionUID = -6293476719276092572L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityContainer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityContainer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityContainer.java
index de83325..ba3c945 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityContainer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityContainer.java
@@ -21,14 +21,16 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlEntityContainer.EntityContainerDeserializer.class)
-class ClientCsdlEntityContainer extends CsdlEntityContainer {
+class ClientCsdlEntityContainer extends CsdlEntityContainer implements Serializable {
private static final long serialVersionUID = 5631432527646955795L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityKey.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityKey.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityKey.java
index 7be9a90..574a6b9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityKey.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityKey.java
@@ -19,19 +19,21 @@
package org.apache.olingo.client.core.edm.xml;
import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem;
import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlEntityKey.EntityKeyDeserializer.class)
-class ClientCsdlEntityKey extends CsdlAbstractEdmItem {
+class ClientCsdlEntityKey extends CsdlAbstractEdmItem implements Serializable {
private static final long serialVersionUID = 520227585458843347L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntitySet.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntitySet.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntitySet.java
index 6973a27..1896f6d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntitySet.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntitySet.java
@@ -21,15 +21,17 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlEntitySet.EntitySetDeserializer.class)
-class ClientCsdlEntitySet extends CsdlEntitySet {
+class ClientCsdlEntitySet extends CsdlEntitySet implements Serializable {
private static final long serialVersionUID = -5553885465204370676L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityType.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityType.java
index f08bcbe..5f6644a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityType.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEntityType.java
@@ -21,15 +21,17 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.provider.CsdlEntityType;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlEntityType.EntityTypeDeserializer.class)
-class ClientCsdlEntityType extends CsdlEntityType {
+class ClientCsdlEntityType extends CsdlEntityType implements Serializable {
private static final long serialVersionUID = -3986417775876689669L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumMember.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumMember.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumMember.java
index 057a678..70aba5d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumMember.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumMember.java
@@ -22,12 +22,14 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlEnumMember.EnumMemberDeserializer.class)
-class ClientCsdlEnumMember extends CsdlEnumMember {
+class ClientCsdlEnumMember extends CsdlEnumMember implements Serializable {
private static final long serialVersionUID = -6138606817225829791L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumType.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumType.java
index a49f3ff..e6a6970 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumType.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlEnumType.java
@@ -21,15 +21,17 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.provider.CsdlEnumType;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlEnumType.EnumTypeDeserializer.class)
-class ClientCsdlEnumType extends CsdlEnumType {
+class ClientCsdlEnumType extends CsdlEnumType implements Serializable {
private static final long serialVersionUID = 9191189755592743333L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunction.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunction.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunction.java
index 97fd637..c4caaba 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunction.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunction.java
@@ -21,15 +21,17 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.provider.CsdlFunction;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlFunction.FunctionDeserializer.class)
-class ClientCsdlFunction extends CsdlFunction {
+class ClientCsdlFunction extends CsdlFunction implements Serializable {
private static final long serialVersionUID = -5494898295282843362L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunctionImport.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunctionImport.java
index 6b6a044..61564d2 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunctionImport.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlFunctionImport.java
@@ -21,15 +21,17 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlFunctionImport.FunctionImportDeserializer.class)
-class ClientCsdlFunctionImport extends CsdlFunctionImport {
+class ClientCsdlFunctionImport extends CsdlFunctionImport implements Serializable {
private static final long serialVersionUID = -1686801084142932402L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlInclude.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlInclude.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlInclude.java
index 541f037..5a21efc 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlInclude.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlInclude.java
@@ -22,13 +22,15 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
import org.apache.olingo.client.api.edm.xml.Include;
import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlInclude.IncludeDeserializer.class)
-class ClientCsdlInclude extends CsdlAbstractEdmItem implements Include {
+class ClientCsdlInclude extends CsdlAbstractEdmItem implements Serializable, Include {
private static final long serialVersionUID = -5450008299655584221L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlIncludeAnnotations.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlIncludeAnnotations.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlIncludeAnnotations.java
index 87150ea..d230f54 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlIncludeAnnotations.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlIncludeAnnotations.java
@@ -22,13 +22,15 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
import org.apache.olingo.client.api.edm.xml.IncludeAnnotations;
import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmItem;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlIncludeAnnotations.IncludeAnnotationsDeserializer.class)
-class ClientCsdlIncludeAnnotations extends CsdlAbstractEdmItem implements IncludeAnnotations {
+class ClientCsdlIncludeAnnotations extends CsdlAbstractEdmItem implements Serializable, IncludeAnnotations {
private static final long serialVersionUID = -8157841387011422396L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationProperty.java
index 2fca830..b456505 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationProperty.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationProperty.java
@@ -21,15 +21,17 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlNavigationProperty.NavigationPropertyDeserializer.class)
-class ClientCsdlNavigationProperty extends CsdlNavigationProperty {
+class ClientCsdlNavigationProperty extends CsdlNavigationProperty implements Serializable {
private static final long serialVersionUID = 6240231735592427582L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationPropertyBinding.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationPropertyBinding.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationPropertyBinding.java
index d9da5b0..6f9a749 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationPropertyBinding.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlNavigationPropertyBinding.java
@@ -22,12 +22,14 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
import org.apache.olingo.commons.api.edm.provider.CsdlNavigationPropertyBinding;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlNavigationPropertyBinding.NavigationPropertyBindingDeserializer.class)
-class ClientCsdlNavigationPropertyBinding extends CsdlNavigationPropertyBinding {
+class ClientCsdlNavigationPropertyBinding extends CsdlNavigationPropertyBinding implements Serializable {
private static final long serialVersionUID = -7056978592235483660L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlOnDelete.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlOnDelete.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlOnDelete.java
index 6fa992f..68ac862 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlOnDelete.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlOnDelete.java
@@ -22,13 +22,15 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
import org.apache.olingo.commons.api.edm.provider.CsdlOnDelete;
import org.apache.olingo.commons.api.edm.provider.CsdlOnDeleteAction;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlOnDelete.OnDeleteDeserializer.class)
-class ClientCsdlOnDelete extends CsdlOnDelete {
+class ClientCsdlOnDelete extends CsdlOnDelete implements Serializable {
private static final long serialVersionUID = -7130889202653716784L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlParameter.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlParameter.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlParameter.java
index 4df4377..dc4f41e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlParameter.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlParameter.java
@@ -21,6 +21,7 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.geo.SRID;
import org.apache.olingo.commons.api.edm.provider.CsdlParameter;
@@ -28,9 +29,10 @@ import org.apache.olingo.commons.api.edm.provider.CsdlParameter;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlParameter.ParameterDeserializer.class)
-class ClientCsdlParameter extends CsdlParameter {
+class ClientCsdlParameter extends CsdlParameter implements Serializable {
private static final long serialVersionUID = 7119478691341167904L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlProperty.java
index 647f386..0fc7507 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlProperty.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlProperty.java
@@ -21,6 +21,7 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.geo.SRID;
import org.apache.olingo.commons.api.edm.provider.CsdlProperty;
@@ -28,9 +29,10 @@ import org.apache.olingo.commons.api.edm.provider.CsdlProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlProperty.PropertyDeserializer.class)
-class ClientCsdlProperty extends CsdlProperty {
+class ClientCsdlProperty extends CsdlProperty implements Serializable {
private static final long serialVersionUID = -4521766603286651372L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlPropertyRef.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlPropertyRef.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlPropertyRef.java
index 6e32473..e9e694e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlPropertyRef.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlPropertyRef.java
@@ -22,12 +22,14 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlPropertyRef.PropertyRefDeserializer.class)
-class ClientCsdlPropertyRef extends CsdlPropertyRef {
+class ClientCsdlPropertyRef extends CsdlPropertyRef implements Serializable {
private static final long serialVersionUID = 1504095609268590326L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReference.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReference.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReference.java
index b0b71e7..1e6c5f5 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReference.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReference.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml;
import java.io.IOException;
+import java.io.Serializable;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +27,7 @@ import java.util.List;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.olingo.client.api.edm.xml.Include;
import org.apache.olingo.client.api.edm.xml.IncludeAnnotations;
import org.apache.olingo.client.api.edm.xml.Reference;
@@ -35,7 +37,7 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlReference.ReferenceDeserializer.class)
-class ClientCsdlReference extends CsdlAbstractEdmItem implements Reference {
+class ClientCsdlReference extends CsdlAbstractEdmItem implements Serializable, Reference {
private static final long serialVersionUID = 7720274712545267654L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReferentialConstraint.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReferentialConstraint.java
index 1327766..2bb3083 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReferentialConstraint.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReferentialConstraint.java
@@ -22,12 +22,14 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlReferentialConstraint.ReferentialConstraintDeserializer.class)
-class ClientCsdlReferentialConstraint extends CsdlReferentialConstraint {
+class ClientCsdlReferentialConstraint extends CsdlReferentialConstraint implements Serializable {
private static final long serialVersionUID = -5822115908069878139L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java
index 302bd9f..21f1183 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java
@@ -21,6 +21,7 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.geo.SRID;
import org.apache.olingo.commons.api.edm.provider.CsdlReturnType;
@@ -28,9 +29,10 @@ import org.apache.olingo.commons.api.edm.provider.CsdlReturnType;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlReturnType.ReturnTypeDeserializer.class)
-class ClientCsdlReturnType extends CsdlReturnType {
+class ClientCsdlReturnType extends CsdlReturnType implements Serializable {
private static final long serialVersionUID = 6261092793901735110L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSchema.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSchema.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSchema.java
index bc141c5..7e0c4f5 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSchema.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSchema.java
@@ -21,14 +21,16 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlSchema.SchemaDeserializer.class)
-class ClientCsdlSchema extends CsdlSchema {
+class ClientCsdlSchema extends CsdlSchema implements Serializable {
private static final long serialVersionUID = 1911087363912024939L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSingleton.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSingleton.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSingleton.java
index 7a2d097..472c9e9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSingleton.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlSingleton.java
@@ -21,14 +21,16 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.olingo.commons.api.edm.provider.CsdlSingleton;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlSingleton.SingletonDeserializer.class)
-class ClientCsdlSingleton extends CsdlSingleton {
+class ClientCsdlSingleton extends CsdlSingleton implements Serializable {
private static final long serialVersionUID = 1656749615107151921L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTerm.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTerm.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTerm.java
index b2cef22..48b514e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTerm.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTerm.java
@@ -21,6 +21,7 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.geo.SRID;
@@ -29,10 +30,11 @@ import org.apache.olingo.commons.api.edm.provider.CsdlTerm;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
import java.util.Arrays;
@JsonDeserialize(using = ClientCsdlTerm.TermDeserializer.class)
-class ClientCsdlTerm extends CsdlTerm {
+class ClientCsdlTerm extends CsdlTerm implements Serializable {
private static final long serialVersionUID = -8350072064720586186L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java
index 420f226..136f30e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java
@@ -21,6 +21,7 @@ package org.apache.olingo.client.core.edm.xml;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.commons.api.edm.geo.SRID;
import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition;
@@ -28,9 +29,10 @@ import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.IOException;
+import java.io.Serializable;
@JsonDeserialize(using = ClientCsdlTypeDefinition.TypeDefinitionDeserializer.class)
-class ClientCsdlTypeDefinition extends CsdlTypeDefinition {
+class ClientCsdlTypeDefinition extends CsdlTypeDefinition implements Serializable {
private static final long serialVersionUID = -902407149079419602L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlApply.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlApply.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlApply.java
index 4e2a000..6458cae 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlApply.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlApply.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.ClientCsdlAnnotation;
@@ -30,7 +31,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlApply.ApplyDeserializer.class)
-class ClientCsdlApply extends CsdlApply {
+class ClientCsdlApply extends CsdlApply implements Serializable {
private static final long serialVersionUID = 4358398303405059879L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCast.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCast.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCast.java
index 7880fb8..8756d93 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCast.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCast.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.ClientCsdlAnnotation;
@@ -31,7 +32,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlCast.CastDeserializer.class)
-class ClientCsdlCast extends CsdlCast {
+class ClientCsdlCast extends CsdlCast implements Serializable {
private static final long serialVersionUID = 3312415984116005313L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCollection.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCollection.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCollection.java
index e76dddd..677fa69 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCollection.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCollection.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.commons.api.edm.provider.annotation.CsdlCollection;
@@ -29,7 +30,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlCollection.CollectionDeserializer.class)
-class ClientCsdlCollection extends CsdlCollection {
+class ClientCsdlCollection extends CsdlCollection implements Serializable {
private static final long serialVersionUID = -724749123749715643L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlDynamicExpression.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlDynamicExpression.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlDynamicExpression.java
index d332649..e4f85e2 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlDynamicExpression.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlDynamicExpression.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.commons.api.edm.provider.annotation.CsdlDynamicExpression;
@@ -38,7 +39,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlDynamicExpression.DynamicExpressionDeserializer.class)
-public abstract class ClientCsdlDynamicExpression extends CsdlDynamicExpression {
+public abstract class ClientCsdlDynamicExpression extends CsdlDynamicExpression implements Serializable {
private static final long serialVersionUID = 1093411847477874348L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlIsOf.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlIsOf.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlIsOf.java
index 31ec91a..411d6dd 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlIsOf.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlIsOf.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.ClientCsdlAnnotation;
@@ -31,7 +32,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlIsOf.IsOfDeserializer.class)
-class ClientCsdlIsOf extends CsdlIsOf{
+class ClientCsdlIsOf extends CsdlIsOf implements Serializable {
private static final long serialVersionUID = -893355856129761174L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlLabeledElement.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlLabeledElement.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlLabeledElement.java
index fdef249..b07a57b 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlLabeledElement.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlLabeledElement.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.ClientCsdlAnnotation;
@@ -30,7 +31,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlLabeledElement.LabeledElementDeserializer.class)
-class ClientCsdlLabeledElement extends CsdlLabeledElement {
+class ClientCsdlLabeledElement extends CsdlLabeledElement implements Serializable {
private static final long serialVersionUID = 4909387630253341824L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlNull.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlNull.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlNull.java
index d8ebb0c..0b0d979 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlNull.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlNull.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.ClientCsdlAnnotation;
@@ -30,7 +31,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlNull.NullDeserializer.class)
-class ClientCsdlNull extends CsdlNull {
+class ClientCsdlNull extends CsdlNull implements Serializable {
private static final long serialVersionUID = -3148516847180393142L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlPropertyValue.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlPropertyValue.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlPropertyValue.java
index 078f66c..0d3fd45 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlPropertyValue.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlPropertyValue.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.ClientCsdlAnnotation;
@@ -30,7 +31,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlPropertyValue.PropertyValueDeserializer.class)
-class ClientCsdlPropertyValue extends CsdlPropertyValue {
+class ClientCsdlPropertyValue extends CsdlPropertyValue implements Serializable {
private static final long serialVersionUID = -8437649215282645228L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlRecord.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlRecord.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlRecord.java
index 10d2f50..a2a1b07 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlRecord.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlRecord.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.client.core.edm.xml.ClientCsdlAnnotation;
@@ -30,7 +31,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlRecord.RecordDeserializer.class)
-class ClientCsdlRecord extends CsdlRecord {
+class ClientCsdlRecord extends CsdlRecord implements Serializable {
private static final long serialVersionUID = 4275271751615410709L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlUrlRef.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlUrlRef.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlUrlRef.java
index 2a4ebc8..fa41141 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlUrlRef.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlUrlRef.java
@@ -19,6 +19,7 @@
package org.apache.olingo.client.core.edm.xml.annotation;
import java.io.IOException;
+import java.io.Serializable;
import org.apache.olingo.client.core.edm.xml.AbstractClientCsdlEdmDeserializer;
import org.apache.olingo.commons.api.edm.provider.annotation.CsdlUrlRef;
@@ -29,7 +30,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@JsonDeserialize(using = ClientCsdlUrlRef.UrlRefDeserializer.class)
-class ClientCsdlUrlRef extends CsdlUrlRef {
+class ClientCsdlUrlRef extends CsdlUrlRef implements Serializable {
private static final long serialVersionUID = -7693224811739000440L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/pom.xml
----------------------------------------------------------------------
diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml
index dabf9c8..64ea2fa 100644
--- a/lib/commons-api/pom.xml
+++ b/lib/commons-api/pom.xml
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
index 15e50bf..a39ce56 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/AbstractODataObject.java
@@ -81,4 +81,29 @@ public abstract class AbstractODataObject extends Annotatable {
title = value;
}
}
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final AbstractODataObject other = (AbstractODataObject) o;
+ return getAnnotations().equals(other.getAnnotations())
+ && (baseURI == null ? other.baseURI == null : baseURI.equals(other.baseURI))
+ && (id == null ? other.id == null : id.equals(other.id))
+ && (title == null ? other.title == null : title.equals(other.title));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getAnnotations().hashCode();
+ result = 31 * result + (baseURI == null ? 0 : baseURI.hashCode());
+ result = 31 * result + (id == null ? 0 : id.hashCode());
+ result = 31 * result + (title == null ? 0 : title.hashCode());
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
index e372aca..f42f10c 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotatable.java
@@ -21,11 +21,6 @@ package org.apache.olingo.commons.api.data;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
/**
* An element with instance annotations.
*/
@@ -41,29 +36,4 @@ public abstract class Annotatable {
public List<Annotation> getAnnotations() {
return annotations;
}
-
- /**
- * Compare for equality.
- *
- * @param obj to compared with
- * @return <code>true</code> if equal, otherwise <code>false</code>
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * Create the hash code.
- * @return hash code for this instance.
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
index 759666b..a3014c1 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Annotation.java
@@ -40,4 +40,22 @@ public class Annotation extends Valuable {
public void setTerm(final String term) {
this.term = term;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ return super.equals(o)
+ && (term == null ? ((Annotation) o).term == null : term.equals(((Annotation) o).term));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + (term == null ? 0 : term.hashCode());
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return term == null ? "null" : term;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
index c146645..0054777 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java
@@ -36,4 +36,21 @@ public class ComplexValue extends Linked {
public List<Property> getValue() {
return value;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ return super.equals(o) && value.equals(((ComplexValue) o).value);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + value.hashCode();
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return value.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
index 1030082..72cef4c 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
@@ -53,4 +53,21 @@ public class Delta extends EntityCollection {
public List<DeltaLink> getDeletedLinks() {
return deletedLinks;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ return super.equals(o)
+ && deletedEntities.equals(((Delta) o).deletedEntities)
+ && addedLinks.equals(((Delta) o).addedLinks)
+ && deletedLinks.equals(((Delta) o).deletedLinks);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + deletedEntities.hashCode();
+ result = 31 * result + addedLinks.hashCode();
+ result = 31 * result + deletedLinks.hashCode();
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
index 052e71c..fe36c10 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeltaLink.java
@@ -76,4 +76,29 @@ public class DeltaLink extends Annotatable {
public void setTarget(final URI target) {
this.target = target;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final DeltaLink other = (DeltaLink) o;
+ return getAnnotations().equals(other.getAnnotations())
+ && (source == null ? other.source == null : source.equals(other.source))
+ && (relationship == null ? other.relationship == null : relationship.equals(other.relationship))
+ && (target == null ? other.target == null : target.equals(other.target));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getAnnotations().hashCode();
+ result = 31 * result + (source == null ? 0 : source.hashCode());
+ result = 31 * result + (relationship == null ? 0 : relationship.hashCode());
+ result = 31 * result + (target == null ? 0 : target.hashCode());
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java
index f5be18c..9742daf 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entity.java
@@ -232,4 +232,44 @@ public class Entity extends Linked {
public boolean isMediaEntity() {
return mediaContentSource != null;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ return super.equals(o)
+ && (eTag == null ? ((Entity) o).eTag == null : eTag.equals(((Entity) o).eTag))
+ && (type == null ? ((Entity) o).type == null : type.equals(((Entity) o).type))
+ && (readLink == null ? ((Entity) o).readLink == null : readLink.equals(((Entity) o).readLink))
+ && (editLink == null ? ((Entity) o).editLink == null : editLink.equals(((Entity) o).editLink))
+ && mediaEditLinks.equals(((Entity) o).mediaEditLinks)
+ && operations.equals(((Entity) o).operations)
+ && properties.equals(((Entity) o).properties)
+ && (mediaContentSource == null ?
+ ((Entity) o).mediaContentSource == null :
+ mediaContentSource.equals(((Entity) o).mediaContentSource))
+ && (mediaContentType == null ?
+ ((Entity) o).mediaContentType == null :
+ mediaContentType.equals(((Entity) o).mediaContentType))
+ && (mediaETag == null ? ((Entity) o).mediaETag == null : mediaETag.equals(((Entity) o).mediaETag));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + (eTag == null ? 0 : eTag.hashCode());
+ result = 31 * result + (type == null ? 0 : type.hashCode());
+ result = 31 * result + (readLink == null ? 0 : readLink.hashCode());
+ result = 31 * result + (editLink == null ? 0 : editLink.hashCode());
+ result = 31 * result + mediaEditLinks.hashCode();
+ result = 31 * result + operations.hashCode();
+ result = 31 * result + properties.hashCode();
+ result = 31 * result + (mediaContentSource == null ? 0 : mediaContentSource.hashCode());
+ result = 31 * result + (mediaContentType == null ? 0 : mediaContentType.hashCode());
+ result = 31 * result + (mediaETag == null ? 0 : mediaETag.hashCode());
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return properties.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
index adb43dc..743d437 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
@@ -27,12 +27,9 @@ import java.util.List;
*/
public class EntityCollection extends AbstractODataObject {
- private Integer count;
-
private final List<Entity> entities = new ArrayList<Entity>();
-
+ private Integer count;
private URI next;
-
private URI deltaLink;
/**
@@ -97,4 +94,26 @@ public class EntityCollection extends AbstractODataObject {
public void setDeltaLink(final URI deltaLink) {
this.deltaLink = deltaLink;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ if (!super.equals(o)) {
+ return false;
+ }
+ final EntityCollection other = (EntityCollection) o;
+ return entities.equals(other.entities)
+ && (count == null ? other.count == null : count.equals(other.count))
+ && (next == null ? other.next == null : next.equals(other.next))
+ && (deltaLink == null ? other.deltaLink == null : deltaLink.equals(other.deltaLink));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + entities.hashCode();
+ result = 31 * result + (count == null ? 0 : count.hashCode());
+ result = 31 * result + (next == null ? 0 : next.hashCode());
+ result = 31 * result + (deltaLink == null ? 0 : deltaLink.hashCode());
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
index cde7dc5..0bf8237 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
@@ -193,4 +193,41 @@ public class Link extends Annotatable {
public void setBindingLinks(final List<String> bindingLinks) {
this.bindingLinks = bindingLinks;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final Link other = (Link) o;
+ return getAnnotations().equals(other.getAnnotations())
+ && (title == null ? other.title == null : title.equals(other.title))
+ && (rel == null ? other.rel == null : rel.equals(other.rel))
+ && (href == null ? other.href == null : href.equals(other.href))
+ && (type == null ? other.type == null : type.equals(other.type))
+ && (mediaETag == null ? other.mediaETag == null : mediaETag.equals(other.mediaETag))
+ && (entity == null ? other.entity == null : entity.equals(other.entity))
+ && (entitySet == null ? other.entitySet == null : entitySet.equals(other.entitySet))
+ && (bindingLink == null ? other.bindingLink == null : bindingLink.equals(other.bindingLink))
+ && bindingLinks.equals(other.bindingLinks);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getAnnotations().hashCode();
+ result = 31 * result + (title == null ? 0 : title.hashCode());
+ result = 31 * result + (rel == null ? 0 : rel.hashCode());
+ result = 31 * result + (href == null ? 0 : href.hashCode());
+ result = 31 * result + (type == null ? 0 : type.hashCode());
+ result = 31 * result + (mediaETag == null ? 0 : mediaETag.hashCode());
+ result = 31 * result + (entity == null ? 0 : entity.hashCode());
+ result = 31 * result + (entitySet == null ? 0 : entitySet.hashCode());
+ result = 31 * result + (bindingLink == null ? 0 : bindingLink.hashCode());
+ result = 31 * result + bindingLinks.hashCode();
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java
index ccc081b..d3c736b 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Linked.java
@@ -97,4 +97,21 @@ public abstract class Linked extends AbstractODataObject {
public List<Link> getNavigationBindings() {
return bindingLinks;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ return super.equals(o)
+ && associationLinks.equals(((Linked) o).associationLinks)
+ && navigationLinks.equals(((Linked) o).navigationLinks)
+ && bindingLinks.equals(((Linked) o).bindingLinks);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + associationLinks.hashCode();
+ result = 31 * result + navigationLinks.hashCode();
+ result = 31 * result + bindingLinks.hashCode();
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
index 2937f25..0b2ed33 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Parameter.java
@@ -56,4 +56,22 @@ public class Parameter extends Valuable {
public Entity asEntity() {
return isEntity() && !isCollection() ? (Entity) getValue() : null;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ return super.equals(o)
+ && (name == null ? ((Parameter) o).name == null : name.equals(((Parameter) o).name));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + (name == null ? 0 : name.hashCode());
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return (name == null ? "null" : name) + '=' + (getValue() == null ? "null" : getValue());
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
index 153bdd9..2117241 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java
@@ -79,4 +79,22 @@ public class Property extends Valuable {
public boolean isNull() {
return getValue() == null || "Edm.Null".equals(getType());
}
+
+ @Override
+ public boolean equals(final Object o) {
+ return super.equals(o)
+ && (name == null ? ((Property) o).name == null : name.equals(((Property) o).name));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + (name == null ? 0 : name.hashCode());
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return (name == null ? "null" : name) + '=' + (getValue() == null ? "null" : getValue());
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6dc92/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
index a2cb509..ccc95cd 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Valuable.java
@@ -171,4 +171,34 @@ public abstract class Valuable extends Annotatable {
public ValueType getValueType() {
return valueType;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final Valuable other = (Valuable) o;
+ return getAnnotations().equals(other.getAnnotations())
+ && (valueType == null ? other.valueType == null : valueType.equals(other.valueType))
+ && (value == null ? other.value == null : value.equals(other.value))
+ && (type == null ? other.type == null : type.equals(other.type));
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getAnnotations().hashCode();
+ result = 31 * result + (valueType == null ? 0 : valueType.hashCode());
+ result = 31 * result + (value == null ? 0 : value.hashCode());
+ result = 31 * result + (type == null ? 0 : type.hashCode());
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return value == null ? "null" : value.toString();
+ }
}