You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/04/10 16:33:28 UTC

[49/51] [partial] [OLINGO-175] using commons (de-)serializers to add some capabilities to fit

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/java/org/apache/olingo/fit/utils/v4/XMLUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/v4/XMLUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/v4/XMLUtilities.java
index 77c46be..86e6e3c 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/v4/XMLUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/v4/XMLUtilities.java
@@ -18,130 +18,11 @@
  */
 package org.apache.olingo.fit.utils.v4;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLEventReader;
-import org.apache.commons.io.IOUtils;
-import org.apache.olingo.fit.utils.Accept;
-import org.apache.olingo.fit.utils.Commons;
-import org.apache.olingo.fit.utils.ConstantKey;
-import org.apache.olingo.fit.utils.Constants;
-import org.apache.olingo.fit.utils.MetadataLinkInfo;
-import org.apache.olingo.fit.utils.ODataVersion;
-import org.apache.olingo.fit.utils.XmlElement;
+import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 
 public class XMLUtilities extends org.apache.olingo.fit.utils.AbstractXMLUtilities {
 
   public XMLUtilities() throws Exception {
-    super(ODataVersion.v4);
-  }
-
-  @Override
-  public void retrieveLinkInfoFromMetadata() throws Exception {
-
-    final MetadataLinkInfo metadataLinkInfo = new MetadataLinkInfo();
-    Commons.getLinkInfo().put(version, metadataLinkInfo);
-
-    final InputStream metadata = fsManager.readFile(Constants.get(version, ConstantKey.METADATA), Accept.XML);
-
-    final ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    IOUtils.copy(metadata, bos);
-    IOUtils.closeQuietly(metadata);
-
-    XMLEventReader reader = getEventReader(new ByteArrayInputStream(bos.toByteArray()));
-
-    final Set<String> singletons = new HashSet<String>();
-
-    try {
-      while (true) {
-        final Map.Entry<Integer, XmlElement> entitySetElement =
-                extractElement(reader, null, Collections.<String>singletonList("Singleton"),
-                null, false, 0, -1, -1);
-
-        final String entitySetName =
-                entitySetElement.getValue().getStart().getAttributeByName(new QName("Name")).getValue().trim();
-        singletons.add(entitySetName);
-      }
-    } catch (Exception e) {
-    } finally {
-      reader.close();
-    }
-
-    reader = getEventReader(new ByteArrayInputStream(bos.toByteArray()));
-
-    try {
-      while (true) {
-        final Map.Entry<Integer, XmlElement> entitySetElement =
-                extractElement(reader, null, Collections.<String>singletonList("EntitySet"),
-                null, false, 0, -1, -1);
-
-        retrieveLinks(entitySetElement.getValue(), metadataLinkInfo, singletons);
-      }
-    } catch (Exception e) {
-    } finally {
-      reader.close();
-    }
-
-    reader = getEventReader(new ByteArrayInputStream(bos.toByteArray()));
-
-    try {
-      while (true) {
-        final Map.Entry<Integer, XmlElement> entitySetElement =
-                extractElement(reader, null, Collections.<String>singletonList("Singleton"),
-                null, false, 0, -1, -1);
-
-        retrieveLinks(entitySetElement.getValue(), metadataLinkInfo, singletons);
-      }
-    } catch (Exception e) {
-    } finally {
-      reader.close();
-    }
-  }
-
-  private void retrieveLinks(
-          final XmlElement entitySetElement, final MetadataLinkInfo metadataLinkInfo, final Set<String> singletons)
-          throws Exception {
-
-    final String entitySetName = entitySetElement.getStart().getAttributeByName(new QName("Name")).getValue().trim();
-
-    final XMLEventReader entityReader = entitySetElement.getContentReader();
-    int size = 0;
-
-    try {
-      while (true) {
-        final XmlElement navProperty =
-                extractElement(entityReader, null, Collections.<String>singletonList("NavigationPropertyBinding"),
-                null, false, 0, -1, -1).getValue();
-
-        final String linkName = navProperty.getStart().getAttributeByName(new QName("Path")).getValue();
-        final String target = navProperty.getStart().getAttributeByName(new QName("Target")).getValue();
-        final boolean feed = !singletons.contains(target);
-
-        metadataLinkInfo.addLink(
-                entitySetName,
-                linkName,
-                target,
-                feed);
-
-        size++;
-      }
-    } catch (Exception e) {
-    } finally {
-      entityReader.close();
-    }
-
-    if (size == 0) {
-      metadataLinkInfo.addEntitySet(entitySetName);
-    }
-
-    if (singletons.contains(entitySetName)) {
-      metadataLinkInfo.setSingleton(entitySetName);
-    }
+    super(ODataServiceVersion.V40);
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/12/$value.bin
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/12/$value.bin b/fit/src/main/resources/V30/Car/12/$value.bin
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/12/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/12/entity.full.json b/fit/src/main/resources/V30/Car/12/entity.full.json
new file mode 100644
index 0000000..6b5a050
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/12/entity.full.json
@@ -0,0 +1,13 @@
+{
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car/@Element",
+  "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(12)",
+  "odata.editLink": "Car(12)",
+  "odata.mediaEditLink": "Car(12)/$value",
+  "odata.mediaReadLink": "Car(12)/$value",
+  "odata.mediaContentType": "*/*",
+  "Photo@odata.mediaEditLink": "Car(12)/Photo",
+  "Video@odata.mediaEditLink": "Car(12)/Video",
+  "VIN": 12,
+  "Description": "lx"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/12/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/12/entity.xml b/fit/src/main/resources/V30/Car/12/entity.xml
new file mode 100644
index 0000000..057f42b
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/12/entity.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(12)</id>
+  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+  <link rel="edit" title="Car" href="Car(12)" />
+  <title />
+  <updated>2014-03-19T09:53:35Z</updated>
+  <author>
+    <name />
+  </author>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" />
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Video" />
+  <link rel="edit-media" title="Car" href="Car(12)/$value" />
+  <content type="*/*" src="Car(12)/$value" />
+  <m:properties>
+    <d:VIN m:type="Edm.Int32">12</d:VIN>
+    <d:Description>lx</d:Description>
+  </m:properties>
+</entry>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/14/$value.bin
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/14/$value.bin b/fit/src/main/resources/V30/Car/14/$value.bin
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/14/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/14/entity.full.json b/fit/src/main/resources/V30/Car/14/entity.full.json
new file mode 100644
index 0000000..c72edbb
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/14/entity.full.json
@@ -0,0 +1,13 @@
+{
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car/@Element",
+  "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(14)",
+  "odata.editLink": "Car(14)",
+  "odata.mediaEditLink": "Car(14)/$value",
+  "odata.mediaReadLink": "Car(14)/$value",
+  "odata.mediaContentType": "*/*",
+  "Photo@odata.mediaEditLink": "Car(14)/Photo",
+  "Video@odata.mediaEditLink": "Car(14)/Video",
+  "VIN": 14,
+  "Description": "畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/14/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/14/entity.xml b/fit/src/main/resources/V30/Car/14/entity.xml
new file mode 100644
index 0000000..c374239
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/14/entity.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(14)</id>
+  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+  <link rel="edit" title="Car" href="Car(14)" />
+  <title />
+  <updated>2014-03-07T15:15:31Z</updated>
+  <author>
+    <name />
+  </author>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" />
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" />
+  <link rel="edit-media" title="Car" href="Car(14)/$value" />
+  <content type="*/*" src="Car(14)/$value" />
+  <m:properties>
+    <d:VIN m:type="Edm.Int32">14</d:VIN>
+    <d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description>
+  </m:properties>
+</entry>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/15/$value.bin
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/15/$value.bin b/fit/src/main/resources/V30/Car/15/$value.bin
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/15/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/15/entity.full.json b/fit/src/main/resources/V30/Car/15/entity.full.json
new file mode 100644
index 0000000..5b5b8c4
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/15/entity.full.json
@@ -0,0 +1,13 @@
+{
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car/@Element",
+  "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)",
+  "odata.editLink": "Car(15)",
+  "odata.mediaEditLink": "Car(15)/$value",
+  "odata.mediaReadLink": "Car(15)/$value",
+  "odata.mediaContentType": "*/*",
+  "Photo@odata.mediaEditLink": "Car(15)/Photo",
+  "Video@odata.mediaEditLink": "Car(15)/Video",
+  "VIN": 15,
+  "Description": "kphszztczthjacvjnttrarxru"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/15/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/15/entity.xml b/fit/src/main/resources/V30/Car/15/entity.xml
new file mode 100644
index 0000000..01ac09c
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/15/entity.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)</id>
+  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+  <link rel="edit" title="Car" href="Car(15)" />
+  <title />
+  <updated>2014-03-19T11:23:02Z</updated>
+  <author>
+    <name />
+  </author>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" />
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" />
+  <link rel="edit-media" title="Car" href="Car(15)/$value" />
+  <content type="*/*" src="Car(15)/$value" />
+  <m:properties>
+    <d:VIN m:type="Edm.Int32">15</d:VIN>
+    <d:Description>kphszztczthjacvjnttrarxru</d:Description>
+  </m:properties>
+</entry>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/16/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/16/entity.full.json b/fit/src/main/resources/V30/Car/16/entity.full.json
new file mode 100644
index 0000000..a7b64c9
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/16/entity.full.json
@@ -0,0 +1,14 @@
+{
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car/@Element",
+  "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(16)",
+  "odata.editLink": "Car(16)",
+  "odata.mediaEditLink": "Car(16)/$value",
+  "odata.mediaReadLink": "Car(16)/$value",
+  "odata.mediaContentType": "*/*",
+  "Photo@odata.mediaEditLink": "Car(16)/Photo",
+  "Photo@odata.mediaContentType": "application/octet-stream",
+  "Video@odata.mediaEditLink": "Car(16)/Video",
+  "VIN": 16,
+  "Description": "ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/16/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/16/entity.xml b/fit/src/main/resources/V30/Car/16/entity.xml
new file mode 100644
index 0000000..4c31d29
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/16/entity.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(16)</id>
+  <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+  <link rel="edit" title="Car" href="Car(16)" />
+  <title />
+  <updated>2014-02-06T13:56:11Z</updated>
+  <author>
+    <name />
+  </author>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" type="application/octet-stream" title="Photo" href="Car(16)/Photo" />
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" />
+  <link rel="edit-media" title="Car" href="Car(16)/$value" />
+  <content type="*/*" src="Car(16)/$value" />
+  <m:properties>
+    <d:VIN m:type="Edm.Int32">16</d:VIN>
+    <d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description>
+  </m:properties>
+</entry>
+

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/feed.full.json b/fit/src/main/resources/V30/Car/feed.full.json
new file mode 100644
index 0000000..383fcc2
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/feed.full.json
@@ -0,0 +1,297 @@
+{
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car",
+  "value":
+          [
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(11)",
+              "odata.editLink": "Car(11)",
+              "odata.mediaEditLink": "Car(11)/$value",
+              "odata.mediaReadLink": "Car(11)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(11)/Photo",
+              "Video@odata.mediaEditLink": "Car(11)/Video",
+              "VIN": 11,
+              "Description": "cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(12)",
+              "odata.editLink": "Car(12)",
+              "odata.mediaEditLink": "Car(12)/$value",
+              "odata.mediaReadLink": "Car(12)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(12)/Photo",
+              "Video@odata.mediaEditLink": "Car(12)/Video",
+              "VIN": 12,
+              "Description": "lx"
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(13)",
+              "odata.editLink": "Car(13)",
+              "odata.mediaEditLink": "Car(13)/$value",
+              "odata.mediaReadLink": "Car(13)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(13)/Photo",
+              "Video@odata.mediaEditLink": "Car(13)/Video",
+              "VIN": 13,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(14)",
+              "odata.editLink": "Car(14)",
+              "odata.mediaEditLink": "Car(14)/$value",
+              "odata.mediaReadLink": "Car(14)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(14)/Photo",
+              "Video@odata.mediaEditLink": "Car(14)/Video",
+              "VIN": 14,
+              "Description": "New Description(1391427673034)"
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)",
+              "odata.editLink": "Car(15)",
+              "odata.mediaEditLink": "Car(15)/$value",
+              "odata.mediaReadLink": "Car(15)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(15)/Photo",
+              "Video@odata.mediaEditLink": "Car(15)/Video",
+              "VIN": 15,
+              "Description": "kphszztczthjacvjnttrarxru"
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(16)",
+              "odata.editLink": "Car(16)",
+              "odata.mediaEditLink": "Car(16)/$value",
+              "odata.mediaReadLink": "Car(16)/$value",
+              "odata.mediaContentType": "*/*",
+              "Photo@odata.mediaEditLink": "Car(16)/Photo",
+              "Photo@odata.mediaContentType": "application/octet-stream",
+              "Video@odata.mediaEditLink": "Car(16)/Video",
+              "VIN": 16,
+              "Description": "ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ"
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(17)",
+              "odata.editLink": "Car(17)",
+              "odata.mediaEditLink": "Car(17)/$value",
+              "odata.mediaReadLink": "Car(17)/$value",
+              "odata.mediaContentType": "*/*",
+              "Photo@odata.mediaEditLink": "Car(17)/Photo",
+              "Video@odata.mediaEditLink": "Car(17)/Video",
+              "VIN": 17,
+              "Description": "まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲ヲをァァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ"
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(18)",
+              "odata.editLink": "Car(18)",
+              "odata.mediaEditLink": "Car(18)/$value",
+              "odata.mediaReadLink": "Car(18)/$value",
+              "odata.mediaContentType": "*/*",
+              "Photo@odata.mediaEditLink": "Car(18)/Photo",
+              "Video@odata.mediaEditLink": "Car(18)/Video",
+              "VIN": 18,
+              "Description": "ёゼボタひべバタぞァяЯ畚ダソゾゾЯ歹ぺボぜたソ畚珱マ欲マグあ畚九ァ畚マグ裹ミゼァ欲ソ弌畚マ弌チ暦ァボぜ裹ミЯaぼひポをゾ弌歹"
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(19)",
+              "odata.editLink": "Car(19)",
+              "odata.mediaEditLink": "Car(19)/$value",
+              "odata.mediaReadLink": "Car(19)/$value",
+              "odata.mediaContentType": "*/*",
+              "Photo@odata.mediaEditLink": "Car(19)/Photo",
+              "Video@odata.mediaEditLink": "Car(19)/Video",
+              "VIN": 19,
+              "Description": "bdssgpfovhjbzevqmgqxxkejsdhvtxugßßßjßfddßlsshrygytoginhrgoydicmjßcebzehqbegxgmsu"
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(20)",
+              "odata.editLink": "Car(20)",
+              "odata.mediaEditLink": "Car(20)/$value",
+              "odata.mediaReadLink": "Car(20)/$value",
+              "odata.mediaContentType": "*/*",
+              "Photo@odata.mediaEditLink": "Car(20)/Photo",
+              "Video@odata.mediaEditLink": "Car(20)/Video",
+              "VIN": 20,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(21)",
+              "odata.editLink": "Car(21)",
+              "odata.mediaEditLink": "Car(21)/$value",
+              "odata.mediaReadLink": "Car(21)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(21)/Photo",
+              "Video@odata.mediaEditLink": "Car(21)/Video",
+              "VIN": 21,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(22)",
+              "odata.editLink": "Car(22)",
+              "odata.mediaEditLink": "Car(22)/$value",
+              "odata.mediaReadLink": "Car(22)/$value",
+              "odata.mediaContentType": "application/json;odata=nometadata",
+              "Photo@odata.mediaEditLink": "Car(22)/Photo",
+              "Video@odata.mediaEditLink": "Car(22)/Video",
+              "VIN": 22,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(27)",
+              "odata.editLink": "Car(27)",
+              "odata.mediaEditLink": "Car(27)/$value",
+              "odata.mediaReadLink": "Car(27)/$value",
+              "odata.mediaContentType": "application/json",
+              "Photo@odata.mediaEditLink": "Car(27)/Photo",
+              "Video@odata.mediaEditLink": "Car(27)/Video",
+              "VIN": 27,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(30)",
+              "odata.editLink": "Car(30)",
+              "odata.mediaEditLink": "Car(30)/$value",
+              "odata.mediaReadLink": "Car(30)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(30)/Photo",
+              "Video@odata.mediaEditLink": "Car(30)/Video",
+              "VIN": 30,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(31)",
+              "odata.editLink": "Car(31)",
+              "odata.mediaEditLink": "Car(31)/$value",
+              "odata.mediaReadLink": "Car(31)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(31)/Photo",
+              "Video@odata.mediaEditLink": "Car(31)/Video",
+              "VIN": 31,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(32)",
+              "odata.editLink": "Car(32)",
+              "odata.mediaEditLink": "Car(32)/$value",
+              "odata.mediaReadLink": "Car(32)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(32)/Photo",
+              "Video@odata.mediaEditLink": "Car(32)/Video",
+              "VIN": 32,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(33)",
+              "odata.editLink": "Car(33)",
+              "odata.mediaEditLink": "Car(33)/$value",
+              "odata.mediaReadLink": "Car(33)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "odata.mediaETag": "\"ii9V2Rc2cJgIZtM0OF+iw3NLRgc=\"",
+              "Photo@odata.mediaEditLink": "Car(33)/Photo",
+              "Video@odata.mediaEditLink": "Car(33)/Video",
+              "VIN": 33,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(34)",
+              "odata.editLink": "Car(34)",
+              "odata.mediaEditLink": "Car(34)/$value",
+              "odata.mediaReadLink": "Car(34)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(34)/Photo",
+              "Video@odata.mediaEditLink": "Car(34)/Video",
+              "VIN": 34,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(35)",
+              "odata.editLink": "Car(35)",
+              "odata.mediaEditLink": "Car(35)/$value",
+              "odata.mediaReadLink": "Car(35)/$value",
+              "odata.mediaContentType": "application/json;odata=nometadata",
+              "Photo@odata.mediaEditLink": "Car(35)/Photo",
+              "Video@odata.mediaEditLink": "Car(35)/Video",
+              "VIN": 35,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(40)",
+              "odata.editLink": "Car(40)",
+              "odata.mediaEditLink": "Car(40)/$value",
+              "odata.mediaReadLink": "Car(40)/$value",
+              "odata.mediaContentType": "application/json",
+              "Photo@odata.mediaEditLink": "Car(40)/Photo",
+              "Video@odata.mediaEditLink": "Car(40)/Video",
+              "VIN": 40,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(43)",
+              "odata.editLink": "Car(43)",
+              "odata.mediaEditLink": "Car(43)/$value",
+              "odata.mediaReadLink": "Car(43)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(43)/Photo",
+              "Video@odata.mediaEditLink": "Car(43)/Video",
+              "VIN": 43,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(44)",
+              "odata.editLink": "Car(44)",
+              "odata.mediaEditLink": "Car(44)/$value",
+              "odata.mediaReadLink": "Car(44)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(44)/Photo",
+              "Video@odata.mediaEditLink": "Car(44)/Video",
+              "VIN": 44,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(45)",
+              "odata.editLink": "Car(45)",
+              "odata.mediaEditLink": "Car(45)/$value",
+              "odata.mediaReadLink": "Car(45)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "Photo@odata.mediaEditLink": "Car(45)/Photo",
+              "Video@odata.mediaEditLink": "Car(45)/Video",
+              "VIN": 45,
+              "Description": null
+            },
+            {
+              "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
+              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(46)",
+              "odata.editLink": "Car(46)",
+              "odata.mediaEditLink": "Car(46)/$value",
+              "odata.mediaReadLink": "Car(46)/$value",
+              "odata.mediaContentType": "application/octet-stream",
+              "odata.mediaETag": "\"ii9V2Rc2cJgIZtM0OF+iw3NLRgc=\"",
+              "Photo@odata.mediaEditLink": "Car(46)/Photo",
+              "Video@odata.mediaEditLink": "Car(46)/Video",
+              "VIN": 46,
+              "Description": null
+            }
+          ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/feed.xml b/fit/src/main/resources/V30/Car/feed.xml
new file mode 100644
index 0000000..482f41f
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/feed.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car</id>
+  <title type="text">Car</title>
+  <updated>2014-02-06T14:09:08Z</updated>
+  <link rel="self" title="Car" href="Car" />
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(11)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(11)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(11)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" />
+    <link rel="edit-media" title="Car" href="Car(11)/$value" />
+    <content type="application/octet-stream" src="Car(11)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">11</d:VIN>
+      <d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(12)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(12)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Video" />
+    <link rel="edit-media" title="Car" href="Car(12)/$value" />
+    <content type="application/octet-stream" src="Car(12)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">12</d:VIN>
+      <d:Description>lx</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(13)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(13)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" />
+    <link rel="edit-media" title="Car" href="Car(13)/$value" />
+    <content type="application/octet-stream" src="Car(13)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">13</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(14)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(14)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" />
+    <link rel="edit-media" title="Car" href="Car(14)/$value" />
+    <content type="application/octet-stream" src="Car(14)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">14</d:VIN>
+      <d:Description>New Description(1391427673034)</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(15)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" />
+    <link rel="edit-media" title="Car" href="Car(15)/$value" />
+    <content type="application/octet-stream" src="Car(15)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">15</d:VIN>
+      <d:Description>kphszztczthjacvjnttrarxru</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(16)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(16)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" type="application/octet-stream" title="Photo" href="Car(16)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" />
+    <link rel="edit-media" title="Car" href="Car(16)/$value" />
+    <content type="*/*" src="Car(16)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">16</d:VIN>
+      <d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(17)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(17)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" />
+    <link rel="edit-media" title="Car" href="Car(17)/$value" />
+    <content type="*/*" src="Car(17)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">17</d:VIN>
+      <d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲ヲをァァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(18)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(18)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(18)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(18)/Video" />
+    <link rel="edit-media" title="Car" href="Car(18)/$value" />
+    <content type="*/*" src="Car(18)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">18</d:VIN>
+      <d:Description>ёゼボタひべバタぞァяЯ畚ダソゾゾЯ歹ぺボぜたソ畚珱マ欲マグあ畚九ァ畚マグ裹ミゼァ欲ソ弌畚マ弌チ暦ァボぜ裹ミЯaぼひポをゾ弌歹</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(19)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(19)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(19)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(19)/Video" />
+    <link rel="edit-media" title="Car" href="Car(19)/$value" />
+    <content type="*/*" src="Car(19)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">19</d:VIN>
+      <d:Description>bdssgpfovhjbzevqmgqxxkejsdhvtxugßßßjßfddßlsshrygytoginhrgoydicmjßcebzehqbegxgmsu</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(20)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(20)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(20)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(20)/Video" />
+    <link rel="edit-media" title="Car" href="Car(20)/$value" />
+    <content type="*/*" src="Car(20)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">20</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(21)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(21)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(21)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(21)/Video" />
+    <link rel="edit-media" title="Car" href="Car(21)/$value" />
+    <content type="application/octet-stream" src="Car(21)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">21</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(22)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(22)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(22)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(22)/Video" />
+    <link rel="edit-media" title="Car" href="Car(22)/$value" />
+    <content type="application/json;odata=nometadata" src="Car(22)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">22</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(27)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(27)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(27)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(27)/Video" />
+    <link rel="edit-media" title="Car" href="Car(27)/$value" />
+    <content type="application/json" src="Car(27)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">27</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(30)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(30)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(30)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(30)/Video" />
+    <link rel="edit-media" title="Car" href="Car(30)/$value" />
+    <content type="application/octet-stream" src="Car(30)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">30</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(31)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(31)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(31)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(31)/Video" />
+    <link rel="edit-media" title="Car" href="Car(31)/$value" />
+    <content type="application/octet-stream" src="Car(31)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">31</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(32)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(32)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(32)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(32)/Video" />
+    <link rel="edit-media" title="Car" href="Car(32)/$value" />
+    <content type="application/octet-stream" src="Car(32)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">32</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(33)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(33)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(33)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(33)/Video" />
+    <link rel="edit-media" title="Car" href="Car(33)/$value" m:etag="&quot;ii9V2Rc2cJgIZtM0OF+iw3NLRgc=&quot;" />
+    <content type="application/octet-stream" src="Car(33)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">33</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(34)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(34)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(34)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(34)/Video" />
+    <link rel="edit-media" title="Car" href="Car(34)/$value" />
+    <content type="application/octet-stream" src="Car(34)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">34</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(35)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(35)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(35)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(35)/Video" />
+    <link rel="edit-media" title="Car" href="Car(35)/$value" />
+    <content type="application/json;odata=nometadata" src="Car(35)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">35</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(40)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(40)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(40)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(40)/Video" />
+    <link rel="edit-media" title="Car" href="Car(40)/$value" />
+    <content type="application/json" src="Car(40)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">40</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(43)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(43)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(43)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(43)/Video" />
+    <link rel="edit-media" title="Car" href="Car(43)/$value" />
+    <content type="application/octet-stream" src="Car(43)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">43</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(44)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(44)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(44)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(44)/Video" />
+    <link rel="edit-media" title="Car" href="Car(44)/$value" />
+    <content type="application/octet-stream" src="Car(44)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">44</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(45)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(45)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(45)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(45)/Video" />
+    <link rel="edit-media" title="Car" href="Car(45)/$value" />
+    <content type="application/octet-stream" src="Car(45)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">45</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(46)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(46)" />
+    <title />
+    <updated>2014-02-06T14:09:08Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(46)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(46)/Video" />
+    <link rel="edit-media" title="Car" href="Car(46)/$value" m:etag="&quot;ii9V2Rc2cJgIZtM0OF+iw3NLRgc=&quot;" />
+    <content type="application/octet-stream" src="Car(46)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">46</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+</feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json
new file mode 100644
index 0000000..68ea558
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json	
@@ -0,0 +1 @@
+{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml
new file mode 100644
index 0000000..0dd66d1
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car</id>
+  <title type="text">Car</title>
+  <updated>2014-02-13T12:09:31Z</updated>
+  <link rel="self" title="Car" href="Car" />
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(15)" />
+    <title />
+    <updated>2014-02-13T12:09:31Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" />
+    <link rel="edit-media" title="Car" href="Car(15)/$value" />
+    <content type="application/octet-stream" src="Car(15)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">15</d:VIN>
+      <d:Description>kphszztczthjacvjnttrarxru</d:Description>
+    </m:properties>
+  </entry>
+</feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json
new file mode 100644
index 0000000..68ea558
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json	
@@ -0,0 +1 @@
+{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml
new file mode 100644
index 0000000..0dd66d1
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car</id>
+  <title type="text">Car</title>
+  <updated>2014-02-13T12:09:31Z</updated>
+  <link rel="self" title="Car" href="Car" />
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(15)" />
+    <title />
+    <updated>2014-02-13T12:09:31Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" />
+    <link rel="edit-media" title="Car" href="Car(15)/$value" />
+    <content type="application/octet-stream" src="Car(15)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">15</d:VIN>
+      <d:Description>kphszztczthjacvjnttrarxru</d:Description>
+    </m:properties>
+  </entry>
+</feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json
new file mode 100644
index 0000000..82f2bc5
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json	
@@ -0,0 +1 @@
+{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New Description(13922
 22565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml
new file mode 100644
index 0000000..3b22fb1
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car</id>
+  <title type="text">Car</title>
+  <updated>2014-02-13T12:09:31Z</updated>
+  <link rel="self" title="Car" href="Car" />
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(13)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(13)" />
+    <title />
+    <updated>2014-02-13T12:09:31Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" />
+    <link rel="edit-media" title="Car" href="Car(13)/$value" />
+    <content type="application/octet-stream" src="Car(13)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">13</d:VIN>
+      <d:Description m:null="true" />
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(14)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(14)" />
+    <title />
+    <updated>2014-02-13T12:09:31Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" />
+    <link rel="edit-media" title="Car" href="Car(14)/$value" />
+    <content type="application/octet-stream" src="Car(14)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">14</d:VIN>
+      <d:Description>New Description(1392222565917)</d:Description>
+    </m:properties>
+  </entry>
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(15)" />
+    <title />
+    <updated>2014-02-13T12:09:31Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" />
+    <link rel="edit-media" title="Car" href="Car(15)/$value" />
+    <content type="application/octet-stream" src="Car(15)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">15</d:VIN>
+      <d:Description>kphszztczthjacvjnttrarxru</d:Description>
+    </m:properties>
+  </entry>
+</feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json
new file mode 100644
index 0000000..68ea558
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json	
@@ -0,0 +1 @@
+{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml
new file mode 100644
index 0000000..0dd66d1
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    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
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.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://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car</id>
+  <title type="text">Car</title>
+  <updated>2014-02-13T12:09:31Z</updated>
+  <link rel="self" title="Car" href="Car" />
+  <entry>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)</id>
+    <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
+    <link rel="edit" title="Car" href="Car(15)" />
+    <title />
+    <updated>2014-02-13T12:09:31Z</updated>
+    <author>
+      <name />
+    </author>
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" />
+    <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" />
+    <link rel="edit-media" title="Car" href="Car(15)/$value" />
+    <content type="application/octet-stream" src="Car(15)/$value" />
+    <m:properties>
+      <d:VIN m:type="Edm.Int32">15</d:VIN>
+      <d:Description>kphszztczthjacvjnttrarxru</d:Description>
+    </m:properties>
+  </entry>
+</feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/450ccfd4/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json
new file mode 100644
index 0000000..1ecab6c
--- /dev/null
+++ b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json	
@@ -0,0 +1 @@
+{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","
 VIN":12,"Description":"lx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car"
 ,"odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file