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 2014/07/16 15:34:41 UTC
[06/23] Removed unused imports
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java
index af7b5b5..fbf94c9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java
@@ -19,15 +19,14 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v3.Association;
import org.apache.olingo.client.api.edm.xml.v3.AssociationEnd;
import org.apache.olingo.client.api.edm.xml.v3.ReferentialConstraint;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = AssociationDeserializer.class)
public class AssociationImpl extends AbstractEdmItem implements Association {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java
index f7268c2..17914c3 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java
@@ -22,11 +22,10 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class AssociationSetDeserializer extends AbstractEdmDeserializer<AssociationSetImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java
index f39beb0..1106883 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v3.AssociationSetEnd;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java
index d49aa44..2b6d386 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java
@@ -19,14 +19,13 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v3.AssociationSet;
import org.apache.olingo.client.api.edm.xml.v3.AssociationSetEnd;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = AssociationSetDeserializer.class)
public class AssociationSetImpl extends AbstractEdmItem implements AssociationSet {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java
index 6f4c837..736dd9c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java
@@ -18,12 +18,12 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.ComplexType;
import org.apache.olingo.client.core.edm.xml.AbstractComplexType;
+import java.util.ArrayList;
+import java.util.List;
+
public class ComplexTypeImpl extends AbstractComplexType implements ComplexType {
private static final long serialVersionUID = -1251230308269425962L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java
index 542c20d..758400c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java
@@ -18,12 +18,12 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.Schema;
import org.apache.olingo.client.core.edm.xml.AbstractDataServices;
+import java.util.ArrayList;
+import java.util.List;
+
public class DataServicesImpl extends AbstractDataServices {
private static final long serialVersionUID = 633129618050875211L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java
index 1866a57..1b788ee 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java
@@ -18,14 +18,14 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.EntitySet;
import org.apache.olingo.client.api.edm.xml.v3.AssociationSet;
import org.apache.olingo.client.api.edm.xml.v3.FunctionImport;
import org.apache.olingo.client.core.edm.xml.AbstractEntityContainer;
+import java.util.ArrayList;
+import java.util.List;
+
public class EntityContainerImpl extends AbstractEntityContainer {
private static final long serialVersionUID = 8934431875078180370L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java
index d20e981..f692161 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java
@@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
+import org.apache.olingo.client.core.edm.xml.AbstractEntityType;
+
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.client.core.edm.xml.AbstractEntityType;
-
public class EntityTypeImpl extends AbstractEntityType {
private static final long serialVersionUID = 8727765036150269547L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java
index 942a2b8..69017b7 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java
@@ -18,12 +18,12 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.Member;
import org.apache.olingo.client.core.edm.xml.AbstractEnumType;
+import java.util.ArrayList;
+import java.util.List;
+
public class EnumTypeImpl extends AbstractEnumType {
private static final long serialVersionUID = 8967396195669128419L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java
index 3b7c4c7..d28a7eb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import java.io.IOException;
+
public class FunctionImportDeserializer extends AbstractEdmDeserializer<FunctionImportImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java
index 7a00c3a..6526afa 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java
@@ -19,13 +19,12 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.apache.olingo.client.api.edm.xml.v3.FunctionImport;
+import org.apache.olingo.client.api.edm.xml.v3.Parameter;
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.v3.FunctionImport;
-import org.apache.olingo.client.api.edm.xml.v3.Parameter;
-
@JsonDeserialize(using = FunctionImportDeserializer.class)
public class FunctionImportImpl implements FunctionImport {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java
index 2c7aa90..ec35c17 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v3.NavigationProperty;
import org.apache.olingo.client.core.edm.xml.AbstractNavigationProperty;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java
index 17c5369..fc4ff00 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java
@@ -19,14 +19,13 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.olingo.client.api.edm.xml.v3.PropertyValue;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
-import org.apache.olingo.client.api.edm.xml.v3.PropertyValue;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
-
public class PropertyValueImpl extends AbstractEdmItem implements PropertyValue {
private static final long serialVersionUID = -6580934436491418564L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java
index b60f581..055c34a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java
@@ -20,7 +20,6 @@ package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v3.ReferentialConstraint;
import org.apache.olingo.client.api.edm.xml.v3.ReferentialConstraintRole;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java
index 4bd4e1a..8648f44 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.PropertyRefImpl;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.PropertyRefImpl;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class ReferentialConstraintRoleDeserializer extends AbstractEdmDeserializer<ReferentialConstraintRoleImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java
index 4f2ddd5..531118a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java
@@ -19,14 +19,13 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.PropertyRef;
import org.apache.olingo.client.api.edm.xml.v3.ReferentialConstraintRole;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = ReferentialConstraintRoleDeserializer.class)
public class ReferentialConstraintRoleImpl extends AbstractEdmItem implements ReferentialConstraintRole {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java
index e8a5650..3ca202a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java
@@ -18,9 +18,6 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.ComplexType;
import org.apache.olingo.client.api.edm.xml.EntityContainer;
import org.apache.olingo.client.api.edm.xml.EntityType;
@@ -32,6 +29,9 @@ import org.apache.olingo.client.api.edm.xml.v3.Using;
import org.apache.olingo.client.api.edm.xml.v3.ValueTerm;
import org.apache.olingo.client.core.edm.xml.AbstractSchema;
+import java.util.ArrayList;
+import java.util.List;
+
public class SchemaImpl extends AbstractSchema implements Schema {
private static final long serialVersionUID = 4453992249818796144L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java
index fd2aac3..418005d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java
@@ -22,11 +22,10 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class TypeAnnotationDeserializer extends AbstractEdmDeserializer<TypeAnnotationImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java
index fe713d4..e8bca6e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java
@@ -19,14 +19,13 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v3.PropertyValue;
import org.apache.olingo.client.api.edm.xml.v3.TypeAnnotation;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = TypeAnnotationDeserializer.class)
public class TypeAnnotationImpl extends AbstractEdmItem implements TypeAnnotation {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java
index e701682..27ec269 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v3.Using;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java
index b55270f..c5c41df 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java
@@ -19,14 +19,13 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.olingo.client.api.edm.xml.v3.ValueAnnotation;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
-import org.apache.olingo.client.api.edm.xml.v3.ValueAnnotation;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
-
public class ValueAnnotationImpl extends AbstractEdmItem implements ValueAnnotation {
private static final long serialVersionUID = -1826414005417952278L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java
index 9b2e663..74859e3 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v3;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v3.ValueTerm;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java
index 41399a9..494d4fc 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import java.io.IOException;
+
public class ActionDeserializer extends AbstractEdmDeserializer<ActionImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java
index a09eea6..28a2f5e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java
@@ -19,14 +19,13 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Action;
import org.apache.olingo.client.api.edm.xml.v4.Parameter;
import org.apache.olingo.client.api.edm.xml.v4.ReturnType;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = ActionDeserializer.class)
public class ActionImpl extends AbstractAnnotatable implements Action {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java
index 5a06389..fe127d2 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v4.ActionImport;
public class ActionImportImpl extends AbstractAnnotatable implements ActionImport {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java
index d9d9e0c..3d26a8f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.v4.annotation.AbstractDynamicAnnotationExpression;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.v4.annotation.AbstractDynamicAnnotationExpression;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class AnnotationDeserializer extends AbstractEdmDeserializer<AnnotationImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java
index c75aa7a..f19c715 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java
index 5ab7afb..b1aa277 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java
@@ -22,11 +22,10 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java
index 110b21f..353062c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java
@@ -19,13 +19,13 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.Annotations;
import org.apache.olingo.client.core.edm.xml.AbstractAnnotations;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = AnnotationsDeserializer.class)
public class AnnotationsImpl extends AbstractAnnotations implements Annotations {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java
index 8a16584..b0dbc4a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java
@@ -18,15 +18,15 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.ComplexType;
import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty;
import org.apache.olingo.client.api.edm.xml.v4.Property;
import org.apache.olingo.client.core.edm.xml.AbstractComplexType;
+import java.util.ArrayList;
+import java.util.List;
+
public class ComplexTypeImpl extends AbstractComplexType implements ComplexType {
private static final long serialVersionUID = -1251230308269425962L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java
index bf4ed66..b30d96e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java
@@ -18,12 +18,12 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Schema;
import org.apache.olingo.client.core.edm.xml.AbstractDataServices;
+import java.util.ArrayList;
+import java.util.List;
+
public class DataServicesImpl extends AbstractDataServices {
private static final long serialVersionUID = -7954360771258897632L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java
index d1bbd07..c8be4d7 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java
@@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Edmx;
import org.apache.olingo.client.api.edm.xml.v4.Reference;
import org.apache.olingo.client.core.edm.xml.AbstractEdmx;
+import java.util.ArrayList;
+import java.util.List;
+
public class EdmxImpl extends AbstractEdmx implements Edmx {
private static final long serialVersionUID = -8031883176876401375L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java
index b79e0eb..0d0910c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java
@@ -18,14 +18,14 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.EntitySet;
import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding;
import org.apache.olingo.client.core.edm.xml.AbstractEntitySet;
+import java.util.ArrayList;
+import java.util.List;
+
public class EntitySetImpl extends AbstractEntitySet implements EntitySet {
private static final long serialVersionUID = 5570833733884884012L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java
index cbe2eea..25addef 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java
@@ -18,15 +18,15 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.EntityType;
import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty;
import org.apache.olingo.client.api.edm.xml.v4.Property;
import org.apache.olingo.client.core.edm.xml.AbstractEntityType;
+import java.util.ArrayList;
+import java.util.List;
+
public class EntityTypeImpl extends AbstractEntityType implements EntityType {
private static final long serialVersionUID = 8727765036150269547L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java
index 44a3b89..41adfac 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java
@@ -18,12 +18,13 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.Annotatable;
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.core.edm.xml.AbstractEnumType;
+import java.util.ArrayList;
+import java.util.List;
+
public class EnumTypeImpl extends AbstractEnumType implements Annotatable {
private static final long serialVersionUID = -3329664331877556957L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java
index 200060f..4c69713 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import java.io.IOException;
+
public class FunctionDeserializer extends AbstractEdmDeserializer<FunctionImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java
index 7041bff..8658e1e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
import org.apache.olingo.client.api.edm.xml.v4.Function;
@JsonDeserialize(using = FunctionDeserializer.class)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java
index 0c4fc0e..227d0ca 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import java.io.IOException;
+
public class FunctionImportDeserializer extends AbstractEdmDeserializer<FunctionImportImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java
index 33e8067..14ec3af 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java
@@ -19,12 +19,12 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.FunctionImport;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = FunctionImportDeserializer.class)
public class FunctionImportImpl implements FunctionImport {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java
index 23d311a..6b4e4c4 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v4.IncludeAnnotations;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java
index ea9bc01..64b9bd4 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v4.Include;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java
index 980dbf9..05e7193 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java
index 8d1e2e2..c9d6f5f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java
@@ -18,18 +18,16 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import org.apache.olingo.client.core.edm.xml.OnDeleteImpl;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.OnDeleteImpl;
import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
public class NavigationPropertyDeserializer extends AbstractEdmDeserializer<NavigationPropertyImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java
index 87c260d..af21dd6 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java
@@ -19,16 +19,15 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.OnDelete;
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty;
import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint;
import org.apache.olingo.client.core.edm.xml.AbstractNavigationProperty;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = NavigationPropertyDeserializer.class)
public class NavigationPropertyImpl extends AbstractNavigationProperty implements NavigationProperty {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java
index 0c117cd..0c1e315 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java
@@ -18,13 +18,14 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.Parameter;
import org.apache.olingo.client.core.edm.xml.AbstractParameter;
import org.apache.olingo.commons.api.edm.geo.SRID;
+import java.util.ArrayList;
+import java.util.List;
+
public class ParameterImpl extends AbstractParameter implements Parameter {
private static final long serialVersionUID = -1067642515116697747L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java
index e8d68ed..2f53ade 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java
@@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.Property;
import org.apache.olingo.client.core.edm.xml.AbstractProperty;
+import java.util.ArrayList;
+import java.util.List;
+
public class PropertyImpl extends AbstractProperty implements Property {
private static final long serialVersionUID = -5541908235094985412L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java
index 94f1ed7..aae95f6 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import java.io.IOException;
import java.net.URI;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class ReferenceDeserializer extends AbstractEdmDeserializer<ReferenceImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java
index a8d0fd9..dad2a98 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java
@@ -19,15 +19,14 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.apache.olingo.client.api.edm.xml.v4.Include;
+import org.apache.olingo.client.api.edm.xml.v4.IncludeAnnotations;
+import org.apache.olingo.client.api.edm.xml.v4.Reference;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.v4.Include;
-import org.apache.olingo.client.api.edm.xml.v4.IncludeAnnotations;
-import org.apache.olingo.client.api.edm.xml.v4.Reference;
-
@JsonDeserialize(using = ReferenceDeserializer.class)
public class ReferenceImpl extends AbstractAnnotatable implements Reference {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java
index 7b1fa7d..8ef2f92 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.annotation.JsonProperty;
-
import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint;
public class ReferentialConstraintImpl extends AbstractAnnotatable implements ReferentialConstraint {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java
index f11605b..b8b26dc 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java
@@ -22,13 +22,12 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import org.apache.olingo.commons.api.edm.geo.SRID;
+import java.io.IOException;
+
public class ReturnTypeDeserializer extends AbstractEdmDeserializer<ReturnTypeImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java
index 1fd4e48..254d666 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java
@@ -19,7 +19,6 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
import org.apache.olingo.client.api.edm.xml.v4.ReturnType;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
import org.apache.olingo.commons.api.edm.geo.SRID;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java
index 0c6c5a8..6d0c133 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java
@@ -18,12 +18,6 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.olingo.client.api.edm.xml.EnumType;
import org.apache.olingo.client.api.edm.xml.v4.Action;
import org.apache.olingo.client.api.edm.xml.v4.ActionImport;
@@ -42,6 +36,12 @@ import org.apache.olingo.client.api.edm.xml.v4.Term;
import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition;
import org.apache.olingo.client.core.edm.xml.AbstractSchema;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class SchemaImpl extends AbstractSchema implements Schema {
private static final long serialVersionUID = 4453992249818796144L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java
index 758f07d..514bd0b 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java
@@ -22,11 +22,10 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class SingletonDeserializer extends AbstractEdmDeserializer<SingletonImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java
index ad75923..bc67997 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java
@@ -19,13 +19,12 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding;
+import org.apache.olingo.client.api.edm.xml.v4.Singleton;
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding;
-import org.apache.olingo.client.api.edm.xml.v4.Singleton;
-
@JsonDeserialize(using = SingletonDeserializer.class)
public class SingletonImpl extends AbstractAnnotatable implements Singleton {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java
index 2746c7c..851722e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java
@@ -22,15 +22,14 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-import java.util.Arrays;
-
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import org.apache.olingo.commons.api.edm.geo.SRID;
+import java.io.IOException;
+import java.util.Arrays;
+
public class TermDeserializer extends AbstractEdmDeserializer<TermImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java
index 9d78710..b8803ca 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java
@@ -19,13 +19,12 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.apache.olingo.client.api.edm.xml.v4.Term;
+import org.apache.olingo.commons.api.edm.geo.SRID;
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.v4.Term;
-import org.apache.olingo.commons.api.edm.geo.SRID;
-
@JsonDeserialize(using = TermDeserializer.class)
public class TermImpl extends AbstractAnnotatable implements Term {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java
index 34e33d8..d46154b 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java
@@ -22,13 +22,12 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-
import org.apache.commons.lang3.BooleanUtils;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import org.apache.olingo.commons.api.edm.geo.SRID;
+import java.io.IOException;
+
public class TypeDefinitionDeserializer extends AbstractEdmDeserializer<TypeDefinitionImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java
index 5123862..0ae4dc1 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java
@@ -19,15 +19,14 @@
package org.apache.olingo.client.core.edm.xml.v4;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition;
import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
import org.apache.olingo.commons.api.edm.geo.SRID;
+import java.util.ArrayList;
+import java.util.List;
+
@JsonDeserialize(using = TypeDefinitionDeserializer.class)
public class TypeDefinitionImpl extends AbstractEdmItem implements TypeDefinition {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java
index 336dc41..acb1a42 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java
@@ -18,14 +18,14 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
-import java.util.List;
-
import org.apache.olingo.client.api.edm.xml.v4.Edmx;
import org.apache.olingo.client.api.edm.xml.v4.Reference;
import org.apache.olingo.client.api.edm.xml.v4.Schema;
import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata;
import org.apache.olingo.client.core.edm.xml.AbstractXMLMetadata;
+import java.util.List;
+
public class XMLMetadataImpl extends AbstractXMLMetadata implements XMLMetadata {
private static final long serialVersionUID = -7765327879691528010L;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java
index bb0843e..25c8fed 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java
@@ -18,11 +18,12 @@
*/
package org.apache.olingo.client.core.edm.xml.v4.annotation;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.Annotatable;
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
abstract class AbstractAnnotatableDynamicAnnotationExpression
extends AbstractDynamicAnnotationExpression implements Annotatable {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java
index 4335880..70df556 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class ApplyDeserializer extends AbstractEdmDeserializer<ApplyImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java
index 40f8aa1..aa6d25f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java
@@ -19,13 +19,12 @@
package org.apache.olingo.client.core.edm.xml.v4.annotation;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.Apply;
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression;
-import org.apache.olingo.client.api.edm.xml.v4.annotation.Apply;
-
@JsonDeserialize(using = ApplyDeserializer.class)
public class ApplyImpl extends AbstractAnnotatableDynamicAnnotationExpression implements Apply {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java
index e29b9ff..f7d65a0 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java
@@ -22,13 +22,12 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-
-import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.commons.api.edm.geo.SRID;
+import java.io.IOException;
+
public class CastDeserializer extends AbstractEdmDeserializer<CastImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java
index 4278a24..1a9158e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java
@@ -18,9 +18,8 @@
*/
package org.apache.olingo.client.core.edm.xml.v4.annotation;
-import org.apache.olingo.client.api.edm.xml.v4.annotation.Cast;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
+import org.apache.olingo.client.api.edm.xml.v4.annotation.Cast;
import org.apache.olingo.client.api.edm.xml.v4.annotation.DynamicAnnotationExpression;
import org.apache.olingo.commons.api.edm.geo.SRID;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java
index 8d6a53c..e3a4fd1 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java
@@ -22,11 +22,10 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class CollectionDeserializer extends AbstractEdmDeserializer<CollectionImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java
index ebe1a65..b470a7f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java
@@ -18,14 +18,13 @@
*/
package org.apache.olingo.client.core.edm.xml.v4.annotation;
-import org.apache.olingo.client.api.edm.xml.v4.annotation.Collection;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.Collection;
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression;
-
@JsonDeserialize(using = CollectionDeserializer.class)
public class CollectionImpl extends AbstractDynamicAnnotationExpression implements Collection {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java
index c5054aa..0b35628 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-import java.io.IOException;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ClassUtils;
import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationPath;
@@ -43,6 +42,8 @@ import org.apache.olingo.client.api.edm.xml.v4.annotation.TwoParamsOpDynamicAnno
import org.apache.olingo.client.api.edm.xml.v4.annotation.UrlRef;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import java.io.IOException;
+
public class DynamicAnnotationExpressionDeserializer
extends AbstractEdmDeserializer<AbstractDynamicAnnotationExpression> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java
index aea0e1b..23cd104 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.olingo.client.core.edm.xml.v4.annotation;
-import org.apache.olingo.client.api.edm.xml.v4.annotation.If;
import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.If;
public class IfImpl extends AbstractAnnotatableDynamicAnnotationExpression implements If {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java
index 6539cc4..f55985a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java
@@ -22,13 +22,12 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
-
-import java.io.IOException;
-
-import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import org.apache.olingo.commons.api.edm.geo.SRID;
+import java.io.IOException;
+
public class IsOfDeserializer extends AbstractEdmDeserializer<IsOfImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java
index a281ff8..7ccd035 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java
@@ -18,10 +18,9 @@
*/
package org.apache.olingo.client.core.edm.xml.v4.annotation;
-import org.apache.olingo.client.api.edm.xml.v4.annotation.IsOf;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
import org.apache.olingo.client.api.edm.xml.v4.annotation.DynamicAnnotationExpression;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.IsOf;
import org.apache.olingo.commons.api.edm.geo.SRID;
@JsonDeserialize(using = IsOfDeserializer.class)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java
index 78c5c51..af5af7f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class LabeledElementDeserializer extends AbstractEdmDeserializer<LabeledElementImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java
index c47b4cc..7924f15 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java
@@ -18,10 +18,9 @@
*/
package org.apache.olingo.client.core.edm.xml.v4.annotation;
-import org.apache.olingo.client.api.edm.xml.v4.annotation.LabeledElement;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
import org.apache.olingo.client.api.edm.xml.v4.annotation.DynamicAnnotationExpression;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.LabeledElement;
@JsonDeserialize(using = LabeledElementDeserializer.class)
public class LabeledElementImpl
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java
index 86d6b52..1f17443 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class NullDeserializer extends AbstractEdmDeserializer<NullImpl> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/890628e0/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java
index 488c581..17d5860 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java
@@ -22,12 +22,11 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
+import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
+import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
import java.io.IOException;
-import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl;
-import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer;
-
public class PropertyValueDeserializer extends AbstractEdmDeserializer<PropertyValueImpl> {
@Override