olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chri...@apache.org
Subject [07/17] [OLINGO-168] Refactor Tech Provider
Date Wed, 02 Apr 2014 07:33:26 GMT
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/59ef14f4/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
index 351fd54..ec78def 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
@@ -30,8 +30,11 @@ import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKin
 import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
 import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind;
 import org.apache.olingo.server.core.edm.provider.EdmProviderImpl;
-import org.apache.olingo.server.core.testutil.EdmTechProvider;
 import org.apache.olingo.server.core.testutil.EdmTechTestProvider;
+import org.apache.olingo.server.core.testutil.techprovider.ComplexTypeProvider;
+import org.apache.olingo.server.core.testutil.techprovider.EntityTypeProvider;
+import org.apache.olingo.server.core.testutil.techprovider.EnumTypeProvider;
+import org.apache.olingo.server.core.testutil.techprovider.PropertyProvider;
 import org.apache.olingo.server.core.uri.parser.UriParserException;
 import org.apache.olingo.server.core.uri.testutil.FilterValidator;
 import org.apache.olingo.server.core.uri.testutil.ResourceValidator;
@@ -62,28 +65,28 @@ public class TestFullResourcePath {
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav()").goPath()
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
         .at(1)
         .isUriPathInfoKind(UriResourceKind.function)
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
 
     // with string parameter
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav(ParameterString='ABC')").goPath()
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
         .at(1)
         .isUriPathInfoKind(UriResourceKind.function)
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
 
     // with string parameter
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav()").goPath()
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
         .at(1)
         .isUriPathInfoKind(UriResourceKind.function)
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
   }
 
   @Test
@@ -94,13 +97,13 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, false)
+        .isType(ComplexTypeProvider.nameCTPrimComp, false)
         .n()
         .isFunction("BFCCTPrimCompRTESBaseTwoKeyNav");
 
@@ -109,16 +112,16 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, false)
+        .isType(ComplexTypeProvider.nameCTPrimComp, false)
         .n()
         .isFunction("BFCCTPrimCompRTESBaseTwoKeyNav")
-        .isType(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isUriPathInfoKind(UriResourceKind.count);
 
@@ -134,7 +137,7 @@ public class TestFullResourcePath {
         .n()
         .isUriPathInfoKind(UriResourceKind.complexProperty)
         .isComplex("CollPropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, true)
+        .isType(ComplexTypeProvider.nameCTPrimComp, true)
         .n()
         .isFunction("BFCCollCTPrimCompRTESAllPrim");
 
@@ -147,10 +150,10 @@ public class TestFullResourcePath {
         .n()
         .isUriPathInfoKind(UriResourceKind.complexProperty)
         .isComplex("CollPropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, true)
+        .isType(ComplexTypeProvider.nameCTPrimComp, true)
         .n()
         .isFunction("BFCCollCTPrimCompRTESAllPrim")
-        .isType(EdmTechProvider.nameETAllPrim, true)
+        .isType(EntityTypeProvider.nameETAllPrim, true)
         .n()
         .isUriPathInfoKind(UriResourceKind.count);
   }
@@ -167,7 +170,7 @@ public class TestFullResourcePath {
         .n()
         .isUriPathInfoKind(UriResourceKind.complexProperty)
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, false)
+        .isType(ComplexTypeProvider.nameCTPrimComp, false)
         .n()
         .isFunction("BFCCTPrimCompRTESTwoKeyNav");
 
@@ -181,10 +184,10 @@ public class TestFullResourcePath {
         .n()
         .isUriPathInfoKind(UriResourceKind.complexProperty)
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, false)
+        .isType(ComplexTypeProvider.nameCTPrimComp, false)
         .n()
         .isFunction("BFCCTPrimCompRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
         .n()
         .isUriPathInfoKind(UriResourceKind.count);
 
@@ -210,10 +213,10 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isFunction("BFCETBaseTwoKeyNavRTESTwoKeyNav");
 
@@ -223,8 +226,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'(''2'')'")
         .n()
@@ -238,8 +241,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isFunction("BFCESBaseTwoKeyNavRTESBaseTwoKey");
 
@@ -249,12 +252,12 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isFunction("BFCESBaseTwoKeyNavRTESBaseTwoKey")
-        .isType(EdmTechProvider.nameETBaseTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETTwoBaseTwoKeyNav);
+        .isType(EntityTypeProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETTwoBaseTwoKeyNav);
 
     testUri.run("ESTwoKeyNav"
         + "/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav()"
@@ -265,11 +268,11 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETTwoBaseTwoKeyNav);
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETTwoBaseTwoKeyNav);
   }
 
   @Test
@@ -280,7 +283,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESAllPrim")
         .n()
         .isFunction("BFCESAllPrimRTCTAllPrim")
-        .isType(EdmTechProvider.nameCTAllPrim);
+        .isType(ComplexTypeProvider.nameCTAllPrim);
 
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTCTTwoPrim()/com.sap.odata.test1.CTBase")
         .isKind(UriInfoKind.resource).goPath()
@@ -288,8 +291,8 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTCTTwoPrim")
-        .isType(EdmTechProvider.nameCTTwoPrim, false)
-        .isTypeFilterOnEntry(EdmTechProvider.nameCTBase);
+        .isType(ComplexTypeProvider.nameCTTwoPrim, false)
+        .isTypeFilterOnEntry(ComplexTypeProvider.nameCTBase);
   }
 
   @Test
@@ -300,7 +303,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTCollCTTwoPrim")
-        .isType(EdmTechProvider.nameCTTwoPrim, true);
+        .isType(ComplexTypeProvider.nameCTTwoPrim, true);
 
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTCollCTTwoPrim()/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -308,7 +311,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTCollCTTwoPrim")
-        .isType(EdmTechProvider.nameCTTwoPrim, true)
+        .isType(ComplexTypeProvider.nameCTTwoPrim, true)
         .n()
         .isUriPathInfoKind(UriResourceKind.count);
   }
@@ -322,7 +325,7 @@ public class TestFullResourcePath {
         .n()
         .isFunction("BFCESTwoKeyNavRTTwoKeyNav")
         .n()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false);
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false);
 
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTTwoKeyNav()/NavPropertyETKeyNavOne/$ref")
         .isKind(UriInfoKind.resource).goPath()
