olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sklev...@apache.org
Subject [4/4] git commit: fix rat:checks
Date Thu, 01 Aug 2013 12:15:44 GMT
fix rat:checks


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

Branch: refs/heads/master
Commit: d97657e91558885201b69cce84cd925436bee050
Parents: 847d4ef
Author: Stephan Klevenz <stephan.klevenz@sap.com>
Authored: Thu Aug 1 14:07:10 2013 +0200
Committer: Stephan Klevenz <stephan.klevenz@sap.com>
Committed: Thu Aug 1 14:15:24 2013 +0200

----------------------------------------------------------------------
 .../src/main/resources/JPAEDMMappingModel.xsd   |  18 ++
 odata-core/src/test/java/META-INF/MANIFEST.MF   |   3 -
 .../core/batch/BatchRequestParserTest.java      |   6 +-
 .../core/ep/consumer/JsonEntryConsumerTest.java |  10 +-
 .../consumer/JsonEntryDeepInsertEntryTest.java  |   4 +-
 .../consumer/JsonEntryDeepInsertFeedTest.java   |   6 +-
 .../core/ep/consumer/JsonFeedConsumerTest.java  |   8 +-
 .../JsonServiceDocumentConsumerTest.java        |   6 +-
 .../consumer/ServiceDocumentConsumerTest.java   |   8 +-
 .../src/test/resources/InvalidSvcDocJson2.json  |   1 +
 .../src/test/resources/InvalidSvcDocJson2.txt   |   1 -
 odata-core/src/test/resources/JsonBuilding      |  17 --
 odata-core/src/test/resources/JsonBuilding.json |  17 ++
 .../test/resources/JsonBuildingWithInlineRooms  |  37 ---
 .../resources/JsonBuildingWithInlineRooms.json  |  37 +++
 ...onBuildingWithInlineRoomsAndNextLinkAndCount |  39 ---
 ...ldingWithInlineRoomsAndNextLinkAndCount.json |  39 +++
 .../src/test/resources/JsonBuildingWithoutD     |  15 -
 .../test/resources/JsonBuildingWithoutD.json    |  15 +
 odata-core/src/test/resources/JsonEmployee      |  48 ---
 odata-core/src/test/resources/JsonEmployee.json |  48 +++
 .../test/resources/JsonEmployeeWithInlineTeam   |  58 ----
 .../resources/JsonEmployeeWithInlineTeam.json   |  58 ++++
 .../resources/JsonInlineRoomWithInlineBuilding  |  75 -----
 .../JsonInlineRoomWithInlineBuilding.json       |  75 +++++
 .../resources/JsonInvalidTeamDoubleNameProperty |  18 --
 .../JsonInvalidTeamDoubleNameProperty.json      |  18 ++
 odata-core/src/test/resources/JsonTeam          |  17 --
 odata-core/src/test/resources/JsonTeam.json     |  17 ++
 odata-core/src/test/resources/JsonTeams         |  34 ---
 odata-core/src/test/resources/JsonTeams.json    |  34 +++
 .../src/test/resources/JsonTeamsWithCount       |  35 ---
 .../src/test/resources/JsonTeamsWithCount.json  |  35 +++
 .../test/resources/JsonTeamsWithCountWithoutD   |  34 ---
 .../resources/JsonTeamsWithCountWithoutD.json   |  34 +++
 .../test/resources/JsonTeamsWithInlineEmployees | 151 ----------
 .../resources/JsonTeamsWithInlineEmployees.json | 151 ++++++++++
 odata-core/src/test/resources/JsonTeamsWithoutD |  33 ---
 .../src/test/resources/JsonTeamsWithoutD.json   |  33 +++
 .../src/test/resources/batchRequest.batch       |  51 ++++
 odata-core/src/test/resources/batchRequest.txt  |  51 ----
 .../src/test/resources/batchWithContent.batch   |   1 +
 .../src/test/resources/batchWithContent.txt     |   1 -
 .../src/test/resources/batchWithPost.batch      |  38 +++
 odata-core/src/test/resources/batchWithPost.txt |  38 ---
 .../src/test/resources/invalidSvcDocJson.json   |   1 +
 .../src/test/resources/invalidSvcDocJson.txt    |   1 -
 odata-core/src/test/resources/refScenario.edmx  |  18 ++
 odata-core/src/test/resources/svcDocJson.json   |   1 +
 odata-core/src/test/resources/svcDocJson.txt    |   1 -
 odata-web/pom.xml                               |   2 +-
 odata-web/src/main/webapp/index.jsp             |  18 ++
 pom.xml                                         |  51 ++++
 src/checkstyle/config.xml                       |  18 ++
 src/eclipse/org.eclipse.jdt.core.prefs          | 291 -------------------
 src/etc/header.txt                              |   1 -
 src/git/hooks/pre-commit                        |  39 ---
 57 files changed, 852 insertions(+), 1063 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/jpa-api/src/main/resources/JPAEDMMappingModel.xsd
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/resources/JPAEDMMappingModel.xsd b/jpa-api/src/main/resources/JPAEDMMappingModel.xsd
index c7f11e4..a57d44b 100644
--- a/jpa-api/src/main/resources/JPAEDMMappingModel.xsd
+++ b/jpa-api/src/main/resources/JPAEDMMappingModel.xsd
@@ -1,4 +1,22 @@
 <?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.
