olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sklev...@apache.org
Subject [21/52] [abbrv] git commit: [OLINGO-65] Removing any non type-based (de)serialization
Date Tue, 01 Apr 2014 09:00:33 GMT
[OLINGO-65] Removing any non type-based (de)serialization


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/fdb18003
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/fdb18003
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/fdb18003

Branch: refs/heads/olingo-206-validator
Commit: fdb1800372f93114b370a0dfd6404e460d47b008
Parents: 4780fc5
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Sun Mar 23 15:33:29 2014 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Sun Mar 23 15:33:29 2014 +0100

----------------------------------------------------------------------
 .../org/apache/olingo/client/api/Constants.java | 29 ++----
 .../core/data/AtomGeoValueDeserializer.java     | 12 ++-
 .../core/data/AtomGeoValueSerializer.java       | 23 +++--
 .../core/data/JSONGeoValueDeserializer.java     | 14 ++-
 .../core/data/JSONGeoValueSerializer.java       | 16 +++-
 .../core/domain/ODataPrimitiveValueImpl.java    |  9 +-
 .../apache/olingo/client/core/uri/URIUtils.java | 20 ++--
 .../client/core/v3/AllGeoTypesSet_-10_Geom.xml  | 13 ++-
 .../v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml   | 43 ++++++++-
 .../olingo/client/core/v3/AllGeoTypesSet_-5.xml | 97 ++++++++++----------
 .../v3/AllGeoTypesSet_-5_GeogCollection.xml     | 19 +++-
 .../core/v3/AllGeoTypesSet_-5_GeogPolygon.xml   | 18 +++-
 .../core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml | 24 ++++-
 .../v3/AllGeoTypesSet_-7_GeomMultiPoint.xml     | 14 ++-
 .../olingo/client/core/v3/AllGeoTypesSet_-8.xml | 81 ++++++++--------
 .../v3/AllGeoTypesSet_-8_GeomCollection.xml     | 18 +++-
 16 files changed, 302 insertions(+), 148 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java