@@ -331,7 +334,7 @@ public class TestFullResourcePath {
         .n()
         .isFunction("BFCESTwoKeyNavRTTwoKeyNav")
         .n()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false)
         .n()
         .isUriPathInfoKind(UriResourceKind.ref);
 
@@ -342,7 +345,7 @@ public class TestFullResourcePath {
         .n()
         .isFunction("BFCESKeyNavRTETKeyNav")
         .n()
-        .isNavProperty("NavPropertyETMediaOne", EdmTechProvider.nameETMedia, false)
+        .isNavProperty("NavPropertyETMediaOne", EntityTypeProvider.nameETMedia, false)
         .n()
         .isValue();
 
@@ -355,7 +358,7 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNavParam")
         .isParameter(0, "ParameterString", "'1'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false);
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESKeyNavRTETKeyNavParam(ParameterString='1')"
         + "/NavPropertyETTwoKeyNavOne/PropertyComplex")
@@ -366,10 +369,10 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNavParam")
         .isParameter(0, "ParameterString", "'1'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false)
         .n()
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp);
+        .isType(ComplexTypeProvider.nameCTPrimComp);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESKeyNavRTETKeyNavParam(ParameterString='1')"
         + "/NavPropertyETTwoKeyNavOne/PropertyComplex/PropertyComplex")
@@ -380,13 +383,13 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNavParam")
         .isParameter(0, "ParameterString", "'1'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false)
         .n()
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp)
+        .isType(ComplexTypeProvider.nameCTPrimComp)
         .n()
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTAllPrim);
+        .isType(ComplexTypeProvider.nameCTAllPrim);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESKeyNavRTETKeyNavParam(ParameterString='1')"
         + "/NavPropertyETTwoKeyNavOne/PropertyString")
@@ -397,9 +400,9 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNavParam")
         .isParameter(0, "ParameterString", "'1'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false)
         .n()
-        .isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false);
+        .isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESKeyNavRTETKeyNavParam(ParameterString='1')"
         + "/NavPropertyETTwoKeyNavMany(PropertyInt16=2,PropertyString='3')/PropertyString")
@@ -410,11 +413,11 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNavParam")
         .isParameter(0, "ParameterString", "'1'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
-        .isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false);
+        .isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false);
   }
 
   @Test
@@ -427,9 +430,9 @@ public class TestFullResourcePath {
         .n()
         .isFunction("BFCESTwoKeyNavRTTwoKeyNav")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false)
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav);
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav);
 
     testUri
         .run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav()(PropertyInt16=1,PropertyString='2')"
@@ -439,13 +442,13 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false)
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
-        .isTypeFilterOnEntry(EdmTechProvider.nameETTwoBaseTwoKeyNav);
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETTwoBaseTwoKeyNav);
 
   }
 
@@ -460,7 +463,7 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNav")
         .n()
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTNavFiveProp);
+        .isType(ComplexTypeProvider.nameCTNavFiveProp);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESKeyNavRTETKeyNav()/PropertyComplex/PropertyInt16")
         .isKind(UriInfoKind.resource).goPath()
@@ -470,9 +473,9 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNav")
         .n()
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTNavFiveProp)
+        .isType(ComplexTypeProvider.nameCTNavFiveProp)
         .n()
-        .isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false);
+        .isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESKeyNavRTETKeyNav()/PropertyComplex/PropertyInt16/$value")
         .isKind(UriInfoKind.resource).goPath()
@@ -482,9 +485,9 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNav")
         .n()
         .isComplex("PropertyComplex")
-        .isType(EdmTechProvider.nameCTNavFiveProp)
+        .isType(ComplexTypeProvider.nameCTNavFiveProp)
         .n()
-        .isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false)
+        .isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false)
         .n()
         .isValue();
 
