You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2016/08/12 11:48:28 UTC

[14/14] olingo-odata4 git commit: [OLINGO-1004] Remove another microsoft from test package name

[OLINGO-1004] Remove another microsoft from test package name


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d16d2b9c
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d16d2b9c
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d16d2b9c

Branch: refs/heads/master
Commit: d16d2b9cd5508b41d2e43b1c154cbc18bfdecde6
Parents: 0063a30
Author: Christian Amend <ch...@sap.com>
Authored: Fri Aug 12 13:44:07 2016 +0200
Committer: Christian Amend <ch...@sap.com>
Committed: Fri Aug 12 13:44:07 2016 +0200

----------------------------------------------------------------------
 .../fit/proxy/APIBasicDesignTestITCase.java     |  48 ++-
 .../olingo/fit/proxy/AbstractTestITCase.java    |   6 +-
 .../olingo/fit/proxy/AsyncTestITCase.java       |  16 +-
 .../fit/proxy/AuthEntityCreateTestITCase.java   |   2 +-
 .../fit/proxy/AuthEntityRetrieveTestITCase.java |   2 +-
 .../proxy/BoundOperationInvokeTestITCase.java   |  22 +-
 .../fit/proxy/ChangeDetectionTestITCase.java    |  17 +-
 .../olingo/fit/proxy/ContextTestITCase.java     |   8 +-
 .../olingo/fit/proxy/DerivedTypeTestITCase.java |  17 +-
 .../fit/proxy/EntityCreateTestITCase.java       |  33 +-
 .../fit/proxy/EntityRetrieveTestITCase.java     |  34 +-
 .../olingo/fit/proxy/EntitySetTestITCase.java   |   4 +-
 .../fit/proxy/EntityUpdateTestITCase.java       |  20 +-
 .../olingo/fit/proxy/FilterTestITCase.java      |  11 +-
 .../fit/proxy/KeyAsSegmentTestITCase.java       |   4 +-
 ...TransactionalAuthEntityCreateTestITCase.java |   2 +-
 .../NonTransactionalEntityCreateTestITCase.java |   2 +-
 .../NonTransactionalEntityUpdateTestITCase.java |   2 +-
 .../proxy/OperationImportInvokeTestITCase.java  |  15 +-
 .../olingo/fit/proxy/PropertyTestITCase.java    |   4 +-
 .../olingo/fit/proxy/SingletonTestITCase.java   |   8 +-
 .../UnauthorizedEntityCreateTestITCase.java     |   2 +-
 .../olingo/fit/proxy/staticservice/Service.java |  60 ++--
 .../services/odatawcfservice/Accounts.java      |  41 ---
 .../services/odatawcfservice/Customers.java     |  41 ---
 .../services/odatawcfservice/Departments.java   |  42 ---
 .../services/odatawcfservice/Employees.java     |  41 ---
 .../odatawcfservice/InMemoryEntities.java       | 226 ------------
 .../services/odatawcfservice/OrderDetails.java  |  43 ---
 .../odata/services/odatawcfservice/Orders.java  |  41 ---
 .../odata/services/odatawcfservice/People.java  |  41 ---
 .../odatawcfservice/ProductDetails.java         |  43 ---
 .../odatawcfservice/ProductReviews.java         |  43 ---
 .../services/odatawcfservice/Products.java      |  41 ---
 .../services/odatawcfservice/StoredPIs.java     |  41 ---
 .../odatawcfservice/SubscriptionTemplates.java  |  42 ---
 .../services/odatawcfservice/package-info.java  |  20 --
 .../odatawcfservice/types/AccessLevel.java      |  46 ---
 .../services/odatawcfservice/types/Account.java | 226 ------------
 .../types/AccountCollection.java                |  41 ---
 .../AccountCollectionComposableInvoker.java     |  32 --
 .../types/AccountComposableInvoker.java         | 156 --------
 .../odatawcfservice/types/AccountInfo.java      |  84 -----
 .../types/AccountInfoCollection.java            |  41 ---
 .../AccountInfoCollectionComposableInvoker.java |  32 --
 .../types/AccountInfoComposableInvoker.java     |  66 ----
 .../services/odatawcfservice/types/Address.java | 102 ------
 .../types/AddressCollection.java                |  41 ---
 .../AddressCollectionComposableInvoker.java     |  32 --
 .../types/AddressComposableInvoker.java         |  78 ----
 .../services/odatawcfservice/types/Asset.java   | 105 ------
 .../odatawcfservice/types/AssetCollection.java  |  41 ---
 .../types/AssetCollectionComposableInvoker.java |  32 --
 .../types/AssetComposableInvoker.java           |  82 -----
 .../services/odatawcfservice/types/Club.java    |  86 -----
 .../odatawcfservice/types/ClubCollection.java   |  41 ---
 .../types/ClubCollectionComposableInvoker.java  |  32 --
 .../types/ClubComposableInvoker.java            |  67 ----
 .../services/odatawcfservice/types/Color.java   |  44 ---
 .../services/odatawcfservice/types/Company.java | 232 ------------
 .../odatawcfservice/types/CompanyAddress.java   | 136 -------
 .../types/CompanyAddressCollection.java         |  41 ---
 ...mpanyAddressCollectionComposableInvoker.java |  32 --
 .../types/CompanyAddressComposableInvoker.java  |  93 -----
 .../odatawcfservice/types/CompanyCategory.java  |  45 ---
 .../types/CompanyCollection.java                |  41 ---
 .../CompanyCollectionComposableInvoker.java     |  32 --
 .../types/CompanyComposableInvoker.java         | 170 ---------
 .../odatawcfservice/types/CreditCardPI.java     | 299 ----------------
 .../types/CreditCardPICollection.java           |  41 ---
 ...CreditCardPICollectionComposableInvoker.java |  32 --
 .../types/CreditCardPIComposableInvoker.java    | 206 -----------
 .../odatawcfservice/types/CreditRecord.java     | 125 -------
 .../types/CreditRecordCollection.java           |  41 ---
 ...CreditRecordCollectionComposableInvoker.java |  32 --
 .../types/CreditRecordComposableInvoker.java    |  97 -----
 .../odatawcfservice/types/Customer.java         | 353 -------------------
 .../types/CustomerCollection.java               |  41 ---
 .../CustomerCollectionComposableInvoker.java    |  32 --
 .../types/CustomerComposableInvoker.java        | 241 -------------
 .../odatawcfservice/types/Department.java       | 120 -------
 .../types/DepartmentCollection.java             |  41 ---
 .../DepartmentCollectionComposableInvoker.java  |  32 --
 .../types/DepartmentComposableInvoker.java      |  94 -----
 .../odatawcfservice/types/Employee.java         | 317 -----------------
 .../types/EmployeeCollection.java               |  41 ---
 .../EmployeeCollectionComposableInvoker.java    |  32 --
 .../types/EmployeeComposableInvoker.java        | 213 -----------
 .../odatawcfservice/types/GiftCard.java         | 152 --------
 .../types/GiftCardCollection.java               |  41 ---
 .../GiftCardCollectionComposableInvoker.java    |  32 --
 .../types/GiftCardComposableInvoker.java        | 112 ------
 .../odatawcfservice/types/HomeAddress.java      | 136 -------
 .../types/HomeAddressCollection.java            |  41 ---
 .../HomeAddressCollectionComposableInvoker.java |  32 --
 .../types/HomeAddressComposableInvoker.java     |  93 -----
 .../services/odatawcfservice/types/IsBoss.java  |  31 --
 .../odatawcfservice/types/LabourUnion.java      |  87 -----
 .../types/LabourUnionCollection.java            |  41 ---
 .../LabourUnionCollectionComposableInvoker.java |  32 --
 .../types/LabourUnionComposableInvoker.java     |  67 ----
 .../services/odatawcfservice/types/Order.java   | 174 ---------
 .../odatawcfservice/types/OrderCollection.java  |  41 ---
 .../types/OrderCollectionComposableInvoker.java |  32 --
 .../types/OrderComposableInvoker.java           | 136 -------
 .../odatawcfservice/types/OrderDetail.java      | 180 ----------
 .../types/OrderDetailCollection.java            |  41 ---
 .../OrderDetailCollectionComposableInvoker.java |  32 --
 .../types/OrderDetailComposableInvoker.java     | 139 --------
 .../odatawcfservice/types/OrderDetailKey.java   |  53 ---
 .../types/PaymentInstrument.java                | 165 ---------
 .../types/PaymentInstrumentCollection.java      |  41 ---
 ...ntInstrumentCollectionComposableInvoker.java |  32 --
 .../PaymentInstrumentComposableInvoker.java     | 132 -------
 .../services/odatawcfservice/types/Person.java  | 240 -------------
 .../odatawcfservice/types/PersonCollection.java |  41 ---
 .../PersonCollectionComposableInvoker.java      |  32 --
 .../types/PersonComposableInvoker.java          | 171 ---------
 .../services/odatawcfservice/types/Product.java | 266 --------------
 .../types/ProductCollection.java                |  53 ---
 .../ProductCollectionComposableInvoker.java     |  32 --
 .../types/ProductComposableInvoker.java         | 193 ----------
 .../odatawcfservice/types/ProductDetail.java    | 172 ---------
 .../types/ProductDetailCollection.java          |  41 ---
 ...roductDetailCollectionComposableInvoker.java |  32 --
 .../types/ProductDetailComposableInvoker.java   | 124 -------
 .../odatawcfservice/types/ProductDetailKey.java |  53 ---
 .../odatawcfservice/types/ProductReview.java    | 168 ---------
 .../types/ProductReviewCollection.java          |  41 ---
 ...roductReviewCollectionComposableInvoker.java |  32 --
 .../types/ProductReviewComposableInvoker.java   | 130 -------
 .../odatawcfservice/types/ProductReviewKey.java |  75 ----
 .../odatawcfservice/types/PublicCompany.java    | 339 ------------------
 .../types/PublicCompanyCollection.java          |  41 ---
 ...ublicCompanyCollectionComposableInvoker.java |  32 --
 .../types/PublicCompanyComposableInvoker.java   | 232 ------------
 .../odatawcfservice/types/Statement.java        | 124 -------
 .../types/StatementCollection.java              |  41 ---
 .../StatementCollectionComposableInvoker.java   |  32 --
 .../types/StatementComposableInvoker.java       |  97 -----
 .../odatawcfservice/types/StoredPI.java         | 124 -------
 .../types/StoredPICollection.java               |  41 ---
 .../StoredPICollectionComposableInvoker.java    |  32 --
 .../types/StoredPIComposableInvoker.java        |  97 -----
 .../odatawcfservice/types/Subscription.java     | 144 --------
 .../types/SubscriptionCollection.java           |  41 ---
 ...SubscriptionCollectionComposableInvoker.java |  32 --
 .../types/SubscriptionComposableInvoker.java    | 112 ------
 .../odatawcfservice/types/package-info.java     |  20 --
 .../staticservice/odatawcfservice/Accounts.java |  41 +++
 .../odatawcfservice/Customers.java              |  41 +++
 .../odatawcfservice/Departments.java            |  41 +++
 .../odatawcfservice/Employees.java              |  41 +++
 .../odatawcfservice/InMemoryEntities.java       | 225 ++++++++++++
 .../odatawcfservice/OrderDetails.java           |  42 +++
 .../staticservice/odatawcfservice/Orders.java   |  41 +++
 .../staticservice/odatawcfservice/People.java   |  41 +++
 .../odatawcfservice/ProductDetails.java         |  42 +++
 .../odatawcfservice/ProductReviews.java         |  42 +++
 .../staticservice/odatawcfservice/Products.java |  41 +++
 .../odatawcfservice/StoredPIs.java              |  41 +++
 .../odatawcfservice/SubscriptionTemplates.java  |  41 +++
 .../odatawcfservice/package-info.java           |  20 ++
 .../odatawcfservice/types/AccessLevel.java      |  46 +++
 .../odatawcfservice/types/Account.java          | 226 ++++++++++++
 .../types/AccountCollection.java                |  41 +++
 .../AccountCollectionComposableInvoker.java     |  32 ++
 .../types/AccountComposableInvoker.java         | 156 ++++++++
 .../odatawcfservice/types/AccountInfo.java      |  84 +++++
 .../types/AccountInfoCollection.java            |  41 +++
 .../AccountInfoCollectionComposableInvoker.java |  32 ++
 .../types/AccountInfoComposableInvoker.java     |  66 ++++
 .../odatawcfservice/types/Address.java          | 102 ++++++
 .../types/AddressCollection.java                |  41 +++
 .../AddressCollectionComposableInvoker.java     |  32 ++
 .../types/AddressComposableInvoker.java         |  78 ++++
 .../odatawcfservice/types/Asset.java            | 105 ++++++
 .../odatawcfservice/types/AssetCollection.java  |  41 +++
 .../types/AssetCollectionComposableInvoker.java |  32 ++
 .../types/AssetComposableInvoker.java           |  82 +++++
 .../odatawcfservice/types/Club.java             |  86 +++++
 .../odatawcfservice/types/ClubCollection.java   |  41 +++
 .../types/ClubCollectionComposableInvoker.java  |  32 ++
 .../types/ClubComposableInvoker.java            |  67 ++++
 .../odatawcfservice/types/Color.java            |  44 +++
 .../odatawcfservice/types/Company.java          | 232 ++++++++++++
 .../odatawcfservice/types/CompanyAddress.java   | 136 +++++++
 .../types/CompanyAddressCollection.java         |  41 +++
 ...mpanyAddressCollectionComposableInvoker.java |  32 ++
 .../types/CompanyAddressComposableInvoker.java  |  93 +++++
 .../odatawcfservice/types/CompanyCategory.java  |  45 +++
 .../types/CompanyCollection.java                |  41 +++
 .../CompanyCollectionComposableInvoker.java     |  32 ++
 .../types/CompanyComposableInvoker.java         | 170 +++++++++
 .../odatawcfservice/types/CreditCardPI.java     | 299 ++++++++++++++++
 .../types/CreditCardPICollection.java           |  41 +++
 ...CreditCardPICollectionComposableInvoker.java |  32 ++
 .../types/CreditCardPIComposableInvoker.java    | 206 +++++++++++
 .../odatawcfservice/types/CreditRecord.java     | 125 +++++++
 .../types/CreditRecordCollection.java           |  41 +++
 ...CreditRecordCollectionComposableInvoker.java |  32 ++
 .../types/CreditRecordComposableInvoker.java    |  97 +++++
 .../odatawcfservice/types/Customer.java         | 353 +++++++++++++++++++
 .../types/CustomerCollection.java               |  41 +++
 .../CustomerCollectionComposableInvoker.java    |  32 ++
 .../types/CustomerComposableInvoker.java        | 241 +++++++++++++
 .../odatawcfservice/types/Department.java       | 120 +++++++
 .../types/DepartmentCollection.java             |  41 +++
 .../DepartmentCollectionComposableInvoker.java  |  32 ++
 .../types/DepartmentComposableInvoker.java      |  94 +++++
 .../odatawcfservice/types/Employee.java         | 317 +++++++++++++++++
 .../types/EmployeeCollection.java               |  41 +++
 .../EmployeeCollectionComposableInvoker.java    |  32 ++
 .../types/EmployeeComposableInvoker.java        | 213 +++++++++++
 .../odatawcfservice/types/GiftCard.java         | 152 ++++++++
 .../types/GiftCardCollection.java               |  41 +++
 .../GiftCardCollectionComposableInvoker.java    |  32 ++
 .../types/GiftCardComposableInvoker.java        | 112 ++++++
 .../odatawcfservice/types/HomeAddress.java      | 136 +++++++
 .../types/HomeAddressCollection.java            |  41 +++
 .../HomeAddressCollectionComposableInvoker.java |  32 ++
 .../types/HomeAddressComposableInvoker.java     |  93 +++++
 .../odatawcfservice/types/IsBoss.java           |  31 ++
 .../odatawcfservice/types/LabourUnion.java      |  87 +++++
 .../types/LabourUnionCollection.java            |  41 +++
 .../LabourUnionCollectionComposableInvoker.java |  32 ++
 .../types/LabourUnionComposableInvoker.java     |  67 ++++
 .../odatawcfservice/types/Order.java            | 174 +++++++++
 .../odatawcfservice/types/OrderCollection.java  |  41 +++
 .../types/OrderCollectionComposableInvoker.java |  32 ++
 .../types/OrderComposableInvoker.java           | 136 +++++++
 .../odatawcfservice/types/OrderDetail.java      | 180 ++++++++++
 .../types/OrderDetailCollection.java            |  41 +++
 .../OrderDetailCollectionComposableInvoker.java |  32 ++
 .../types/OrderDetailComposableInvoker.java     | 139 ++++++++
 .../odatawcfservice/types/OrderDetailKey.java   |  53 +++
 .../types/PaymentInstrument.java                | 165 +++++++++
 .../types/PaymentInstrumentCollection.java      |  41 +++
 ...ntInstrumentCollectionComposableInvoker.java |  32 ++
 .../PaymentInstrumentComposableInvoker.java     | 132 +++++++
 .../odatawcfservice/types/Person.java           | 240 +++++++++++++
 .../odatawcfservice/types/PersonCollection.java |  41 +++
 .../PersonCollectionComposableInvoker.java      |  32 ++
 .../types/PersonComposableInvoker.java          | 171 +++++++++
 .../odatawcfservice/types/Product.java          | 266 ++++++++++++++
 .../types/ProductCollection.java                |  53 +++
 .../ProductCollectionComposableInvoker.java     |  32 ++
 .../types/ProductComposableInvoker.java         | 193 ++++++++++
 .../odatawcfservice/types/ProductDetail.java    | 172 +++++++++
 .../types/ProductDetailCollection.java          |  41 +++
 ...roductDetailCollectionComposableInvoker.java |  32 ++
 .../types/ProductDetailComposableInvoker.java   | 124 +++++++
 .../odatawcfservice/types/ProductDetailKey.java |  53 +++
 .../odatawcfservice/types/ProductReview.java    | 168 +++++++++
 .../types/ProductReviewCollection.java          |  41 +++
 ...roductReviewCollectionComposableInvoker.java |  32 ++
 .../types/ProductReviewComposableInvoker.java   | 130 +++++++
 .../odatawcfservice/types/ProductReviewKey.java |  75 ++++
 .../odatawcfservice/types/PublicCompany.java    | 339 ++++++++++++++++++
 .../types/PublicCompanyCollection.java          |  41 +++
 ...ublicCompanyCollectionComposableInvoker.java |  32 ++
 .../types/PublicCompanyComposableInvoker.java   | 232 ++++++++++++
 .../odatawcfservice/types/Statement.java        | 124 +++++++
 .../types/StatementCollection.java              |  41 +++
 .../StatementCollectionComposableInvoker.java   |  32 ++
 .../types/StatementComposableInvoker.java       |  97 +++++
 .../odatawcfservice/types/StoredPI.java         | 124 +++++++
 .../types/StoredPICollection.java               |  41 +++
 .../StoredPICollectionComposableInvoker.java    |  32 ++
 .../types/StoredPIComposableInvoker.java        |  97 +++++
 .../odatawcfservice/types/Subscription.java     | 144 ++++++++
 .../types/SubscriptionCollection.java           |  41 +++
 ...SubscriptionCollectionComposableInvoker.java |  32 ++
 .../types/SubscriptionComposableInvoker.java    | 112 ++++++
 .../odatawcfservice/types/package-info.java     |  20 ++
 275 files changed, 11231 insertions(+), 11256 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/APIBasicDesignTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/APIBasicDesignTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/APIBasicDesignTestITCase.java