+-->
 <xs:schema attributeFormDefault="unqualified"
 	elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	targetNamespace="http://www.sap.com/core/odata/processor/api/jpa/model/mapping"

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/java/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/META-INF/MANIFEST.MF b/odata-core/src/test/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/odata-core/src/test/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
index ba0233c..cb2f420 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
@@ -71,7 +71,7 @@ public class BatchRequestParserTest {
 
   @Test
   public void test() throws IOException, BatchException, URISyntaxException {
-    String fileName = "/batchWithPost.txt";
+    String fileName = "/batchWithPost.batch";
     InputStream in = ClassLoader.class.getResourceAsStream(fileName);
     if (in == null) {
       throw new IOException("Requested file '" + fileName + "' was not found.");
@@ -122,7 +122,7 @@ public class BatchRequestParserTest {
 
   @Test
   public void testImageInContent() throws IOException, BatchException, URISyntaxException {
-    String fileName = "/batchWithContent.txt";
+    String fileName = "/batchWithContent.batch";
     InputStream contentInputStream = ClassLoader.class.getResourceAsStream(fileName);
     if (contentInputStream == null) {
       throw new IOException("Requested file '" + fileName + "' was not found.");
@@ -180,7 +180,7 @@ public class BatchRequestParserTest {
 
   @Test
   public void testPostWithoutBody() throws IOException, BatchException, URISyntaxException {
-    String fileName = "/batchWithContent.txt";
+    String fileName = "/batchWithContent.batch";
     InputStream contentInputStream = ClassLoader.class.getResourceAsStream(fileName);
     if (contentInputStream == null) {
       throw new IOException("Requested file '" + fileName + "' was not found.");

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
index c7def2d..afadac0 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
@@ -45,11 +45,11 @@ import org.apache.olingo.odata2.testutil.mock.MockFacade;
  */
 public class JsonEntryConsumerTest extends AbstractConsumerTest {
 
-  private static final String SIMPLE_ENTRY_BUILDING = "JsonBuilding";
-  private static final String SIMPLE_ENTRY_EMPLOYEE = "JsonEmployee";
-  private static final String SIMPLE_ENTRY_TEAM = "JsonTeam";
-  private static final String INVALID_ENTRY_TEAM_DOUBLE_NAME_PROPERTY = "JsonInvalidTeamDoubleNameProperty";
-  private static final String SIMPLE_ENTRY_BUILDING_WITHOUT_D = "JsonBuildingWithoutD";
+  private static final String SIMPLE_ENTRY_BUILDING = "JsonBuilding.json";
+  private static final String SIMPLE_ENTRY_EMPLOYEE = "JsonEmployee.json";
+  private static final String SIMPLE_ENTRY_TEAM = "JsonTeam.json";
+  private static final String INVALID_ENTRY_TEAM_DOUBLE_NAME_PROPERTY = "JsonInvalidTeamDoubleNameProperty.json";
+  private static final String SIMPLE_ENTRY_BUILDING_WITHOUT_D = "JsonBuildingWithoutD.json";
 
   //Negative Test jsonStart
   private static final String negativeJsonStart_1 = "{ \"abc\": {";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java
index 3a08245..e6f6f38 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertEntryTest.java
@@ -50,8 +50,8 @@ import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 public class JsonEntryDeepInsertEntryTest extends AbstractConsumerTest {
 
-  private static final String EMPLOYEE_WITH_INLINE_TEAM = "JsonEmployeeWithInlineTeam";
-  private static final String INLINE_ROOM_WITH_INLINE_BUILDING = "JsonInlineRoomWithInlineBuilding";
+  private static final String EMPLOYEE_WITH_INLINE_TEAM = "JsonEmployeeWithInlineTeam.json";
+  private static final String INLINE_ROOM_WITH_INLINE_BUILDING = "JsonInlineRoomWithInlineBuilding.json";
 
   @Test
   public void innerEntryNoMediaResourceWithoutCallback() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
index 2207b18..8ba8dda 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
@@ -45,9 +45,9 @@ import org.apache.olingo.odata2.testutil.mock.MockFacade;
  */
 public class JsonEntryDeepInsertFeedTest extends AbstractConsumerTest {
 
-  private static final String BUILDING_WITH_INLINE_ROOMS = "JsonBuildingWithInlineRooms";
-  private static final String TEAM_WITH_INLINE_EMPLOYEES = "JsonTeamsWithInlineEmployees";
-  private static final String BUILDING_WITH_INLINE_ROOMS_NEXTLINK_AND_COUNT = "JsonBuildingWithInlineRoomsAndNextLinkAndCount";
+  private static final String BUILDING_WITH_INLINE_ROOMS = "JsonBuildingWithInlineRooms.json";
+  private static final String TEAM_WITH_INLINE_EMPLOYEES = "JsonTeamsWithInlineEmployees.json";
+  private static final String BUILDING_WITH_INLINE_ROOMS_NEXTLINK_AND_COUNT = "JsonBuildingWithInlineRoomsAndNextLinkAndCount.json";
 
   @Test
   public void innerFeedNoMediaResourceWithoutCallback() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
index 9f5b183..ec71e5e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
@@ -43,7 +43,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
 
   @Test
   public void teamsFeed() throws Exception {
-    ODataFeed feed = prepareAndExecuteFeed("JsonTeams", "Teams", DEFAULT_PROPERTIES);
+    ODataFeed feed = prepareAndExecuteFeed("JsonTeams.json", "Teams", DEFAULT_PROPERTIES);
 
     List<ODataEntry> entries = feed.getEntries();
     assertNotNull(entries);
@@ -88,7 +88,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
 
   @Test
   public void teamsFeedWithoutD() throws Exception {
-    ODataFeed feed = prepareAndExecuteFeed("JsonTeamsWithoutD", "Teams", DEFAULT_PROPERTIES);
+    ODataFeed feed = prepareAndExecuteFeed("JsonTeamsWithoutD.json", "Teams", DEFAULT_PROPERTIES);
 
     List<ODataEntry> entries = feed.getEntries();
     assertNotNull(entries);
@@ -272,7 +272,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
 
   @Test
   public void teamsFeedWithCount() throws Exception {
-    ODataFeed feed = prepareAndExecuteFeed("JsonTeamsWithCount", "Teams", DEFAULT_PROPERTIES);
+    ODataFeed feed = prepareAndExecuteFeed("JsonTeamsWithCount.json", "Teams", DEFAULT_PROPERTIES);
 
     List<ODataEntry> entries = feed.getEntries();
     assertNotNull(entries);
@@ -287,7 +287,7 @@ public class JsonFeedConsumerTest extends AbstractConsumerTest {
 
   @Test
   public void teamsFeedWithCountWithoutD() throws Exception {
-    ODataFeed feed = prepareAndExecuteFeed("JsonTeamsWithCountWithoutD", "Teams", DEFAULT_PROPERTIES);
+    ODataFeed feed = prepareAndExecuteFeed("JsonTeamsWithCountWithoutD.json", "Teams", DEFAULT_PROPERTIES);
 
     List<ODataEntry> entries = feed.getEntries();
     assertNotNull(entries);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
index 4a07398..9f1b1d0 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
@@ -36,7 +36,7 @@ public class JsonServiceDocumentConsumerTest {
   @Test
   public void test() throws EntityProviderException {
     JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
-    InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.txt");
+    InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
     ServiceDocument serviceDoc = parser.parseJson(in);
     List<EdmEntitySetInfo> entitySetsInfo = serviceDoc.getEntitySetsInfo();
     assertNotNull(entitySetsInfo);
@@ -57,14 +57,14 @@ public class JsonServiceDocumentConsumerTest {
   @Test(expected = EntityProviderException.class)
   public void testInvalidServiceDocument() throws EntityProviderException {
     JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
-    InputStream in = ClassLoader.class.getResourceAsStream("/invalidSvcDocJson.txt");
+    InputStream in = ClassLoader.class.getResourceAsStream("/invalidSvcDocJson.json");
     parser.parseJson(in);
   }
 
   @Test(expected = EntityProviderException.class)
   public void testServiceDocumentWithInvalidStructure() throws EntityProviderException {
     JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
-    InputStream in = ClassLoader.class.getResourceAsStream("/invalidSvcDocJson2.txt");
+    InputStream in = ClassLoader.class.getResourceAsStream("/invalidSvcDocJson2.json");
     parser.parseJson(in);
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
index 27c59c4..ce34f22 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
@@ -66,19 +66,19 @@ public class ServiceDocumentConsumerTest {
 
   @Test
   public void testJson() throws EntityProviderException {
-    InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.txt");
+    InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
     assertNotNull(EntityProvider.readServiceDocument(in, "application/json"));
   }
 
   @Test(expected = EntityProviderException.class)
   public void testInvalidInputStream() throws EntityProviderException {
-    InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.txt");
+    InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
     EntityProvider.readServiceDocument(in, "application/atom+xml");
   }
 
   @Test
   public void testJsonServiceDocument() throws EntityProviderException {
-    InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.txt");
+    InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
     ServiceDocument serviceDoc = EntityProvider.readServiceDocument(in, "application/json");
     assertNotNull(serviceDoc);
     assertNull(serviceDoc.getAtomInfo());
@@ -97,7 +97,7 @@ public class ServiceDocumentConsumerTest {
 
   @Test
   public void testCompareJsonWithAtom() throws EntityProviderException {
-    InputStream inputJson = ClassLoader.class.getResourceAsStream("/svcDocJson.txt");
+    InputStream inputJson = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
     ServiceDocument serviceDocJson = EntityProvider.readServiceDocument(inputJson, "application/json");
     assertNotNull(serviceDocJson);
     List<EdmEntitySetInfo> entitySetsInfoJson = serviceDocJson.getEntitySetsInfo();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/InvalidSvcDocJson2.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/InvalidSvcDocJson2.json b/odata-core/src/test/resources/InvalidSvcDocJson2.json
new file mode 100644
index 0000000..ccac068
--- /dev/null
+++ b/odata-core/src/test/resources/InvalidSvcDocJson2.json
@@ -0,0 +1 @@
+{"d":{"EntitySets":["Employees","Teams","Rooms","Managers","Buildings","Container2.Photos"]}}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/InvalidSvcDocJson2.txt
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/InvalidSvcDocJson2.txt b/odata-core/src/test/resources/InvalidSvcDocJson2.txt
deleted file mode 100644
index ccac068..0000000
--- a/odata-core/src/test/resources/InvalidSvcDocJson2.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"d":{"EntitySets":["Employees","Teams","Rooms","Managers","Buildings","Container2.Photos"]}}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonBuilding
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonBuilding b/odata-core/src/test/resources/JsonBuilding
deleted file mode 100644
index 598ee8b..0000000
--- a/odata-core/src/test/resources/JsonBuilding
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-			"type" : "RefScenario.Building"
-		},
-		"Id" : "1",
-		"Name" : "Building 1",
-		"Image" : null,
-		"nb_Rooms" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')/nb_Rooms"
-			}
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonBuilding.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonBuilding.json b/odata-core/src/test/resources/JsonBuilding.json
new file mode 100644
index 0000000..598ee8b
--- /dev/null
+++ b/odata-core/src/test/resources/JsonBuilding.json
@@ -0,0 +1,17 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+			"type" : "RefScenario.Building"
+		},
+		"Id" : "1",
+		"Name" : "Building 1",
+		"Image" : null,
+		"nb_Rooms" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')/nb_Rooms"
+			}
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonBuildingWithInlineRooms
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonBuildingWithInlineRooms b/odata-core/src/test/resources/JsonBuildingWithInlineRooms
deleted file mode 100644
index f02ae54..0000000
--- a/odata-core/src/test/resources/JsonBuildingWithInlineRooms
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-			"type" : "RefScenario.Building"
-		},
-		"Id" : "1",
-		"Name" : "Building 1",
-		"Image" : null,
-		"nb_Rooms" : {
-			"results" : [{
-					"__metadata" : {
-						"id" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
-						"type" : "RefScenario.Room",
-						"etag" : "W/\"1\""
-					},
-					"Id" : "1",
-					"Name" : "Room 1",
-					"Seats" : 1,
-					"Version" : 1,
-					"nr_Employees" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Employees"
-						}
-					},
-					"nr_Building" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Building"
-						}
-					}
-				}
-			]
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonBuildingWithInlineRooms.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonBuildingWithInlineRooms.json b/odata-core/src/test/resources/JsonBuildingWithInlineRooms.json
new file mode 100644
index 0000000..f02ae54
--- /dev/null
+++ b/odata-core/src/test/resources/JsonBuildingWithInlineRooms.json
@@ -0,0 +1,37 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+			"type" : "RefScenario.Building"
+		},
+		"Id" : "1",
+		"Name" : "Building 1",
+		"Image" : null,
+		"nb_Rooms" : {
+			"results" : [{
+					"__metadata" : {
+						"id" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
+						"type" : "RefScenario.Room",
+						"etag" : "W/\"1\""
+					},
+					"Id" : "1",
+					"Name" : "Room 1",
+					"Seats" : 1,
+					"Version" : 1,
+					"nr_Employees" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Employees"
+						}
+					},
+					"nr_Building" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Building"
+						}
+					}
+				}
+			]
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonBuildingWithInlineRoomsAndNextLinkAndCount
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonBuildingWithInlineRoomsAndNextLinkAndCount b/odata-core/src/test/resources/JsonBuildingWithInlineRoomsAndNextLinkAndCount
deleted file mode 100644
index 4e2929e..0000000
--- a/odata-core/src/test/resources/JsonBuildingWithInlineRoomsAndNextLinkAndCount
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-			"type" : "RefScenario.Building"
-		},
-		"Id" : "1",
-		"Name" : "Building 1",
-		"Image" : null,
-		"nb_Rooms" : {
-			"__count" : "1",
-			"results" : [{
-					"__metadata" : {
-						"id" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
-						"type" : "RefScenario.Room",
-						"etag" : "W/\"1\""
-					},
-					"Id" : "1",
-					"Name" : "Room 1",
-					"Seats" : 1,
-					"Version" : 1,
-					"nr_Employees" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Employees"
-						}
-					},
-					"nr_Building" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Building"
-						}
-					}
-				}
-			],
-			"__next" : "nextLink"
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonBuildingWithInlineRoomsAndNextLinkAndCount.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonBuildingWithInlineRoomsAndNextLinkAndCount.json b/odata-core/src/test/resources/JsonBuildingWithInlineRoomsAndNextLinkAndCount.json
new file mode 100644
index 0000000..4e2929e
--- /dev/null
+++ b/odata-core/src/test/resources/JsonBuildingWithInlineRoomsAndNextLinkAndCount.json
@@ -0,0 +1,39 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+			"type" : "RefScenario.Building"
+		},
+		"Id" : "1",
+		"Name" : "Building 1",
+		"Image" : null,
+		"nb_Rooms" : {
+			"__count" : "1",
+			"results" : [{
+					"__metadata" : {
+						"id" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
+						"type" : "RefScenario.Room",
+						"etag" : "W/\"1\""
+					},
+					"Id" : "1",
+					"Name" : "Room 1",
+					"Seats" : 1,
+					"Version" : 1,
+					"nr_Employees" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Employees"
+						}
+					},
+					"nr_Building" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Building"
+						}
+					}
+				}
+			],
+			"__next" : "nextLink"
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonBuildingWithoutD
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonBuildingWithoutD b/odata-core/src/test/resources/JsonBuildingWithoutD
deleted file mode 100644
index 8712a1c..0000000
--- a/odata-core/src/test/resources/JsonBuildingWithoutD
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-			"type" : "RefScenario.Building"
-		},
-		"Id" : "1",
-		"Name" : "Building 1",
-		"Image" : null,
-		"nb_Rooms" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')/nb_Rooms"
-			}
-		}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonBuildingWithoutD.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonBuildingWithoutD.json b/odata-core/src/test/resources/JsonBuildingWithoutD.json
new file mode 100644
index 0000000..8712a1c
--- /dev/null
+++ b/odata-core/src/test/resources/JsonBuildingWithoutD.json
@@ -0,0 +1,15 @@
+{
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+			"type" : "RefScenario.Building"
+		},
+		"Id" : "1",
+		"Name" : "Building 1",
+		"Image" : null,
+		"nb_Rooms" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')/nb_Rooms"
+			}
+		}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonEmployee
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonEmployee b/odata-core/src/test/resources/JsonEmployee
deleted file mode 100644
index 868f58a..0000000
--- a/odata-core/src/test/resources/JsonEmployee
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
-			"type" : "RefScenario.Employee",
-			"content_type" : "image/jpeg",
-			"media_src" : "Employees('1')/$value",
-			"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/$value"
-		},
-		"EmployeeId" : "1",
-		"EmployeeName" : "Walter Winter",
-		"ManagerId" : "1",
-		"RoomId" : "1",
-		"TeamId" : "1",
-		"Location" : {
-			"__metadata" : {
-				"type" : "RefScenario.c_Location"
-			},
-			"City" : {
-				"__metadata" : {
-					"type" : "RefScenario.c_City"
-				},
-				"PostalCode" : "69124",
-				"CityName" : "Heidelberg"
-			},
-			"Country" : "Germany"
-		},
-		"Age" : 52,
-		"EntryDate" : "\/Date(915148800000)\/",
-		"ImageUrl" : "Employees('1')/$value",
-		"ne_Manager" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Manager"
-			}
-		},
-		"ne_Team" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Team"
-			}
-		},
-		"ne_Room" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Room"
-			}
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonEmployee.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonEmployee.json b/odata-core/src/test/resources/JsonEmployee.json
new file mode 100644
index 0000000..868f58a
--- /dev/null
+++ b/odata-core/src/test/resources/JsonEmployee.json
@@ -0,0 +1,48 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
+			"type" : "RefScenario.Employee",
+			"content_type" : "image/jpeg",
+			"media_src" : "Employees('1')/$value",
+			"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/$value"
+		},
+		"EmployeeId" : "1",
+		"EmployeeName" : "Walter Winter",
+		"ManagerId" : "1",
+		"RoomId" : "1",
+		"TeamId" : "1",
+		"Location" : {
+			"__metadata" : {
+				"type" : "RefScenario.c_Location"
+			},
+			"City" : {
+				"__metadata" : {
+					"type" : "RefScenario.c_City"
+				},
+				"PostalCode" : "69124",
+				"CityName" : "Heidelberg"
+			},
+			"Country" : "Germany"
+		},
+		"Age" : 52,
+		"EntryDate" : "\/Date(915148800000)\/",
+		"ImageUrl" : "Employees('1')/$value",
+		"ne_Manager" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Manager"
+			}
+		},
+		"ne_Team" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Team"
+			}
+		},
+		"ne_Room" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Room"
+			}
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonEmployeeWithInlineTeam
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonEmployeeWithInlineTeam b/odata-core/src/test/resources/JsonEmployeeWithInlineTeam
deleted file mode 100644
index 07f4c34..0000000
--- a/odata-core/src/test/resources/JsonEmployeeWithInlineTeam
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
-			"type" : "RefScenario.Employee",
-			"content_type" : "image/jpeg",
-			"media_src" : "Employees('1')/$value",
-			"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/$value"
-		},
-		"EmployeeId" : "1",
-		"EmployeeName" : "Walter Winter",
-		"ManagerId" : "1",
-		"RoomId" : "1",
-		"TeamId" : "1",
-		"Location" : {
-			"__metadata" : {
-				"type" : "RefScenario.c_Location"
-			},
-			"City" : {
-				"__metadata" : {
-					"type" : "RefScenario.c_City"
-				},
-				"PostalCode" : "69124",
-				"CityName" : "Heidelberg"
-			},
-			"Country" : "Germany"
-		},
-		"Age" : 52,
-		"EntryDate" : "\/Date(915148800000)\/",
-		"ImageUrl" : "Employees('1')/$value",
-		"ne_Manager" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Manager"
-			}
-		},
-		"ne_Team" : {
-			"__metadata" : {
-				"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-				"type" : "RefScenario.Team"
-			},
-			"Id" : "1",
-			"Name" : "Team 1",
-			"isScrumTeam" : false,
-			"nt_Employees" : {
-				"__deferred" : {
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
-				}
-			}
-		},
-		"ne_Room" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Room"
-			}
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonEmployeeWithInlineTeam.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonEmployeeWithInlineTeam.json b/odata-core/src/test/resources/JsonEmployeeWithInlineTeam.json
new file mode 100644
index 0000000..07f4c34
--- /dev/null
+++ b/odata-core/src/test/resources/JsonEmployeeWithInlineTeam.json
@@ -0,0 +1,58 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
+			"type" : "RefScenario.Employee",
+			"content_type" : "image/jpeg",
+			"media_src" : "Employees('1')/$value",
+			"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/$value"
+		},
+		"EmployeeId" : "1",
+		"EmployeeName" : "Walter Winter",
+		"ManagerId" : "1",
+		"RoomId" : "1",
+		"TeamId" : "1",
+		"Location" : {
+			"__metadata" : {
+				"type" : "RefScenario.c_Location"
+			},
+			"City" : {
+				"__metadata" : {
+					"type" : "RefScenario.c_City"
+				},
+				"PostalCode" : "69124",
+				"CityName" : "Heidelberg"
+			},
+			"Country" : "Germany"
+		},
+		"Age" : 52,
+		"EntryDate" : "\/Date(915148800000)\/",
+		"ImageUrl" : "Employees('1')/$value",
+		"ne_Manager" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Manager"
+			}
+		},
+		"ne_Team" : {
+			"__metadata" : {
+				"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+				"type" : "RefScenario.Team"
+			},
+			"Id" : "1",
+			"Name" : "Team 1",
+			"isScrumTeam" : false,
+			"nt_Employees" : {
+				"__deferred" : {
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
+				}
+			}
+		},
+		"ne_Room" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Room"
+			}
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonInlineRoomWithInlineBuilding
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonInlineRoomWithInlineBuilding b/odata-core/src/test/resources/JsonInlineRoomWithInlineBuilding
deleted file mode 100644
index a9cf63c..0000000
--- a/odata-core/src/test/resources/JsonInlineRoomWithInlineBuilding
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
-			"type" : "RefScenario.Employee",
-			"content_type" : "image/jpeg",
-			"media_src" : "Employees('1')/$value",
-			"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/$value"
-		},
-		"EmployeeId" : "1",
-		"EmployeeName" : "Walter Winter",
-		"ManagerId" : "1",
-		"RoomId" : "1",
-		"TeamId" : "1",
-		"Location" : {
-			"__metadata" : {
-				"type" : "RefScenario.c_Location"
-			},
-			"City" : {
-				"__metadata" : {
-					"type" : "RefScenario.c_City"
-				},
-				"PostalCode" : "69124",
-				"CityName" : "Heidelberg"
-			},
-			"Country" : "Germany"
-		},
-		"Age" : 52,
-		"EntryDate" : "\/Date(915148800000)\/",
-		"ImageUrl" : "Employees('1')/$value",
-		"ne_Manager" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Manager"
-			}
-		},
-		"ne_Team" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Team"
-			}
-		},
-		"ne_Room" : {
-			"__metadata" : {
-				"id" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
-				"type" : "RefScenario.Room",
-				"etag" : "W/\"1\""
-			},
-			"Id" : "1",
-			"Name" : "Room 1",
-			"Seats" : 1,
-			"Version" : 1,
-			"nr_Employees" : {
-				"__deferred" : {
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Employees"
-				}
-			},
-			"nr_Building" : {
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
-					"type" : "RefScenario.Building"
-				},
-				"Id" : "1",
-				"Name" : "Building 1",
-				"Image" : null,
-				"nb_Rooms" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')/nb_Rooms"
-					}
-				}
-			}
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonInlineRoomWithInlineBuilding.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonInlineRoomWithInlineBuilding.json b/odata-core/src/test/resources/JsonInlineRoomWithInlineBuilding.json
new file mode 100644
index 0000000..a9cf63c
--- /dev/null
+++ b/odata-core/src/test/resources/JsonInlineRoomWithInlineBuilding.json
@@ -0,0 +1,75 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
+			"type" : "RefScenario.Employee",
+			"content_type" : "image/jpeg",
+			"media_src" : "Employees('1')/$value",
+			"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/$value"
+		},
+		"EmployeeId" : "1",
+		"EmployeeName" : "Walter Winter",
+		"ManagerId" : "1",
+		"RoomId" : "1",
+		"TeamId" : "1",
+		"Location" : {
+			"__metadata" : {
+				"type" : "RefScenario.c_Location"
+			},
+			"City" : {
+				"__metadata" : {
+					"type" : "RefScenario.c_City"
+				},
+				"PostalCode" : "69124",
+				"CityName" : "Heidelberg"
+			},
+			"Country" : "Germany"
+		},
+		"Age" : 52,
+		"EntryDate" : "\/Date(915148800000)\/",
+		"ImageUrl" : "Employees('1')/$value",
+		"ne_Manager" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Manager"
+			}
+		},
+		"ne_Team" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Team"
+			}
+		},
+		"ne_Room" : {
+			"__metadata" : {
+				"id" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')",
+				"type" : "RefScenario.Room",
+				"etag" : "W/\"1\""
+			},
+			"Id" : "1",
+			"Name" : "Room 1",
+			"Seats" : 1,
+			"Version" : 1,
+			"nr_Employees" : {
+				"__deferred" : {
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Rooms('1')/nr_Employees"
+				}
+			},
+			"nr_Building" : {
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')",
+					"type" : "RefScenario.Building"
+				},
+				"Id" : "1",
+				"Name" : "Building 1",
+				"Image" : null,
+				"nb_Rooms" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Buildings('1')/nb_Rooms"
+					}
+				}
+			}
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonInvalidTeamDoubleNameProperty
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonInvalidTeamDoubleNameProperty b/odata-core/src/test/resources/JsonInvalidTeamDoubleNameProperty
deleted file mode 100644
index 7b96837..0000000
--- a/odata-core/src/test/resources/JsonInvalidTeamDoubleNameProperty
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-			"type" : "RefScenario.Team"
-		},
-		"Id" : "1",
-		"Name" : "Team 1",
-		"Name" : "Wrong TeamName",
-		"isScrumTeam" : false,
-		"nt_Employees" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
-			}
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonInvalidTeamDoubleNameProperty.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonInvalidTeamDoubleNameProperty.json b/odata-core/src/test/resources/JsonInvalidTeamDoubleNameProperty.json
new file mode 100644
index 0000000..7b96837
--- /dev/null
+++ b/odata-core/src/test/resources/JsonInvalidTeamDoubleNameProperty.json
@@ -0,0 +1,18 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+			"type" : "RefScenario.Team"
+		},
+		"Id" : "1",
+		"Name" : "Team 1",
+		"Name" : "Wrong TeamName",
+		"isScrumTeam" : false,
+		"nt_Employees" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
+			}
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeam
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeam b/odata-core/src/test/resources/JsonTeam
deleted file mode 100644
index 50e1694..0000000
--- a/odata-core/src/test/resources/JsonTeam
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-			"type" : "RefScenario.Team"
-		},
-		"Id" : "1",
-		"Name" : "Team 1",
-		"isScrumTeam" : false,
-		"nt_Employees" : {
-			"__deferred" : {
-				"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
-			}
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeam.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeam.json b/odata-core/src/test/resources/JsonTeam.json
new file mode 100644
index 0000000..50e1694
--- /dev/null
+++ b/odata-core/src/test/resources/JsonTeam.json
@@ -0,0 +1,17 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+			"type" : "RefScenario.Team"
+		},
+		"Id" : "1",
+		"Name" : "Team 1",
+		"isScrumTeam" : false,
+		"nt_Employees" : {
+			"__deferred" : {
+				"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
+			}
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeams
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeams b/odata-core/src/test/resources/JsonTeams
deleted file mode 100644
index 4743c84..0000000
--- a/odata-core/src/test/resources/JsonTeams
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"d" : {
-		"results" : [{
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-					"type" : "RefScenario.Team"
-				},
-				"Id" : "1",
-				"Name" : "Team 1",
-				"isScrumTeam" : false,
-				"nt_Employees" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
-					}
-				}
-			}, {
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
-					"type" : "RefScenario.Team"
-				},
-				"Id" : "2",
-				"Name" : "Team 2",
-				"isScrumTeam" : true,
-				"nt_Employees" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')/nt_Employees"
-					}
-				}
-			}
-		]
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeams.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeams.json b/odata-core/src/test/resources/JsonTeams.json
new file mode 100644
index 0000000..4743c84
--- /dev/null
+++ b/odata-core/src/test/resources/JsonTeams.json
@@ -0,0 +1,34 @@
+{
+	"d" : {
+		"results" : [{
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+					"type" : "RefScenario.Team"
+				},
+				"Id" : "1",
+				"Name" : "Team 1",
+				"isScrumTeam" : false,
+				"nt_Employees" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
+					}
+				}
+			}, {
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
+					"type" : "RefScenario.Team"
+				},
+				"Id" : "2",
+				"Name" : "Team 2",
+				"isScrumTeam" : true,
+				"nt_Employees" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')/nt_Employees"
+					}
+				}
+			}
+		]
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeamsWithCount
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeamsWithCount b/odata-core/src/test/resources/JsonTeamsWithCount
deleted file mode 100644
index b76fff8..0000000
--- a/odata-core/src/test/resources/JsonTeamsWithCount
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"d" : {
-		"__count" : "3",
-		"results" : [{
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
-					"type" : "RefScenario.Team"
-				},
-				"Id" : "2",
-				"Name" : "Team 2",
-				"isScrumTeam" : true,
-				"nt_Employees" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')/nt_Employees"
-					}
-				}
-			}, {
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')",
-					"type" : "RefScenario.Team"
-				},
-				"Id" : "3",
-				"Name" : "Team 3",
-				"isScrumTeam" : false,
-				"nt_Employees" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')/nt_Employees"
-					}
-				}
-			}
-		]
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeamsWithCount.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeamsWithCount.json b/odata-core/src/test/resources/JsonTeamsWithCount.json
new file mode 100644
index 0000000..b76fff8
--- /dev/null
+++ b/odata-core/src/test/resources/JsonTeamsWithCount.json
@@ -0,0 +1,35 @@
+{
+	"d" : {
+		"__count" : "3",
+		"results" : [{
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
+					"type" : "RefScenario.Team"
+				},
+				"Id" : "2",
+				"Name" : "Team 2",
+				"isScrumTeam" : true,
+				"nt_Employees" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')/nt_Employees"
+					}
+				}
+			}, {
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')",
+					"type" : "RefScenario.Team"
+				},
+				"Id" : "3",
+				"Name" : "Team 3",
+				"isScrumTeam" : false,
+				"nt_Employees" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')/nt_Employees"
+					}
+				}
+			}
+		]
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeamsWithCountWithoutD
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeamsWithCountWithoutD b/odata-core/src/test/resources/JsonTeamsWithCountWithoutD
deleted file mode 100644
index a0231e6..0000000
--- a/odata-core/src/test/resources/JsonTeamsWithCountWithoutD
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-		"__count" : "3",
-		"results" : [{
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
-					"type" : "RefScenario.Team"
-				},
-				"Id" : "2",
-				"Name" : "Team 2",
-				"isScrumTeam" : true,
-				"nt_Employees" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')/nt_Employees"
-					}
-				}
-			}, {
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')",
-					"type" : "RefScenario.Team"
-				},
-				"Id" : "3",
-				"Name" : "Team 3",
-				"isScrumTeam" : false,
-				"nt_Employees" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')/nt_Employees"
-					}
-				}
-			}
-		]
-	}
-

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeamsWithCountWithoutD.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeamsWithCountWithoutD.json b/odata-core/src/test/resources/JsonTeamsWithCountWithoutD.json
new file mode 100644
index 0000000..a0231e6
--- /dev/null
+++ b/odata-core/src/test/resources/JsonTeamsWithCountWithoutD.json
@@ -0,0 +1,34 @@
+{
+		"__count" : "3",
+		"results" : [{
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
+					"type" : "RefScenario.Team"
+				},
+				"Id" : "2",
+				"Name" : "Team 2",
+				"isScrumTeam" : true,
+				"nt_Employees" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')/nt_Employees"
+					}
+				}
+			}, {
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')",
+					"type" : "RefScenario.Team"
+				},
+				"Id" : "3",
+				"Name" : "Team 3",
+				"isScrumTeam" : false,
+				"nt_Employees" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('3')/nt_Employees"
+					}
+				}
+			}
+		]
+	}
+

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeamsWithInlineEmployees
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeamsWithInlineEmployees b/odata-core/src/test/resources/JsonTeamsWithInlineEmployees
deleted file mode 100644
index 568bbc9..0000000
--- a/odata-core/src/test/resources/JsonTeamsWithInlineEmployees
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-	"d" : {
-		"__metadata" : {
-			"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-			"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-			"type" : "RefScenario.Team"
-		},
-		"Id" : "1",
-		"Name" : "Team 1",
-		"isScrumTeam" : false,
-		"nt_Employees" : {
-			"results" : [{
-					"__metadata" : {
-						"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
-						"type" : "RefScenario.Employee",
-						"content_type" : "image/jpeg",
-						"media_src" : "Employees('1')/$value",
-						"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/$value"
-					},
-					"EmployeeId" : "1",
-					"EmployeeName" : "Walter Winter",
-					"ManagerId" : "1",
-					"RoomId" : "1",
-					"TeamId" : "1",
-					"Location" : {
-						"__metadata" : {
-							"type" : "RefScenario.c_Location"
-						},
-						"City" : {
-							"__metadata" : {
-								"type" : "RefScenario.c_City"
-							},
-							"PostalCode" : "69124",
-							"CityName" : "Heidelberg"
-						},
-						"Country" : "Germany"
-					},
-					"Age" : 52,
-					"EntryDate" : "\/Date(915148800000)\/",
-					"ImageUrl" : "Employees('1')/$value",
-					"ne_Manager" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Manager"
-						}
-					},
-					"ne_Team" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Team"
-						}
-					},
-					"ne_Room" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Room"
-						}
-					}
-				}, {
-					"__metadata" : {
-						"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')",
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')",
-						"type" : "RefScenario.Employee",
-						"content_type" : "image/jpeg",
-						"media_src" : "Employees('2')/$value",
-						"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')/$value"
-					},
-					"EmployeeId" : "2",
-					"EmployeeName" : "Frederic Fall",
-					"ManagerId" : "1",
-					"RoomId" : "2",
-					"TeamId" : "1",
-					"Location" : {
-						"__metadata" : {
-							"type" : "RefScenario.c_Location"
-						},
-						"City" : {
-							"__metadata" : {
-								"type" : "RefScenario.c_City"
-							},
-							"PostalCode" : "69190",
-							"CityName" : "Walldorf"
-						},
-						"Country" : "Germany"
-					},
-					"Age" : 32,
-					"EntryDate" : "\/Date(1057017600000)\/",
-					"ImageUrl" : "Employees('2')/$value",
-					"ne_Manager" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')/ne_Manager"
-						}
-					},
-					"ne_Team" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')/ne_Team"
-						}
-					},
-					"ne_Room" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')/ne_Room"
-						}
-					}
-				}, {
-					"__metadata" : {
-						"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')",
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')",
-						"type" : "RefScenario.Employee",
-						"content_type" : "image/jpeg",
-						"media_src" : "Employees('3')/$value",
-						"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')/$value"
-					},
-					"EmployeeId" : "3",
-					"EmployeeName" : "Jonathan Smith",
-					"ManagerId" : "1",
-					"RoomId" : "2",
-					"TeamId" : "1",
-					"Location" : {
-						"__metadata" : {
-							"type" : "RefScenario.c_Location"
-						},
-						"City" : {
-							"__metadata" : {
-								"type" : "RefScenario.c_City"
-							},
-							"PostalCode" : "69190",
-							"CityName" : "Walldorf"
-						},
-						"Country" : "Germany"
-					},
-					"Age" : 56,
-					"EntryDate" : null,
-					"ImageUrl" : "Employees('3')/$value",
-					"ne_Manager" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')/ne_Manager"
-						}
-					},
-					"ne_Team" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')/ne_Team"
-						}
-					},
-					"ne_Room" : {
-						"__deferred" : {
-							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')/ne_Room"
-						}
-					}
-				}
-			]
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeamsWithInlineEmployees.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeamsWithInlineEmployees.json b/odata-core/src/test/resources/JsonTeamsWithInlineEmployees.json
new file mode 100644
index 0000000..568bbc9
--- /dev/null
+++ b/odata-core/src/test/resources/JsonTeamsWithInlineEmployees.json
@@ -0,0 +1,151 @@
+{
+	"d" : {
+		"__metadata" : {
+			"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+			"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+			"type" : "RefScenario.Team"
+		},
+		"Id" : "1",
+		"Name" : "Team 1",
+		"isScrumTeam" : false,
+		"nt_Employees" : {
+			"results" : [{
+					"__metadata" : {
+						"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')",
+						"type" : "RefScenario.Employee",
+						"content_type" : "image/jpeg",
+						"media_src" : "Employees('1')/$value",
+						"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/$value"
+					},
+					"EmployeeId" : "1",
+					"EmployeeName" : "Walter Winter",
+					"ManagerId" : "1",
+					"RoomId" : "1",
+					"TeamId" : "1",
+					"Location" : {
+						"__metadata" : {
+							"type" : "RefScenario.c_Location"
+						},
+						"City" : {
+							"__metadata" : {
+								"type" : "RefScenario.c_City"
+							},
+							"PostalCode" : "69124",
+							"CityName" : "Heidelberg"
+						},
+						"Country" : "Germany"
+					},
+					"Age" : 52,
+					"EntryDate" : "\/Date(915148800000)\/",
+					"ImageUrl" : "Employees('1')/$value",
+					"ne_Manager" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Manager"
+						}
+					},
+					"ne_Team" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Team"
+						}
+					},
+					"ne_Room" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('1')/ne_Room"
+						}
+					}
+				}, {
+					"__metadata" : {
+						"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')",
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')",
+						"type" : "RefScenario.Employee",
+						"content_type" : "image/jpeg",
+						"media_src" : "Employees('2')/$value",
+						"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')/$value"
+					},
+					"EmployeeId" : "2",
+					"EmployeeName" : "Frederic Fall",
+					"ManagerId" : "1",
+					"RoomId" : "2",
+					"TeamId" : "1",
+					"Location" : {
+						"__metadata" : {
+							"type" : "RefScenario.c_Location"
+						},
+						"City" : {
+							"__metadata" : {
+								"type" : "RefScenario.c_City"
+							},
+							"PostalCode" : "69190",
+							"CityName" : "Walldorf"
+						},
+						"Country" : "Germany"
+					},
+					"Age" : 32,
+					"EntryDate" : "\/Date(1057017600000)\/",
+					"ImageUrl" : "Employees('2')/$value",
+					"ne_Manager" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')/ne_Manager"
+						}
+					},
+					"ne_Team" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')/ne_Team"
+						}
+					},
+					"ne_Room" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('2')/ne_Room"
+						}
+					}
+				}, {
+					"__metadata" : {
+						"id" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')",
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')",
+						"type" : "RefScenario.Employee",
+						"content_type" : "image/jpeg",
+						"media_src" : "Employees('3')/$value",
+						"edit_media" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')/$value"
+					},
+					"EmployeeId" : "3",
+					"EmployeeName" : "Jonathan Smith",
+					"ManagerId" : "1",
+					"RoomId" : "2",
+					"TeamId" : "1",
+					"Location" : {
+						"__metadata" : {
+							"type" : "RefScenario.c_Location"
+						},
+						"City" : {
+							"__metadata" : {
+								"type" : "RefScenario.c_City"
+							},
+							"PostalCode" : "69190",
+							"CityName" : "Walldorf"
+						},
+						"Country" : "Germany"
+					},
+					"Age" : 56,
+					"EntryDate" : null,
+					"ImageUrl" : "Employees('3')/$value",
+					"ne_Manager" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')/ne_Manager"
+						}
+					},
+					"ne_Team" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')/ne_Team"
+						}
+					},
+					"ne_Room" : {
+						"__deferred" : {
+							"uri" : "http://localhost:8080/ReferenceScenario.svc/Employees('3')/ne_Room"
+						}
+					}
+				}
+			]
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeamsWithoutD
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeamsWithoutD b/odata-core/src/test/resources/JsonTeamsWithoutD
deleted file mode 100644
index 5848584..0000000
--- a/odata-core/src/test/resources/JsonTeamsWithoutD
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-		"results" : [{
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
-					"type" : "RefScenario.Team"
-				},
-				"Id" : "1",
-				"Name" : "Team 1",
-				"isScrumTeam" : false,
-				"nt_Employees" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
-					}
-				}
-			}, {
-				"__metadata" : {
-					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
-					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
-					"type" : "RefScenario.Team"
-				},
-				"Id" : "2",
-				"Name" : "Team 2",
-				"isScrumTeam" : true,
-				"nt_Employees" : {
-					"__deferred" : {
-						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')/nt_Employees"
-					}
-				}
-			}
-		]
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/JsonTeamsWithoutD.json
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/JsonTeamsWithoutD.json b/odata-core/src/test/resources/JsonTeamsWithoutD.json
new file mode 100644
index 0000000..5848584
--- /dev/null
+++ b/odata-core/src/test/resources/JsonTeamsWithoutD.json
@@ -0,0 +1,33 @@
+{
+		"results" : [{
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')",
+					"type" : "RefScenario.Team"
+				},
+				"Id" : "1",
+				"Name" : "Team 1",
+				"isScrumTeam" : false,
+				"nt_Employees" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('1')/nt_Employees"
+					}
+				}
+			}, {
+				"__metadata" : {
+					"id" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
+					"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')",
+					"type" : "RefScenario.Team"
+				},
+				"Id" : "2",
+				"Name" : "Team 2",
+				"isScrumTeam" : true,
+				"nt_Employees" : {
+					"__deferred" : {
+						"uri" : "http://localhost:8080/ReferenceScenario.svc/Teams('2')/nt_Employees"
+					}
+				}
+			}
+		]
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/batchRequest.batch
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/batchRequest.batch b/odata-core/src/test/resources/batchRequest.batch
new file mode 100644
index 0000000..bcede7e
--- /dev/null
+++ b/odata-core/src/test/resources/batchRequest.batch
@@ -0,0 +1,51 @@
+POST http://some.host.com/service.root/$batch HTTP/1.1 
+Host: some.host.com
+Content-Length:1117
+Content-Type: multipart/mixed; boundary=batch_36522ad7-fc75-4b56-8c71-56071383e77b 
+
+--batch_36522ad7-fc75-4b56-8c71-56071383e77b
+Content-Type: application/http
+Content-Transfer-Encoding:binary
+
+GET /service/Customers('ALFKI') HTTP/1.1
+
+
+--batch_36522ad7-fc75-4b56-8c71-56071383e77b 
+Content-Type: multipart/mixed; boundary=changeset_77162fcd-b8da-41ac-a9f8-9357efbbd621
+Content-Length: ###       
+
+--changeset_77162fcd-b8da-41ac-a9f8-9357efbbd621 
+Content-Type: application/http 
+Content-Transfer-Encoding: binary 
+
+POST /service/Customers HTTP/1.1 
+Host: host  
+Content-Type: application/atom+xml;type=entry 
+Content-Length: ### 
+
+<AtomPub representation of a new Customer> 
+
+
+--changeset_77162fcd-b8da-41ac-a9f8-9357efbbd621 
+Content-Type: application/http 
+Content-Transfer-Encoding:binary 
+
+PUT /service/Customers('ALFKI') HTTP/1.1 
+Host: host 
+Content-Type: application/json 
+If-Match: xxxxx 
+Content-Length: ### 
+
+<JSON representation of Customer ALFKI> 
+
+--changeset_77162fcd-b8da-41ac-a9f8-9357efbbd621-- 
+
+--batch_36522ad7-fc75-4b56-8c71-56071383e77b 
+Content-Type: application/http 
+Content-Transfer-Encoding:binary 
+
+GET service/Products HTTP/1.1 
+Host: host 
+
+
+--batch_36522ad7-fc75-4b56-8c71-56071383e77b--
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d97657e9/odata-core/src/test/resources/batchRequest.txt
----------------------------------------------------------------------
diff --git a/odata-core/src/test/resources/batchRequest.txt b/odata-core/src/test/resources/batchRequest.txt
deleted file mode 100644
index bcede7e..0000000
--- a/odata-core/src/test/resources/batchRequest.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-POST http://some.host.com/service.root/$batch HTTP/1.1 
-Host: some.host.com
-Content-Length:1117
-Content-Type: multipart/mixed; boundary=batch_36522ad7-fc75-4b56-8c71-56071383e77b 
-
---batch_36522ad7-fc75-4b56-8c71-56071383e77b
-Content-Type: application/http
-Content-Transfer-Encoding:binary
-
-GET /service/Customers('ALFKI') HTTP/1.1
-
-
---batch_36522ad7-fc75-4b56-8c71-56071383e77b 
-Content-Type: multipart/mixed; boundary=changeset_77162fcd-b8da-41ac-a9f8-9357efbbd621
-Content-Length: ###       
-
---changeset_77162fcd-b8da-41ac-a9f8-9357efbbd621 
-Content-Type: application/http 
-Content-Transfer-Encoding: binary 
-
-POST /service/Customers HTTP/1.1 
-Host: host  
-Content-Type: application/atom+xml;type=entry 
-Content-Length: ### 
-
-<AtomPub representation of a new Customer> 
-
-
---changeset_77162fcd-b8da-41ac-a9f8-9357efbbd621 
-Content-Type: application/http 
-Content-Transfer-Encoding:binary 
-
-PUT /service/Customers('ALFKI') HTTP/1.1 
-Host: host 
-Content-Type: application/json 
-If-Match: xxxxx 
-Content-Length: ### 
-
-<JSON representation of Customer ALFKI> 
-
---changeset_77162fcd-b8da-41ac-a9f8-9357efbbd621-- 
-
---batch_36522ad7-fc75-4b56-8c71-56071383e77b 
-Content-Type: application/http 
-Content-Transfer-Encoding:binary 
-
-GET service/Products HTTP/1.1 
-Host: host 
-
-
---batch_36522ad7-fc75-4b56-8c71-56071383e77b--
\ No newline at end of file


Mime
View raw message