http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
index 3ac61cb..48369c3 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
@@ -1,37 +1,38 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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:OFF (Maven checkstyle)
 import java.util.concurrent.Future;
-//CHECKSTYLE:ON (Maven checkstyle)
+// 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 = "Customer",
-        openType = false,
-        hasStream = false,
-        isAbstract = false,
-        baseType = "ODataDemo.Person")
-public interface Customer 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person   {
+    openType = false,
+    hasStream = false,
+    isAbstract = false,
+    baseType = "ODataDemo.Person")
+public interface Customer
+    extends org.apache.olingo.ext.proxy.api.Annotatable,
+    org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
 
   @Override
   Customer load();
@@ -48,99 +49,98 @@ public interface Customer
   @Override
   Customer select(String... select);
 
-    
-
-    @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 = "")
-    @Override
-    java.lang.Integer getID();
+  @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 = "")
+  @Override
+  java.lang.Integer getID();
+
+  @Override
+  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 = "")
+  @Override
+  java.lang.String getName();
+
+  @Override
+  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);
+
+  @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
-    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 = "")
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ID",
+        type = "Edm.Int32")
+    org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations();
+
     @Override
-    java.lang.String getName();
+    @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 = 
"TotalExpense",
+        type = "Edm.Decimal")
+    org.apache.olingo.ext.proxy.api.Annotatable getTotalExpenseAnnotations();
+
     @Override
-    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);
-    
-
-
-        @Override
-        Operations operations();
-
-    interface Operations extends 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Operations{
-    //No additional methods needed for now.
-        }
-    Annotations annotations();
-
-    interface Annotations            extends 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.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 = 
"TotalExpense",
-                   type = "Edm.Decimal")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getTotalExpenseAnnotations();
-
-
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "PersonDetail", 
-                  type = "ODataDemo.PersonDetail")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getPersonDetailAnnotations();
-    }
+    
@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/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
index 416b93b..6d21b38 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
@@ -1,38 +1,40 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.AbstractTerm;
+// CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
-//CHECKSTYLE:ON (Maven checkstyle)
+// CHECKSTYLE:ON (Maven checkstyle)
 
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
-public interface CustomerCollection extends 
+public interface CustomerCollection
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection>,
-    
org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer,
 org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection, 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection> {
+org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer,
 org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection, 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection> {
+
+  Operations operations();
 
-        Operations operations();
+  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
+    // No additional methods needed for now.
+  }
 
-    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/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollectionComposableInvoker.java
index 72300da..34eb06b 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollectionComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollectionComposableInvoker.java
@@ -1,27 +1,27 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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)
+// CHECKSTYLE:OFF (Maven checkstyle)
 
-
-public interface CustomerCollectionComposableInvoker extends 
+public interface CustomerCollectionComposableInvoker
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection,
 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection.Operations>
 {
 
   @Override

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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
index 22b2e45..f1fa92b 100644
--- 
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
@@ -1,29 +1,31 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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)
+
+// 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>
-   {
+// CHECKSTYLE:ON (Maven checkstyle)
+
+public interface CustomerComposableInvoker
+    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Customer, 
Customer.Operations>
+{
 
   @Override
   CustomerComposableInvoker select(String... select);
@@ -31,67 +33,60 @@ public interface CustomerComposableInvoker
   @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);
 
-    @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();
+  @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 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);
 
-    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();
+  @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);
-    
+  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();
+  @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);
-    
+  void 
setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail
 _personDetail);
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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
index e6923de..15776d0 100644
--- 
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
@@ -1,37 +1,38 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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:OFF (Maven checkstyle)
 import java.util.concurrent.Future;
-//CHECKSTYLE:ON (Maven checkstyle)
+// 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   {
+    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();
@@ -48,137 +49,136 @@ public interface Employee
   @Override
   Employee select(String... select);
 
-    
-
-    @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);
-    
-
-
-        @Override
-        Operations operations();
-
-    interface Operations extends 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Operations{
-    //No additional methods needed for now.
-        }
-    Annotations annotations();
-
-    interface Annotations            extends 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.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 = 
"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();
-
-
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "PersonDetail", 
-                  type = "ODataDemo.PersonDetail")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getPersonDetailAnnotations();
-    }
+  @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/d1507449/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
index f834197..5388121 100644
--- 
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
@@ -1,38 +1,40 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.AbstractTerm;
+// CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
-//CHECKSTYLE:ON (Maven checkstyle)
+// CHECKSTYLE:ON (Maven checkstyle)
 
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
-public interface EmployeeCollection extends 
+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> {
+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();
 
-        Operations operations();
+  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
+    // No additional methods needed for now.
+  }
 
-    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/d1507449/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
index 04600ef..eebb122 100644
--- 
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
@@ -1,27 +1,27 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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)
+// CHECKSTYLE:OFF (Maven checkstyle)
 
-
-public interface EmployeeCollectionComposableInvoker extends 
+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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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
index 994d7df..8bef4fb 100644
--- 
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
@@ -1,29 +1,31 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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)
+
+// 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>
-   {
+// CHECKSTYLE:ON (Maven checkstyle)
+
+public interface EmployeeComposableInvoker
+    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Employee, 
Employee.Operations>
+{
 
   @Override
   EmployeeComposableInvoker select(String... select);
@@ -31,99 +33,90 @@ public interface EmployeeComposableInvoker
   @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);
-    
+  @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/d1507449/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
index 7a469dd..c2fe2e8 100644
--- 
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
@@ -1,37 +1,38 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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:OFF (Maven checkstyle)
 import java.util.concurrent.Future;
-//CHECKSTYLE:ON (Maven checkstyle)
+// 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   {
+    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();
@@ -48,219 +49,237 @@ public interface FeaturedProduct
   @Override
   FeaturedProduct select(String... select);
 
-    
-
-    @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);
-    
-
-
-        @Override
-        Operations operations();
-
-    interface Operations extends 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Operations{
-    //No additional methods needed for now.
-        }
-    Annotations annotations();
-
-    interface Annotations            extends 
org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.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();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "Advertisement", 
-                  type = "ODataDemo.Advertisement")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getAdvertisementAnnotations();
-    }
+  @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/d1507449/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
index 7778434..9f7dcf5 100644
--- 
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
@@ -1,38 +1,40 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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.AbstractTerm;
+// CHECKSTYLE:OFF (Maven checkstyle)
 import java.util.Collection;
-//CHECKSTYLE:ON (Maven checkstyle)
+// CHECKSTYLE:ON (Maven checkstyle)
 
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
 
-public interface FeaturedProductCollection extends 
+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> {
+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();
 
-        Operations operations();
+  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
+    // No additional methods needed for now.
+  }
 
-    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/d1507449/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
index 5701a7f..140cb9d 100644
--- 
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
@@ -1,27 +1,27 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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)
+// CHECKSTYLE:OFF (Maven checkstyle)
 
-
-public interface FeaturedProductCollectionComposableInvoker extends 
+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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/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
index e0f5c6d..ea80859 100644
--- 
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
@@ -1,29 +1,31 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * 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)
+
+// 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>
-   {
+// CHECKSTYLE:ON (Maven checkstyle)
+
+public interface FeaturedProductComposableInvoker
+    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<FeaturedProduct, 
FeaturedProduct.Operations>
+{
 
   @Override
   FeaturedProductComposableInvoker select(String... select);
@@ -31,161 +33,150 @@ public interface FeaturedProductComposableInvoker
   @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);
-    
+  @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);
 
 }

Reply via email to