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

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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerComposableInvoker.java
deleted file mode 100644
index f1fa92b..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerComposableInvoker.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface CustomerComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Customer, Customer.Operations>
-{
-
-  @Override
-  CustomerComposableInvoker select(String... select);
-
-  @Override
-  CustomerComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  void setID(java.lang.Integer _iD);
-
-  @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 = "TotalExpense",
-      type = "Edm.Decimal",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.math.BigDecimal getTotalExpense();
-
-  void setTotalExpense(java.math.BigDecimal _totalExpense);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
-      type = "ODataDemo.PersonDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "PersonDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
deleted file mode 100644
index 15776d0..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.concurrent.Future;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
-    openType = false,
-    hasStream = false,
-    isAbstract = false,
-    baseType = "ODataDemo.Person")
-public interface Employee
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
-
-  @Override
-  Employee load();
-
-  @Override
-  Future<? extends Employee> loadAsync();
-
-  @Override
-  Employee refs();
-
-  @Override
-  Employee expand(String... expand);
-
-  @Override
-  Employee select(String... select);
-
-  @Override
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  @Override
-  void setID(java.lang.Integer _iD);
-
-  @Override
-  @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();
-
-  @Override
-  void setName(java.lang.String _name);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmployeeID",
-      type = "Edm.Int64",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Long getEmployeeID();
-
-  void setEmployeeID(java.lang.Long _employeeID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HireDate",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getHireDate();
-
-  void setHireDate(java.sql.Timestamp _hireDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
-      type = "Edm.Single",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Float getSalary();
-
-  void setSalary(java.lang.Float _salary);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
-      type = "ODataDemo.PersonDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "PersonDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
-  @Override
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-  @Override
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Operations {
-    // No additional methods needed for now.
-  }
-
-  @Override
-  Annotations annotations();
-
-  interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations {
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations();
-
-    @Override
-    @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 = "EmployeeID",
-        type = "Edm.Int64")
-    org.apache.olingo.ext.proxy.api.Annotatable getEmployeeIDAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HireDate",
-        type = "Edm.DateTimeOffset")
-    org.apache.olingo.ext.proxy.api.Annotatable getHireDateAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
-        type = "Edm.Single")
-    org.apache.olingo.ext.proxy.api.Annotatable getSalaryAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
-        type = "ODataDemo.PersonDetail")
-    org.apache.olingo.ext.proxy.api.Annotatable getPersonDetailAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
deleted file mode 100644
index 5388121..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface EmployeeCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollectionComposableInvoker.java
deleted file mode 100644
index eebb122..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface EmployeeCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection.Operations> {
-
-  @Override
-  EmployeeCollectionComposableInvoker select(String... select);
-
-  @Override
-  EmployeeCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeComposableInvoker.java
deleted file mode 100644
index 8bef4fb..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeComposableInvoker.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface EmployeeComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Employee, Employee.Operations>
-{
-
-  @Override
-  EmployeeComposableInvoker select(String... select);
-
-  @Override
-  EmployeeComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  void setID(java.lang.Integer _iD);
-
-  @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 = "EmployeeID",
-      type = "Edm.Int64",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Long getEmployeeID();
-
-  void setEmployeeID(java.lang.Long _employeeID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HireDate",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getHireDate();
-
-  void setHireDate(java.sql.Timestamp _hireDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
-      type = "Edm.Single",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Float getSalary();
-
-  void setSalary(java.lang.Float _salary);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
-      type = "ODataDemo.PersonDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "PersonDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
deleted file mode 100644
index c2fe2e8..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.concurrent.Future;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "FeaturedProduct",
-    openType = false,
-    hasStream = false,
-    isAbstract = false,
-    baseType = "ODataDemo.Product")
-public interface FeaturedProduct
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product {
-
-  @Override
-  FeaturedProduct load();
-
-  @Override
-  Future<? extends FeaturedProduct> loadAsync();
-
-  @Override
-  FeaturedProduct refs();
-
-  @Override
-  FeaturedProduct expand(String... expand);
-
-  @Override
-  FeaturedProduct select(String... select);
-
-  @Override
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  @Override
-  void setID(java.lang.Integer _iD);
-
-  @Override
-  @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();
-
-  @Override
-  void setName(java.lang.String _name);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getDescription();
-
-  @Override
-  void setDescription(java.lang.String _description);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getReleaseDate();
-
-  @Override
-  void setReleaseDate(java.sql.Timestamp _releaseDate);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
-      type = "Edm.DateTimeOffset",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getDiscontinuedDate();
-
-  @Override
-  void setDiscontinuedDate(java.sql.Timestamp _discontinuedDate);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
-      type = "Edm.Int16",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getRating();
-
-  @Override
-  void setRating(java.lang.Short _rating);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
-      type = "Edm.Double",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Double getPrice();
-
-  @Override
-  void setPrice(java.lang.Double _price);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
-      type = "ODataDemo.Category",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Categories",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
-
-  @Override
-  void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
-      type = "ODataDemo.Supplier",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Suppliers",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
-
-  @Override
-  void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
-
-  @Override
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
-      type = "ODataDemo.ProductDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "ProductDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
-
-  @Override
-  void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement",
-      type = "ODataDemo.Advertisement",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Advertisements",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement();
-
-  void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement);
-
-  @Override
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Operations {
-    // No additional methods needed for now.
-  }
-
-  @Override
-  Annotations annotations();
-
-  interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Annotations {
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getNameAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getDescriptionAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReleaseDate",
-        type = "Edm.DateTimeOffset")
-    org.apache.olingo.ext.proxy.api.Annotatable getReleaseDateAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedDate",
-        type = "Edm.DateTimeOffset")
-    org.apache.olingo.ext.proxy.api.Annotatable getDiscontinuedDateAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Rating",
-        type = "Edm.Int16")
-    org.apache.olingo.ext.proxy.api.Annotatable getRatingAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Price",
-        type = "Edm.Double")
-    org.apache.olingo.ext.proxy.api.Annotatable getPriceAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Categories",
-        type = "ODataDemo.Category")
-    org.apache.olingo.ext.proxy.api.Annotatable getCategoriesAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Supplier",
-        type = "ODataDemo.Supplier")
-    org.apache.olingo.ext.proxy.api.Annotatable getSupplierAnnotations();
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductDetail",
-        type = "ODataDemo.ProductDetail")
-    org.apache.olingo.ext.proxy.api.Annotatable getProductDetailAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Advertisement",
-        type = "ODataDemo.Advertisement")
-    org.apache.olingo.ext.proxy.api.Annotatable getAdvertisementAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
deleted file mode 100644
index 9f7dcf5..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface FeaturedProductCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java
deleted file mode 100644
index 140cb9d..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface FeaturedProductCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection.Operations> {
-
-  @Override
-  FeaturedProductCollectionComposableInvoker select(String... select);
-
-  @Override
-  FeaturedProductCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductComposableInvoker.java
deleted file mode 100644
index ea80859..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductComposableInvoker.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface FeaturedProductComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<FeaturedProduct, FeaturedProduct.Operations>
-{
-
-  @Override
-  FeaturedProductComposableInvoker select(String... select);
-
-  @Override
-  FeaturedProductComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  void setID(java.lang.Integer _iD);
-
-  @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 = "Description",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getDescription();
-
-  void setDescription(java.lang.String _description);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getReleaseDate();
-
-  void setReleaseDate(java.sql.Timestamp _releaseDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
-      type = "Edm.DateTimeOffset",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getDiscontinuedDate();
-
-  void setDiscontinuedDate(java.sql.Timestamp _discontinuedDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
-      type = "Edm.Int16",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getRating();
-
-  void setRating(java.lang.Short _rating);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
-      type = "Edm.Double",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Double getPrice();
-
-  void setPrice(java.lang.Double _price);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
-      type = "ODataDemo.Category",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Categories",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
-
-  void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
-      type = "ODataDemo.Supplier",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Suppliers",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
-
-  void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
-      type = "ODataDemo.ProductDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "ProductDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
-
-  void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement",
-      type = "ODataDemo.Advertisement",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Advertisements",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement();
-
-  void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
deleted file mode 100644
index c81d527..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
-    openType = false,
-    hasStream = false,
-    isAbstract = false)
-public interface Person
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<Person>, org.apache.olingo.ext.proxy.api.StructuredQuery<Person> {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  void setID(java.lang.Integer _iD);
-
-  @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.NavigationProperty(name = "PersonDetail",
-      type = "ODataDemo.PersonDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "PersonDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-  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 = "ID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations();
-
-    @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.AnnotationsForNavigationProperty(name = "PersonDetail",
-        type = "ODataDemo.PersonDetail")
-    org.apache.olingo.ext.proxy.api.Annotatable getPersonDetailAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
deleted file mode 100644
index 064af50..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface PersonCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollectionComposableInvoker.java
deleted file mode 100644
index 49f8c08..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface PersonCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection.Operations> {
-
-  @Override
-  PersonCollectionComposableInvoker select(String... select);
-
-  @Override
-  PersonCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonComposableInvoker.java
deleted file mode 100644
index 7255bb1..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonComposableInvoker.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface PersonComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Person, Person.Operations>
-{
-
-  @Override
-  PersonComposableInvoker select(String... select);
-
-  @Override
-  PersonComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  void setID(java.lang.Integer _iD);
-
-  @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.NavigationProperty(name = "PersonDetail",
-      type = "ODataDemo.PersonDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "PersonDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
-  void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
deleted file mode 100644
index 5918747..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PersonDetail",
-    openType = false,
-    hasStream = false,
-    isAbstract = false)
-public interface PersonDetail
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<PersonDetail>,
-    org.apache.olingo.ext.proxy.api.StructuredQuery<PersonDetail> {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getPersonID();
-
-  void setPersonID(java.lang.Integer _personID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Age",
-      type = "Edm.Byte",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getAge();
-
-  void setAge(java.lang.Short _age);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Gender",
-      type = "Edm.Boolean",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Boolean getGender();
-
-  void setGender(java.lang.Boolean _gender);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getPhone();
-
-  void setPhone(java.lang.String _phone);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
-      type = "ODataDemo.Address",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
-
-  void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
-      type = "Edm.Stream",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.EdmStreamValue getPhoto();
-
-  void setPhoto(org.apache.olingo.ext.proxy.api.EdmStreamValue _photo);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
-      type = "ODataDemo.Person",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Persons",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person getPerson();
-
-  void setPerson(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person _person);
-
-  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 = "PersonID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getPersonIDAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Age",
-        type = "Edm.Byte")
-    org.apache.olingo.ext.proxy.api.Annotatable getAgeAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Gender",
-        type = "Edm.Boolean")
-    org.apache.olingo.ext.proxy.api.Annotatable getGenderAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Phone",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getPhoneAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
-        type = "ODataDemo.Address")
-    org.apache.olingo.ext.proxy.api.Annotatable getAddressAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
-        type = "Edm.Stream")
-    org.apache.olingo.ext.proxy.api.Annotatable getPhotoAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
-        type = "ODataDemo.Person")
-    org.apache.olingo.ext.proxy.api.Annotatable getPersonAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
deleted file mode 100644
index d672ffc..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface PersonDetailCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java
deleted file mode 100644
index e7d62d3..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface PersonDetailCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection.Operations> {
-
-  @Override
-  PersonDetailCollectionComposableInvoker select(String... select);
-
-  @Override
-  PersonDetailCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailComposableInvoker.java
deleted file mode 100644
index 2d54c16..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailComposableInvoker.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface PersonDetailComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<PersonDetail, PersonDetail.Operations>
-{
-
-  @Override
-  PersonDetailComposableInvoker select(String... select);
-
-  @Override
-  PersonDetailComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getPersonID();
-
-  void setPersonID(java.lang.Integer _personID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Age",
-      type = "Edm.Byte",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getAge();
-
-  void setAge(java.lang.Short _age);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Gender",
-      type = "Edm.Boolean",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Boolean getGender();
-
-  void setGender(java.lang.Boolean _gender);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getPhone();
-
-  void setPhone(java.lang.String _phone);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
-      type = "ODataDemo.Address",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
-
-  void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
-      type = "Edm.Stream",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  org.apache.olingo.ext.proxy.api.EdmStreamValue getPhoto();
-
-  void setPhoto(org.apache.olingo.ext.proxy.api.EdmStreamValue _photo);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
-      type = "ODataDemo.Person",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Persons",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person getPerson();
-
-  void setPerson(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person _person);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
deleted file mode 100644
index cb3ff03..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.OperationType;
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-
-@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
-@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
-    openType = false,
-    hasStream = false,
-    isAbstract = false)
-public interface Product
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<Product>, org.apache.olingo.ext.proxy.api.StructuredQuery<Product> {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  void setID(java.lang.Integer _iD);
-
-  @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 = "Description",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getDescription();
-
-  void setDescription(java.lang.String _description);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getReleaseDate();
-
-  void setReleaseDate(java.sql.Timestamp _releaseDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
-      type = "Edm.DateTimeOffset",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getDiscontinuedDate();
-
-  void setDiscontinuedDate(java.sql.Timestamp _discontinuedDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
-      type = "Edm.Int16",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getRating();
-
-  void setRating(java.lang.Short _rating);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
-      type = "Edm.Double",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Double getPrice();
-
-  void setPrice(java.lang.Double _price);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
-      type = "ODataDemo.Category",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Categories",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
-
-  void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
-      type = "ODataDemo.Supplier",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Suppliers",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
-
-  void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
-      type = "ODataDemo.ProductDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "ProductDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
-
-  void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Discount",
-        type = OperationType.ACTION,
-        referenceType = java.lang.Double.class, returnType = "Edm.Double")
-        org.apache.olingo.ext.proxy.api.Invoker<java.lang.Double>
-        discount(
-            @Parameter(name = "discountPercentage", type = "Edm.Int32", nullable = false) java.lang.Integer discountPercentage
-        );
-
-  }
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getNameAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
-        type = "Edm.String")
-    org.apache.olingo.ext.proxy.api.Annotatable getDescriptionAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReleaseDate",
-        type = "Edm.DateTimeOffset")
-    org.apache.olingo.ext.proxy.api.Annotatable getReleaseDateAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedDate",
-        type = "Edm.DateTimeOffset")
-    org.apache.olingo.ext.proxy.api.Annotatable getDiscontinuedDateAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Rating",
-        type = "Edm.Int16")
-    org.apache.olingo.ext.proxy.api.Annotatable getRatingAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Price",
-        type = "Edm.Double")
-    org.apache.olingo.ext.proxy.api.Annotatable getPriceAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Categories",
-        type = "ODataDemo.Category")
-    org.apache.olingo.ext.proxy.api.Annotatable getCategoriesAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Supplier",
-        type = "ODataDemo.Supplier")
-    org.apache.olingo.ext.proxy.api.Annotatable getSupplierAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductDetail",
-        type = "ODataDemo.ProductDetail")
-    org.apache.olingo.ext.proxy.api.Annotatable getProductDetailAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
deleted file mode 100644
index b9e6bb4..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface ProductCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollectionComposableInvoker.java
deleted file mode 100644
index 3d6bb61..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface ProductCollectionComposableInvoker
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection.Operations> {
-
-  @Override
-  ProductCollectionComposableInvoker select(String... select);
-
-  @Override
-  ProductCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductComposableInvoker.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductComposableInvoker.java
deleted file mode 100644
index 9968948..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductComposableInvoker.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface ProductComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Product, Product.Operations>
-{
-
-  @Override
-  ProductComposableInvoker select(String... select);
-
-  @Override
-  ProductComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getID();
-
-  void setID(java.lang.Integer _iD);
-
-  @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 = "Description",
-      type = "Edm.String",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getDescription();
-
-  void setDescription(java.lang.String _description);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getReleaseDate();
-
-  void setReleaseDate(java.sql.Timestamp _releaseDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
-      type = "Edm.DateTimeOffset",
-      nullable = true,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getDiscontinuedDate();
-
-  void setDiscontinuedDate(java.sql.Timestamp _discontinuedDate);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
-      type = "Edm.Int16",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getRating();
-
-  void setRating(java.lang.Short _rating);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
-      type = "Edm.Double",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Double getPrice();
-
-  void setPrice(java.lang.Double _price);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
-      type = "ODataDemo.Category",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Categories",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
-
-  void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
-      type = "ODataDemo.Supplier",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "Suppliers",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
-
-  void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
-      type = "ODataDemo.ProductDetail",
-      targetSchema = "ODataDemo",
-      targetContainer = "DemoService",
-      targetEntitySet = "ProductDetails",
-      containsTarget = false)
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
-
-  void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
-
-}