You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/02/18 15:02:33 UTC

[02/51] [partial] olingo-odata4 git commit: [OLINGO-575] Delete V3 sources from master

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/types/ComputerDetailComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailComposableInvoker.java
deleted file mode 100644
index 9051c1f..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailComposableInvoker.java
+++ /dev/null
@@ -1,212 +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.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-public interface ComputerDetailComposableInvoker 
-  extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<ComputerDetail, ComputerDetail.Operations>
-   {
-
-  @Override
-  ComputerDetailComposableInvoker select(String... select);
-
-  @Override
-  ComputerDetailComposableInvoker expand(String... expand);
-
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getComputerDetailId();
-
-    void setComputerDetailId(java.lang.Integer _computerDetailId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer", 
-                type = "Edm.String", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.String getManufacturer();
-
-    void setManufacturer(java.lang.String _manufacturer);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model", 
-                type = "Edm.String", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.String getModel();
-
-    void setModel(java.lang.String _model);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial", 
-                type = "Edm.String", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.String getSerial();
-
-    void setSerial(java.lang.String _serial);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag", 
-                type = "Edm.String", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getSpecificationsBag();
-
-    void setSpecificationsBag(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _specificationsBag);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate", 
-                type = "Edm.DateTime", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.sql.Timestamp getPurchaseDate();
-
-    void setPurchaseDate(java.sql.Timestamp _purchaseDate);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
-    void setDimensions(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer", 
-                targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "Computer",
-                containsTarget = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer();
-
-    void setComputer(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
-    
-
-}

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/types/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
deleted file mode 100644
index 023c157..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ /dev/null
@@ -1,59 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ConcurrencyInfo")
-public interface ConcurrencyInfo 
-    extends org.apache.olingo.ext.proxy.api.ComplexType<ConcurrencyInfo>, org.apache.olingo.ext.proxy.api.StructuredQuery<ConcurrencyInfo> {
-
-
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "Token", 
-                type = "Edm.String", 
-                nullable = true)
-    java.lang.String getToken();
-
-    void setToken(java.lang.String _token);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "QueriedDateTime", 
-                type = "Edm.DateTime", 
-                nullable = true)
-    java.sql.Timestamp getQueriedDateTime();
-
-    void setQueriedDateTime(java.sql.Timestamp _queriedDateTime);
-
-    
-
-
-        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/types/ConcurrencyInfoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoCollection.java
deleted file mode 100644
index 252026c..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoCollection.java
+++ /dev/null
@@ -1,39 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import java.util.Collection;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-public interface ConcurrencyInfoCollection extends 
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfoCollection>,
-    org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfoCollection, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfoCollection> {
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

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/types/ConcurrencyInfoCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoCollectionComposableInvoker.java
deleted file mode 100644
index b6a018f..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-
-
-public interface ConcurrencyInfoCollectionComposableInvoker extends 
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfoCollection, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfoCollection.Operations> {
-
-  @Override
-  ConcurrencyInfoCollectionComposableInvoker select(String... select);
-
-  @Override
-  ConcurrencyInfoCollectionComposableInvoker expand(String... expand);
-}

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/types/ConcurrencyInfoComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoComposableInvoker.java
deleted file mode 100644
index c9ef49d..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfoComposableInvoker.java
+++ /dev/null
@@ -1,56 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-
-
-public interface ConcurrencyInfoComposableInvoker 
-  extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<ConcurrencyInfo, ConcurrencyInfo.Operations> {
-
-  @Override
-  ConcurrencyInfoComposableInvoker select(String... select);
-
-  @Override
-  ConcurrencyInfoComposableInvoker expand(String... expand);
-
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "Token", 
-                type = "Edm.String", 
-                nullable = true)
-    java.lang.String getToken();
-
-    void setToken(java.lang.String _token);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "QueriedDateTime", 
-                type = "Edm.DateTime", 
-                nullable = true)
-    java.sql.Timestamp getQueriedDateTime();
-
-    void setQueriedDateTime(java.sql.Timestamp _queriedDateTime);
-
-    
-
-}

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/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
deleted file mode 100644
index e5c76ca..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ /dev/null
@@ -1,103 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails")
-public interface ContactDetails 
-    extends org.apache.olingo.ext.proxy.api.ComplexType<ContactDetails>, org.apache.olingo.ext.proxy.api.StructuredQuery<ContactDetails> {
-
-
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "EmailBag", 
-                type = "Edm.String", 
-                nullable = false)
-    org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getEmailBag();
-
-    void setEmailBag(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _emailBag);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "AlternativeNames", 
-                type = "Edm.String", 
-                nullable = false)
-    org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getAlternativeNames();
-
-    void setAlternativeNames(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _alternativeNames);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "ContactAlias", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", 
-                nullable = true)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias();
-
-    void setContactAlias(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
-
-        
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "HomePhone", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", 
-                nullable = true)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone();
-
-    void setHomePhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
-
-        
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "WorkPhone", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", 
-                nullable = true)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone();
-
-    void setWorkPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
-
-        
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "MobilePhoneBag", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", 
-                nullable = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection getMobilePhoneBag();
-
-    void setMobilePhoneBag(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection _mobilePhoneBag);
-
-        
-
-
-        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/types/ContactDetailsCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsCollection.java
deleted file mode 100644
index 4fd2067..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsCollection.java
+++ /dev/null
@@ -1,39 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import java.util.Collection;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-public interface ContactDetailsCollection extends 
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetailsCollection>,
-    org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetailsCollection, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetailsCollection> {
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

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/types/ContactDetailsCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsCollectionComposableInvoker.java
deleted file mode 100644
index d8f5e07..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-
-
-public interface ContactDetailsCollectionComposableInvoker extends 
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetailsCollection, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetailsCollection.Operations> {
-
-  @Override
-  ContactDetailsCollectionComposableInvoker select(String... select);
-
-  @Override
-  ContactDetailsCollectionComposableInvoker expand(String... expand);
-}

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/types/ContactDetailsComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsComposableInvoker.java
deleted file mode 100644
index 76f38f3..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetailsComposableInvoker.java
+++ /dev/null
@@ -1,100 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-
-
-public interface ContactDetailsComposableInvoker 
-  extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<ContactDetails, ContactDetails.Operations> {
-
-  @Override
-  ContactDetailsComposableInvoker select(String... select);
-
-  @Override
-  ContactDetailsComposableInvoker expand(String... expand);
-
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "EmailBag", 
-                type = "Edm.String", 
-                nullable = false)
-    org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getEmailBag();
-
-    void setEmailBag(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _emailBag);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "AlternativeNames", 
-                type = "Edm.String", 
-                nullable = false)
-    org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getAlternativeNames();
-
-    void setAlternativeNames(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _alternativeNames);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "ContactAlias", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", 
-                nullable = true)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias();
-
-    void setContactAlias(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
-
-        
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "HomePhone", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", 
-                nullable = true)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone();
-
-    void setHomePhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
-
-        
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "WorkPhone", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", 
-                nullable = true)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone();
-
-    void setWorkPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
-
-        
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "MobilePhoneBag", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", 
-                nullable = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection getMobilePhoneBag();
-
-    void setMobilePhoneBag(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection _mobilePhoneBag);
-
-        
-
-}

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/types/Contractor.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
deleted file mode 100644
index 830c168..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ /dev/null
@@ -1,255 +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.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import java.util.concurrent.Future;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Contractor",
-        openType = false,
-        hasStream = false,
-        isAbstract = false,
-        baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
-public interface Contractor 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person   {
-
-  @Override
-  Contractor load();
-
-  @Override
-  Future<? extends Contractor> loadAsync();
-
-  @Override
-  Contractor refs();
-
-  @Override
-  Contractor expand(String... expand);
-
-  @Override
-  Contractor select(String... select);
-
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getPersonId();
-
-    void setPersonId(java.lang.Integer _personId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name", 
-                type = "Edm.String", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.String getName();
-
-    void setName(java.lang.String _name);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getContratorCompanyId();
-
-    void setContratorCompanyId(java.lang.Integer _contratorCompanyId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getBillingRate();
-
-    void setBillingRate(java.lang.Integer _billingRate);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getTeamContactPersonId();
-
-    void setTeamContactPersonId(java.lang.Integer _teamContactPersonId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription", 
-                type = "Edm.String", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.String getJobDescription();
-
-    void setJobDescription(java.lang.String _jobDescription);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata", 
-                targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "PersonMetadata",
-                containsTarget = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
-    void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-    
-
-
-        @Override
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Operations{
-    
-          
-      @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
-                    type = OperationType.ACTION)
-      org.apache.olingo.ext.proxy.api.Invoker<Void> updatePersonInfo(
-            );
-
-        }
-    Annotations annotations();
-
-    interface Annotations            extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations{
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getPersonIdAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
-                   type = "Edm.String")
-        org.apache.olingo.ext.proxy.api.Annotatable getNameAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ContratorCompanyId",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getContratorCompanyIdAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getBillingRateAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getTeamContactPersonIdAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription",
-                   type = "Edm.String")
-        org.apache.olingo.ext.proxy.api.Annotatable getJobDescriptionAnnotations();
-
-
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata", 
-                  type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
-        org.apache.olingo.ext.proxy.api.Annotatable getPersonMetadataAnnotations();
-    }
-
-}

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/types/ContractorCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
deleted file mode 100644
index e6c093e..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
+++ /dev/null
@@ -1,39 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import java.util.Collection;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-public interface ContractorCollection extends 
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection>,
-    org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Contractor, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection> {
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

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/types/ContractorCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollectionComposableInvoker.java
deleted file mode 100644
index 157fb09..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-
-
-public interface ContractorCollectionComposableInvoker extends 
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection.Operations> {
-
-  @Override
-  ContractorCollectionComposableInvoker select(String... select);
-
-  @Override
-  ContractorCollectionComposableInvoker expand(String... expand);
-}

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/types/ContractorComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorComposableInvoker.java
deleted file mode 100644
index 9c5ac43..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorComposableInvoker.java
+++ /dev/null
@@ -1,189 +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.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-public interface ContractorComposableInvoker 
-  extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Contractor, Contractor.Operations>
-   {
-
-  @Override
-  ContractorComposableInvoker select(String... select);
-
-  @Override
-  ContractorComposableInvoker expand(String... expand);
-
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getPersonId();
-
-    void setPersonId(java.lang.Integer _personId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name", 
-                type = "Edm.String", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.String getName();
-
-    void setName(java.lang.String _name);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getContratorCompanyId();
-
-    void setContratorCompanyId(java.lang.Integer _contratorCompanyId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getBillingRate();
-
-    void setBillingRate(java.lang.Integer _billingRate);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getTeamContactPersonId();
-
-    void setTeamContactPersonId(java.lang.Integer _teamContactPersonId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription", 
-                type = "Edm.String", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.String getJobDescription();
-
-    void setJobDescription(java.lang.String _jobDescription);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata", 
-                targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "PersonMetadata",
-                containsTarget = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
-    void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-    
-
-}

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/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
deleted file mode 100644
index 56d5a15..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ /dev/null
@@ -1,314 +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.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
-        openType = false,
-        hasStream = false,
-        isAbstract = false)
-public interface Customer 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  org.apache.olingo.ext.proxy.api.EntityType<Customer>, org.apache.olingo.ext.proxy.api.StructuredQuery<Customer>   {
-
-
-    
-
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Thumbnail", 
-                type = "Edm.Stream", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    org.apache.olingo.ext.proxy.api.EdmStreamValue getThumbnail();
-
-    void setThumbnail(org.apache.olingo.ext.proxy.api.EdmStreamValue _thumbnail);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video", 
-                type = "Edm.Stream", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    org.apache.olingo.ext.proxy.api.EdmStreamValue getVideo();
-
-    void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamValue _video);
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.Integer getCustomerId();
-
-    void setCustomerId(java.lang.Integer _customerId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name", 
-                type = "Edm.String", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    java.lang.String getName();
-
-    void setName(java.lang.String _name);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo();
-
-    void setPrimaryContactInfo(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetailsCollection getBackupContactInfo();
-
-    void setBackupContactInfo(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetailsCollection _backupContactInfo);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "",
-                concurrencyMode = ConcurrencyMode.None,
-                fcSourcePath = "",
-                fcTargetPath = "",
-                fcContentKind = EdmContentKind.text,
-                fcNSPrefix = "",
-                fcNSURI = "",
-                fcKeepInContent = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing();
-
-    void setAuditing(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order", 
-                targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "Order",
-                containsTarget = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
-    void setOrders(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Logins", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login", 
-                targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "Login",
-                containsTarget = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection getLogins();
-
-    void setLogins(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Husband", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", 
-                targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "Customer",
-                containsTarget = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer getHusband();
-
-    void setHusband(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Wife", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", 
-                targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "Customer",
-                containsTarget = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer getWife();
-
-    void setWife(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Info", 
-                type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", 
-                targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "CustomerInfo",
-                containsTarget = false)
-    org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo getInfo();
-
-    void setInfo(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
-    
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }
-    Annotations annotations();
-
-    interface Annotations {
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Thumbnail",
-                   type = "Edm.Stream")
-        org.apache.olingo.ext.proxy.api.Annotatable getThumbnailAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
-                   type = "Edm.Stream")
-        org.apache.olingo.ext.proxy.api.Annotatable getVideoAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getCustomerIdAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
-                   type = "Edm.String")
-        org.apache.olingo.ext.proxy.api.Annotatable getNameAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PrimaryContactInfo",
-                   type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
-        org.apache.olingo.ext.proxy.api.Annotatable getPrimaryContactInfoAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BackupContactInfo",
-                   type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
-        org.apache.olingo.ext.proxy.api.Annotatable getBackupContactInfoAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Auditing",
-                   type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
-        org.apache.olingo.ext.proxy.api.Annotatable getAuditingAnnotations();
-
-
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders", 
-                  type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
-        org.apache.olingo.ext.proxy.api.Annotatable getOrdersAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Logins", 
-                  type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
-        org.apache.olingo.ext.proxy.api.Annotatable getLoginsAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Husband", 
-                  type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
-        org.apache.olingo.ext.proxy.api.Annotatable getHusbandAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Wife", 
-                  type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
-        org.apache.olingo.ext.proxy.api.Annotatable getWifeAnnotations();
-
-        @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Info", 
-                  type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo")
-        org.apache.olingo.ext.proxy.api.Annotatable getInfoAnnotations();
-    }
-
-}

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/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
deleted file mode 100644
index 5d60280..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
+++ /dev/null
@@ -1,39 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import java.util.Collection;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-public interface CustomerCollection extends 
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection>,
-    org.apache.olingo.ext.proxy.api.EntityCollection<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.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    
-        }
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

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/types/CustomerCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollectionComposableInvoker.java
deleted file mode 100644
index 183f053..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.types;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-
-
-public interface CustomerCollectionComposableInvoker extends 
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection.Operations> {
-
-  @Override
-  CustomerCollectionComposableInvoker select(String... select);
-
-  @Override
-  CustomerCollectionComposableInvoker expand(String... expand);
-}