You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/09/01 14:45:09 UTC

[07/31] olingo-odata4 git commit: [OLINGO-659] Removed v4 from package and class names

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
deleted file mode 100644
index be254e4..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
+++ /dev/null
@@ -1,357 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.concurrent.Future;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
-    openType = false,
-    hasStream = false,
-    isAbstract = false,
-    baseType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
-public interface Customer
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person {
-
-  @Override
-  Customer load();
-
-  @Override
-  Future<? extends Customer> loadAsync();
-
-  @Override
-  Customer refs();
-
-  @Override
-  Customer expand(String... expand);
-
-  @Override
-  Customer select(String... select);
-
-  @Override
-  @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 = "")
-  java.lang.Integer getPersonID();
-
-  @Override
-  void setPersonID(java.lang.Integer _personID);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getFirstName();
-
-  @Override
-  void setFirstName(java.lang.String _firstName);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getLastName();
-
-  @Override
-  void setLastName(java.lang.String _lastName);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getMiddleName();
-
-  @Override
-  void setMiddleName(java.lang.String _middleName);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
-      getHomeAddress();
-
-  @Override
-      void
-      setHomeAddress(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
-      type = "Edm.GeographyPoint",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.commons.api.edm.geo.Point getHome();
-
-  @Override
-  void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getNumbers();
-
-  @Override
-  void setNumbers(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _numbers);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getEmails();
-
-  @Override
-  void setEmails(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _emails);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getCity();
-
-  void setCity(java.lang.String _city);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Birthday",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getBirthday();
-
-  void setBirthday(java.sql.Timestamp _birthday);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeBetweenLastTwoOrders",
-      type = "Edm.Duration",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.math.BigDecimal getTimeBetweenLastTwoOrders();
-
-  void setTimeBetweenLastTwoOrders(java.math.BigDecimal _timeBetweenLastTwoOrders);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "People",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
-
-  @Override
-  void setParent(
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "Orders",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection
-      getOrders();
-
-      void
-      setOrders(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection _orders);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "Company",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
-      void
-      setCompany(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-  @Override
-  Operations operations();
-
-  interface Operations
-      extends
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Operations {
-    // No additional methods needed for now.
-  }
-
-  @Override
-  Annotations annotations();
-
-  interface Annotations
-      extends
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations {
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getPersonIDAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getFirstNameAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getLastNameAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getMiddleNameAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
-    org.apache.olingo.ext.proxy.api.Annotatable getHomeAddressAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
-        type = "Edm.GeographyPoint")
-    org.apache.olingo.ext.proxy.api.Annotatable getHomeAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getNumbersAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getEmailsAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getCityAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Birthday",
-        type = "Edm.DateTimeOffset")
-    org.apache.olingo.ext.proxy.api.Annotatable getBirthdayAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeBetweenLastTwoOrders",
-        type = "Edm.Duration")
-    org.apache.olingo.ext.proxy.api.Annotatable getTimeBetweenLastTwoOrdersAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
-    org.apache.olingo.ext.proxy.api.Annotatable getParentAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
-    org.apache.olingo.ext.proxy.api.Annotatable getOrdersAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
-    org.apache.olingo.ext.proxy.api.Annotatable getCompanyAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
deleted file mode 100644
index e358eed..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
+++ /dev/null
@@ -1,41 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface CustomerCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java
deleted file mode 100644
index 1a7ba5c..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface CustomerCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection.Operations> {
-
-  @Override
-  CustomerCollectionComposableInvoker select(String... select);
-
-  @Override
-  CustomerCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java
deleted file mode 100644
index 7525933..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java
+++ /dev/null
@@ -1,241 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface CustomerComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Customer, Customer.Operations>
-{
-
-  @Override
-  CustomerComposableInvoker select(String... select);
-
-  @Override
-  CustomerComposableInvoker 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 = "")
-  java.lang.Integer getPersonID();
-
-  void setPersonID(java.lang.Integer _personID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getFirstName();
-
-  void setFirstName(java.lang.String _firstName);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getLastName();
-
-  void setLastName(java.lang.String _lastName);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getMiddleName();
-
-  void setMiddleName(java.lang.String _middleName);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
-      getHomeAddress();
-
-      void
-      setHomeAddress(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
-      type = "Edm.GeographyPoint",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.commons.api.edm.geo.Point getHome();
-
-  void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getNumbers();
-
-  void setNumbers(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _numbers);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getEmails();
-
-  void setEmails(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _emails);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getCity();
-
-  void setCity(java.lang.String _city);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Birthday",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getBirthday();
-
-  void setBirthday(java.sql.Timestamp _birthday);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeBetweenLastTwoOrders",
-      type = "Edm.Duration",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.math.BigDecimal getTimeBetweenLastTwoOrders();
-
-  void setTimeBetweenLastTwoOrders(java.math.BigDecimal _timeBetweenLastTwoOrders);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "People",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
-
-  void setParent(
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "Orders",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection
-      getOrders();
-
-      void
-      setOrders(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection _orders);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "Company",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
-      void
-      setCompany(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
deleted file mode 100644
index 7bd8869..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
+++ /dev/null
@@ -1,120 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Department",
-    openType = false,
-    hasStream = false,
-    isAbstract = false)
-public interface Department
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<Department>, org.apache.olingo.ext.proxy.api.StructuredQuery<Department> {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getDepartmentID();
-
-  void setDepartmentID(java.lang.Integer _departmentID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getName();
-
-  void setName(java.lang.String _name);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentNO",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getDepartmentNO();
-
-  void setDepartmentNO(java.lang.String _departmentNO);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "Company",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
-      void
-      setCompany(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DepartmentID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getDepartmentIDAnnotations();
-
-    @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 = "DepartmentNO",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getDepartmentNOAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
-    org.apache.olingo.ext.proxy.api.Annotatable getCompanyAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
deleted file mode 100644
index 16a8183..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
+++ /dev/null
@@ -1,41 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface DepartmentCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java
deleted file mode 100644
index 88103be..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface DepartmentCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection.Operations> {
-
-  @Override
-  DepartmentCollectionComposableInvoker select(String... select);
-
-  @Override
-  DepartmentCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java
deleted file mode 100644
index 08427f4..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java
+++ /dev/null
@@ -1,94 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface DepartmentComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Department, Department.Operations>
-{
-
-  @Override
-  DepartmentComposableInvoker select(String... select);
-
-  @Override
-  DepartmentComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getDepartmentID();
-
-  void setDepartmentID(java.lang.Integer _departmentID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getName();
-
-  void setName(java.lang.String _name);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentNO",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getDepartmentNO();
-
-  void setDepartmentNO(java.lang.String _departmentNO);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "Company",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
-      void
-      setCompany(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
deleted file mode 100644
index f65a9e5..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
+++ /dev/null
@@ -1,321 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.concurrent.Future;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
-    openType = false,
-    hasStream = false,
-    isAbstract = false,
-    baseType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
-public interface Employee
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person {
-
-  @Override
-  Employee load();
-
-  @Override
-  Future<? extends Employee> loadAsync();
-
-  @Override
-  Employee refs();
-
-  @Override
-  Employee expand(String... expand);
-
-  @Override
-  Employee select(String... select);
-
-  @Override
-  @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 = "")
-  java.lang.Integer getPersonID();
-
-  @Override
-  void setPersonID(java.lang.Integer _personID);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getFirstName();
-
-  @Override
-  void setFirstName(java.lang.String _firstName);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getLastName();
-
-  @Override
-  void setLastName(java.lang.String _lastName);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getMiddleName();
-
-  @Override
-  void setMiddleName(java.lang.String _middleName);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
-      getHomeAddress();
-
-  @Override
-      void
-      setHomeAddress(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
-      type = "Edm.GeographyPoint",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.commons.api.edm.geo.Point getHome();
-
-  @Override
-  void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getNumbers();
-
-  @Override
-  void setNumbers(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _numbers);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getEmails();
-
-  @Override
-  void setEmails(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _emails);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateHired",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getDateHired();
-
-  void setDateHired(java.sql.Timestamp _dateHired);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Office",
-      type = "Edm.GeographyPoint",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.commons.api.edm.geo.Point getOffice();
-
-  void setOffice(org.apache.olingo.commons.api.edm.geo.Point _office);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "People",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
-
-  @Override
-  void setParent(
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "Company",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
-      void
-      setCompany(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-  @Override
-  Operations operations();
-
-  interface Operations
-      extends
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Operations {
-    // No additional methods needed for now.
-  }
-
-  @Override
-  Annotations annotations();
-
-  interface Annotations
-      extends
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations {
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getPersonIDAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getFirstNameAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getLastNameAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getMiddleNameAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
-    org.apache.olingo.ext.proxy.api.Annotatable getHomeAddressAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
-        type = "Edm.GeographyPoint")
-    org.apache.olingo.ext.proxy.api.Annotatable getHomeAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getNumbersAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getEmailsAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DateHired",
-        type = "Edm.DateTimeOffset")
-    org.apache.olingo.ext.proxy.api.Annotatable getDateHiredAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Office",
-        type = "Edm.GeographyPoint")
-    org.apache.olingo.ext.proxy.api.Annotatable getOfficeAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
-    org.apache.olingo.ext.proxy.api.Annotatable getParentAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
-    org.apache.olingo.ext.proxy.api.Annotatable getCompanyAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
deleted file mode 100644
index b9bf519..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
+++ /dev/null
@@ -1,41 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface EmployeeCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java
deleted file mode 100644
index d5556eb..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface EmployeeCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection.Operations> {
-
-  @Override
-  EmployeeCollectionComposableInvoker select(String... select);
-
-  @Override
-  EmployeeCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java
deleted file mode 100644
index 2516340..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java
+++ /dev/null
@@ -1,213 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface EmployeeComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Employee, Employee.Operations>
-{
-
-  @Override
-  EmployeeComposableInvoker select(String... select);
-
-  @Override
-  EmployeeComposableInvoker 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 = "")
-  java.lang.Integer getPersonID();
-
-  void setPersonID(java.lang.Integer _personID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getFirstName();
-
-  void setFirstName(java.lang.String _firstName);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getLastName();
-
-  void setLastName(java.lang.String _lastName);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getMiddleName();
-
-  void setMiddleName(java.lang.String _middleName);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address
-      getHomeAddress();
-
-      void
-      setHomeAddress(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
-      type = "Edm.GeographyPoint",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.commons.api.edm.geo.Point getHome();
-
-  void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getNumbers();
-
-  void setNumbers(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _numbers);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getEmails();
-
-  void setEmails(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _emails);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateHired",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getDateHired();
-
-  void setDateHired(java.sql.Timestamp _dateHired);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Office",
-      type = "Edm.GeographyPoint",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.commons.api.edm.geo.Point getOffice();
-
-  void setOffice(org.apache.olingo.commons.api.edm.geo.Point _office);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "People",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent();
-
-  void setParent(
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "Company",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany();
-
-      void
-      setCompany(
-          org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
deleted file mode 100644
index d1432e6..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
+++ /dev/null
@@ -1,152 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.OperationType;
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "GiftCard",
-    openType = false,
-    hasStream = false,
-    isAbstract = false)
-public interface GiftCard
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<GiftCard>, org.apache.olingo.ext.proxy.api.StructuredQuery<GiftCard> {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getGiftCardID();
-
-  void setGiftCardID(java.lang.Integer _giftCardID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardNO",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getGiftCardNO();
-
-  void setGiftCardNO(java.lang.String _giftCardNO);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount",
-      type = "Edm.Double",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Double getAmount();
-
-  void setAmount(java.lang.Double _amount);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExperationDate",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getExperationDate();
-
-  void setExperationDate(java.sql.Timestamp _experationDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OwnerName",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getOwnerName();
-
-  void setOwnerName(java.lang.String _ownerName);
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetActualAmount",
-        type = OperationType.FUNCTION,
-        isComposable = false,
-        referenceType = java.lang.Double.class, returnType = "Edm.Double")
-    org.apache.olingo.ext.proxy.api.Invoker<java.lang.Double> getActualAmount(
-        @Parameter(name = "bonusRate", type = "Edm.Double", nullable = true) java.lang.Double bonusRate
-        );
-
-  }
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GiftCardID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getGiftCardIDAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GiftCardNO",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getGiftCardNOAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Amount",
-        type = "Edm.Double")
-    org.apache.olingo.ext.proxy.api.Annotatable getAmountAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExperationDate",
-        type = "Edm.DateTimeOffset")
-    org.apache.olingo.ext.proxy.api.Annotatable getExperationDateAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OwnerName",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getOwnerNameAnnotations();
-
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
deleted file mode 100644
index 988128e..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
+++ /dev/null
@@ -1,41 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface GiftCardCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCardCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCardCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCardCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java
deleted file mode 100644
index 40cab5b..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface GiftCardCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCardCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCardCollection.Operations> {
-
-  @Override
-  GiftCardCollectionComposableInvoker select(String... select);
-
-  @Override
-  GiftCardCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java
deleted file mode 100644
index 0672afd..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java
+++ /dev/null
@@ -1,112 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface GiftCardComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<GiftCard, GiftCard.Operations>
-{
-
-  @Override
-  GiftCardComposableInvoker select(String... select);
-
-  @Override
-  GiftCardComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getGiftCardID();
-
-  void setGiftCardID(java.lang.Integer _giftCardID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardNO",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getGiftCardNO();
-
-  void setGiftCardNO(java.lang.String _giftCardNO);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount",
-      type = "Edm.Double",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Double getAmount();
-
-  void setAmount(java.lang.Double _amount);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExperationDate",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getExperationDate();
-
-  void setExperationDate(java.sql.Timestamp _experationDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OwnerName",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getOwnerName();
-
-  void setOwnerName(java.lang.String _ownerName);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
deleted file mode 100644
index 02e7ec4..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
+++ /dev/null
@@ -1,136 +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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.Annotatable;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "HomeAddress",
-    isOpenType = false,
-    isAbstract = false,
-    baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
-public interface HomeAddress
-    extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address {
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getStreet();
-
-  @Override
-  void setStreet(java.lang.String _street);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getCity();
-
-  @Override
-  void setCity(java.lang.String _city);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getPostalCode();
-
-  @Override
-  void setPostalCode(java.lang.String _postalCode);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FamilyName",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getFamilyName();
-
-  void setFamilyName(java.lang.String _familyName);
-
-  @Override
-  Annotations annotations();
-
-  interface Annotations
-      extends
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations {
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
-        type = "Edm.String")
-    Annotatable getStreetAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
-        type = "Edm.String")
-    Annotatable getCityAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
-        type = "Edm.String")
-    Annotatable getPostalCodeAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FamilyName",
-        type = "Edm.String")
-    Annotatable getFamilyNameAnnotations();
-
-  }
-
-  @Override
-  Operations operations();
-
-  interface Operations
-      extends
-      org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Operations {
-    // No additional methods needed for now.
-  }
-}