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/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
deleted file mode 100644
index 1d1f928..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ /dev/null
@@ -1,514 +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)
-
-
[email protected]("Microsoft.Test.OData.Services.AstoriaDefaultService")
[email protected](name = 
"AllSpatialTypes",
-        openType = false,
-        hasStream = false,
-        isAbstract = false)
-public interface AllSpatialTypes 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  org.apache.olingo.ext.proxy.api.EntityType<AllSpatialTypes>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<AllSpatialTypes>   {
-
-
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id", 
-                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 getId();
-
-    void setId(java.lang.Integer _id);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geog", 
-                type = "Edm.Geography", 
-                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.commons.api.edm.geo.Geospatial getGeog();
-
-    void setGeog(org.apache.olingo.commons.api.edm.geo.Geospatial _geog);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPoint", 
-                type = "Edm.GeographyPoint", 
-                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.commons.api.edm.geo.Point getGeogPoint();
-
-    void setGeogPoint(org.apache.olingo.commons.api.edm.geo.Point _geogPoint);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogLine", 
-                type = "Edm.GeographyLineString", 
-                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.commons.api.edm.geo.LineString getGeogLine();
-
-    void setGeogLine(org.apache.olingo.commons.api.edm.geo.LineString 
_geogLine);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogPolygon", 
-                type = "Edm.GeographyPolygon", 
-                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.commons.api.edm.geo.Polygon getGeogPolygon();
-
-    void setGeogPolygon(org.apache.olingo.commons.api.edm.geo.Polygon 
_geogPolygon);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogCollection", 
-                type = "Edm.GeographyCollection", 
-                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.commons.api.edm.geo.GeospatialCollection 
getGeogCollection();
-
-    void 
setGeogCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection 
_geogCollection);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogMultiPoint", 
-                type = "Edm.GeographyMultiPoint", 
-                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.commons.api.edm.geo.MultiPoint getGeogMultiPoint();
-
-    void setGeogMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint 
_geogMultiPoint);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogMultiLine", 
-                type = "Edm.GeographyMultiLineString", 
-                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.commons.api.edm.geo.MultiLineString getGeogMultiLine();
-
-    void 
setGeogMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString 
_geogMultiLine);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogMultiPolygon", 
-                type = "Edm.GeographyMultiPolygon", 
-                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.commons.api.edm.geo.MultiPolygon getGeogMultiPolygon();
-
-    void 
setGeogMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon 
_geogMultiPolygon);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geom", 
-                type = "Edm.Geometry", 
-                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.commons.api.edm.geo.Geospatial getGeom();
-
-    void setGeom(org.apache.olingo.commons.api.edm.geo.Geospatial _geom);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPoint", 
-                type = "Edm.GeometryPoint", 
-                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.commons.api.edm.geo.Point getGeomPoint();
-
-    void setGeomPoint(org.apache.olingo.commons.api.edm.geo.Point _geomPoint);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomLine", 
-                type = "Edm.GeometryLineString", 
-                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.commons.api.edm.geo.LineString getGeomLine();
-
-    void setGeomLine(org.apache.olingo.commons.api.edm.geo.LineString 
_geomLine);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomPolygon", 
-                type = "Edm.GeometryPolygon", 
-                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.commons.api.edm.geo.Polygon getGeomPolygon();
-
-    void setGeomPolygon(org.apache.olingo.commons.api.edm.geo.Polygon 
_geomPolygon);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomCollection", 
-                type = "Edm.GeometryCollection", 
-                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.commons.api.edm.geo.GeospatialCollection 
getGeomCollection();
-
-    void 
setGeomCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection 
_geomCollection);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomMultiPoint", 
-                type = "Edm.GeometryMultiPoint", 
-                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.commons.api.edm.geo.MultiPoint getGeomMultiPoint();
-
-    void setGeomMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint 
_geomMultiPoint);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomMultiLine", 
-                type = "Edm.GeometryMultiLineString", 
-                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.commons.api.edm.geo.MultiLineString getGeomMultiLine();
-
-    void 
setGeomMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString 
_geomMultiLine);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomMultiPolygon", 
-                type = "Edm.GeometryMultiPolygon", 
-                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.commons.api.edm.geo.MultiPolygon getGeomMultiPolygon();
-
-    void 
setGeomMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon 
_geomMultiPolygon);
-    
-
-
-
-        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 = "Id",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getIdAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Geog",
-                   type = "Edm.Geography")
-        org.apache.olingo.ext.proxy.api.Annotatable getGeogAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeogPoint",
-                   type = "Edm.GeographyPoint")
-        org.apache.olingo.ext.proxy.api.Annotatable getGeogPointAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeogLine",
-                   type = "Edm.GeographyLineString")
-        org.apache.olingo.ext.proxy.api.Annotatable getGeogLineAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeogPolygon",
-                   type = "Edm.GeographyPolygon")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeogPolygonAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeogCollection",
-                   type = "Edm.GeographyCollection")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeogCollectionAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeogMultiPoint",
-                   type = "Edm.GeographyMultiPoint")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeogMultiPointAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeogMultiLine",
-                   type = "Edm.GeographyMultiLineString")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeogMultiLineAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeogMultiPolygon",
-                   type = "Edm.GeographyMultiPolygon")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeogMultiPolygonAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Geom",
-                   type = "Edm.Geometry")
-        org.apache.olingo.ext.proxy.api.Annotatable getGeomAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeomPoint",
-                   type = "Edm.GeometryPoint")
-        org.apache.olingo.ext.proxy.api.Annotatable getGeomPointAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeomLine",
-                   type = "Edm.GeometryLineString")
-        org.apache.olingo.ext.proxy.api.Annotatable getGeomLineAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeomPolygon",
-                   type = "Edm.GeometryPolygon")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeomPolygonAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeomCollection",
-                   type = "Edm.GeometryCollection")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeomCollectionAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeomMultiPoint",
-                   type = "Edm.GeometryMultiPoint")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeomMultiPointAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeomMultiLine",
-                   type = "Edm.GeometryMultiLineString")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeomMultiLineAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GeomMultiPolygon",
-                   type = "Edm.GeometryMultiPolygon")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getGeomMultiPolygonAnnotations();
-
-
-    }
-
-}

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/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
deleted file mode 100644
index 76693e2..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.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 AllSpatialTypesCollection extends 
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection>,
-    
org.apache.olingo.ext.proxy.api.EntityCollection<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.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection>
 {
-
-        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/AllSpatialTypesCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollectionComposableInvoker.java
deleted file mode 100644
index 6685c4f..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollectionComposableInvoker.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 AllSpatialTypesCollectionComposableInvoker extends 
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection.Operations>
 {
-
-  @Override
-  AllSpatialTypesCollectionComposableInvoker select(String... select);
-
-  @Override
-  AllSpatialTypesCollectionComposableInvoker 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/AllSpatialTypesComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesComposableInvoker.java
deleted file mode 100644
index a3a4593..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesComposableInvoker.java
+++ /dev/null
@@ -1,432 +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 AllSpatialTypesComposableInvoker 
-  extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<AllSpatialTypes, 
AllSpatialTypes.Operations>
-   {
-
-  @Override
-  AllSpatialTypesComposableInvoker select(String... select);
-
-  @Override
-  AllSpatialTypesComposableInvoker expand(String... expand);
-
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id", 
-                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 getId();
-
-    void setId(java.lang.Integer _id);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geog", 
-                type = "Edm.Geography", 
-                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.commons.api.edm.geo.Geospatial getGeog();
-
-    void setGeog(org.apache.olingo.commons.api.edm.geo.Geospatial _geog);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPoint", 
-                type = "Edm.GeographyPoint", 
-                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.commons.api.edm.geo.Point getGeogPoint();
-
-    void setGeogPoint(org.apache.olingo.commons.api.edm.geo.Point _geogPoint);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogLine", 
-                type = "Edm.GeographyLineString", 
-                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.commons.api.edm.geo.LineString getGeogLine();
-
-    void setGeogLine(org.apache.olingo.commons.api.edm.geo.LineString 
_geogLine);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogPolygon", 
-                type = "Edm.GeographyPolygon", 
-                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.commons.api.edm.geo.Polygon getGeogPolygon();
-
-    void setGeogPolygon(org.apache.olingo.commons.api.edm.geo.Polygon 
_geogPolygon);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogCollection", 
-                type = "Edm.GeographyCollection", 
-                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.commons.api.edm.geo.GeospatialCollection 
getGeogCollection();
-
-    void 
setGeogCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection 
_geogCollection);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogMultiPoint", 
-                type = "Edm.GeographyMultiPoint", 
-                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.commons.api.edm.geo.MultiPoint getGeogMultiPoint();
-
-    void setGeogMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint 
_geogMultiPoint);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogMultiLine", 
-                type = "Edm.GeographyMultiLineString", 
-                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.commons.api.edm.geo.MultiLineString getGeogMultiLine();
-
-    void 
setGeogMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString 
_geogMultiLine);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeogMultiPolygon", 
-                type = "Edm.GeographyMultiPolygon", 
-                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.commons.api.edm.geo.MultiPolygon getGeogMultiPolygon();
-
-    void 
setGeogMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon 
_geogMultiPolygon);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geom", 
-                type = "Edm.Geometry", 
-                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.commons.api.edm.geo.Geospatial getGeom();
-
-    void setGeom(org.apache.olingo.commons.api.edm.geo.Geospatial _geom);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPoint", 
-                type = "Edm.GeometryPoint", 
-                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.commons.api.edm.geo.Point getGeomPoint();
-
-    void setGeomPoint(org.apache.olingo.commons.api.edm.geo.Point _geomPoint);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomLine", 
-                type = "Edm.GeometryLineString", 
-                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.commons.api.edm.geo.LineString getGeomLine();
-
-    void setGeomLine(org.apache.olingo.commons.api.edm.geo.LineString 
_geomLine);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomPolygon", 
-                type = "Edm.GeometryPolygon", 
-                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.commons.api.edm.geo.Polygon getGeomPolygon();
-
-    void setGeomPolygon(org.apache.olingo.commons.api.edm.geo.Polygon 
_geomPolygon);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomCollection", 
-                type = "Edm.GeometryCollection", 
-                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.commons.api.edm.geo.GeospatialCollection 
getGeomCollection();
-
-    void 
setGeomCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection 
_geomCollection);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomMultiPoint", 
-                type = "Edm.GeometryMultiPoint", 
-                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.commons.api.edm.geo.MultiPoint getGeomMultiPoint();
-
-    void setGeomMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint 
_geomMultiPoint);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomMultiLine", 
-                type = "Edm.GeometryMultiLineString", 
-                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.commons.api.edm.geo.MultiLineString getGeomMultiLine();
-
-    void 
setGeomMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString 
_geomMultiLine);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"GeomMultiPolygon", 
-                type = "Edm.GeometryMultiPolygon", 
-                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.commons.api.edm.geo.MultiPolygon getGeomMultiPolygon();
-
-    void 
setGeomMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon 
_geomMultiPolygon);
-    
-
-
-}

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/AuditInfo.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
deleted file mode 100644
index 309e011..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ /dev/null
@@ -1,70 +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)
-
-
[email protected]("Microsoft.Test.OData.Services.AstoriaDefaultService")
[email protected](name = "AuditInfo")
-public interface AuditInfo 
-    extends org.apache.olingo.ext.proxy.api.ComplexType<AuditInfo>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<AuditInfo> {
-
-
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "ModifiedDate", 
-                type = "Edm.DateTime", 
-                nullable = false)
-    java.sql.Timestamp getModifiedDate();
-
-    void setModifiedDate(java.sql.Timestamp _modifiedDate);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "ModifiedBy", 
-                type = "Edm.String", 
-                nullable = true)
-    java.lang.String getModifiedBy();
-
-    void setModifiedBy(java.lang.String _modifiedBy);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "Concurrency", 
-                type = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", 
-                nullable = true)
-    
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
 getConcurrency();