@@ -503,8 +506,8 @@ public class TestFullResourcePath {
         .isParameter(0, "ParameterString", "'1'")
         .n()
         .isComplex("PropertyComplexTwoPrim")
-        .isType(EdmTechProvider.nameCTTwoPrim)
-        .isTypeFilter(EdmTechProvider.nameCTTwoBase);
+        .isType(ComplexTypeProvider.nameCTTwoPrim)
+        .isTypeFilter(ComplexTypeProvider.nameCTTwoBase);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESKeyNavRTETKeyNavParam(ParameterString='1')"
         + "/NavPropertyETTwoKeyNavMany(PropertyInt16=2,PropertyString='3')"
@@ -516,13 +519,13 @@ public class TestFullResourcePath {
         .isFunction("BFCESKeyNavRTETKeyNavParam")
         .isParameter(0, "ParameterString", "'1'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
         .isComplex("PropertyComplexTwoPrim")
-        .isType(EdmTechProvider.nameCTTwoPrim)
-        .isTypeFilter(EdmTechProvider.nameCTTwoBase);
+        .isType(ComplexTypeProvider.nameCTTwoPrim)
+        .isTypeFilter(ComplexTypeProvider.nameCTTwoBase);
   }
 
   @Test
@@ -534,7 +537,7 @@ public class TestFullResourcePath {
         .n()
         .isFunction("BFCESKeyNavRTETKeyNav")
         .n()
-        .isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false);
+        .isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESKeyNavRTETKeyNav()/PropertyInt16/$value")
         .isKind(UriInfoKind.resource).goPath()
@@ -543,7 +546,7 @@ public class TestFullResourcePath {
         .n()
         .isFunction("BFCESKeyNavRTETKeyNav")
         .n()
-        .isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false)
+        .isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false)
         .n()
         .isValue();
 
@@ -558,7 +561,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
 
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav(ParameterString='2')")
         .isKind(UriInfoKind.resource).goPath()
@@ -567,7 +570,7 @@ public class TestFullResourcePath {
         .n()
         .isFunction("BFCESTwoKeyNavRTESTwoKeyNav")
         .isParameter(0, "ParameterString", "'2'")
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav()")
         .isKind(UriInfoKind.resource).goPath()
@@ -575,7 +578,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
 
     testUri.run("ESKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav(ParameterString='3')")
         .isKind(UriInfoKind.resource).goPath()
@@ -584,7 +587,7 @@ public class TestFullResourcePath {
         .n()
         .isFunction("BFCESTwoKeyNavRTESTwoKeyNav")
         .isParameter(0, "ParameterString", "'3'")
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
 
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav()/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -592,7 +595,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
         .n()
         .isCount();
 
@@ -618,7 +621,7 @@ public class TestFullResourcePath {
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
         .isComplex("CollPropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp)
+        .isType(ComplexTypeProvider.nameCTPrimComp)
         .n()
         .isFunction("BFCCollCTPrimCompRTESAllPrim")
         .n()
@@ -641,7 +644,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTString")
-        .isType(EdmTechProvider.nameString)
+        .isType(PropertyProvider.nameString)
         .n()
         .isValue();
   }
@@ -654,7 +657,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTCollString")
-        .isType(EdmTechProvider.nameString, true);
+        .isType(PropertyProvider.nameString, true);
 
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTCollString()/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -662,7 +665,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .n()
         .isFunction("BFCESTwoKeyNavRTCollString")
-        .isType(EdmTechProvider.nameString, true)
+        .isType(PropertyProvider.nameString, true)
         .n()
         .isCount();
   }
@@ -675,10 +678,10 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isPrimitiveProperty("CollPropertyString", EdmTechProvider.nameString, true)
+        .isPrimitiveProperty("CollPropertyString", PropertyProvider.nameString, true)
         .n()
         .isFunction("BFCCollStringRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, true);
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true);
 
     testUri.run("ESKeyNav(1)/CollPropertyString/com.sap.odata.test1.BFCCollStringRTESTwoKeyNav()/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -686,10 +689,10 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isPrimitiveProperty("CollPropertyString", EdmTechProvider.nameString, true)
+        .isPrimitiveProperty("CollPropertyString", PropertyProvider.nameString, true)
         .n()
         .isFunction("BFCCollStringRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
         .n()
         .isCount();
   }
@@ -703,10 +706,10 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false)
+        .isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false)
         .n()
         .isFunction("BFCStringRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, true);
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true);
 
     testUri.run("ESKeyNav(1)/PropertyString/com.sap.odata.test1.BFCStringRTESTwoKeyNav()/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -714,10 +717,10 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false)
+        .isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false)
         .n()
         .isFunction("BFCStringRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
         .n()
         .isCount();
 
@@ -727,10 +730,10 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false)
+        .isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false)
         .n()
         .isFunction("BFCStringRTESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
         .n()
         .isRef();
   }
@@ -742,7 +745,7 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .n()
         .isFunction("BFCSINavRTESTwoKeyNav");
   }
