You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2016/01/25 21:31:21 UTC
[41/51] [abbrv] olingo-odata4 git commit: [OLINGO-852] reduced usage
of Serializable and org.apache.commons.lang3 in commons
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;
+ }
}