-
-    void 
setConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
 _concurrency);
-
-        
-
-
-        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/AuditInfoCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoCollection.java
deleted file mode 100644
index c3d423e..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoCollection.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 AuditInfoCollection extends 
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfoCollection>,
-    
org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfoCollection,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfoCollection>
 {
-
-        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/AuditInfoCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoCollectionComposableInvoker.java
deleted file mode 100644
index 9fc0545..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoCollectionComposableInvoker.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 AuditInfoCollectionComposableInvoker extends 
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfoCollection,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfoCollection.Operations>
 {
-
-  @Override
-  AuditInfoCollectionComposableInvoker select(String... select);
-
-  @Override
-  AuditInfoCollectionComposableInvoker 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/AuditInfoComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoComposableInvoker.java
deleted file mode 100644
index 5d0c778..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfoComposableInvoker.java
+++ /dev/null
@@ -1,67 +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 AuditInfoComposableInvoker 
-  extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<AuditInfo, 
AuditInfo.Operations> {
-
-  @Override
-  AuditInfoComposableInvoker select(String... select);
-
-  @Override
-  AuditInfoComposableInvoker expand(String... expand);
-
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "ModifiedDate", 
-                type = "Edm.DateTime", 
-                nullable = false)
-    java.sql.Timestamp getModifiedDate();
-
-    void setModifiedDate(java.sql.Timestamp _modifiedDate);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "ModifiedBy", 
-                type = "Edm.String", 
-                nullable = true)
-    java.lang.String getModifiedBy();
-
-    void setModifiedBy(java.lang.String _modifiedBy);
-
-    
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(
-                name = "Concurrency", 
-                type = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", 
-                nullable = true)
-    
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
 getConcurrency();
-
-    void 
setConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo
 _concurrency);