@@ -753,8 +756,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
-        .isTypeFilter(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
+        .isTypeFilter(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isFunction("BFCETBaseTwoKeyNavRTESBaseTwoKey");
   }
@@ -798,20 +801,20 @@ public class TestFullResourcePath {
         .goPath()
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
-        .isType(EdmTechProvider.nameETAllPrim, false)
+        .isType(EntityTypeProvider.nameETAllPrim, false)
         .at(1)
         .isUriPathInfoKind(UriResourceKind.primitiveProperty)
-        .isType(EdmTechProvider.nameString);
+        .isType(PropertyProvider.nameString);
 
     // on collection of primitive
     testUri.run("ESCollAllPrim(1)/CollPropertyString/com.sap.odata.test1.BFCCollStringRTESTwoKeyNav()")
         .goPath()
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
-        .isType(EdmTechProvider.nameETCollAllPrim, false)
+        .isType(EntityTypeProvider.nameETCollAllPrim, false)
         .at(1)
         .isUriPathInfoKind(UriResourceKind.primitiveProperty)
-        .isType(EdmTechProvider.nameString);
+        .isType(PropertyProvider.nameString);
 
     // on complex
     testUri.run("ESTwoKeyNav(ParameterInt16=1,PropertyString='ABC')"
@@ -819,11 +822,11 @@ public class TestFullResourcePath {
         .goPath()
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .at(1)
         .isUriPathInfoKind(UriResourceKind.complexProperty)
         .at(2)
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
 
     // on collection of complex
     testUri.run("ESKeyNav(1)/CollPropertyComplex/com.sap.odata.test1.BFCCollCTPrimCompRTESAllPrim()")
@@ -831,10 +834,10 @@ public class TestFullResourcePath {
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
         .at(1)
-        .isType(EdmTechProvider.nameCTPrimComp, true)
+        .isType(ComplexTypeProvider.nameCTPrimComp, true)
         .at(2)
         .isUriPathInfoKind(UriResourceKind.function)
-        .isType(EdmTechProvider.nameETAllPrim);
+        .isType(EntityTypeProvider.nameETAllPrim);
 
     // on entity
     testUri.run("ESTwoKeyNav(ParameterInt16=1,PropertyString='ABC')"
@@ -842,19 +845,19 @@ public class TestFullResourcePath {
         .goPath()
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .at(1)
         .isUriPathInfoKind(UriResourceKind.function)
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
 
     // on collection of entity
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.BFCESTwoKeyNavRTESTwoKeyNav()")
         .goPath()
         .at(0)
         .isUriPathInfoKind(UriResourceKind.entitySet)
-        .isType(EdmTechProvider.nameETTwoKeyNav, true)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, true)
         .at(1).isUriPathInfoKind(UriResourceKind.function)
-        .isType(EdmTechProvider.nameETTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav);
   }
 
   @Test
@@ -867,7 +870,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isAction("BAETBaseTwoKeyNavRTETBaseTwoKeyNav");
 
@@ -876,10 +879,10 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETTwoBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETTwoBaseTwoKeyNav)
         .n()
         .isAction("BAETTwoBaseTwoKeyNavRTETBaseTwoKeyNav");
   }
@@ -910,7 +913,7 @@ public class TestFullResourcePath {
         .isIdText("ESKeyNav(1)");
     testUri.run("$entity/com.sap.odata.test1.ETKeyNav?$id=ESKeyNav(1)")
         .isKind(UriInfoKind.entityId)
-        .isEntityType(EdmTechProvider.nameETKeyNav)
+        .isEntityType(EntityTypeProvider.nameETKeyNav)
         .isIdText("ESKeyNav(1)");
   }
 
@@ -929,13 +932,13 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESAllPrim")
-        .isType(EdmTechProvider.nameETAllPrim, true);
+        .isType(EntityTypeProvider.nameETAllPrim, true);
 
     testUri.run("ESAllPrim/$count")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESAllPrim")
-        .isType(EdmTechProvider.nameETAllPrim, true)
+        .isType(EntityTypeProvider.nameETAllPrim, true)
         .n()
         .isCount();
   }
@@ -988,32 +991,32 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim, true)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBase);
+        .isType(EntityTypeProvider.nameETTwoPrim, true)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBase);
 
     testUri.run("ESTwoPrim/com.sap.odata.test1.ETBase(-32768)/com.sap.odata.test1.ETTwoBase")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim, false)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBase)
+        .isType(EntityTypeProvider.nameETTwoPrim, false)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBase)
         .isKeyPredicate(0, "PropertyInt16", "-32768")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETTwoBase);
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETTwoBase);
 
     testUri.run("ESTwoPrim/com.sap.odata.test1.ETTwoBase(-32768)")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim, false)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETTwoBase)
+        .isType(EntityTypeProvider.nameETTwoPrim, false)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETTwoBase)
         .isKeyPredicate(0, "PropertyInt16", "-32768");
 
     testUri.run("ESTwoPrim/Namespace1_Alias.ETTwoBase(-32768)")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim, false)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETTwoBase)
+        .isType(EntityTypeProvider.nameETTwoPrim, false)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETTwoBase)
         .isKeyPredicate(0, "PropertyInt16", "-32768");
 
   }
@@ -1025,26 +1028,26 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
-        .isPrimitiveProperty("PropertyDate", EdmTechProvider.nameDate, false);
+        .isPrimitiveProperty("PropertyDate", PropertyProvider.nameDate, false);
 
     testUri.run("ESTwoKeyNav(PropertyInt16=1,PropertyString='2')/com.sap.odata.test1.ETBaseTwoKeyNav"
         + "/PropertyComplex/PropertyInt16")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplex")
         .n()
-        .isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false);
+        .isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false);
   }
 
   @Test
@@ -1118,48 +1121,48 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim)
+        .isType(EntityTypeProvider.nameETTwoPrim)
         .isKeyPredicate(0, "PropertyInt16", "1")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBase);
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBase);
 
     testUri.run("ESTwoPrim(1)/com.sap.odata.test1.ETTwoBase")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim)
+        .isType(EntityTypeProvider.nameETTwoPrim)
         .isKeyPredicate(0, "PropertyInt16", "1")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETTwoBase);
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETTwoBase);
 
     testUri.run("ESTwoPrim/com.sap.odata.test1.ETBase(1)")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim)
+        .isType(EntityTypeProvider.nameETTwoPrim)
         .isKeyPredicate(0, "PropertyInt16", "1")
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBase);
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBase);
 
     testUri.run("ESTwoPrim/com.sap.odata.test1.ETTwoBase(1)")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim)
+        .isType(EntityTypeProvider.nameETTwoPrim)
         .isKeyPredicate(0, "PropertyInt16", "1")
-        .isTypeFilterOnCollection(EdmTechProvider.nameETTwoBase);
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETTwoBase);
 
     testUri.run("ESTwoPrim/com.sap.odata.test1.ETBase(1)/com.sap.odata.test1.ETTwoBase")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim)
+        .isType(EntityTypeProvider.nameETTwoPrim)
         .isKeyPredicate(0, "PropertyInt16", "1")
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBase);
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBase);
 
     testUri.run("ESTwoPrim/com.sap.odata.test1.ETTwoBase")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoPrim")
-        .isType(EdmTechProvider.nameETTwoPrim)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETTwoBase);
+        .isType(EntityTypeProvider.nameETTwoPrim)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETTwoBase);
   }
 
   @Test
@@ -1168,17 +1171,17 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav);
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav);
 
     testUri.run("ESTwoKeyNav/com.sap.odata.test1.ETBaseTwoKeyNav(PropertyInt16=1,PropertyString='2')")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'");
   }
