http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java
deleted file mode 100644
index 5b227e1..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v3;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.util.UUID;
-import org.apache.olingo.client.api.v3.EdmEnabledODataClient;
-import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.fit.proxy.v3.primitivekeys.Service;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.TestContext;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle;
-import 
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check basic feed operations.
- */
-public class PrimitiveKeysTestITCase extends AbstractTestITCase {
-
-  @Test
-  public void readPrimitiveKeys() {
-    final Service<EdmEnabledODataClient> testContainerFactory =
-            Service.getV3(testPrimitiveKeysServiceRootURL);
-    testContainerFactory.getClient().getConfiguration().
-            setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM);
-    final TestContext testContainer = 
testContainerFactory.getEntityContainer(TestContext.class);
-    assertNotNull(testContainer);
-
-    final EdmBoolean edmBooleanSet = 
testContainer.getEdmBooleanSet().getByKey(Boolean.TRUE).load();
-    assertEquals(Boolean.TRUE, edmBooleanSet.getId());
-
-    final EdmByte edmByteSet = 
testContainer.getEdmByteSet().getByKey(Short.valueOf("255")).load();
-    assertEquals(Short.valueOf("255"), edmByteSet.getId());
-
-    final EdmDecimal edmDecimalSet =
-            testContainer.getEdmDecimalSet().getByKey(new 
BigDecimal("79228162514264337593543950335")).load();
-    assertEquals(new BigDecimal("79228162514264337593543950335"), 
edmDecimalSet.getId());
-
-    final EdmDouble edmDoubleSet = 
testContainer.getEdmDoubleSet().getByKey(1.7976931348623157E+308D).load();
-    assertEquals(1.7976931348623157E+308D, edmDoubleSet.getId(), 0);
-
-    final EdmSingle edmSingleSet = 
testContainer.getEdmSingleSet().getByKey(3.4028235E+38F).load();
-    assertEquals(3.4028235E+38F, edmSingleSet.getId(), 0);
-
-    final EdmGuid edmGuidSet =
-            
testContainer.getEdmGuidSet().getByKey(UUID.fromString("00000000-0000-0000-0000-000000000000")).load();
-    assertEquals(UUID.fromString("00000000-0000-0000-0000-000000000000"), 
edmGuidSet.getId());
-
-    final EdmInt16 edmInt16Set = 
testContainer.getEdmInt16Set().getByKey(Short.valueOf("32767")).load();
-    assertEquals(Short.valueOf("32767"), edmInt16Set.getId(), 0);
-
-    final EdmInt32 edmInt32Set = 
testContainer.getEdmInt32Set().getByKey(-2147483648).load();
-    assertEquals(-2147483648, edmInt32Set.getId(), 0);
-
-    final EdmInt64 edmInt64Set = 
testContainer.getEdmInt64Set().getByKey(9223372036854775807L).load();
-    assertEquals(9223372036854775807L, edmInt64Set.getId(), 0);
-
-    final EdmString edmStringSet = 
testContainer.getEdmStringSet().getByKey("$").load();
-    assertEquals("$", edmStringSet.getId());
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java
deleted file mode 100644
index 481160b..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v3;
-
-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.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver;
-import 
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check actions overloading.
- */
-public class PropertyTestITCase extends AbstractTestITCase {
-
-  @Test
-  public void nullNullableProperty() {
-    Order order = container.getOrder().getByKey(-8);
-    order.setCustomerId(null);
-    container.flush();
-
-    assertNull(container.getOrder().getByKey(-8).getCustomerId());
-  }
-
-  @Test
-  public void nullNonNullableProperty() {
-    Driver driver = container.getDriver().getByKey("2");
-    driver.setBirthDate(null);
-
-    try {
-      container.flush();
-      fail();
-    } catch (ODataFlushException e) {
-      assertNotNull(e);
-    }
-    service.getContext().detachAll();
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/Service.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/Service.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/Service.java
deleted file mode 100644
index 18a2807..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/Service.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v3.actionoverloading;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
-import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.ext.proxy.AbstractService;
-
-public class Service<C extends CommonEdmEnabledODataClient<?>> extends 
AbstractService<C> {
-
-  //CHECKSTYLE:OFF (Maven checkstyle)
-  private static final String COMPRESSED_METADATA = 
"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";
-  private static final String METADATA_ETAG = null;
-  //CHECKSTYLE:ON (Maven checkstyle)
-
-  private static final Map<String, Service<?>> SERVICES = new 
ConcurrentHashMap<String, Service<?>>();
-
-  @SuppressWarnings("unchecked")
-  private static <C extends CommonEdmEnabledODataClient<?>> Service<C> 
getInstance(
-          final ODataServiceVersion version, final String serviceRoot, final 
boolean transactional) {
-
-    if (!SERVICES.containsKey(serviceRoot)) {
-      final Service<C> instance = new Service<C>(COMPRESSED_METADATA, 
METADATA_ETAG, 
-          version, serviceRoot, transactional);
-      SERVICES.put(serviceRoot, instance);
-    }
-
-    return (Service<C>) SERVICES.get(serviceRoot);
-  }
-
-  /**
-   * Gives an OData 3.0 instance for given service root, operating in 
transactions (with batch requests).
-   *
-   * @param serviceRoot OData service root
-   * @return OData 3.0 instance for given service root, operating in 
transactions (with batch requests)
-   */
-  public static Service<org.apache.olingo.client.api.v3.EdmEnabledODataClient> 
getV3(
-          final String serviceRoot) {
-
-    return getV3(serviceRoot, true);
-  }
-
-  /**
-   * Gives an OData 3.0 instance for given service root.
-   *
-   * @param serviceRoot OData service root
-   * @param transactional whether operating in transactions (with batch 
requests) or not
-   * @return OData 3.0 instance for given service root
-   */
-  public static Service<org.apache.olingo.client.api.v3.EdmEnabledODataClient> 
getV3(
-          final String serviceRoot, final boolean transactional) {
-
-    return getInstance(ODataServiceVersion.V30, serviceRoot, transactional);
-  }
-
-  /**
-   * Gives an OData 4.0 instance for given service root, operating in 
transactions (with batch requests).
-   *
-   * @param serviceRoot OData service root
-   * @return OData 4.0 instance for given service root, operating in 
transactions (with batch requests)
-   */
-  public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> 
getV4(
-          final String serviceRoot) {
-
-    return getV4(serviceRoot, true);
-  }
-
-  /**
-   * Gives an OData 4.0 instance for given service root.
-   *
-   * @param serviceRoot OData service root
-   * @param transactional whether operating in transactions (with batch 
requests) or not
-   * @return OData 4.0 instance for given service root
-   */
-  public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> 
getV4(
-          final String serviceRoot, final boolean transactional) {
-
-    return getInstance(ODataServiceVersion.V40, serviceRoot, transactional);
-  }
-
-  private final Map<String, Class<?>> entityTypes = new HashMap<String, 
Class<?>>();
-
-  private final Map<String, Class<?>> complexTypes = new HashMap<String, 
Class<?>>();
-
-  private final Map<String, Class<?>> enumTypes = new HashMap<String, 
Class<?>>();
-
-  private final Map<String, Class<? extends AbstractTerm>> terms = new 
HashMap<String, Class<? extends AbstractTerm>>();
-
-  public Service(final String compressedMetadata, final String metadataETag,
-          final ODataServiceVersion version, final String serviceRoot, final 
boolean transactional) {
-
-    super(compressedMetadata, metadataETag,version, serviceRoot, 
transactional);
-
-    //CHECKSTYLE:OFF (Maven checkstyle)
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.License", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes_Simple",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Driver", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Login", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.PageView", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee.class);
-    entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Car", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPageView",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.MappedEntityType",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Employee", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine2",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Computer", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Message", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Product", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Contractor.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Person", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Order", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.RSAToken", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.class);
-    
entityTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.class);
-    
complexTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory.class);
-    
complexTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails.class);
-    
complexTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions.class);
-    
complexTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo.class);
-    
complexTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo.class);
-    
complexTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone.class);
-    
complexTypes.put("Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases.class);
-    //CHECKSTYLE:ON (Maven checkstyle)
-  }
-
-  @Override
-  public Class<?> getEntityTypeClass(final String name) {
-    return entityTypes.get(name);
-  }
-
-  @Override
-  public Class<?> getComplexTypeClass(final String name) {
-    return complexTypes.get(name);
-  }
-
-  @Override
-  public Class<?> getEnumTypeClass(final String name) {
-    return enumTypes.get(name);
-  }
-
-  @Override
-  public Class<? extends AbstractTerm> getTermClass(final String name) {
-    return terms.get(name);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
deleted file mode 100644
index 2b7083c..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = 
"AllGeoCollectionTypesSet", container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface AllGeoCollectionTypesSet 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection>,
 
-  
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AllGeoCollectionTypesSet>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
deleted file mode 100644
index af09b4e..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = 
"AllGeoTypesSet", container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface AllGeoTypesSet 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AllGeoTypesSet>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
deleted file mode 100644
index badec29..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "Car", container 
= "Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface Car 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Car>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
deleted file mode 100644
index acd0b0b..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "Computer", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface Computer 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Computer>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
deleted file mode 100644
index c27f769..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = 
"ComputerDetail", container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface ComputerDetail 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ComputerDetail>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
deleted file mode 100644
index e22c69e..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "Customer", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface Customer 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Customer>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
deleted file mode 100644
index ca6a105..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "CustomerInfo", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface CustomerInfo 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<CustomerInfo>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
deleted file mode 100644
index 4b3f8fc..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.PersistenceManager;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.ComplexCollection;
-import org.apache.olingo.ext.proxy.api.ComplexType;
-import org.apache.olingo.ext.proxy.api.EntityCollection;
-import org.apache.olingo.ext.proxy.api.EntityType;
-import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-import org.apache.olingo.ext.proxy.api.EdmStreamValue;
-import java.io.Serializable;
-import java.io.InputStream;
-//CHECKSTYLE:ON (Maven checkstyle)
-
[email protected]("Microsoft.Test.OData.Services.AstoriaDefaultService")
[email protected](name = 
"DefaultContainer",
-  namespace = "Microsoft.Test.OData.Services.AstoriaDefaultService",
-  isDefaultEntityContainer = true)
-public interface DefaultContainer extends PersistenceManager {
-
-    Customer getCustomer();
-
-    Login getLogin();
-
-    OrderLine getOrderLine();
-
-    ComputerDetail getComputerDetail();
-
-    Product getProduct();
-
-    Message getMessage();
-
-    ProductDetail getProductDetail();
-
-    ProductPhoto getProductPhoto();
-
-    Order getOrder();
-
-    Computer getComputer();
-
-    MappedEntityType getMappedEntityType();
-
-    PageView getPageView();
-
-    Driver getDriver();
-
-    AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
-
-    Car getCar();
-
-    CustomerInfo getCustomerInfo();
-
-    License getLicense();
-
-    ProductReview getProductReview();
-
-    LastLogin getLastLogin();
-
-    MessageAttachment getMessageAttachment();
-
-    AllGeoTypesSet getAllGeoTypesSet();
-
-    PersonMetadata getPersonMetadata();
-
-    RSAToken getRSAToken();
-
-    Person getPerson();
-
-
-
-
-
-  Operations operations();
-
-  public interface Operations extends 
org.apache.olingo.ext.proxy.api.Operations {
-  
-        
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"UpdatePersonInfo",
-                    type = OperationType.ACTION)
-    org.apache.olingo.ext.proxy.api.Invoker<Void> updatePersonInfo(
-    );
-  
-          
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"RetrieveProduct",
-                    type = OperationType.ACTION,
-                    referenceType = java.lang.Integer.class,                   
 returnType = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Invoker<java.lang.Integer> retrieveProduct(
-    );
-  
-      }
-
-  <NE extends EntityType<?>> NE newEntityInstance(Class<NE> ref);
-
-  <T extends EntityType<?>, NEC extends EntityCollection<T, ?, ?>> NEC 
newEntityCollection(Class<NEC> ref);
-
-  <NE extends ComplexType<?>> NE newComplexInstance(Class<NE> ref);
-
-  <T extends ComplexType<?>, NEC extends ComplexCollection<T, ?, ?>> NEC 
newComplexCollection(Class<NEC> ref);
-
-  <T extends Serializable, NEC extends PrimitiveCollection<T>> NEC 
newPrimitiveCollection(Class<T> ref);
-
-  EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
deleted file mode 100644
index 889b577..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "Driver", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface Driver 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Driver>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver,
 java.lang.String, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
deleted file mode 100644
index cbd23a3..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "LastLogin", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface LastLogin 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<LastLogin>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin,
 java.lang.String, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
deleted file mode 100644
index ba64131..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "License", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface License 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<License>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License,
 java.lang.String, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
deleted file mode 100644
index ba9c599..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "Login", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface Login 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Login>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login,
 java.lang.String, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
deleted file mode 100644
index bc7a2cf..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = 
"MappedEntityType", container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface MappedEntityType 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<MappedEntityType>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
deleted file mode 100644
index 9712442..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "Message", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface Message 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Message>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message,
 MessageKey, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
deleted file mode 100644
index 8274083..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = 
"MessageAttachment", container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface MessageAttachment 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<MessageAttachment>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment,
 java.util.UUID, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
deleted file mode 100644
index d8ce0ee..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "Order", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface Order 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Order>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
deleted file mode 100644
index de653fa..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "OrderLine", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface OrderLine 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<OrderLine>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine,
 OrderLineKey, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
deleted file mode 100644
index 567cef2..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "PageView", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface PageView 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<PageView>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
deleted file mode 100644
index 286ba79..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
[email protected](name = "Person", 
container = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.DefaultContainer")
-public interface Person 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection>,
 
-  org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Person>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection>
 {
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }}

Reply via email to