-
-        
-
-}

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/BackOrderLine.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
deleted file mode 100644
index 550d637..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ /dev/null
@@ -1,236 +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.annotations.KeyRef;
-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)
-
-@KeyRef(OrderLineKey.class)
[email protected]("Microsoft.Test.OData.Services.AstoriaDefaultService")
[email protected](name = "BackOrderLine",
-        openType = false,
-        hasStream = false,
-        isAbstract = false,
-        baseType = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine")
-public interface BackOrderLine 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine
   {
-
-  @Override
-  BackOrderLine load();
-
-  @Override
-  Future<? extends BackOrderLine> loadAsync();
-
-  @Override
-  BackOrderLine refs();
-
-  @Override
-  BackOrderLine expand(String... expand);
-
-  @Override
-  BackOrderLine select(String... select);
-
-        
-
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"OrderLineStream", 
-                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 getOrderLineStream();
-
-    void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamValue 
_orderLineStream);
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId", 
-                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 getOrderId();
-
-    void setOrderId(java.lang.Integer _orderId);
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId", 
-                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 getProductId();
-
-    void setProductId(java.lang.Integer _productId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity", 
-                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 getQuantity();
-
-    void setQuantity(java.lang.Integer _quantity);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"ConcurrencyToken", 
-                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 getConcurrencyToken();
-
-    void setConcurrencyToken(java.lang.String _concurrencyToken);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"Order", 
-                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.Order
 getOrder();
-
-    void 
setOrder(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order
 _order);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"Product", 
-                type = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.Product", 
-                targetSchema = 
"Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "Product",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
 getProduct();
-
-    void 
setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
 _product);
-    
-
-
-        @Override
-        Operations operations();
-
-    interface Operations extends 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Operations{
-    
-        }
-    Annotations annotations();
-
-    interface Annotations            extends 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Annotations{
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderLineStream",
-                   type = "Edm.Stream")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getOrderLineStreamAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderId",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getOrderIdAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ProductId",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getProductIdAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Quantity",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getQuantityAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ConcurrencyToken",
-                   type = "Edm.String")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getConcurrencyTokenAnnotations();
-
-
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "Order", 
-                  type = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
-        org.apache.olingo.ext.proxy.api.Annotatable getOrderAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "Product", 
-                  type = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
-        org.apache.olingo.ext.proxy.api.Annotatable getProductAnnotations();
-    }
-
-}

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/BackOrderLine2.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
deleted file mode 100644
index 7c8c77d..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ /dev/null
@@ -1,236 +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.annotations.KeyRef;
-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)
-
-@KeyRef(OrderLineKey.class)
[email protected]("Microsoft.Test.OData.Services.AstoriaDefaultService")
[email protected](name = 
"BackOrderLine2",
-        openType = false,
-        hasStream = false,
-        isAbstract = false,
-        baseType = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine")
-public interface BackOrderLine2 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine
   {
-
-  @Override
-  BackOrderLine2 load();
-
-  @Override
-  Future<? extends BackOrderLine2> loadAsync();
-
-  @Override
-  BackOrderLine2 refs();
-
-  @Override
-  BackOrderLine2 expand(String... expand);
-
-  @Override
-  BackOrderLine2 select(String... select);
-
-        
-
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"OrderLineStream", 
-                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 getOrderLineStream();
-
-    void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamValue 
_orderLineStream);
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId", 
-                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 getOrderId();
-
-    void setOrderId(java.lang.Integer _orderId);
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId", 
-                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 getProductId();
-
-    void setProductId(java.lang.Integer _productId);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity", 
-                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 getQuantity();
-
-    void setQuantity(java.lang.Integer _quantity);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"ConcurrencyToken", 
-                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 getConcurrencyToken();
-
-    void setConcurrencyToken(java.lang.String _concurrencyToken);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"Order", 
-                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.Order
 getOrder();
-
-    void 
setOrder(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order
 _order);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"Product", 
-                type = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.Product", 
-                targetSchema = 
"Microsoft.Test.OData.Services.AstoriaDefaultService", 
-                targetContainer = "DefaultContainer", 
-                targetEntitySet = "Product",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
 getProduct();
-
-    void 
setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product
 _product);