@@ -1215,27 +1218,27 @@ public class TestFullResourcePath {
         .isKeyPredicate(0, "PropertyInt16", "5")
         .n()
         .isComplex("CollPropertyComplex")
-        .isType(EdmTechProvider.nameCTTwoPrim, true);
+        .isType(ComplexTypeProvider.nameCTTwoPrim, true);
 
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavOne/CollPropertyComplex")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESKeyNav")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false)
         .n()
         .isComplex("CollPropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, true);
+        .isType(ComplexTypeProvider.nameCTPrimComp, true);
 
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavOne/CollPropertyComplex/$count")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESKeyNav")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false)
         .n()
         .isComplex("CollPropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, true)
+        .isType(ComplexTypeProvider.nameCTPrimComp, true)
         .n()
         .isCount();
   }
@@ -1248,8 +1251,8 @@ public class TestFullResourcePath {
         .isEntitySet("ESTwoKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplex");
 
@@ -1259,8 +1262,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
         .n()
@@ -1274,15 +1277,15 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
 
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplexTwoPrim")
-        .isType(EdmTechProvider.nameCTTwoPrim)
-        .isTypeFilter(EdmTechProvider.nameCTBase);
+        .isType(ComplexTypeProvider.nameCTTwoPrim)
+        .isTypeFilter(ComplexTypeProvider.nameCTBase);
 
     testUri
         .run("ESTwoKeyNav(PropertyInt16=1,PropertyString='2')/com.sap.odata.test1.ETBaseTwoKeyNav"
@@ -1290,14 +1293,14 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplexTwoPrim")
-        .isType(EdmTechProvider.nameCTTwoPrim)
-        .isTypeFilter(EdmTechProvider.nameCTTwoBase);
+        .isType(ComplexTypeProvider.nameCTTwoPrim)
+        .isTypeFilter(ComplexTypeProvider.nameCTTwoBase);
   }
 
   @Test
@@ -1308,7 +1311,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, true);
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, true);
 
     testUri.run("ESKeyNav(1)/NavPropertyETKeyNavMany(2)")
         .isKind(UriInfoKind.resource).goPath()
@@ -1316,7 +1319,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2");
 
     testUri.run("ESKeyNav(PropertyInt16=1)/NavPropertyETKeyNavMany(PropertyInt16=2)")
@@ -1325,7 +1328,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2");
 
     testUri.run("ESKeyNav(1)/NavPropertyETKeyNavMany(2)/PropertyInt16")
@@ -1334,10 +1337,10 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .n()
-        .isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false);
+        .isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false);
 
     testUri.run("ESKeyNav(1)/NavPropertyETKeyNavMany(2)/PropertyComplex")
         .isKind(UriInfoKind.resource).goPath()
@@ -1345,7 +1348,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .n()
         .isComplex("PropertyComplex");
@@ -1356,10 +1359,10 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .n()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false);
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false);
 
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavMany(PropertyInt16=2,PropertyString='3')"
         + "/NavPropertyETKeyNavMany(4)")
@@ -1368,11 +1371,11 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "4");
 
     testUri.run("ESKeyNav(1)/PropertyComplex/NavPropertyETTwoKeyNavOne")
@@ -1383,7 +1386,7 @@ public class TestFullResourcePath {
         .n()
         .isComplex("PropertyComplex")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false);
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false);
 
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavMany(PropertyInt16=2,PropertyString='(3)')"
         + "/PropertyComplex/PropertyComplex/PropertyInt16")
@@ -1392,7 +1395,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'(3)'")
         .n()
@@ -1400,7 +1403,7 @@ public class TestFullResourcePath {
         .n()
         .isComplex("PropertyComplex")
         .n()
-        .isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false);
+        .isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false);
 
     testUri.run("ESKeyNav(1)/NavPropertyETMediaMany(2)/$value")
         .isKind(UriInfoKind.resource).goPath()
@@ -1408,7 +1411,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETMediaMany", EdmTechProvider.nameETMedia, false)
+        .isNavProperty("NavPropertyETMediaMany", EntityTypeProvider.nameETMedia, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .n()
         .isValue();
@@ -1420,13 +1423,13 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false)
         .n()
-        .isNavProperty("NavPropertyETMediaOne", EdmTechProvider.nameETMedia, false)
+        .isNavProperty("NavPropertyETMediaOne", EntityTypeProvider.nameETMedia, false)
         .n()
         .isValue();
 
@@ -1437,11 +1440,11 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false)
         .n()
         .isRef();
   }
@@ -1453,24 +1456,24 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true);
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true);
 
     testUri.run("ESTwoKeyNav(PropertyInt16=1,PropertyString='2')/com.sap.odata.test1.ETBaseTwoKeyNav"
         + "/NavPropertyETKeyNavMany(3)")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "3");
 
     testUri.run("ESTwoKeyNav(PropertyInt16=1,PropertyString='2')/com.sap.odata.test1.ETBaseTwoKeyNav"
@@ -1478,15 +1481,15 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isEntitySet("ESTwoKeyNav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "3")
         .isKeyPredicate(1, "PropertyString", "'4'")
-        .isTypeFilterOnCollection(EdmTechProvider.nameETTwoBaseTwoKeyNav);
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETTwoBaseTwoKeyNav);
 
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavMany(PropertyInt16=2,PropertyString='3')"
         + "/NavPropertyETTwoKeyNavMany/com.sap.odata.test1.ETBaseTwoKeyNav(PropertyInt16=4,PropertyString='5')"
@@ -1496,18 +1499,18 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "4")
         .isKeyPredicate(1, "PropertyString", "'5'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETTwoBaseTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETTwoBaseTwoKeyNav)
         .n()
-        .isNavProperty("NavPropertyETBaseTwoKeyNavMany", EdmTechProvider.nameETBaseTwoKeyNav, true);
+        .isNavProperty("NavPropertyETBaseTwoKeyNavMany", EntityTypeProvider.nameETBaseTwoKeyNav, true);
 
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavMany(PropertyInt16=2,PropertyString='3')/"
         + "NavPropertyETTwoKeyNavMany/com.sap.odata.test1.ETBaseTwoKeyNav(PropertyInt16=4,PropertyString='5')/"
@@ -1517,16 +1520,16 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "4")
         .isKeyPredicate(1, "PropertyString", "'5'")
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true);
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true);
   }
 
   @Test
