[OLINGO-659] Removed v4 from package and class names

fit/src/main/java/org/apache/olingo/fit/AbstractServices.java

@@ -684,7 +684,7 @@ public abstract class AbstractServices {
 
       final String location;
 
-      if ((this instanceof V4KeyAsSegment)) {
+      if ((this instanceof KeyAsSegment)) {
         location = uriInfo.getRequestUri().toASCIIString() + "/" + entityKey;
 
         final Link editLink = new Link();
@@ -1223,7 +1223,7 @@ public abstract class AbstractServices {
       }
       final Entity entry = container.getPayload();
 
-      if ((this instanceof V4KeyAsSegment)) {
+      if ((this instanceof KeyAsSegment)) {
         final Link editLink = new Link();
         editLink.setRel("edit");
         editLink.setTitle(entitySetName);

fit/src/main/java/org/apache/olingo/fit/Demo.java

@@ -51,9 +51,9 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Path("/V40/Demo.svc")
-public class V4Demo extends V4Services {
+public class Demo extends Services {
 
-  public V4Demo() throws IOException {
+  public Demo() throws IOException {
     super(new Metadata(FSManager.instance(ODataServiceVersion.V40).
         readRes("demo" + StringUtils.capitalize(Constants.get(ConstantKey.METADATA)), Accept.XML)));
   }

fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java

@@ -47,9 +47,9 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Path("/V40/KeyAsSegment.svc")
-public class V4KeyAsSegment extends V4Services {
+public class KeyAsSegment extends Services {
 
-  public V4KeyAsSegment() throws IOException {
+  public KeyAsSegment() throws IOException {
     super();
   }
 

fit/src/main/java/org/apache/olingo/fit/NorthWind.java

@@ -32,9 +32,9 @@ import org.springframework.stereotype.Service;
 @Service
 @Path("/V40/NorthWind.svc")
 @InInterceptors(classes = XHTTPMethodInterceptor.class)
-public class V4NorthWind extends V4Services {
+public class NorthWind extends Services {
 
-  public V4NorthWind() throws IOException {
+  public NorthWind() throws IOException {
     super();
   }
 

fit/src/main/java/org/apache/olingo/fit/NorthWindExt.java

@@ -33,9 +33,9 @@ import org.springframework.stereotype.Service;
 @Service
 @Path("/V40/NorthWindExt.svc")
 @InInterceptors(classes = { XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class })
-public class V4NorthWindExt extends V4Services {
+public class NorthWindExt extends Services {
 
-  public V4NorthWindExt() throws IOException {
+  public NorthWindExt() throws IOException {
     super();
   }
 

fit/src/main/java/org/apache/olingo/fit/OAuth2.java

@@ -26,9 +26,9 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Path("/V40/OAuth2.svc")
-public class V4OAuth2 extends V4Services {
+public class OAuth2 extends Services {
 
-  public V4OAuth2() throws IOException {
+  public OAuth2() throws IOException {
     super();
   }
 

fit/src/main/java/org/apache/olingo/fit/OpenType.java

@@ -50,9 +50,9 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Path("/V40/OpenType.svc")
-public class V4OpenType extends V4Services {
+public class OpenType extends Services {
 
-  public V4OpenType() throws IOException {
+  public OpenType() throws IOException {
     super(new Metadata(FSManager.instance(ODataServiceVersion.V40).
         readRes("openType" + StringUtils.capitalize(Constants.get(ConstantKey.METADATA)), Accept.XML)));
   }

fit/src/main/java/org/apache/olingo/fit/Services.java

@@ -88,7 +88,7 @@ import org.springframework.stereotype.Service;
 @Service
 @Path("/V40/Static.svc")
 @InInterceptors(classes = { XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class })
-public class V4Services extends AbstractServices {
+public class Services extends AbstractServices {
 
   /**
    * CR/LF.
@@ -102,11 +102,11 @@ public class V4Services extends AbstractServices {
 
   private final Map<String, String> providedAsync = new HashMap<String, String>();
 
-  public V4Services() throws IOException {
+  public Services() throws IOException {
     super(ODataServiceVersion.V40, Commons.getMetadata(ODataServiceVersion.V40));
   }
 
-  protected V4Services(final Metadata metadata) throws IOException {
+  protected Services(final Metadata metadata) throws IOException {
     super(ODataServiceVersion.V40, metadata);
   }
 

fit/src/main/java/org/apache/olingo/fit/Vocabularies.java

@@ -38,15 +38,13 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Path("/V40/Vocabularies.svc")
-public class V4Vocabularies {
-
-  private final Metadata metadata;
+public class Vocabularies {
 
   private final XMLUtilities xml;
 
-  public V4Vocabularies() throws IOException {
-    metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readRes(
-        "vocabularies-" + Constants.get(ConstantKey.METADATA), Accept.XML));
+  public Vocabularies() throws IOException {
+    Metadata metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readRes(
+            "vocabularies-" + Constants.get(ConstantKey.METADATA), Accept.XML));
     xml = new XMLUtilities(metadata);
   }
 

fit/src/test/java/org/apache/olingo/fit/base/AbstractTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.startsWith;

fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/base/AuthBatchTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 

fit/src/test/java/org/apache/olingo/fit/base/BatchTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/base/BoundOperationInvokeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/ConformanceTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/base/DeltaTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/DerivedTypeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 

fit/src/test/java/org/apache/olingo/fit/base/EntityCreateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/EntityRetrieveTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/EntitySetTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/EntityUpdateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/ErrorResponseTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

fit/src/test/java/org/apache/olingo/fit/base/FilterFactoryTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 

fit/src/test/java/org/apache/olingo/fit/base/JSONFormatConformanceTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/base/KeyAsSegmentTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/base/MediaEntityTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/base/OAuth2TestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

fit/src/test/java/org/apache/olingo/fit/base/OpenTypeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/OperationImportInvokeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

fit/src/test/java/org/apache/olingo/fit/base/PropertyTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -129,7 +129,8 @@ public class PropertyTestITCase extends AbstractTestITCase {
     complex(client, ContentType.JSON_FULL_METADATA);
   }
 
-  private void updateComplexProperty(final ContentType contentType, final UpdateType type) throws IOException {
+  private void updateComplexProperty(final ContentType contentType, final UpdateType type)
+          throws IOException {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
         appendEntitySetSegment("Customers").appendKeySegment(1).appendPropertySegment("HomeAddress");
 
@@ -139,12 +140,14 @@ public class PropertyTestITCase extends AbstractTestITCase {
 
     ODataRetrieveResponse<ClientProperty> retrieveRes = retrieveReq.execute();
     assertEquals(200, retrieveRes.getStatusCode());
+    ClientProperty oldAddress = retrieveRes.getBody();
 
     ClientProperty homeAddress = client.getObjectFactory().newComplexProperty("HomeAddress",
         client.getObjectFactory().newComplexValue(retrieveRes.getBody().getComplexValue().getTypeName()));
 
+    final String cityName = "Pescara";
     homeAddress.getComplexValue().add(client.getObjectFactory().
-        newPrimitiveProperty("City", client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara")));
+        newPrimitiveProperty("City", client.getObjectFactory().newPrimitiveValueBuilder().buildString(cityName)));
 
     final ODataPropertyUpdateRequest updateReq = client.getCUDRequestFactory().
         getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, homeAddress);
@@ -165,7 +168,12 @@ public class PropertyTestITCase extends AbstractTestITCase {
     assertEquals(200, retrieveRes.getStatusCode());
 
     homeAddress = retrieveRes.getBody();
-    assertEquals("Pescara", homeAddress.getComplexValue().get("City").getPrimitiveValue().toString());
+    assertEquals(cityName, homeAddress.getComplexValue().get("City").getPrimitiveValue().toString());
+
+    //
+    final ODataPropertyUpdateRequest resetRequest = client.getCUDRequestFactory().
+            getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, oldAddress);
+    assertEquals(204, resetRequest.execute().getStatusCode());
   }
 
   @Test

fit/src/test/java/org/apache/olingo/fit/base/PropertyValueTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -75,7 +75,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
   /**
    * Test <tt>$filter</tt> and <tt>$orderby</tt>.
    *
-   * @see org.apache.olingo.fit.v4.FilterFactoryTestITCase for more tests.
+   * @see org.apache.olingo.fit.base.FilterFactoryTestITCase for more tests.
    */
   @Test
   public void filterOrderby() throws EdmPrimitiveTypeException {

fit/src/test/java/org/apache/olingo/fit/base/ServiceDocumentTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 

fit/src/test/java/org/apache/olingo/fit/base/SingletonTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.v4;
+package org.apache.olingo.fit.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

fit/src/test/java/org/apache/olingo/fit/proxy/APIBasicDesignTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -41,27 +41,31 @@ import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.EdmStreamValue;
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
 import org.apache.olingo.ext.proxy.commons.AbstractCollectionInvocationHandler;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollectionComposableInvoker;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.demo.Service;
+import org.apache.olingo.fit.proxy.demo.odatademo.DemoService;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetail;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
+        .ProductCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
+        .ProductDetailCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection;
+
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;
 
@@ -199,7 +203,7 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase {
 
   @Test
   public void loadWithSelect() {
-    org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order order =
+    Order order =
         getContainer().getOrders().getByKey(8);
     assertNull(order.getOrderID());
     assertNull(order.getOrderDate());
@@ -324,8 +328,8 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase {
     // ---------------------------------------
     // Instantiate Demo Service
     // ---------------------------------------
-    final org.apache.olingo.fit.proxy.v4.demo.Service<EdmEnabledODataClient> dservice =
-        org.apache.olingo.fit.proxy.v4.demo.Service.getV4(testDemoServiceRootURL);
+    final Service<EdmEnabledODataClient> dservice =
+        Service.getV4(testDemoServiceRootURL);
     dservice.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
     final DemoService dcontainer = dservice.getEntityContainer(DemoService.class);
     assertNotNull(dcontainer);
@@ -354,8 +358,8 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase {
     // ---------------------------------------
     // Instantiate Demo Service
     // ---------------------------------------
-    final org.apache.olingo.fit.proxy.v4.demo.Service<EdmEnabledODataClient> dservice =
-        org.apache.olingo.fit.proxy.v4.demo.Service.getV4(testDemoServiceRootURL);
+    final Service<EdmEnabledODataClient> dservice =
+        Service.getV4(testDemoServiceRootURL);
     dservice.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
     final DemoService dcontainer = dservice.getEntityContainer(DemoService.class);
     assertNotNull(dcontainer);

fit/src/test/java/org/apache/olingo/fit/proxy/AbstractTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -35,10 +35,10 @@ import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
 import org.apache.olingo.fit.AbstractBaseTestITCase;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
 import org.junit.BeforeClass;
 
 public abstract class AbstractTestITCase extends AbstractBaseTestITCase {

fit/src/test/java/org/apache/olingo/fit/proxy/AsyncTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -27,12 +27,14 @@ import java.util.concurrent.Future;
 
 import org.apache.commons.lang3.RandomStringUtils;
 // CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
+        .PersonComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
+        .ProductCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;

fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
 
 public class AuthEntityCreateTestITCase extends EntityCreateTestITCase {
 

fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
 
 public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase {
 

fit/src/test/java/org/apache/olingo/fit/proxy/BoundOperationInvokeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import static org.junit.Assert.assertEquals;
@@ -25,16 +25,18 @@ import static org.junit.Assert.assertNotNull;
 import java.sql.Timestamp;
 import java.util.Calendar;
 
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoComposableInvoker;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductComposableInvoker;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollectionComposableInvoker;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
+        .ProductDetailCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductComposableInvoker;
+
 import org.junit.Test;
 // CHECKSTYLE:ON (Maven checkstyle)
 

fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -30,11 +30,11 @@ import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.ext.proxy.api.ODataFlushException;
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
 import org.junit.Test;
 
 public class ContextTestITCase extends AbstractTestITCase {

fit/src/test/java/org/apache/olingo/fit/proxy/DerivedTypeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -26,13 +26,14 @@ import java.sql.Timestamp;
 import java.util.Calendar;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection;
+
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;

fit/src/test/java/org/apache/olingo/fit/proxy/EntityCreateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import static org.junit.Assert.assertEquals;
@@ -34,22 +34,24 @@ import org.apache.commons.lang3.RandomUtils;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection;
+
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
+import org.junit.Assert;
 import org.junit.Test;
 // CHECKSTYLE:ON (Maven checkstyle)
 
@@ -106,13 +108,13 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
     Employee actual = getContainer().getPeople().getByKey(id, Employee.class).load();
     assertNotNull(actual);
     assertEquals(id, actual.getPersonID());
-    assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity());
+    Assert.assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity());
 
     getService().getContext().detachAll();
     actual = getContainer().getPeople().getByKey(id, Employee.class).load();
     assertNotNull(actual);
     assertEquals(id, actual.getPersonID());
-    assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity());
+    Assert.assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity());
 
     getContainer().getPeople().delete(actual.getPersonID());
     getContainer().flush();
@@ -167,9 +169,9 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
     getContainer().flush();
 
     Customer actual = readCustomer(getContainer(), id);
-    assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity());
-    assertEquals(1, actual.getOrders().execute().size());
-    assertEquals(8, actual.getOrders().iterator().next().getOrderID(), 0);
+    Assert.assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity());
+    Assert.assertEquals(1, actual.getOrders().execute().size());
+    Assert.assertEquals(8, actual.getOrders().iterator().next().getOrderID(), 0);
 
     getContainer().getCustomers().delete(actual.getPersonID());
     getContainer().flush();
@@ -248,13 +250,13 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
     assertEquals(id, customer.getPersonID());
 
     Customer actual = readCustomer(getContainer(), id);
-    assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity());
-    assertEquals(1, actual.getOrders().execute().size());
-    assertEquals(id, actual.getOrders().iterator().next().getOrderID());
+    Assert.assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity());
+    Assert.assertEquals(1, actual.getOrders().execute().size());
+    Assert.assertEquals(id, actual.getOrders().iterator().next().getOrderID());
 
     order = getContainer().getOrders().getByKey(id);
     assertNotNull(order);
-    assertEquals(id, order.getCustomerForOrder().load().getPersonID());
+    Assert.assertEquals(id, order.getCustomerForOrder().load().getPersonID());
 
     getContainer().getOrders().delete(actual.getOrders());
     getContainer().flush();
@@ -346,7 +348,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
 
     product = getContainer().getProducts().getByKey(12).load();
     assertEquals("Latte", product.getName());
-    assertEquals(12, product.getDetails().execute().iterator().next().getProductDetailID(), 0);
+    Assert.assertEquals(12, product.getDetails().execute().iterator().next().getProductDetailID(), 0);
   }
 
   @Test

fit/src/test/java/org/apache/olingo/fit/proxy/EntityRetrieveTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -32,22 +32,22 @@ import java.util.TimeZone;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
 // CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;

fit/src/test/java/org/apache/olingo/fit/proxy/EntitySetTestITCase.java

@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -33,7 +34,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
   @Test
   public void count() {
     assertNotNull(container.getOrders());
-    assertEquals(2, container.getOrders().count().longValue());
+    Assert.assertEquals(2, container.getOrders().count().longValue());
   }
 
   @Test

fit/src/test/java/org/apache/olingo/fit/proxy/EntityUpdateTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import static org.junit.Assert.assertEquals;
@@ -35,16 +35,16 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
 import org.junit.Test;
 
 // CHECKSTYLE:ON (Maven checkstyle)

fit/src/test/java/org/apache/olingo/fit/proxy/FilterTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -29,11 +29,11 @@ import java.util.List;
 import org.apache.olingo.ext.proxy.api.Search;
 import org.apache.olingo.ext.proxy.api.Sort;
 // CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.People;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.People;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
 import org.junit.Test;
 
 // CHECKSTYLE:ON (Maven checkstyle)

fit/src/test/java/org/apache/olingo/fit/proxy/KeyAsSegmentTestITCase.java

@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
 import org.junit.Test;
 
 public class KeyAsSegmentTestITCase extends AbstractTestITCase {

fit/src/test/java/org/apache/olingo/fit/proxy/MediaEntityTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -33,9 +33,9 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.ext.proxy.api.EdmStreamValue;
-import org.apache.olingo.fit.proxy.v4.demo.Service;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement;
+import org.apache.olingo.fit.proxy.demo.Service;
+import org.apache.olingo.fit.proxy.demo.odatademo.DemoService;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Advertisement;
 import org.junit.Test;
 
 /**

fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
 
 public class NonTransactionalAuthEntityCreateTestITCase extends EntityCreateTestITCase {
 

fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java

@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
 
 public class NonTransactionalEntityCreateTestITCase extends EntityCreateTestITCase {
 

fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java

@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
 
 public class NonTransactionalEntityUpdateTestITCase extends EntityUpdateTestITCase {
 

fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalMediaEntityTestITCase.java

@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v4.demo.Service;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService;
+import org.apache.olingo.fit.proxy.demo.Service;
+import org.apache.olingo.fit.proxy.demo.odatademo.DemoService;
 
 public class NonTransactionalMediaEntityTestITCase extends MediaEntityTestITCase {
 

fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -33,14 +33,14 @@ import java.util.UUID;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.ext.proxy.api.annotations.EntityType;
-import org.apache.olingo.fit.proxy.v4.opentype.Service;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.DefaultContainer;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.AccountInfo;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Color;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.ContactDetails;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRow;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row;
-import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex;
+import org.apache.olingo.fit.proxy.opentype.Service;
+import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.DefaultContainer;
+import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.AccountInfo;
+import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Color;
+import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails;
+import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow;
+import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row;
+import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

fit/src/test/java/org/apache/olingo/fit/proxy/OperationImportInvokeTestITCase.java

@@ -16,20 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
+        .PersonComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
+        .ProductCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
 // CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
 // CHECKSTYLE:ON (Maven checkstyle)
+import org.junit.Assert;
 import org.junit.Test;
 
 public class OperationImportInvokeTestITCase extends AbstractTestITCase {
@@ -60,7 +63,7 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase {
   @Test
   public void getAllProducts() {
     final ProductCollectionComposableInvoker products = container.operations().getAllProducts();
-    assertEquals(5, products.execute().size());
+    Assert.assertEquals(5, products.execute().size());
   }
 
   @Test

fit/src/test/java/org/apache/olingo/fit/proxy/PropertyTestITCase.java

@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
 import org.apache.olingo.ext.proxy.api.ODataFlushException;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI;
 import org.junit.Test;
 
 /**

fit/src/test/java/org/apache/olingo/fit/proxy/SingletonTestITCase.java

@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.IsBoss;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.IsBoss;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
 import org.junit.Test;
 
 public class SingletonTestITCase extends AbstractTestITCase {

fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java

@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4;
+package org.apache.olingo.fit.proxy;
 
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.api.http.HttpClientException;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v4.staticservice.Service;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.Service;
+import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
 import org.junit.Test;
 
 public class UnauthorizedEntityCreateTestITCase extends AbstractTestITCase {

fit/src/test/java/org/apache/olingo/fit/proxy/demo/Service.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo;
+package org.apache.olingo.fit.proxy.demo;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,6 +26,17 @@ import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.AbstractTerm;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Address;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Advertisement;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Category;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Customer;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Employee;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.FeaturedProduct;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Person;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetail;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Product;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.ProductDetail;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Supplier;
 
 public class Service<C extends EdmEnabledODataClient> extends AbstractService<C> {
 
@@ -89,18 +100,18 @@ public class Service<C extends EdmEnabledODataClient> extends AbstractService<C>
     super(compressedMetadata, metadataETag, version, serviceRoot, transactional);
 
     // CHECKSTYLE:OFF (Maven checkstyle)
-    entityTypes.put("ODataDemo.Customer", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer.class);
-    entityTypes.put("ODataDemo.PersonDetail", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail.class);
-    entityTypes.put("ODataDemo.ProductDetail", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail.class);
-    entityTypes.put("ODataDemo.Employee", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee.class);
-    entityTypes.put("ODataDemo.Product", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.class);
-    entityTypes.put("ODataDemo.Advertisement", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement.class);
-    entityTypes.put("ODataDemo.Category", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category.class);
-    entityTypes.put("ODataDemo.Person", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.class);
-    entityTypes.put("ODataDemo.Supplier", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier.class);
+    entityTypes.put("ODataDemo.Customer", Customer.class);
+    entityTypes.put("ODataDemo.PersonDetail", PersonDetail.class);
+    entityTypes.put("ODataDemo.ProductDetail", ProductDetail.class);
+    entityTypes.put("ODataDemo.Employee", Employee.class);
+    entityTypes.put("ODataDemo.Product", Product.class);
+    entityTypes.put("ODataDemo.Advertisement", Advertisement.class);
+    entityTypes.put("ODataDemo.Category", Category.class);
+    entityTypes.put("ODataDemo.Person", Person.class);
+    entityTypes.put("ODataDemo.Supplier", Supplier.class);
     entityTypes.put("ODataDemo.FeaturedProduct",
-        org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct.class);
-    complexTypes.put("ODataDemo.Address", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address.class);
+        FeaturedProduct.class);
+    complexTypes.put("ODataDemo.Address", Address.class);
     // CHECKSTYLE:ON (Maven checkstyle)
   }
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Advertisements.java

@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Advertisement;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.AdvertisementCollection;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 
 @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Advertisements", container = "ODataDemo.DemoService")
 public interface Advertisements
     extends
-    org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection>,
+    org.apache.olingo.ext.proxy.api.EntitySet<Advertisement, AdvertisementCollection>,
     org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Advertisements>,
-    AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, java.util.UUID, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection> {
+    AbstractEntitySet<Advertisement, java.util.UUID, AdvertisementCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Categories.java

@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Category;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.CategoryCollection;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 
 @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Categories", container = "ODataDemo.DemoService")
 public interface Categories
     extends
-    org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection>,
+    org.apache.olingo.ext.proxy.api.EntitySet<Category, CategoryCollection>,
     org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Categories>,
-    AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection> {
+    AbstractEntitySet<Category, java.lang.Integer, CategoryCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/DemoService.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.io.InputStream;

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/PersonDetails.java

@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetail;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetailCollection;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 
 @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonDetails", container = "ODataDemo.DemoService")
 public interface PersonDetails
     extends
-    org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection>,
+    org.apache.olingo.ext.proxy.api.EntitySet<PersonDetail, PersonDetailCollection>,
     org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<PersonDetails>,
-    AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection> {
+    AbstractEntitySet<PersonDetail, java.lang.Integer, PersonDetailCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Persons.java

@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Person;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonCollection;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 
 @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Persons", container = "ODataDemo.DemoService")
 public interface Persons
     extends
-    org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection>,
+    org.apache.olingo.ext.proxy.api.EntitySet<Person, PersonCollection>,
     org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Persons>,
-    AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection> {
+    AbstractEntitySet<Person, java.lang.Integer, PersonCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/ProductDetails.java

@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.ProductDetail;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.ProductDetailCollection;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 
 @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails", container = "ODataDemo.DemoService")
 public interface ProductDetails
     extends
-    org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection>,
+    org.apache.olingo.ext.proxy.api.EntitySet<ProductDetail, ProductDetailCollection>,
     org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ProductDetails>,
-    AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection> {
+    AbstractEntitySet<ProductDetail, java.lang.Integer, ProductDetailCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Products.java

@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Product;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.ProductCollection;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 
 @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products", container = "ODataDemo.DemoService")
 public interface Products
     extends
-    org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection>,
+    org.apache.olingo.ext.proxy.api.EntitySet<Product, ProductCollection>,
     org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Products>,
-    AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection> {
+    AbstractEntitySet<Product, java.lang.Integer, ProductCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Suppliers.java

@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.Supplier;
+import org.apache.olingo.fit.proxy.demo.odatademo.types.SupplierCollection;
 
 // CHECKSTYLE:ON (Maven checkstyle)
 
 @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Suppliers", container = "ODataDemo.DemoService")
 public interface Suppliers
     extends
-    org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection>,
+    org.apache.olingo.ext.proxy.api.EntitySet<Supplier, SupplierCollection>,
     org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Suppliers>,
-    AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection> {
+    AbstractEntitySet<Supplier, java.lang.Integer, SupplierCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/package-info.java

@@ -16,5 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+package org.apache.olingo.fit.proxy.demo.odatademo;
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Address.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.Annotatable;

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressCollection.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
@@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
 public interface AddressCollection
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection>,
-org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AddressCollection>,
+org.apache.olingo.ext.proxy.api.ComplexCollection<Address, AddressCollection, AddressCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressCollectionComposableInvoker.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 
 public interface AddressCollectionComposableInvoker
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection.Operations> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<AddressCollection, AddressCollection.Operations> {
 
   @Override
   AddressCollectionComposableInvoker select(String... select);

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressComposableInvoker.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Advertisement.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
@@ -85,9 +85,9 @@ public interface Advertisement
       targetContainer = "DemoService",
       targetEntitySet = "Products",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct();
+  FeaturedProduct getFeaturedProduct();
 
-  void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct);
+  void setFeaturedProduct(FeaturedProduct _featuredProduct);
 
   void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream);
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementCollection.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
@@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
 public interface AdvertisementCollection
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AdvertisementCollection>,
+org.apache.olingo.ext.proxy.api.EntityCollection<Advertisement, AdvertisementCollection, AdvertisementCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 
 public interface AdvertisementCollectionComposableInvoker
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection.Operations> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<AdvertisementCollection, AdvertisementCollection.Operations> {
 
   @Override
   AdvertisementCollectionComposableInvoker select(String... select);

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementComposableInvoker.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
@@ -85,9 +85,9 @@ public interface AdvertisementComposableInvoker
       targetContainer = "DemoService",
       targetEntitySet = "Products",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct();
+  FeaturedProduct getFeaturedProduct();
 
-  void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct);
+  void setFeaturedProduct(FeaturedProduct _featuredProduct);
 
   void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream);
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Category.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractOpenType;
@@ -70,9 +70,9 @@ public interface Category
       targetContainer = "DemoService",
       targetEntitySet = "Products",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
+  ProductCollection getProducts();
 
-  void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
+  void setProducts(ProductCollection _products);
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryCollection.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
@@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
 public interface CategoryCollection
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<CategoryCollection>,
+org.apache.olingo.ext.proxy.api.EntityCollection<Category, CategoryCollection, CategoryCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryCollectionComposableInvoker.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 
 public interface CategoryCollectionComposableInvoker
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection.Operations> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<CategoryCollection, CategoryCollection.Operations> {
 
   @Override
   CategoryCollectionComposableInvoker select(String... select);

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryComposableInvoker.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractOpenType;
@@ -71,8 +71,8 @@ public interface CategoryComposableInvoker
       targetContainer = "DemoService",
       targetEntitySet = "Products",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
+  ProductCollection getProducts();
 
-  void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
+  void setProducts(ProductCollection _products);
 
 }

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Customer.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.concurrent.Future;
@@ -32,7 +32,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
     baseType = "ODataDemo.Person")
 public interface Customer
     extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
+        Person {
 
   @Override
   Customer load();
@@ -106,22 +106,22 @@ public interface Customer
       targetContainer = "DemoService",
       targetEntitySet = "PersonDetails",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+  PersonDetail getPersonDetail();
 
   @Override
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+  void setPersonDetail(PersonDetail _personDetail);
 
   @Override
   Operations operations();
 
-  interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Operations {
+  interface Operations extends Person.Operations {
     // No additional methods needed for now.
   }
 
   @Override
   Annotations annotations();
 
-  interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations {
+  interface Annotations extends Person.Annotations {
 
     @Override
     @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerCollection.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
@@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
 public interface CustomerCollection
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<CustomerCollection>,
+org.apache.olingo.ext.proxy.api.EntityCollection<Customer, CustomerCollection, CustomerCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerCollectionComposableInvoker.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 
 public interface CustomerCollectionComposableInvoker
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection.Operations> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<CustomerCollection, CustomerCollection.Operations> {
 
   @Override
   CustomerCollectionComposableInvoker select(String... select);

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerComposableInvoker.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
@@ -85,8 +85,8 @@ public interface CustomerComposableInvoker
       targetContainer = "DemoService",
       targetEntitySet = "PersonDetails",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+  PersonDetail getPersonDetail();
 
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+  void setPersonDetail(PersonDetail _personDetail);
 
 }

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Employee.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.concurrent.Future;
@@ -32,7 +32,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
     baseType = "ODataDemo.Person")
 public interface Employee
     extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
+        Person {
 
   @Override
   Employee load();
@@ -136,22 +136,22 @@ public interface Employee
       targetContainer = "DemoService",
       targetEntitySet = "PersonDetails",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+  PersonDetail getPersonDetail();
 
   @Override
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+  void setPersonDetail(PersonDetail _personDetail);
 
   @Override
   Operations operations();
 
-  interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Operations {
+  interface Operations extends Person.Operations {
     // No additional methods needed for now.
   }
 
   @Override
   Annotations annotations();
 
-  interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations {
+  interface Annotations extends Person.Annotations {
 
     @Override
     @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeCollection.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
@@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
 public interface EmployeeCollection
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<EmployeeCollection>,
+org.apache.olingo.ext.proxy.api.EntityCollection<Employee, EmployeeCollection, EmployeeCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeCollectionComposableInvoker.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 
 public interface EmployeeCollectionComposableInvoker
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection.Operations> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<EmployeeCollection, EmployeeCollection.Operations> {
 
   @Override
   EmployeeCollectionComposableInvoker select(String... select);

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeComposableInvoker.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
@@ -115,8 +115,8 @@ public interface EmployeeComposableInvoker
       targetContainer = "DemoService",
       targetEntitySet = "PersonDetails",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+  PersonDetail getPersonDetail();
 
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+  void setPersonDetail(PersonDetail _personDetail);
 
 }

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProduct.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.concurrent.Future;
@@ -32,7 +32,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key;
     baseType = "ODataDemo.Product")
 public interface FeaturedProduct
     extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product {
+        Product {
 
   @Override
   FeaturedProduct load();
@@ -176,10 +176,10 @@ public interface FeaturedProduct
       targetContainer = "DemoService",
       targetEntitySet = "Categories",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
+  CategoryCollection getCategories();
 
   @Override
-  void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
+  void setCategories(CategoryCollection _categories);
 
   @Override
   @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
@@ -188,10 +188,10 @@ public interface FeaturedProduct
       targetContainer = "DemoService",
       targetEntitySet = "Suppliers",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
+  Supplier getSupplier();
 
   @Override
-  void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
+  void setSupplier(Supplier _supplier);
 
   @Override
   @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
@@ -200,10 +200,10 @@ public interface FeaturedProduct
       targetContainer = "DemoService",
       targetEntitySet = "ProductDetails",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
+  ProductDetail getProductDetail();
 
   @Override
-  void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
+  void setProductDetail(ProductDetail _productDetail);
 
   @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement",
       type = "ODataDemo.Advertisement",
@@ -211,21 +211,21 @@ public interface FeaturedProduct
       targetContainer = "DemoService",
       targetEntitySet = "Advertisements",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement();
+  Advertisement getAdvertisement();
 
-  void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement);
+  void setAdvertisement(Advertisement _advertisement);
 
   @Override
   Operations operations();
 
-  interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Operations {
+  interface Operations extends Product.Operations {
     // No additional methods needed for now.
   }
 
   @Override
   Annotations annotations();
 
-  interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Annotations {
+  interface Annotations extends Product.Annotations {
 
     @Override
     @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductCollection.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
@@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
 public interface FeaturedProductCollection
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<FeaturedProductCollection>,
+org.apache.olingo.ext.proxy.api.EntityCollection<FeaturedProduct, FeaturedProductCollection, FeaturedProductCollection> {
 
   Operations operations();
 

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 
 public interface FeaturedProductCollectionComposableInvoker
     extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection.Operations> {
+    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<FeaturedProductCollection, FeaturedProductCollection.Operations> {
 
   @Override
   FeaturedProductCollectionComposableInvoker select(String... select);

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductComposableInvoker.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
@@ -145,9 +145,9 @@ public interface FeaturedProductComposableInvoker
       targetContainer = "DemoService",
       targetEntitySet = "Categories",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
+  CategoryCollection getCategories();
 
-  void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
+  void setCategories(CategoryCollection _categories);
 
   @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
       type = "ODataDemo.Supplier",
@@ -155,9 +155,9 @@ public interface FeaturedProductComposableInvoker
       targetContainer = "DemoService",
       targetEntitySet = "Suppliers",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
+  Supplier getSupplier();
 
-  void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
+  void setSupplier(Supplier _supplier);
 
   @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
       type = "ODataDemo.ProductDetail",
@@ -165,9 +165,9 @@ public interface FeaturedProductComposableInvoker
       targetContainer = "DemoService",
       targetEntitySet = "ProductDetails",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
+  ProductDetail getProductDetail();
 
-  void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
+  void setProductDetail(ProductDetail _productDetail);
 
   @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement",
       type = "ODataDemo.Advertisement",
@@ -175,8 +175,8 @@ public interface FeaturedProductComposableInvoker
       targetContainer = "DemoService",
       targetEntitySet = "Advertisements",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement();
+  Advertisement getAdvertisement();
 
-  void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement);
+  void setAdvertisement(Advertisement _advertisement);
 
 }

fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Person.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+package org.apache.olingo.fit.proxy.demo.odatademo.types;
 
 // CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
@@ -69,9 +69,9 @@ public interface Person
       targetContainer = "DemoService",
       targetEntitySet = "PersonDetails",
       containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+  PersonDetail getPersonDetail();
 
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+  void setPersonDetail(PersonDetail _personDetail);
 
   Operations operations();