index d395268..828536f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/APIBasicDesignTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/APIBasicDesignTestITCase.java
@@ -44,31 +44,29 @@ import org.apache.olingo.ext.proxy.commons.AbstractCollectionInvocationHandler;
 import org.apache.olingo.fit.proxy.demo.Service;
 import org.apache.olingo.fit.proxy.demo.odatademo.DemoService;
 import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetail;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .ProductCollectionComposableInvoker;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .ProductDetailCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Account;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AddressCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Color;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrumentCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PersonCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PersonComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Product;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductDetail;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductDetailCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductDetailCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Account.MyPaymentInstruments;
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/AbstractTestITCase.java
index c6e1b2c..09cbb15 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/AbstractTestITCase.java
@@ -36,9 +36,9 @@ import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
 import org.apache.olingo.fit.AbstractBaseTestITCase;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Order;
 import org.junit.BeforeClass;
 
 public abstract class AbstractTestITCase extends AbstractBaseTestITCase {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/AsyncTestITCase.java
index 6d4fe7f..94ce7ce 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/AsyncTestITCase.java
@@ -26,16 +26,12 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import org.apache.commons.lang3.RandomStringUtils;
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .PersonComposableInvoker;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .ProductCollectionComposableInvoker;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PersonComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductCollectionComposableInvoker;
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java
index 2a54622..04a7176 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java
@@ -22,7 +22,7 @@ import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
 
 public class AuthEntityCreateTestITCase extends EntityCreateTestITCase {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java
index 471c01b..30b36c4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java
@@ -22,7 +22,7 @@ import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
 
 public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/BoundOperationInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/BoundOperationInvokeTestITCase.java
index 5847f47..c3ac663 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/BoundOperationInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/BoundOperationInvokeTestITCase.java
@@ -25,18 +25,16 @@ import static org.junit.Assert.assertNotNull;
 import java.sql.Timestamp;
 import java.util.Calendar;
 
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .ProductDetailCollectionComposableInvoker;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoComposableInvoker;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductComposableInvoker;
-
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AccountInfoComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AddressCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductDetailCollectionComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductDetailKey;
 import org.junit.Test;
 // CHECKSTYLE:ON (Maven checkstyle)
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/ChangeDetectionTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/ChangeDetectionTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/ChangeDetectionTestITCase.java
index 33897e7..da467dd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/ChangeDetectionTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/ChangeDetectionTestITCase.java
@@ -32,15 +32,14 @@ import org.apache.olingo.ext.proxy.api.EntityType;
 import org.apache.olingo.ext.proxy.commons.ComplexInvocationHandler;
 import org.apache.olingo.ext.proxy.commons.EntityCollectionInvocationHandler;
 import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Account;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrumentCollection;
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java
index 2d97038..063f186 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java
@@ -31,10 +31,10 @@ import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.ext.proxy.api.ODataFlushException;
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
 import org.junit.Test;
 
 public class ContextTestITCase extends AbstractTestITCase {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/DerivedTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/DerivedTypeTestITCase.java
index f59dcd8..5855bb6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/DerivedTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/DerivedTypeTestITCase.java
@@ -25,16 +25,13 @@ import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.Calendar;
 
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection;
-
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CompanyAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CreditCardPI;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CreditCardPICollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityCreateTestITCase.java
index e581111..9f77079 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityCreateTestITCase.java
@@ -34,23 +34,22 @@ import org.apache.commons.lang3.RandomUtils;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection;
-
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Color;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderDetail;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderDetailKey;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrumentCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Product;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductDetail;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductDetailCollection;
 import org.junit.Assert;
 import org.junit.Test;
 // CHECKSTYLE:ON (Maven checkstyle)

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityRetrieveTestITCase.java
index 3b74db8..deba8e7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityRetrieveTestITCase.java
@@ -31,24 +31,22 @@ import java.util.TimeZone;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
-
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Company;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CustomerCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.EmployeeCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderDetail;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderDetailKey;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PersonCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Product;
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/EntitySetTestITCase.java
index 7610603..d83e691 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/EntitySetTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/EntitySetTestITCase.java
@@ -21,8 +21,8 @@ package org.apache.olingo.fit.proxy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityUpdateTestITCase.java
index fce3d85..9c1ac88 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityUpdateTestITCase.java
@@ -35,16 +35,16 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CompanyAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderDetail;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderDetailKey;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
 import org.junit.Test;
 
 // CHECKSTYLE:ON (Maven checkstyle)

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/FilterTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/FilterTestITCase.java
index d9f3c9d..9d8dbb2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/FilterTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/FilterTestITCase.java
@@ -28,12 +28,11 @@ import java.util.List;
 
 import org.apache.olingo.ext.proxy.api.Search;
 import org.apache.olingo.ext.proxy.api.Sort;
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.People;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.People;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.EmployeeCollection;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PersonCollection;
 import org.junit.Test;
 
 // CHECKSTYLE:ON (Maven checkstyle)

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/KeyAsSegmentTestITCase.java
index bc57529..1c5a9e6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/KeyAsSegmentTestITCase.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertNotNull;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
 import org.junit.Test;
 
 public class KeyAsSegmentTestITCase extends AbstractTestITCase {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java
index 60c4c12..7d07540 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java
@@ -22,7 +22,7 @@ import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
 
 public class NonTransactionalAuthEntityCreateTestITCase extends EntityCreateTestITCase {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java
index 9b797ce..257e534 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java
@@ -21,7 +21,7 @@ package org.apache.olingo.fit.proxy;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
 
 public class NonTransactionalEntityCreateTestITCase extends EntityCreateTestITCase {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java
index 0ed093c..5b84543 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java
@@ -21,7 +21,7 @@ package org.apache.olingo.fit.proxy;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
 
 public class NonTransactionalEntityUpdateTestITCase extends EntityUpdateTestITCase {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/OperationImportInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/OperationImportInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/OperationImportInvokeTestITCase.java
index e30ffb6..775cadc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/OperationImportInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/OperationImportInvokeTestITCase.java
@@ -22,15 +22,12 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .PersonComposableInvoker;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .ProductCollectionComposableInvoker;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Color;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PersonComposableInvoker;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductCollectionComposableInvoker;
 // CHECKSTYLE:ON (Maven checkstyle)
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/PropertyTestITCase.java
index 015161a..b395d8d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/PropertyTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/PropertyTestITCase.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
 import org.apache.olingo.ext.proxy.api.ODataFlushException;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.StoredPI;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/SingletonTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/SingletonTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/SingletonTestITCase.java
index fab7a14..39bdb41 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/SingletonTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/SingletonTestITCase.java
@@ -23,10 +23,10 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.olingo.ext.proxy.api.Annotatable;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.IsBoss;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Company;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CompanyCategory;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.IsBoss;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
 import org.junit.Test;
 
 public class SingletonTestITCase extends AbstractTestITCase {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java
index 93906ef..1c773e6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java
@@ -23,7 +23,7 @@ import org.apache.olingo.client.api.http.HttpClientException;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.fit.proxy.staticservice.Service;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.InMemoryEntities;
 import org.junit.Test;
 
 public class UnauthorizedEntityCreateTestITCase extends AbstractTestITCase {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/Service.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/Service.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/Service.java
index 5b5a829..5d30c76 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/Service.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/Service.java
@@ -26,36 +26,36 @@ import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.IsBoss;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AccessLevel;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Account;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.AccountInfo;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Address;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Asset;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Club;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Color;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Company;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CompanyAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CompanyCategory;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CreditCardPI;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.CreditRecord;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Customer;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Department;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Employee;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.GiftCard;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.HomeAddress;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.IsBoss;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.LabourUnion;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Order;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.OrderDetail;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PaymentInstrument;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Person;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Product;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductDetail;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.ProductReview;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.PublicCompany;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Statement;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.StoredPI;
+import org.apache.olingo.fit.proxy.staticservice.odatawcfservice.types.Subscription;
 
 public class Service<C extends EdmEnabledODataClient> extends AbstractService<C> {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
deleted file mode 100644
index 61b8f7b..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.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.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Accounts",
-    container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface Accounts
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<Account, AccountCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Accounts>,
-    AbstractEntitySet<Account, java.lang.Integer, AccountCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
deleted file mode 100644
index 0974312..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.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.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customers",
-    container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface Customers
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<Customer, CustomerCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Customers>,
-    AbstractEntitySet<Customer, java.lang.Integer, CustomerCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
deleted file mode 100644
index 8917add..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
+++ /dev/null
@@ -1,42 +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.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .DepartmentCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Departments",
-    container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface Departments
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<Department, DepartmentCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Departments>,
-    AbstractEntitySet<Department, java.lang.Integer, DepartmentCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
deleted file mode 100644
index 4b1bccf..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.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.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee;
-import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Employees",
-    container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface Employees
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<Employee, EmployeeCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Employees>,
-    AbstractEntitySet<Employee, java.lang.Integer, EmployeeCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-}