@@ -1537,7 +1540,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicateRef(0, "PropertyInt16", "PropertyInt16")
         .isKeyPredicate(1, "PropertyString", "'2'");
 
@@ -1546,7 +1549,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicateRef(0, "PropertyInt16", "PropertyInt16")
         .isKeyPredicate(1, "PropertyString", "'2'");
 
@@ -1560,7 +1563,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESAllPrim")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isPrimitiveProperty("PropertyByte", EdmTechProvider.nameByte, false);
+        .isPrimitiveProperty("PropertyByte", PropertyProvider.nameByte, false);
 
     testUri.run("ESAllPrim(1)/PropertyByte/$value")
         .isKind(UriInfoKind.resource).goPath()
@@ -1568,7 +1571,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESAllPrim")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isPrimitiveProperty("PropertyByte", EdmTechProvider.nameByte, false)
+        .isPrimitiveProperty("PropertyByte", PropertyProvider.nameByte, false)
         .n()
         .isValue();
 
@@ -1580,7 +1583,7 @@ public class TestFullResourcePath {
         .n()
         .isComplex("PropertyComplex")
         .n()
-        .isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false);
+        .isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false);
   }
 
   @Test
@@ -1591,7 +1594,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESCollAllPrim")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isPrimitiveProperty("CollPropertyString", EdmTechProvider.nameString, true);
+        .isPrimitiveProperty("CollPropertyString", PropertyProvider.nameString, true);
 
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavMany(PropertyInt16=2,PropertyString='3')/CollPropertyString")
         .isKind(UriInfoKind.resource).goPath()
@@ -1599,9 +1602,9 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .n()
-        .isPrimitiveProperty("CollPropertyString", EdmTechProvider.nameString, true);
+        .isPrimitiveProperty("CollPropertyString", PropertyProvider.nameString, true);
 
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavMany(PropertyInt16=2,PropertyString='3')/CollPropertyString/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -1609,11 +1612,11 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
-        .isPrimitiveProperty("CollPropertyString", EdmTechProvider.nameString, true)
+        .isPrimitiveProperty("CollPropertyString", PropertyProvider.nameString, true)
         .n()
         .isCount();
 
@@ -1641,7 +1644,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, true)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, true)
         .n()
         .isRef();
     testUri.run("ESKeyNav(1)/NavPropertyETTwoKeyNavMany(PropertyInt16=1,PropertyString='2')/$ref")
