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/InMemoryEntities.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
deleted file mode 100644
index cbe45ed..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
+++ /dev/null
@@ -1,226 +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 java.io.InputStream;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-import java.io.Serializable;
-
-import org.apache.olingo.ext.proxy.api.ComplexCollection;
-import org.apache.olingo.ext.proxy.api.ComplexType;
-import org.apache.olingo.ext.proxy.api.EdmStreamValue;
-import org.apache.olingo.ext.proxy.api.EntityCollection;
-import org.apache.olingo.ext.proxy.api.EntityType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.PersistenceManager;
-import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-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.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.LabourUnion;
-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.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.StoredPI;
-
[email protected]("Microsoft.Test.OData.Services.ODataWCFService")
[email protected](name = 
"InMemoryEntities",
-    namespace = "Microsoft.Test.OData.Services.ODataWCFService")
-public interface InMemoryEntities extends PersistenceManager {
-
-  Accounts getAccounts();
-
-  StoredPIs getStoredPIs();
-
-  Customers getCustomers();
-
-  Products getProducts();
-
-  OrderDetails getOrderDetails();
-
-  Departments getDepartments();
-
-  Employees getEmployees();
-
-  Orders getOrders();
-
-  People getPeople();
-
-  SubscriptionTemplates getSubscriptionTemplates();
-
-  ProductReviews getProductReviews();
-
-  ProductDetails getProductDetails();
-
-  @org.apache.olingo.ext.proxy.api.annotations.Singleton(
-      name = "PublicCompany",
-      container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-  Company
-      getPublicCompany();
-
-  @org.apache.olingo.ext.proxy.api.annotations.Singleton(
-      name = "DefaultStoredPI",
-      container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-  StoredPI
-      getDefaultStoredPI();
-
-  @org.apache.olingo.ext.proxy.api.annotations.Singleton(
-      name = "VipCustomer",
-      container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-  Customer
-      getVipCustomer();
-
-  @org.apache.olingo.ext.proxy.api.annotations.Singleton(
-      name = "Company",
-      container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-  Company getCompany();
-
-  @org.apache.olingo.ext.proxy.api.annotations.Singleton(
-      name = "Boss",
-      container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-  Person getBoss();
-
-  @org.apache.olingo.ext.proxy.api.annotations.Singleton(
-      name = "LabourUnion",
-      container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-  LabourUnion
-      getLabourUnion();
-
-  Operations operations();
-
-  public interface Operations extends 
org.apache.olingo.ext.proxy.api.Operations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"GetBossEmails",
-        type = OperationType.FUNCTION,
-        isComposable = false,
-        referenceType = 
org.apache.olingo.ext.proxy.api.PrimitiveCollection.class,
-        returnType = "Collection(Edm.String)")
-        
org.apache.olingo.ext.proxy.api.PrimitiveCollectionInvoker<org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String>>
-        getBossEmails(
-            @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = 
"start", type = "Edm.Int32", nullable = false) java.lang.Integer start,
-            @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = 
"count", type = "Edm.Int32", nullable = false) java.lang.Integer count
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(
-        name = "GetPerson2",
-        type = OperationType.FUNCTION,
-        isComposable = true,
-        referenceType = Person.class,
-        returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
-    PersonComposableInvoker
-        getPerson2(
-            @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = 
"city", type = "Edm.String", nullable = false) java.lang.String city
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(
-        name = "GetDefaultColor",
-        type = OperationType.FUNCTION,
-        isComposable = true,
-        referenceType = Color.class,
-        returnType = "Microsoft.Test.OData.Services.ODataWCFService.Color")
-        org.apache.olingo.ext.proxy.api.Invoker<Color>
-        getDefaultColor(
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(
-        name = "GetPerson",
-        type = OperationType.FUNCTION,
-        isComposable = true,
-        referenceType = Person.class,
-        returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
-    PersonComposableInvoker
-        getPerson(
-            @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = 
"address",
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) 
Address address
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"GetProductsByAccessLevel",
-        type = OperationType.FUNCTION,
-        isComposable = false,
-        referenceType = 
org.apache.olingo.ext.proxy.api.PrimitiveCollection.class,
-        returnType = "Collection(Edm.String)")
-        
org.apache.olingo.ext.proxy.api.PrimitiveCollectionInvoker<org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String>>
-        getProductsByAccessLevel(
-            @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = 
"accessLevel",
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = false) 
AccessLevel accessLevel
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(
-        name = "GetAllProducts",
-        type = OperationType.FUNCTION,
-        isComposable = true,
-        referenceType = ProductCollection.class,
-        returnType = 
"Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)")
-    ProductCollectionComposableInvoker
-        getAllProducts(
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(
-        name = "ResetBossAddress",
-        type = OperationType.ACTION,
-        referenceType = Address.class,
-        returnType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
-        org.apache.olingo.ext.proxy.api.StructuredInvoker<Address>
-        resetBossAddress(
-            @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = 
"address",
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) 
Address address
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"ResetDataSource",
-        type = OperationType.ACTION)
-    org.apache.olingo.ext.proxy.api.Invoker<Void> resetDataSource(
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Discount",
-        type = OperationType.ACTION)
-    org.apache.olingo.ext.proxy.api.Invoker<Void> discount(
-        @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = 
"percentage", type = "Edm.Int32",
-            nullable = false) java.lang.Integer percentage
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"ResetBossEmail",
-        type = OperationType.ACTION,
-        referenceType = 
org.apache.olingo.ext.proxy.api.PrimitiveCollection.class,
-        returnType = "Collection(Edm.String)")
-        
org.apache.olingo.ext.proxy.api.PrimitiveCollectionInvoker<org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String>>
-        resetBossEmail(
-            @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = 
"emails", type = "Collection(Edm.String)",
-                nullable = false) 
org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> emails
-        );
-
-  }
-
-  <NE extends EntityType<?>> NE newEntityInstance(Class<NE> ref);
-
-  <T extends EntityType<?>, NEC extends EntityCollection<T, ?, ?>> NEC 
newEntityCollection(Class<NEC> ref);
-
-  <NE extends ComplexType<?>> NE newComplexInstance(Class<NE> ref);
-
-  <T extends ComplexType<?>, NEC extends ComplexCollection<T, ?, ?>> NEC 
newComplexCollection(Class<NEC> ref);
-
-  <T extends Serializable, NEC extends PrimitiveCollection<T>> NEC 
newPrimitiveCollection(Class<T> ref);
-
-  EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
deleted file mode 100644
index c150e3b..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
+++ /dev/null
@@ -1,43 +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.OrderDetail;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .OrderDetailCollection;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "OrderDetails",
-    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface OrderDetails
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<OrderDetail, 
OrderDetailCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<OrderDetails>,
-    AbstractEntitySet<OrderDetail, OrderDetailKey, OrderDetailCollection> {
-
-  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/Orders.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
deleted file mode 100644
index 7334de6..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.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.Order;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "Orders",
-    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface Orders
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<Order, OrderCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Orders>,
-    AbstractEntitySet<Order, java.lang.Integer, OrderCollection> {
-
-  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/People.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
deleted file mode 100644
index 4b2a35a..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/People.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.Person;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "People",
-    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface People
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<Person, PersonCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<People>,
-    AbstractEntitySet<Person, java.lang.Integer, PersonCollection> {
-
-  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/ProductDetails.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
deleted file mode 100644
index b70fd7b..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
+++ /dev/null
@@ -1,43 +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.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.ProductDetailKey;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "ProductDetails",
-    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface ProductDetails
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<ProductDetail, 
ProductDetailCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ProductDetails>,
-    AbstractEntitySet<ProductDetail, ProductDetailKey, 
ProductDetailCollection> {
-
-  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/ProductReviews.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
deleted file mode 100644
index 04bb395..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
+++ /dev/null
@@ -1,43 +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.ProductReview;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .ProductReviewCollection;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewKey;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "ProductReviews",
-    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface ProductReviews
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<ProductReview, 
ProductReviewCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ProductReviews>,
-    AbstractEntitySet<ProductReview, ProductReviewKey, 
ProductReviewCollection> {
-
-  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/Products.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
deleted file mode 100644
index bc1f21c..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Products.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.Product;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "Products",
-    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface Products
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<Product, ProductCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Products>,
-    AbstractEntitySet<Product, java.lang.Integer, ProductCollection> {
-
-  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/StoredPIs.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
deleted file mode 100644
index acf5a88..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.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.StoredPI;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "StoredPIs",
-    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface StoredPIs
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<StoredPI, StoredPICollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<StoredPIs>,
-    AbstractEntitySet<StoredPI, java.lang.Integer, StoredPICollection> {
-
-  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/SubscriptionTemplates.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
deleted file mode 100644
index b912850..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.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.Subscription;
-import 
org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types
-        .SubscriptionCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = 
"SubscriptionTemplates",
-    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface SubscriptionTemplates
-    extends
-    org.apache.olingo.ext.proxy.api.EntitySet<Subscription, 
SubscriptionCollection>,
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<SubscriptionTemplates>,
-    AbstractEntitySet<Subscription, java.lang.Integer, SubscriptionCollection> 
{
-
-  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/package-info.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
deleted file mode 100644
index 5faa3a5..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
+++ /dev/null
@@ -1,20 +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;
-

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/types/AccessLevel.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
deleted file mode 100644
index f41b243..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
+++ /dev/null
@@ -1,46 +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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected]("Microsoft.Test.OData.Services.ODataWCFService")
[email protected](name = "AccessLevel",
-    underlyingType = EdmPrimitiveTypeKind.Int32,
-    isFlags = true)
-public enum AccessLevel {
-  None(0),
-  Read(1),
-  Write(2),
-  Execute(4),
-  ReadWrite(3);
-
-  private java.lang.Integer value;
-
-  public java.lang.Integer getValue() {
-    return value;
-  }
-
-  private AccessLevel(final java.lang.Integer value) {
-    this.value = value;
-  }
-}

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/types/Account.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
deleted file mode 100644
index 2487465..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
+++ /dev/null
@@ -1,226 +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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-
[email protected]("Microsoft.Test.OData.Services.ODataWCFService")
[email protected](name = "Account",
-    openType = false,
-    hasStream = false,
-    isAbstract = false)
-public interface Account
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<Account>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<Account> {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getAccountID();
-
-  void setAccountID(java.lang.Integer _accountID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getCountry();
-
-  void setCountry(java.lang.String _country);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  AccountInfo
-      getAccountInfo();
-
-      void
-      setAccountInfo(
-          AccountInfo _accountInfo);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyGiftCard",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "",
-      targetEntitySet = "",
-      containsTarget = true)
-  GiftCard
-      getMyGiftCard();
-
-      void
-      setMyGiftCard(
-          GiftCard _myGiftCard);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"AvailableSubscriptionTemplatess",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "SubscriptionTemplates",
-      containsTarget = false)
-  SubscriptionCollection
-      getAvailableSubscriptionTemplatess();
-
-      void
-      setAvailableSubscriptionTemplatess(
-          SubscriptionCollection _availableSubscriptionTemplatess);
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(
-        name = "GetDefaultPI",
-        type = OperationType.FUNCTION,
-        isComposable = false,
-        referenceType = PaymentInstrument.class,
-        returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
-        org.apache.olingo.ext.proxy.api.StructuredInvoker<PaymentInstrument>
-        getDefaultPI(
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(
-        name = "GetAccountInfo",
-        type = OperationType.FUNCTION,
-        isComposable = true,
-        referenceType = AccountInfo.class,
-        returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
-    AccountInfoComposableInvoker
-        getAccountInfo(
-        );
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(
-        name = "RefreshDefaultPI",
-        type = OperationType.ACTION,
-        referenceType = PaymentInstrument.class,
-        returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
-        org.apache.olingo.ext.proxy.api.StructuredInvoker<PaymentInstrument>
-        refreshDefaultPI(
-            @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable 
= true) java.sql.Timestamp newDate
-        );
-
-  }
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"AccountID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getAccountIDAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Country",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getCountryAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"AccountInfo",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
-    org.apache.olingo.ext.proxy.api.Annotatable getAccountInfoAnnotations();
-
-    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "MyGiftCard",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard")
-    org.apache.olingo.ext.proxy.api.Annotatable getMyGiftCardAnnotations();
-
-    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "MyPaymentInstruments",
-        type = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
-    org.apache.olingo.ext.proxy.api.Annotatable 
getMyPaymentInstrumentsAnnotations();
-
-    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "ActiveSubscriptions",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
-    org.apache.olingo.ext.proxy.api.Annotatable 
getActiveSubscriptionsAnnotations();
-
-    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(
-        name = "AvailableSubscriptionTemplatess",
-        type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
-    org.apache.olingo.ext.proxy.api.Annotatable 
getAvailableSubscriptionTemplatessAnnotations();
-  }
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyPaymentInstruments",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "SubscriptionTemplates",
-      containsTarget = true)
-      Account.MyPaymentInstruments
-      getMyPaymentInstruments();
-
-      void
-      setMyPaymentInstruments(
-          Account.MyPaymentInstruments _myPaymentInstruments);
-
-  @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"MyPaymentInstruments", contained = true)
-  interface MyPaymentInstruments
-      extends
-      org.apache.olingo.ext.proxy.api.EntitySet<PaymentInstrument, 
PaymentInstrumentCollection>,
-      
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<MyPaymentInstruments>,
-  AbstractEntitySet<PaymentInstrument, java.lang.Integer, 
PaymentInstrumentCollection> {
-    // No additional methods needed for now.
-  }
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"ActiveSubscriptions",
-      type = "java.lang.Integer",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "SubscriptionTemplates",
-      containsTarget = true)
-      Account.ActiveSubscriptions
-      getActiveSubscriptions();
-
-      void
-      setActiveSubscriptions(
-          Account.ActiveSubscriptions _activeSubscriptions);
-
-  @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"ActiveSubscriptions", contained = true)
-  interface ActiveSubscriptions
-      extends
-      org.apache.olingo.ext.proxy.api.EntitySet<Subscription, 
SubscriptionCollection>,
-      
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ActiveSubscriptions>,
-  AbstractEntitySet<Subscription, java.lang.Integer, SubscriptionCollection> {
-    // 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/types/AccountCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
deleted file mode 100644
index 875ee01..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface AccountCollection
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AccountCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<Account, AccountCollection, 
AccountCollection> {
-
-  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/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java
deleted file mode 100644
index fd966bf..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface AccountCollectionComposableInvoker
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<AccountCollection,
 AccountCollection.Operations> {
-
-  @Override
-  AccountCollectionComposableInvoker select(String... select);
-
-  @Override
-  AccountCollectionComposableInvoker expand(String... expand);
-}

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/types/AccountComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java
deleted file mode 100644
index 1792bec..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java
+++ /dev/null
@@ -1,156 +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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-public interface AccountComposableInvoker
-    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Account, 
Account.Operations>
-{
-
-  @Override
-  AccountComposableInvoker select(String... select);
-
-  @Override
-  AccountComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getAccountID();
-
-  void setAccountID(java.lang.Integer _accountID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getCountry();
-
-  void setCountry(java.lang.String _country);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  AccountInfo
-      getAccountInfo();
-
-      void
-      setAccountInfo(
-          AccountInfo _accountInfo);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyGiftCard",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "",
-      targetEntitySet = "",
-      containsTarget = true)
-  GiftCard
-      getMyGiftCard();
-
-      void
-      setMyGiftCard(
-          GiftCard _myGiftCard);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"AvailableSubscriptionTemplatess",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "SubscriptionTemplates",
-      containsTarget = false)
-  SubscriptionCollection
-      getAvailableSubscriptionTemplatess();
-
-      void
-      setAvailableSubscriptionTemplatess(
-          SubscriptionCollection _availableSubscriptionTemplatess);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyPaymentInstruments",
-      type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "SubscriptionTemplates",
-      containsTarget = true)
-      Account.MyPaymentInstruments
-      getMyPaymentInstruments();
-
-      void
-      setMyPaymentInstruments(
-          Account.MyPaymentInstruments _myPaymentInstruments);
-
-  @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"MyPaymentInstruments", contained = true)
-  interface MyPaymentInstruments
-      extends
-      org.apache.olingo.ext.proxy.api.EntitySet<PaymentInstrument, 
PaymentInstrumentCollection>,
-      
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<MyPaymentInstruments>,
-  AbstractEntitySet<PaymentInstrument, java.lang.Integer, 
PaymentInstrumentCollection> {
-    // No additional methods needed for now.
-  }
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"ActiveSubscriptions",
-      type = "java.lang.Integer",
-      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
-      targetContainer = "InMemoryEntities",
-      targetEntitySet = "SubscriptionTemplates",
-      containsTarget = true)
-      Account.ActiveSubscriptions
-      getActiveSubscriptions();
-
-      void
-      setActiveSubscriptions(
-          Account.ActiveSubscriptions _activeSubscriptions);
-
-  @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"ActiveSubscriptions", contained = true)
-  interface ActiveSubscriptions
-      extends
-      org.apache.olingo.ext.proxy.api.EntitySet<Subscription, 
SubscriptionCollection>,
-      
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ActiveSubscriptions>,
-  AbstractEntitySet<Subscription, java.lang.Integer, SubscriptionCollection> {
-    // 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/types/AccountInfo.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
deleted file mode 100644
index 3ac9a0a..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
+++ /dev/null
@@ -1,84 +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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected]("Microsoft.Test.OData.Services.ODataWCFService")
[email protected](name = "AccountInfo",
-    isOpenType = true,
-    isAbstract = false)
-public interface AccountInfo
-    extends org.apache.olingo.ext.proxy.api.ComplexType<AccountInfo>,
-    org.apache.olingo.ext.proxy.api.StructuredQuery<AccountInfo>, 
AbstractOpenType {
-
-  @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);
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"FirstName",
-        type = "Edm.String")
-    Annotatable getFirstNameAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"LastName",
-        type = "Edm.String")
-    Annotatable getLastNameAnnotations();
-
-  }
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    //
-  }
-}

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/types/AccountInfoCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java
deleted file mode 100644
index 940018e..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface AccountInfoCollection
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AccountInfoCollection>,
-org.apache.olingo.ext.proxy.api.ComplexCollection<AccountInfo, 
AccountInfoCollection, AccountInfoCollection> {
-
-  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/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java
deleted file mode 100644
index 54e8b00..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface AccountInfoCollectionComposableInvoker
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<AccountInfoCollection,
 AccountInfoCollection.Operations> {
-
-  @Override
-  AccountInfoCollectionComposableInvoker select(String... select);
-
-  @Override
-  AccountInfoCollectionComposableInvoker expand(String... expand);
-}

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/types/AccountInfoComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java
deleted file mode 100644
index 85fb42d..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java
+++ /dev/null
@@ -1,66 +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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface AccountInfoComposableInvoker
-    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<AccountInfo, 
AccountInfo.Operations>
-    , AbstractOpenType {
-
-  @Override
-  AccountInfoComposableInvoker select(String... select);
-
-  @Override
-  AccountInfoComposableInvoker expand(String... expand);
-
-  @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);
-
-}

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/types/Address.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
deleted file mode 100644
index 7942c93..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
+++ /dev/null
@@ -1,102 +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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.Annotatable;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected]("Microsoft.Test.OData.Services.ODataWCFService")
[email protected](name = "Address",
-    isOpenType = false,
-    isAbstract = false)
-public interface Address
-    extends org.apache.olingo.ext.proxy.api.ComplexType<Address>,
-    org.apache.olingo.ext.proxy.api.StructuredQuery<Address> {
-
-  @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();
-
-  void setStreet(java.lang.String _street);
-
-  @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 = "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();
-
-  void setPostalCode(java.lang.String _postalCode);
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Street",
-        type = "Edm.String")
-    Annotatable getStreetAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"City",
-        type = "Edm.String")
-    Annotatable getCityAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"PostalCode",
-        type = "Edm.String")
-    Annotatable getPostalCodeAnnotations();
-
-  }
-
-  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/types/AddressCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java
deleted file mode 100644
index 19e3b97..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface AddressCollection
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AddressCollection>,
-org.apache.olingo.ext.proxy.api.ComplexCollection<Address, AddressCollection, 
AddressCollection> {
-
-  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/d16d2b9c/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java
deleted file mode 100644
index 2c69252..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface AddressCollectionComposableInvoker
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<AddressCollection,
 AddressCollection.Operations> {
-
-  @Override
-  AddressCollectionComposableInvoker select(String... select);
-
-  @Override
-  AddressCollectionComposableInvoker expand(String... expand);
-}

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/types/AddressComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java
deleted file mode 100644
index 8f91d37..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java
+++ /dev/null
@@ -1,78 +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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface AddressComposableInvoker
-    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Address, 
Address.Operations>
-{
-
-  @Override
-  AddressComposableInvoker select(String... select);
-
-  @Override
-  AddressComposableInvoker expand(String... expand);
-
-  @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();
-
-  void setStreet(java.lang.String _street);
-
-  @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 = "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();
-
-  void setPostalCode(java.lang.String _postalCode);
-
-}

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/types/Asset.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
deleted file mode 100644
index 2971cfd..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
+++ /dev/null
@@ -1,105 +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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected]("Microsoft.Test.OData.Services.ODataWCFService")
[email protected](name = "Asset",
-    openType = false,
-    hasStream = false,
-    isAbstract = false)
-public interface Asset
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<Asset>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<Asset> {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AssetID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getAssetID();
-
-  void setAssetID(java.lang.Integer _assetID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getName();
-
-  void setName(java.lang.String _name);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Number",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getNumber();
-
-  void setNumber(java.lang.Integer _number);
-
-  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 = 
"AssetID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getAssetIDAnnotations();
-
-    @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 = 
"Number",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getNumberAnnotations();
-
-  }
-
-}

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/types/AssetCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
deleted file mode 100644
index 5a12aec..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.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.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface AssetCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AssetCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<Asset, AssetCollection, 
AssetCollection> {
-
-  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();
-}

Reply via email to