-    
-
-
-        @Override
-        Operations operations();
-
-    interface Operations extends 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Operations{
-    
-        }
-    Annotations annotations();
-
-    interface Annotations            extends 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Annotations{
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderLineStream",
-                   type = "Edm.Stream")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getOrderLineStreamAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderId",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getOrderIdAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ProductId",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getProductIdAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Quantity",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getQuantityAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ConcurrencyToken",
-                   type = "Edm.String")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getConcurrencyTokenAnnotations();
-
-
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "Order", 
-                  type = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
-        org.apache.olingo.ext.proxy.api.Annotatable getOrderAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "Product", 
-                  type = 
"Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
-        org.apache.olingo.ext.proxy.api.Annotatable getProductAnnotations();
-    }
-
-}

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/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
deleted file mode 100644
index 6c728b1..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.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 BackOrderLine2Collection extends 
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection>,
-    
org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection>
 {
-
-        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/BackOrderLine2CollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2CollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2CollectionComposableInvoker.java
deleted file mode 100644
index f51676a..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2CollectionComposableInvoker.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 BackOrderLine2CollectionComposableInvoker extends 
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection,
 
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection.Operations>
 {
-
-  @Override
-  BackOrderLine2CollectionComposableInvoker select(String... select);
-
-  @Override
-  BackOrderLine2CollectionComposableInvoker expand(String... expand);
-}

Reply via email to