@@ -1650,7 +1653,7 @@ public class TestFullResourcePath {
         .isEntitySet("ESKeyNav")
         .isKeyPredicate(0, "PropertyInt16", "1")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'")
         .n()
@@ -1673,8 +1676,8 @@ public class TestFullResourcePath {
         .isFunctionImport("FICRTETTwoKeyNavParam")
         .isFunction("UFCRTETTwoKeyNavParam")
         .isParameter(0, "ParameterInt16", "1")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isFunction("BFCETBaseTwoKeyNavRTETTwoKeyNav");
 
@@ -1686,8 +1689,8 @@ public class TestFullResourcePath {
         .isFunctionImport("FICRTESTwoKeyNavParam")
         .isFunction("UFCRTESTwoKeyNavParam")
         .isParameter(0, "ParameterInt16", "1")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
         .n()
@@ -1702,7 +1705,7 @@ public class TestFullResourcePath {
         .first()
         .isFunctionImport("FICRTETKeyNav")
         .isFunction("UFCRTETKeyNav")
-        .isType(EdmTechProvider.nameETKeyNav);
+        .isType(EntityTypeProvider.nameETKeyNav);
 
     testUri.run("FICRTETTwoKeyNavParam(ParameterInt16=1)(PropertyInt16=2,PropertyString='3')")
         .isKind(UriInfoKind.resource).goPath()
@@ -1741,8 +1744,8 @@ public class TestFullResourcePath {
         .isFunctionImport("FICRTETTwoKeyNavParam")
         .isFunction("UFCRTETTwoKeyNavParam")
         .isParameter(0, "ParameterInt16", "1")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav);
 
     testUri.run("FICRTETTwoKeyNavParam(ParameterInt16=1)(PropertyInt16=2,PropertyString='3')"
         + "/com.sap.odata.test1.ETBaseTwoKeyNav")
@@ -1753,8 +1756,8 @@ public class TestFullResourcePath {
         .isParameter(0, "ParameterInt16", "1")
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnEntry(EdmTechProvider.nameETBaseTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETBaseTwoKeyNav);
 
     testUri.run("FICRTESTwoKeyNavParam(ParameterInt16=1)"
         + "/com.sap.odata.test1.ETBaseTwoKeyNav(PropertyInt16=2,PropertyString='3')")
@@ -1763,8 +1766,8 @@ public class TestFullResourcePath {
         .isFunctionImport("FICRTESTwoKeyNavParam")
         .isFunction("UFCRTESTwoKeyNavParam")
         .isParameter(0, "ParameterInt16", "1")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'");
   }
@@ -1779,7 +1782,7 @@ public class TestFullResourcePath {
         .isFunction("UFCRTESMixPrimCollCompTwoParam")
         .isParameter(0, "ParameterInt16", "1")
         .isParameter(1, "ParameterString", "'2'")
-        .isType(EdmTechProvider.nameETMixPrimCollComp);
+        .isType(EntityTypeProvider.nameETMixPrimCollComp);
 
     testUri.run("FINRTESMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='2')")
         .isKind(UriInfoKind.resource).goPath()
@@ -1788,7 +1791,7 @@ public class TestFullResourcePath {
         .isFunction("UFNRTESMixPrimCollCompTwoParam")
         .isParameter(0, "ParameterInt16", "1")
         .isParameter(1, "ParameterString", "'2'")
-        .isType(EdmTechProvider.nameETMixPrimCollComp);
+        .isType(EntityTypeProvider.nameETMixPrimCollComp);
 
     testUri.run("FICRTESMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='2')/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -1797,7 +1800,7 @@ public class TestFullResourcePath {
         .isFunction("UFCRTESMixPrimCollCompTwoParam")
         .isParameter(0, "ParameterInt16", "1")
         .isParameter(1, "ParameterString", "'2'")
-        .isType(EdmTechProvider.nameETMixPrimCollComp)
+        .isType(EntityTypeProvider.nameETMixPrimCollComp)
         .n()
         .isCount();
   }
@@ -1825,8 +1828,8 @@ public class TestFullResourcePath {
         .isFunctionImport("FICRTESTwoKeyNavParam")
         .isFunction("UFCRTESTwoKeyNavParam")
         .isParameter(0, "ParameterInt16", "1")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav);
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav);
 
     testUri.run("FICRTESTwoKeyNavParam(ParameterInt16=1)/com.sap.odata.test1.ETBaseTwoKeyNav/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -1834,8 +1837,8 @@ public class TestFullResourcePath {
         .isFunctionImport("FICRTESTwoKeyNavParam")
         .isFunction("UFCRTESTwoKeyNavParam")
         .isParameter(0, "ParameterInt16", "1")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isCount();
 
@@ -1846,8 +1849,8 @@ public class TestFullResourcePath {
         .isFunctionImport("FICRTESTwoKeyNavParam")
         .isFunction("UFCRTESTwoKeyNavParam")
         .isParameter(0, "ParameterInt16", "1")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'");
 
@@ -1859,11 +1862,11 @@ public class TestFullResourcePath {
         .isFunctionImport("FICRTESTwoKeyNavParam")
         .isFunction("UFCRTESTwoKeyNavParam")
         .isParameter(0, "ParameterInt16", "1")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilterOnCollection(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilterOnCollection(EntityTypeProvider.nameETBaseTwoKeyNav)
         .isKeyPredicate(0, "PropertyInt16", "2")
         .isKeyPredicate(1, "PropertyString", "'3'")
-        .isTypeFilterOnEntry(EdmTechProvider.nameETTwoBaseTwoKeyNav);
+        .isTypeFilterOnEntry(EntityTypeProvider.nameETTwoBaseTwoKeyNav);
 
   }
 
@@ -1882,19 +1885,19 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilter(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilter(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true);
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true);
 
     testUri.run("SINav/com.sap.odata.test1.ETBaseTwoKeyNav/NavPropertyETKeyNavMany(1)")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilter(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilter(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1");
 
   }
@@ -1905,8 +1908,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilter(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilter(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplex");
 
@@ -1914,8 +1917,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilter(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilter(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplex")
         .n()
@@ -1925,12 +1928,12 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilter(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilter(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
         .isComplex("PropertyComplexTwoPrim")
-        .isType(EdmTechProvider.nameCTTwoPrim)
-        .isTypeFilter(EdmTechProvider.nameCTBase);
+        .isType(ComplexTypeProvider.nameCTTwoPrim)
+        .isTypeFilter(ComplexTypeProvider.nameCTBase);
 
   }
 
@@ -1940,20 +1943,20 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilter(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilter(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
-        .isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false);
+        .isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false);
 
     testUri.run("SINav/com.sap.odata.test1.ETBaseTwoKeyNav/CollPropertyString")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
-        .isType(EdmTechProvider.nameETTwoKeyNav)
-        .isTypeFilter(EdmTechProvider.nameETBaseTwoKeyNav)
+        .isType(EntityTypeProvider.nameETTwoKeyNav)
+        .isTypeFilter(EntityTypeProvider.nameETBaseTwoKeyNav)
         .n()
-        .isPrimitiveProperty("CollPropertyString", EdmTechProvider.nameString, true)
-        .isType(EdmTechProvider.nameString, true);
+        .isPrimitiveProperty("CollPropertyString", PropertyProvider.nameString, true)
+        .isType(PropertyProvider.nameString, true);
 
   }
 
@@ -1964,14 +1967,14 @@ public class TestFullResourcePath {
         .first()
         .isSingleton("SINav")
         .n()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true);
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true);
 
     testUri.run("SINav/NavPropertyETTwoKeyNavMany(PropertyInt16=1,PropertyString='2')")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
         .n()
-        .isNavProperty("NavPropertyETTwoKeyNavMany", EdmTechProvider.nameETTwoKeyNav, false)
+        .isNavProperty("NavPropertyETTwoKeyNavMany", EntityTypeProvider.nameETTwoKeyNav, false)
         .isKeyPredicate(0, "PropertyInt16", "1")
         .isKeyPredicate(1, "PropertyString", "'2'");
 
@@ -2005,7 +2008,7 @@ public class TestFullResourcePath {
         .isSingleton("SINav")
         .n()
         .isComplex("CollPropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, true);
+        .isType(ComplexTypeProvider.nameCTPrimComp, true);
 
     testUri.run("SINav/CollPropertyComplex/$count")
         .isKind(UriInfoKind.resource).goPath()
@@ -2013,7 +2016,7 @@ public class TestFullResourcePath {
         .isSingleton("SINav")
         .n()
         .isComplex("CollPropertyComplex")
-        .isType(EdmTechProvider.nameCTPrimComp, true)
+        .isType(ComplexTypeProvider.nameCTPrimComp, true)
         .n()
         .isCount();
   }
@@ -2025,7 +2028,7 @@ public class TestFullResourcePath {
         .first()
         .isSingleton("SINav")
         .n()
-        .isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false);
+        .isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false);
   }
 
   @Test
@@ -2036,13 +2039,13 @@ public class TestFullResourcePath {
         .first()
         .isSingleton("SINav")
         .n()
-        .isPrimitiveProperty("CollPropertyString", EdmTechProvider.nameString, true);
+        .isPrimitiveProperty("CollPropertyString", PropertyProvider.nameString, true);
     testUri.run("SINav/CollPropertyString/$count")
         .isKind(UriInfoKind.resource).goPath()
         .first()
         .isSingleton("SINav")
         .n()
-        .isPrimitiveProperty("CollPropertyString", EdmTechProvider.nameString, true)
+        .isPrimitiveProperty("CollPropertyString", PropertyProvider.nameString, true)
         .n()
         .isCount();
   }
@@ -2067,7 +2070,7 @@ public class TestFullResourcePath {
         .isSegmentStar(0).isSegmentRef(1)
         .next()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true);
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true);
 
     testUri.run("ESKeyNav(1)?$expand=*($levels=3)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
@@ -2085,24 +2088,24 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isRef();
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavOne/$ref")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false)
-        .isType(EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false)
+        .isType(EntityTypeProvider.nameETKeyNav, false)
         .n().isRef();
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavMany/$ref($filter=PropertyInt16 eq 1)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isRef()
         .goUpExpandValidator().isFilterSerialized("<<PropertyInt16> eq <1>>");
 
@@ -2110,19 +2113,19 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isRef()
         .goUpExpandValidator()
         .isSortOrder(0, false)
-        .goOrder(0).goPath().isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false);
+        .goOrder(0).goPath().isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false);
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavMany/$ref($skip=1)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isRef()
         .goUpExpandValidator()
         .isSkipText("1");
@@ -2131,8 +2134,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isRef()
         .goUpExpandValidator()
         .isTopText("2");
@@ -2141,8 +2144,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isRef()
         .goUpExpandValidator()
         .isInlineCountText("true");
@@ -2151,8 +2154,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isRef()
         .goUpExpandValidator()
         .isSkipText("1")
@@ -2162,8 +2165,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isRef()
         .goUpExpandValidator()
         .isSkipText("1")
@@ -2173,24 +2176,24 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isCount();
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavOne/$count")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false)
-        .isType(EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false)
+        .isType(EntityTypeProvider.nameETKeyNav, false)
         .n().isCount();
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavMany/$count($filter=PropertyInt16 gt 1)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .n().isCount()
         .goUpExpandValidator()
         .isFilterSerialized("<<PropertyInt16> gt <1>>");
@@ -2199,8 +2202,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .isFilterSerialized("<<PropertyInt16> eq <1>>");
 
@@ -2208,18 +2211,18 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .isSortOrder(0, false)
-        .goOrder(0).goPath().isPrimitiveProperty("PropertyInt16", EdmTechProvider.nameInt16, false);
+        .goOrder(0).goPath().isPrimitiveProperty("PropertyInt16", PropertyProvider.nameInt16, false);
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavMany($skip=1)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .isSkipText("1");
 
@@ -2227,8 +2230,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .isTopText("2");
 
@@ -2236,8 +2239,8 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .isInlineCountText("true");
 
@@ -2245,40 +2248,40 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .isSelectText("PropertyString")
-        .goSelectItem(0).isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false);
+        .goSelectItem(0).isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false);
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavMany($expand=NavPropertyETTwoKeyNavOne)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .goExpand()
         .goPath().first()
-        .isNavProperty("NavPropertyETTwoKeyNavOne", EdmTechProvider.nameETTwoKeyNav, false);
+        .isNavProperty("NavPropertyETTwoKeyNavOne", EntityTypeProvider.nameETTwoKeyNav, false);
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavMany($expand=NavPropertyETKeyNavMany)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .goExpand()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true);
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true);
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavOne($levels=5)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false)
-        .isType(EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false)
+        .isType(EntityTypeProvider.nameETKeyNav, false)
         .goUpExpandValidator()
         .isLevelText("5");
 
@@ -2286,18 +2289,18 @@ public class TestFullResourcePath {
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavMany", EdmTechProvider.nameETKeyNav, true)
-        .isType(EdmTechProvider.nameETKeyNav, true)
+        .isNavProperty("NavPropertyETKeyNavMany", EntityTypeProvider.nameETKeyNav, true)
+        .isType(EntityTypeProvider.nameETKeyNav, true)
         .goUpExpandValidator()
         .isSelectText("PropertyString")
-        .goSelectItem(0).isPrimitiveProperty("PropertyString", EdmTechProvider.nameString, false);
+        .goSelectItem(0).isPrimitiveProperty("PropertyString", PropertyProvider.nameString, false);
 
     testUri.run("ESKeyNav(1)?$expand=NavPropertyETKeyNavOne($levels=max)")
         .isKind(UriInfoKind.resource).goPath().goExpand()
         .first()
         .goPath().first()
-        .isNavProperty("NavPropertyETKeyNavOne", EdmTechProvider.nameETKeyNav, false)
-        .isType(EdmTechProvider.nameETKeyNav, false)
+        .isNavProperty("NavPropertyETKeyNavOne", EntityTypeProvider.nameETKeyNav, false)
+        .isType(EntityTypeProv

<TRUNCATED>

Mime
View raw message