index 7d9b4a2..6f94915 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java
@@ -29,7 +29,9 @@ public class Constants {
   // Other stuff
   public final static String UTF8 = "UTF-8";
 
-  public final static String NAME = "name";
+  public final static Integer DEFAULT_PRECISION = 40;
+
+  public final static Integer DEFAULT_SCALE = 25;
 
   // XML namespaces and prefixes
   public final static String NS_ATOM = "http://www.w3.org/2005/Atom";
@@ -38,32 +40,19 @@ public class Constants {
 
   public static final String NS_GML = "http://www.opengis.net/gml";
 
-  public static final String XMLNS_DATASERVICES = XMLConstants.XMLNS_ATTRIBUTE + ":d";
-
   public static final String PREFIX_DATASERVICES = "d";
 
-  public static final String XMLNS_METADATA = XMLConstants.XMLNS_ATTRIBUTE + ":m";
-
   public static final String PREFIX_METADATA = "m";
 
-  public static final String XMLNS_GEORSS = XMLConstants.XMLNS_ATTRIBUTE + ":georss";
-
   public static final String PREFIX_GEORSS = "georss";
 
-  public static final String XMLNS_GML = XMLConstants.XMLNS_ATTRIBUTE + ":gml";
-
   public static final String PREFIX_GML = "gml";
 
   public final static String SRS_URLPREFIX = "http://www.opengis.net/def/crs/EPSG/0/";
 
-  /**
-   * Edit link rel value.
-   */
+  // Link rel(s)
   public static final String EDIT_LINK_REL = "edit";
 
-  /**
-   * Self link rel value.
-   */
   public static final String SELF_LINK_REL = "self";
 
   public static final String NEXT_LINK_REL = "next";
@@ -75,12 +64,8 @@ public class Constants {
 
   public final static String ATTR_TYPE = "type";
 
-  public static final String ATTR_M_TYPE = PREFIX_METADATA + ":" + ATTR_TYPE;
-
   public final static String ATTR_NULL = "null";
 
-  public static final String ATTR_M_NULL = PREFIX_METADATA + ":" + ATTR_NULL;
-
   public static final String ATTR_XML_BASE = "base";
 
   public static final QName QNAME_ATTR_XML_BASE = new QName(XMLConstants.XML_NS_URI, ATTR_XML_BASE);
@@ -95,8 +80,6 @@ public class Constants {
 
   public static final String ATTR_TARGET = "target";
 
-  public static final String ELEM_COLLECTION = "collection";
-
   public static final String ATTR_SRSNAME = "srsName";
 
   public static final QName QNAME_ATTR_SRSNAME = new QName(NS_GML, ATTR_SRSNAME);
@@ -143,8 +126,6 @@ public class Constants {
 
   public static final String ELEM_POS = "pos";
 
-  public static final String ELEM_POSLIST = "posList";
-
   public static final String ELEM_PROPERTY = "property";
 
   public static final String ELEM_LINKS = "links";
@@ -204,6 +185,8 @@ public class Constants {
 
   public final static String JSON_NEXT_LINK = "odata.nextLink";
 
+  public final static String JSON_NAME = "name";
+
   // Atom stuff
   public final static String ATOM_ELEM_ENTRY = "entry";
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java
index 20dd164..1187a81 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java
@@ -29,6 +29,7 @@ import javax.xml.stream.events.XMLEvent;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.client.api.Constants;
 import org.apache.olingo.client.api.data.GeoUtils;
+import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
 import org.apache.olingo.commons.api.edm.geo.Geospatial;
 import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
@@ -38,6 +39,7 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
 import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
 import org.apache.olingo.commons.api.edm.geo.Point;
 import org.apache.olingo.commons.api.edm.geo.Polygon;
+import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble;
 
 class AtomGeoValueDeserializer {
 
@@ -54,8 +56,14 @@ class AtomGeoValueDeserializer {
         final String[] pointInfo = event.asCharacters().getData().split(" ");
 
         final Point point = new Point(GeoUtils.getDimension(type), crs);
-        point.setX(Double.valueOf(pointInfo[0]));
-        point.setY(Double.valueOf(pointInfo[1]));
+        try {
+          point.setX(EdmDouble.getInstance().valueOfString(pointInfo[0], null, null,
+                  Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, Double.class));
+          point.setY(EdmDouble.getInstance().valueOfString(pointInfo[1], null, null,
+                  Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, Double.class));
+        } catch (EdmPrimitiveTypeException e) {
+          throw new XMLStreamException("While deserializing point coordinates as double", e);
+        }
         result.add(point);
       }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java
index 78d87ba..02425b4 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java
@@ -18,13 +18,12 @@
  */
 package org.apache.olingo.client.core.data;
 
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.Collections;
 import java.util.Iterator;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import org.apache.olingo.client.api.Constants;
+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.GeospatialCollection;
 import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -33,18 +32,10 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
 import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
 import org.apache.olingo.commons.api.edm.geo.Point;
 import org.apache.olingo.commons.api.edm.geo.Polygon;
+import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble;
 
 class AtomGeoValueSerializer {
 
-  private static final ThreadLocal<DecimalFormat> DOUBLE_FORMAT = new ThreadLocal<DecimalFormat>() {
-    @Override
-    protected DecimalFormat initialValue() {
-      final DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols();
-      otherSymbols.setDecimalSeparator('.');
-      return new DecimalFormat("#.#########################", otherSymbols);
-    }
-  };
-
   private void points(final XMLStreamWriter writer, final Iterator<Point> itor, final boolean wrap)
           throws XMLStreamException {
 
@@ -56,7 +47,15 @@ class AtomGeoValueSerializer {
       }
 
       writer.writeStartElement(Constants.PREFIX_GML, Constants.ELEM_POS, Constants.NS_GML);
-      writer.writeCharacters(DOUBLE_FORMAT.get().format(point.getX()) + " " + DOUBLE_FORMAT.get().format(point.getY()));
+      try {
+        writer.writeCharacters(EdmDouble.getInstance().valueToString(point.getX(), null, null,
+                Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null)
+                + " "
+                + EdmDouble.getInstance().valueToString(point.getY(), null, null,
+                        Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null));
+      } catch (EdmPrimitiveTypeException e) {
+        throw new XMLStreamException("While serializing point coordinates as double", e);
+      }
       writer.writeEndElement();
 
       if (wrap) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java
index eebfef3..c58ff66 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java
@@ -26,6 +26,7 @@ import java.util.List;
 import org.apache.olingo.client.api.Constants;
 import org.apache.olingo.client.api.data.GeoUtils;
 import org.apache.olingo.client.core.edm.EdmTypeInfo;
+import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -36,6 +37,7 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
 import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
 import org.apache.olingo.commons.api.edm.geo.Point;
 import org.apache.olingo.commons.api.edm.geo.Polygon;
+import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble;
 
 class JSONGeoValueDeserializer {
 
@@ -50,8 +52,14 @@ class JSONGeoValueDeserializer {
 
     if (itor.hasNext()) {
       point = new Point(GeoUtils.getDimension(type), crs);
-      point.setX(Double.valueOf(itor.next().asText()));
-      point.setY(Double.valueOf(itor.next().asText()));
+      try {
+        point.setX(EdmDouble.getInstance().valueOfString(itor.next().asText(), null, null,
+                Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, Double.class));
+        point.setY(EdmDouble.getInstance().valueOfString(itor.next().asText(), null, null,
+                Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, Double.class));
+      } catch (EdmPrimitiveTypeException e) {
+        throw new IllegalArgumentException("While deserializing point coordinates as double", e);
+      }
     }
 
     return point;
@@ -217,7 +225,7 @@ class JSONGeoValueDeserializer {
 
     String crs = null;
     if (node.has(Constants.JSON_CRS)) {
-      crs = node.get(Constants.JSON_CRS).get(Constants.PROPERTIES).get(Constants.NAME).asText().split(":")[1];
+      crs = node.get(Constants.JSON_CRS).get(Constants.PROPERTIES).get(Constants.JSON_NAME).asText().split(":")[1];
     }
 
     Geospatial value = null;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java
index 2e692ae..4794b01 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import java.io.IOException;
 import java.util.Iterator;
 import org.apache.olingo.client.api.Constants;
+import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
 import org.apache.olingo.commons.api.edm.geo.ComposedGeospatial;
 import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -32,21 +33,28 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
 import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
 import org.apache.olingo.commons.api.edm.geo.Point;
 import org.apache.olingo.commons.api.edm.geo.Polygon;
+import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble;
 
 class JSONGeoValueSerializer {
 
   private void crs(final JsonGenerator jgen, final String crs) throws IOException {
     jgen.writeObjectFieldStart(Constants.JSON_CRS);
-    jgen.writeStringField(Constants.ATTR_TYPE, Constants.NAME);
+    jgen.writeStringField(Constants.ATTR_TYPE, Constants.JSON_NAME);
     jgen.writeObjectFieldStart(Constants.PROPERTIES);
-    jgen.writeStringField(Constants.NAME, "EPSG:" + crs);
+    jgen.writeStringField(Constants.JSON_NAME, "EPSG:" + crs);
     jgen.writeEndObject();
     jgen.writeEndObject();
   }
 
   private void point(final JsonGenerator jgen, final Point point) throws IOException {
-    jgen.writeNumber(point.getX());
-    jgen.writeNumber(point.getY());
+    try {
+      jgen.writeNumber(EdmDouble.getInstance().valueToString(point.getX(), null, null,
+              Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null));
+      jgen.writeNumber(EdmDouble.getInstance().valueToString(point.getY(), null, null,
+              Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null));
+    } catch (EdmPrimitiveTypeException e) {
+      throw new IllegalArgumentException("While serializing point coordinates as double", e);
+    }
   }
 
   private void multipoint(final JsonGenerator jgen, final MultiPoint multiPoint) throws IOException {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java
index 4f191d8..e6a0408 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java
@@ -22,6 +22,7 @@ import java.sql.Timestamp;
 import java.util.Calendar;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.olingo.client.api.Constants;
 import org.apache.olingo.client.api.domain.AbstractODataValue;
 import org.apache.olingo.client.api.domain.ODataPrimitiveValue;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
@@ -96,7 +97,8 @@ public class ODataPrimitiveValueImpl extends AbstractODataValue implements OData
         try {
           // TODO: when Edm is available, set facets when calling this method
           this.instance.value = this.instance.type.valueOfString(
-                  this.instance.text, null, null, 40, 25, null, returnType);
+                  this.instance.text, null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null,
+                  returnType);
         } catch (EdmPrimitiveTypeException e) {
           throw new IllegalArgumentException(e);
         }
@@ -105,7 +107,7 @@ public class ODataPrimitiveValueImpl extends AbstractODataValue implements OData
         try {
           // TODO: when Edm is available, set facets when calling this method
           this.instance.text = this.instance.type.valueToString(
-                  this.instance.value, null, null, 40, 25, null);
+                  this.instance.value, null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null);
         } catch (EdmPrimitiveTypeException e) {
           throw new IllegalArgumentException(e);
         }
@@ -153,7 +155,8 @@ public class ODataPrimitiveValueImpl extends AbstractODataValue implements OData
   @Override
   public <T> T toCastValue(final Class<T> reference) throws EdmPrimitiveTypeException {
     // TODO: when Edm is available, set facets when calling this method
-    return type.valueOfString(this.text, null, null, 40, 25, null, reference);
+    return type.valueOfString(this.text, null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null,
+            reference);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
index 50245ff..095f8ae 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
@@ -25,7 +25,6 @@ import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.sql.Timestamp;
-import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.UUID;
 import javax.xml.datatype.Duration;
@@ -38,6 +37,10 @@ import org.apache.olingo.commons.api.edm.EdmEntityContainer;
 import org.apache.olingo.commons.api.edm.EdmFunctionImport;
 import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTime;
 import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTimeOffset;
+import org.apache.olingo.commons.core.edm.primitivetype.EdmDecimal;
+import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble;
+import org.apache.olingo.commons.core.edm.primitivetype.EdmInt64;
+import org.apache.olingo.commons.core.edm.primitivetype.EdmSingle;
 import org.apache.olingo.commons.core.edm.primitivetype.EdmTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -157,19 +160,22 @@ public final class URIUtils {
                       valueToString(obj, null, null, null, null, null), Constants.UTF8) + "'"
               : (obj instanceof Calendar)
               ? "datetimeoffset'" + URLEncoder.encode(EdmDateTimeOffset.getInstance().
-                      valueToString(obj, null, null, null, null, null), Constants.UTF8)
-              + "'"
+                      valueToString(obj, null, null, null, null, null), Constants.UTF8) + "'"
               : (obj instanceof Duration)
               ? "time'" + URLEncoder.encode(EdmTime.getInstance().
                       valueToString(obj, null, null, null, null, null), Constants.UTF8) + "'"
               : (obj instanceof BigDecimal)
-              ? new DecimalFormat("#.#######################").format((BigDecimal) obj) + "M"
+              ? EdmDecimal.getInstance().valueToString(obj, null, null,
+                      Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + "M"
               : (obj instanceof Double)
-              ? new DecimalFormat("#.#######################E0").format((Double) obj) + "D"
+              ? EdmDouble.getInstance().valueToString(obj, null, null,
+                      Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + "D"
               : (obj instanceof Float)
-              ? new DecimalFormat("#.#######E0").format((Float) obj) + "f"
+              ? EdmSingle.getInstance().valueToString(obj, null, null,
+                      Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + "f"
               : (obj instanceof Long)
-              ? ((Long) obj).toString() + "L"
+              ? EdmInt64.getInstance().valueToString(obj, null, null,
+                      Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + "L"
               : (obj instanceof String)
               ? "'" + URLEncoder.encode((String) obj, Constants.UTF8) + "'"
               : obj.toString();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml
index e103b35..50c16a2 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml
@@ -19,4 +19,15 @@
     under the License.
 
 -->
-<d:Geom xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryLineString"><gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pos>1 1</gml:pos><gml:pos>3 3</gml:pos><gml:pos>2 4</gml:pos><gml:pos>2 0</gml:pos></gml:LineString></d:Geom>
+<d:Geom xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
+        xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+        xmlns:georss="http://www.georss.org/georss" 
+        xmlns:gml="http://www.opengis.net/gml" 
+        m:type="Edm.GeometryLineString">
+  <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
+    <gml:pos>1.0 1.0</gml:pos>
+    <gml:pos>3.0 3.0</gml:pos>
+    <gml:pos>2.0 4.0</gml:pos>
+    <gml:pos>2.0 0.0</gml:pos>
+  </gml:LineString>
+</d:Geom>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml
index 7353d0a..f9e00cf 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml
@@ -5,7 +5,7 @@
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
     regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
+    to you under the Apache License, Version 2.0.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
 
@@ -19,4 +19,43 @@
     under the License.
 
 -->
-<d:GeomMultiPolygon xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryMultiPolygon"><gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:surfaceMembers><gml:Polygon><gml:exterior><gml:LinearRing><gml:pos>40 40</gml:pos><gml:pos>20 45</gml:pos><gml:pos>45 30</gml:pos><gml:pos>40 40</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon><gml:Polygon><gml:exterior><gml:LinearRing><gml:pos>20 35</gml:pos><gml:pos>45 20</gml:pos><gml:pos>30 5</gml:pos><gml:pos>10 10</gml:pos><gml:pos>10 30</gml:pos><gml:pos>20 35</gml:pos></gml:LinearRing></gml:exterior><gml:interior><gml:LinearRing><gml:pos>30 20</gml:pos><gml:pos>20 25</gml:pos><gml:pos>20 15</gml:pos><gml:pos>30 20</gml:pos></gml:LinearRing></gml:interior></gml:Polygon></gml:surfaceMembers></gml:MultiSurface></d:GeomMultiPol
 ygon>
+<d:GeomMultiPolygon xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
+                    xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+                    xmlns:georss="http://www.georss.org/georss" 
+                    xmlns:gml="http://www.opengis.net/gml" 
+                    m:type="Edm.GeometryMultiPolygon">
+  <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
+    <gml:surfaceMembers>
+      <gml:Polygon>
+        <gml:exterior>
+          <gml:LinearRing>
+            <gml:pos>40.0 40.0</gml:pos>
+            <gml:pos>20.0 45.0</gml:pos>
+            <gml:pos>45.0 30.0</gml:pos>
+            <gml:pos>40.0 40.0</gml:pos>
+          </gml:LinearRing>
+        </gml:exterior>
+      </gml:Polygon>
+      <gml:Polygon>
+        <gml:exterior>
+          <gml:LinearRing>
+            <gml:pos>20.0 35.0</gml:pos>
+            <gml:pos>45.0 20.0</gml:pos>
+            <gml:pos>30.0 5.0</gml:pos>
+            <gml:pos>10.0 10.0</gml:pos>
+            <gml:pos>10.0 30.0</gml:pos>
+            <gml:pos>20.0 35.0</gml:pos>
+          </gml:LinearRing>
+        </gml:exterior>
+        <gml:interior>
+          <gml:LinearRing>
+            <gml:pos>30.0 20.0</gml:pos>
+            <gml:pos>20.0 25.0</gml:pos>
+            <gml:pos>20.0 15.0</gml:pos>
+            <gml:pos>30.0 20.0</gml:pos>
+          </gml:LinearRing>
+        </gml:interior>
+      </gml:Polygon>
+    </gml:surfaceMembers>
+  </gml:MultiSurface>
+</d:GeomMultiPolygon>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml
index 90037fd..738dcbf 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml
@@ -19,22 +19,27 @@
     under the License.
 
 -->
-<entry xml:base="http://192.168.0.160:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+<entry xml:base="http://192.168.0.160:8080/DefaultService.svc/" 
+       xmlns="http://www.w3.org/2005/Atom" 
+       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
+       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+       xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
   <id>http://192.168.0.160:8080/DefaultService.svc/AllGeoTypesSet(-5)</id>
-  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
-  <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-5)" />
-  <title />
+  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" 
+            scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
+  <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-5)"/>
+  <title/>
   <updated>2013-09-11T07:48:06Z</updated>
   <author>
-    <name />
+    <name/>
   </author>
   <content type="application/xml">
     <m:properties>
       <d:Id m:type="Edm.Int32">-5</d:Id>
       <d:Geog m:type="Edm.GeographyCollection">
-        <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" />
+        <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"/>
       </d:Geog>
-      <d:GeogPoint m:null="true" />
+      <d:GeogPoint m:null="true"/>
       <d:GeogLine m:type="Edm.GeographyLineString">
         <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
           <gml:pos>10.5 10.5</gml:pos>
@@ -46,11 +51,11 @@
         <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
           <gml:exterior>
             <gml:LinearRing>
-              <gml:pos>5 15</gml:pos>
-              <gml:pos>10 40</gml:pos>
-              <gml:pos>20 10</gml:pos>
-              <gml:pos>10 5</gml:pos>
-              <gml:pos>5 15</gml:pos>
+              <gml:pos>5.0 15.0</gml:pos>
+              <gml:pos>10.0 40.0</gml:pos>
+              <gml:pos>20.0 10.0</gml:pos>
+              <gml:pos>10.0 5.0</gml:pos>
+              <gml:pos>5.0 15.0</gml:pos>
             </gml:LinearRing>
           </gml:exterior>
         </gml:Polygon>
@@ -58,11 +63,11 @@
       <d:GeogCollection m:type="Edm.GeographyCollection">
         <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
           <gml:geometryMembers>
-            <gml:MultiGeometry />
+            <gml:MultiGeometry/>
             <gml:MultiGeometry>
               <gml:geometryMembers>
                 <gml:Point>
-                  <gml:pos>2 1</gml:pos>
+                  <gml:pos>2.0 1.0</gml:pos>
                 </gml:Point>
               </gml:geometryMembers>
             </gml:MultiGeometry>
@@ -79,7 +84,7 @@
         </gml:MultiPoint>
       </d:GeogMultiPoint>
       <d:GeogMultiLine m:type="Edm.GeographyMultiLineString">
-        <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" />
+        <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"/>
       </d:GeogMultiLine>
       <d:GeogMultiPolygon m:type="Edm.GeographyMultiPolygon">
         <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
@@ -87,30 +92,30 @@
             <gml:Polygon>
               <gml:exterior>
                 <gml:LinearRing>
-                  <gml:pos>40 40</gml:pos>
-                  <gml:pos>45 20</gml:pos>
-                  <gml:pos>30 45</gml:pos>
-                  <gml:pos>40 40</gml:pos>
+                  <gml:pos>40.0 40.0</gml:pos>
+                  <gml:pos>45.0 20.0</gml:pos>
+                  <gml:pos>30.0 45.0</gml:pos>
+                  <gml:pos>40.0 40.0</gml:pos>
                 </gml:LinearRing>
               </gml:exterior>
             </gml:Polygon>
             <gml:Polygon>
               <gml:exterior>
                 <gml:LinearRing>
-                  <gml:pos>35 20</gml:pos>
-                  <gml:pos>20 45</gml:pos>
-                  <gml:pos>5 30</gml:pos>
-                  <gml:pos>10 10</gml:pos>
-                  <gml:pos>30 10</gml:pos>
-                  <gml:pos>35 20</gml:pos>
+                  <gml:pos>35.0 20.0</gml:pos>
+                  <gml:pos>20.0 45.0</gml:pos>
+                  <gml:pos>5.0 30.0</gml:pos>
+                  <gml:pos>10.0 10.0</gml:pos>
+                  <gml:pos>30.0 10.0</gml:pos>
+                  <gml:pos>35.0 20.0</gml:pos>
                 </gml:LinearRing>
               </gml:exterior>
               <gml:interior>
                 <gml:LinearRing>
-                  <gml:pos>20 30</gml:pos>
-                  <gml:pos>25 20</gml:pos>
-                  <gml:pos>15 20</gml:pos>
-                  <gml:pos>20 30</gml:pos>
+                  <gml:pos>20.0 30.0</gml:pos>
+                  <gml:pos>25.0 20.0</gml:pos>
+                  <gml:pos>15.0 20.0</gml:pos>
+                  <gml:pos>20.0 30.0</gml:pos>
                 </gml:LinearRing>
               </gml:interior>
             </gml:Polygon>
@@ -118,7 +123,7 @@
         </gml:MultiSurface>
       </d:GeogMultiPolygon>
       <d:Geom m:type="Edm.GeometryPolygon">
-        <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
+        <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/>
       </d:Geom>
       <d:GeomPoint m:type="Edm.GeometryPoint">
         <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
@@ -127,23 +132,23 @@
       </d:GeomPoint>
       <d:GeomLine m:type="Edm.GeometryLineString">
         <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
-          <gml:pos>1 1</gml:pos>
-          <gml:pos>3 3</gml:pos>
-          <gml:pos>2 4</gml:pos>
-          <gml:pos>2 0</gml:pos>
+          <gml:pos>1.0 1.0</gml:pos>
+          <gml:pos>3.0 3.0</gml:pos>
+          <gml:pos>2.0 4.0</gml:pos>
+          <gml:pos>2.0 0.0</gml:pos>
         </gml:LineString>
       </d:GeomLine>
       <d:GeomPolygon m:type="Edm.GeometryPolygon">
-        <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
+        <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/>
       </d:GeomPolygon>
       <d:GeomCollection m:type="Edm.GeometryCollection">
         <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
           <gml:geometryMembers>
-            <gml:MultiGeometry />
+            <gml:MultiGeometry/>
             <gml:MultiGeometry>
               <gml:geometryMembers>
                 <gml:Point>
-                  <gml:pos>1 2</gml:pos>
+                  <gml:pos>1.0 2.0</gml:pos>
                 </gml:Point>
               </gml:geometryMembers>
             </gml:MultiGeometry>
@@ -151,26 +156,26 @@
         </gml:MultiGeometry>
       </d:GeomCollection>
       <d:GeomMultiPoint m:type="Edm.GeometryMultiPoint">
-        <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
+        <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/>
       </d:GeomMultiPoint>
       <d:GeomMultiLine m:type="Edm.GeometryMultiLineString">
         <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
           <gml:curveMembers>
             <gml:LineString>
-              <gml:pos>10 10</gml:pos>
-              <gml:pos>20 20</gml:pos>
-              <gml:pos>10 40</gml:pos>
+              <gml:pos>10.0 10.0</gml:pos>
+              <gml:pos>20.0 20.0</gml:pos>
+              <gml:pos>10.0 40.0</gml:pos>
             </gml:LineString>
             <gml:LineString>
-              <gml:pos>40 40</gml:pos>
-              <gml:pos>30 30</gml:pos>
-              <gml:pos>40 20</gml:pos>
-              <gml:pos>30 10</gml:pos>
+              <gml:pos>40.0 40.0</gml:pos>
+              <gml:pos>30.0 30.0</gml:pos>
+              <gml:pos>40.0 20.0</gml:pos>
+              <gml:pos>30.0 10.0</gml:pos>
             </gml:LineString>
           </gml:curveMembers>
         </gml:MultiCurve>
       </d:GeomMultiLine>
-      <d:GeomMultiPolygon m:null="true" />
+      <d:GeomMultiPolygon m:null="true"/>
     </m:properties>
   </content>
 </entry>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml
index a13a98d..5e1eaa2 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml
@@ -19,4 +19,21 @@
     under the License.
 
 -->
-<d:GeogCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeographyCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:geometryMembers><gml:MultiGeometry /><gml:MultiGeometry><gml:geometryMembers><gml:Point><gml:pos>2 1</gml:pos></gml:Point></gml:geometryMembers></gml:MultiGeometry></gml:geometryMembers></gml:MultiGeometry></d:GeogCollection>
+<d:GeogCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
+                  xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+                  xmlns:georss="http://www.georss.org/georss" 
+                  xmlns:gml="http://www.opengis.net/gml" 
+                  m:type="Edm.GeographyCollection">
+  <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+    <gml:geometryMembers>
+      <gml:MultiGeometry />
+      <gml:MultiGeometry>
+        <gml:geometryMembers>
+          <gml:Point>
+            <gml:pos>2.0 1.0</gml:pos>
+          </gml:Point>
+        </gml:geometryMembers>
+      </gml:MultiGeometry>
+    </gml:geometryMembers>
+  </gml:MultiGeometry>
+</d:GeogCollection>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml
index 766d2c8..947f48f 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml
@@ -19,4 +19,20 @@
     under the License.
 
 -->
-<d:GeogPolygon xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeographyPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:exterior><gml:LinearRing><gml:pos>5 15</gml:pos><gml:pos>10 40</gml:pos><gml:pos>20 10</gml:pos><gml:pos>10 5</gml:pos><gml:pos>5 15</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon></d:GeogPolygon>
+<d:GeogPolygon xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
+               xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+               xmlns:georss="http://www.georss.org/georss" 
+               xmlns:gml="http://www.opengis.net/gml" 
+               m:type="Edm.GeographyPolygon">
+  <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+    <gml:exterior>
+      <gml:LinearRing>
+        <gml:pos>5.0 15.0</gml:pos>
+        <gml:pos>10.0 40.0</gml:pos>
+        <gml:pos>20.0 10.0</gml:pos>
+        <gml:pos>10.0 5.0</gml:pos>
+        <gml:pos>5.0 15.0</gml:pos>
+      </gml:LinearRing>
+    </gml:exterior>
+  </gml:Polygon>
+</d:GeogPolygon>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml
index dbaf3ad..847eb02 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml
@@ -5,7 +5,7 @@
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
     regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
+    to you under the Apache License, Version 2.0.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
 
@@ -19,4 +19,24 @@
     under the License.
 
 -->
-<d:GeomMultiLine xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryMultiLineString"><gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:curveMembers><gml:LineString><gml:pos>10 10</gml:pos><gml:pos>20 20</gml:pos><gml:pos>10 40</gml:pos></gml:LineString><gml:LineString><gml:pos>40 40</gml:pos><gml:pos>30 30</gml:pos><gml:pos>40 20</gml:pos><gml:pos>30 10</gml:pos></gml:LineString></gml:curveMembers></gml:MultiCurve></d:GeomMultiLine>
+<d:GeomMultiLine xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+                 xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+                 xmlns:georss="http://www.georss.org/georss" 
+                 xmlns:gml="http://www.opengis.net/gml" 
+                 m:type="Edm.GeometryMultiLineString">
+  <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
+    <gml:curveMembers>
+      <gml:LineString>
+        <gml:pos>10.0 10.0</gml:pos>
+        <gml:pos>20.0 20.0</gml:pos>
+        <gml:pos>10.0 40.0</gml:pos>
+      </gml:LineString>
+      <gml:LineString>
+        <gml:pos>40.0 40.0</gml:pos>
+        <gml:pos>30.0 30.0</gml:pos>
+        <gml:pos>40.0 20.0</gml:pos>
+        <gml:pos>30.0 10.0</gml:pos>
+      </gml:LineString>
+    </gml:curveMembers>
+  </gml:MultiCurve>
+</d:GeomMultiLine>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml
index f7b1dfb..5aac3b9 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml
@@ -19,4 +19,16 @@
     under the License.
 
 -->
-<d:GeomMultiPoint xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryMultiPoint"><gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pointMembers><gml:Point><gml:pos>0 0</gml:pos></gml:Point></gml:pointMembers></gml:MultiPoint></d:GeomMultiPoint>
+<d:GeomMultiPoint xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
+                  xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+                  xmlns:georss="http://www.georss.org/georss" 
+                  xmlns:gml="http://www.opengis.net/gml" 
+                  m:type="Edm.GeometryMultiPoint">
+  <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
+    <gml:pointMembers>
+      <gml:Point>
+        <gml:pos>0.0 0.0</gml:pos>
+      </gml:Point>
+    </gml:pointMembers>
+  </gml:MultiPoint>
+</d:GeomMultiPoint>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml
index 2d1ce3c..a5bf4eb 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml
@@ -20,16 +20,19 @@
 
 -->
 <entry xml:base="http://192.168.43.55:8080/DefaultService.svc/" 
-       xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
+       xmlns="http://www.w3.org/2005/Atom" 
+       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
        xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
-       xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+       xmlns:georss="http://www.georss.org/georss" 
+       xmlns:gml="http://www.opengis.net/gml">
   <id>http://192.168.43.55:8080/DefaultService.svc/AllGeoTypesSet(-8)</id>
-  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
-  <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-8)" />
-  <title />
+  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" 
+            scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
+  <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-8)"/>
+  <title/>
   <updated>2013-08-21T10:50:04Z</updated>
   <author>
-    <name />
+    <name/>
   </author>
   <content type="application/xml">
     <m:properties>
@@ -46,16 +49,16 @@
       </d:GeogPoint>
       <d:GeogLine m:type="Edm.GeographyLineString">
         <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-          <gml:pos>10 10</gml:pos>
-          <gml:pos>20 20</gml:pos>
-          <gml:pos>40 10</gml:pos>
+          <gml:pos>10.0 10.0</gml:pos>
+          <gml:pos>20.0 20.0</gml:pos>
+          <gml:pos>40.0 10.0</gml:pos>
         </gml:LineString>
       </d:GeogLine>
       <d:GeogPolygon m:type="Edm.GeographyPolygon">
-        <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" />
+        <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"/>
       </d:GeogPolygon>
       <d:GeogCollection m:type="Edm.GeographyCollection">
-        <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" />
+        <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"/>
       </d:GeogCollection>
       <d:GeogMultiPoint m:type="Edm.GeographyMultiPoint">
         <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
@@ -89,30 +92,30 @@
             <gml:Polygon>
               <gml:exterior>
                 <gml:LinearRing>
-                  <gml:pos>40 40</gml:pos>
-                  <gml:pos>45 20</gml:pos>
-                  <gml:pos>30 45</gml:pos>
-                  <gml:pos>40 40</gml:pos>
+                  <gml:pos>40.0 40.0</gml:pos>
+                  <gml:pos>45.0 20.0</gml:pos>
+                  <gml:pos>30.0 45.0</gml:pos>
+                  <gml:pos>40.0 40.0</gml:pos>
                 </gml:LinearRing>
               </gml:exterior>
             </gml:Polygon>
             <gml:Polygon>
               <gml:exterior>
                 <gml:LinearRing>
-                  <gml:pos>35 20</gml:pos>
-                  <gml:pos>20 45</gml:pos>
-                  <gml:pos>5 30</gml:pos>
-                  <gml:pos>10 10</gml:pos>
-                  <gml:pos>30 10</gml:pos>
-                  <gml:pos>35 20</gml:pos>
+                  <gml:pos>35.0 20.0</gml:pos>
+                  <gml:pos>20.0 45.0</gml:pos>
+                  <gml:pos>5.0 30.0</gml:pos>
+                  <gml:pos>10.0 10.0</gml:pos>
+                  <gml:pos>30.0 10.0</gml:pos>
+                  <gml:pos>35.0 20.0</gml:pos>
                 </gml:LinearRing>
               </gml:exterior>
               <gml:interior>
                 <gml:LinearRing>
-                  <gml:pos>20 30</gml:pos>
-                  <gml:pos>25 20</gml:pos>
-                  <gml:pos>15 20</gml:pos>
-                  <gml:pos>20 30</gml:pos>
+                  <gml:pos>20.0 30.0</gml:pos>
+                  <gml:pos>25.0 20.0</gml:pos>
+                  <gml:pos>15.0 20.0</gml:pos>
+                  <gml:pos>20.0 30.0</gml:pos>
                 </gml:LinearRing>
               </gml:interior>
             </gml:Polygon>
@@ -131,20 +134,20 @@
       </d:GeomPoint>
       <d:GeomLine m:type="Edm.GeometryLineString">
         <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
-          <gml:pos>1 1</gml:pos>
-          <gml:pos>3 3</gml:pos>
-          <gml:pos>2 4</gml:pos>
-          <gml:pos>2 0</gml:pos>
+          <gml:pos>1.0 1.0</gml:pos>
+          <gml:pos>3.0 3.0</gml:pos>
+          <gml:pos>2.0 4.0</gml:pos>
+          <gml:pos>2.0 0.0</gml:pos>
         </gml:LineString>
       </d:GeomLine>
       <d:GeomPolygon m:type="Edm.GeometryPolygon">
         <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
           <gml:exterior>
             <gml:LinearRing>
-              <gml:pos>30 20</gml:pos>
-              <gml:pos>10 40</gml:pos>
-              <gml:pos>45 40</gml:pos>
-              <gml:pos>30 20</gml:pos>
+              <gml:pos>30.0 20.0</gml:pos>
+              <gml:pos>10.0 40.0</gml:pos>
+              <gml:pos>45.0 40.0</gml:pos>
+              <gml:pos>30.0 20.0</gml:pos>
             </gml:LinearRing>
           </gml:exterior>
         </gml:Polygon>
@@ -153,21 +156,21 @@
         <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
           <gml:geometryMembers>
             <gml:Point>
-              <gml:pos>4 6</gml:pos>
+              <gml:pos>4.0 6.0</gml:pos>
             </gml:Point>
             <gml:LineString>
-              <gml:pos>4 6</gml:pos>
-              <gml:pos>7 10</gml:pos>
+              <gml:pos>4.0 6.0</gml:pos>
+              <gml:pos>7.0 10.0</gml:pos>
             </gml:LineString>
           </gml:geometryMembers>
         </gml:MultiGeometry>
       </d:GeomCollection>
-      <d:GeomMultiPoint m:null="true" />
+      <d:GeomMultiPoint m:null="true"/>
       <d:GeomMultiLine m:type="Edm.GeometryMultiLineString">
-        <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
+        <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/>
       </d:GeomMultiLine>
       <d:GeomMultiPolygon m:type="Edm.GeometryMultiPolygon">
-        <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
+        <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/>
       </d:GeomMultiPolygon>
     </m:properties>
   </content>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fdb18003/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml
index d1374bd..130f8be 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml
@@ -19,4 +19,20 @@
     under the License.
 
 -->
-<d:GeomCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:geometryMembers><gml:Point><gml:pos>4 6</gml:pos></gml:Point><gml:LineString><gml:pos>4 6</gml:pos><gml:pos>7 10</gml:pos></gml:LineString></gml:geometryMembers></gml:MultiGeometry></d:GeomCollection>
+<d:GeomCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
+                  xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
+                  xmlns:georss="http://www.georss.org/georss" 
+                  xmlns:gml="http://www.opengis.net/gml" 
+                  m:type="Edm.GeometryCollection">
+  <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
+    <gml:geometryMembers>
+      <gml:Point>
+        <gml:pos>4.0 6.0</gml:pos>
+      </gml:Point>
+      <gml:LineString>
+        <gml:pos>4.0 6.0</gml:pos>
+        <gml:pos>7.0 10.0</gml:pos>
+      </gml:LineString>
+    </gml:geometryMembers>
+  </gml:MultiGeometry>
+</d:GeomCollection>


Mime
View raw message