http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java
index ebe046b..8c9f177 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java
@@ -1,29 +1,28 @@
-/* 
+/*
  * 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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
 
-//CHECKSTYLE:OFF (Maven checkstyle)
+// CHECKSTYLE:OFF (Maven checkstyle)
 
-
-public interface HomeAddressComposableInvoker 
-  extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<HomeAddress, 
HomeAddress.Operations>
-   {
+public interface HomeAddressComposableInvoker
+    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<HomeAddress, 
HomeAddress.Operations>
+{
 
   @Override
   HomeAddressComposableInvoker select(String... select);
@@ -31,76 +30,64 @@ public interface HomeAddressComposableInvoker
   @Override
   HomeAddressComposableInvoker expand(String... expand);
 
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getStreet();
-
-    void setStreet(java.lang.String _street);
-
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getCity();
-
-    void setCity(java.lang.String _city);
-
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getPostalCode();
-
-    void setPostalCode(java.lang.String _postalCode);
-
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FamilyName", 
-                type = "Edm.String",
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getFamilyName();
-
-    void setFamilyName(java.lang.String _familyName);
-
-    
-
-
-
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getStreet();
+
+  void setStreet(java.lang.String _street);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getCity();
+
+  void setCity(java.lang.String _city);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getPostalCode();
+
+  void setPostalCode(java.lang.String _postalCode);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FamilyName",
+      type = "Edm.String",
+      nullable = true,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getFamilyName();
+
+  void setFamilyName(java.lang.String _familyName);
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
index bf7beae..8df09d5 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
@@ -1,30 +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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
 
-//CHECKSTYLE:OFF (Maven checkstyle)
+// CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractTerm;
-//CHECKSTYLE:ON (Maven checkstyle)
+
+// CHECKSTYLE:ON (Maven checkstyle)
 
 
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
 @org.apache.olingo.ext.proxy.api.annotations.Term(name = "IsBoss",
-      type="Edm.Boolean")
+    type = "Edm.Boolean")
 public interface IsBoss extends AbstractTerm {
-//No additional methods needed for now.
+  // No additional methods needed for now.
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
index c8b3f89..8abed01 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
@@ -1,93 +1,87 @@
-/* 
+/*
  * 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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
+
+// CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
-//CHECKSTYLE:ON (Maven checkstyle)
 
+// CHECKSTYLE:ON (Maven checkstyle)
 
 
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
 @org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "LabourUnion",
-        openType = false,
-        hasStream = false,
-        isAbstract = false)
-public interface LabourUnion 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  org.apache.olingo.ext.proxy.api.EntityType<LabourUnion>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<LabourUnion>   {
-
-
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"LabourUnionID", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getLabourUnionID();
-
-    void setLabourUnionID(java.lang.Integer _labourUnionID);
-    
-    
-    @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);
-    
-
-
-
-        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 = 
"LabourUnionID",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getLabourUnionIDAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Name",
-                   type = "Edm.String")
-        org.apache.olingo.ext.proxy.api.Annotatable getNameAnnotations();
-
-
-    }
+    openType = false,
+    hasStream = false,
+    isAbstract = false)
+public interface LabourUnion
+    extends org.apache.olingo.ext.proxy.api.Annotatable,
+    org.apache.olingo.ext.proxy.api.EntityType<LabourUnion>,
+    org.apache.olingo.ext.proxy.api.StructuredQuery<LabourUnion> {
+
+  @Key
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LabourUnionID",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getLabourUnionID();
+
+  void setLabourUnionID(java.lang.Integer _labourUnionID);
+
+  @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);
+
+  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 = 
"LabourUnionID",
+        type = "Edm.Int32")
+    org.apache.olingo.ext.proxy.api.Annotatable getLabourUnionIDAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Name",
+        type = "Edm.String")
+    org.apache.olingo.ext.proxy.api.Annotatable getNameAnnotations();
+
+  }
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
index cb358dc..901a50b 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.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.staticservice.microsoft.test.odata.services.odatawcfservice.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 LabourUnionCollection extends 
+public interface LabourUnionCollection
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection>,
-    
org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection>
 {
+org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection>
 {
+
+  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/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java
index e4e7df4..b2a0d0b 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
 
-//CHECKSTYLE:OFF (Maven checkstyle)
+// CHECKSTYLE:OFF (Maven checkstyle)
 
-
-public interface LabourUnionCollectionComposableInvoker extends 
+public interface LabourUnionCollectionComposableInvoker
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection.Operations>
 {
 
   @Override

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java
index 69e2d5b..ed3d991 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
+
+// CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
-//CHECKSTYLE:ON (Maven checkstyle)
 
-public interface LabourUnionComposableInvoker 
-  extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<LabourUnion, 
LabourUnion.Operations>
-   {
+// CHECKSTYLE:ON (Maven checkstyle)
+
+public interface LabourUnionComposableInvoker
+    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<LabourUnion, 
LabourUnion.Operations>
+{
 
   @Override
   LabourUnionComposableInvoker select(String... select);
@@ -31,41 +33,35 @@ public interface LabourUnionComposableInvoker
   @Override
   LabourUnionComposableInvoker expand(String... expand);
 
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"LabourUnionID", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getLabourUnionID();
+  @Key
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LabourUnionID",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getLabourUnionID();
 
-    void setLabourUnionID(java.lang.Integer _labourUnionID);
-    
-    
-    @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 setLabourUnionID(java.lang.Integer _labourUnionID);
 
-    void setName(java.lang.String _name);
-    
+  @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);
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
index c6e8dde..bec3700 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
@@ -1,175 +1,174 @@
-/* 
+/*
  * 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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
+
+// CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
-//CHECKSTYLE:ON (Maven checkstyle)
 
+// CHECKSTYLE:ON (Maven checkstyle)
 
 
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
 @org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Order",
-        openType = false,
-        hasStream = false,
-        isAbstract = false)
-public interface Order 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  org.apache.olingo.ext.proxy.api.EntityType<Order>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<Order>   {
-
-
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getOrderID();
-
-    void setOrderID(java.lang.Integer _orderID);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderDate", 
-                type = "Edm.DateTimeOffset", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.sql.Timestamp getOrderDate();
-
-    void setOrderDate(java.sql.Timestamp _orderDate);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ShelfLife", 
-                type = "Edm.Duration", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.math.BigDecimal getShelfLife();
-
-    void setShelfLife(java.math.BigDecimal _shelfLife);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"OrderShelfLifes", 
-                type = "Edm.Duration", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.math.BigDecimal> 
getOrderShelfLifes();
-
-    void 
setOrderShelfLifes(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.math.BigDecimal>
 _orderShelfLifes);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"LoggedInEmployee", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Employee", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "Employees",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
 getLoggedInEmployee();
-
-    void 
setLoggedInEmployee(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
 _loggedInEmployee);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"CustomerForOrder", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Customer", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "Customers",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
 getCustomerForOrder();
-
-    void 
setCustomerForOrder(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
 _customerForOrder);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"OrderDetails", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.OrderDetail", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "OrderDetails",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
 getOrderDetails();
-
-    void 
setOrderDetails(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
 _orderDetails);
-    
-
-
-        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 = 
"OrderID",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getOrderIDAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderDate",
-                   type = "Edm.DateTimeOffset")
-        org.apache.olingo.ext.proxy.api.Annotatable getOrderDateAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ShelfLife",
-                   type = "Edm.Duration")
-        org.apache.olingo.ext.proxy.api.Annotatable getShelfLifeAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderShelfLifes",
-                   type = "Edm.Duration")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getOrderShelfLifesAnnotations();
-
-
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "LoggedInEmployee", 
-                  type = 
"Microsoft.Test.OData.Services.ODataWCFService.Employee")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getLoggedInEmployeeAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "CustomerForOrder", 
-                  type = 
"Microsoft.Test.OData.Services.ODataWCFService.Customer")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getCustomerForOrderAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "OrderDetails", 
-                  type = 
"Microsoft.Test.OData.Services.ODataWCFService.OrderDetail")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getOrderDetailsAnnotations();
-    }
+    openType = false,
+    hasStream = false,
+    isAbstract = false)
+public interface Order
+    extends org.apache.olingo.ext.proxy.api.Annotatable,
+    org.apache.olingo.ext.proxy.api.EntityType<Order>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<Order> {
+
+  @Key
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getOrderID();
+
+  void setOrderID(java.lang.Integer _orderID);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderDate",
+      type = "Edm.DateTimeOffset",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.sql.Timestamp getOrderDate();
+
+  void setOrderDate(java.sql.Timestamp _orderDate);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ShelfLife",
+      type = "Edm.Duration",
+      nullable = true,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.math.BigDecimal getShelfLife();
+
+  void setShelfLife(java.math.BigDecimal _shelfLife);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"OrderShelfLifes",
+      type = "Edm.Duration",
+      nullable = true,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.math.BigDecimal> 
getOrderShelfLifes();
+
+  void 
setOrderShelfLifes(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.math.BigDecimal>
 _orderShelfLifes);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"LoggedInEmployee",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "Employees",
+      containsTarget = false)
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
+      getLoggedInEmployee();
+
+      void
+      setLoggedInEmployee(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
 _loggedInEmployee);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"CustomerForOrder",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "Customers",
+      containsTarget = false)
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
+      getCustomerForOrder();
+
+      void
+      setCustomerForOrder(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
 _customerForOrder);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"OrderDetails",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "OrderDetails",
+      containsTarget = false)
+      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
+      getOrderDetails();
+
+      void
+      setOrderDetails(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
 _orderDetails);
+
+  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 = 
"OrderID",
+        type = "Edm.Int32")
+    org.apache.olingo.ext.proxy.api.Annotatable getOrderIDAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderDate",
+        type = "Edm.DateTimeOffset")
+    org.apache.olingo.ext.proxy.api.Annotatable getOrderDateAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ShelfLife",
+        type = "Edm.Duration")
+    org.apache.olingo.ext.proxy.api.Annotatable getShelfLifeAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderShelfLifes",
+        type = "Edm.Duration")
+    org.apache.olingo.ext.proxy.api.Annotatable 
getOrderShelfLifesAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "LoggedInEmployee",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
+    org.apache.olingo.ext.proxy.api.Annotatable 
getLoggedInEmployeeAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "CustomerForOrder",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
+    org.apache.olingo.ext.proxy.api.Annotatable 
getCustomerForOrderAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "OrderDetails",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail")
+    org.apache.olingo.ext.proxy.api.Annotatable getOrderDetailsAnnotations();
+  }
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
index 7351fe9..f7575f7 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.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.staticservice.microsoft.test.odata.services.odatawcfservice.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 OrderCollection extends 
+public interface OrderCollection
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection>,
-    
org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection>
 {
+org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection>
 {
+
+  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/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java
index 471031d..7e64e1f 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
 
-//CHECKSTYLE:OFF (Maven checkstyle)
+// CHECKSTYLE:OFF (Maven checkstyle)
 
-
-public interface OrderCollectionComposableInvoker extends 
+public interface OrderCollectionComposableInvoker
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection.Operations>
 {
 
   @Override

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java
index 096ca14..94817ee 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
+
+// CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
-//CHECKSTYLE:ON (Maven checkstyle)
 
-public interface OrderComposableInvoker 
-  extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Order, 
Order.Operations>
-   {
+// CHECKSTYLE:ON (Maven checkstyle)
+
+public interface OrderComposableInvoker
+    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Order, 
Order.Operations>
+{
 
   @Override
   OrderComposableInvoker select(String... select);
@@ -31,103 +33,104 @@ public interface OrderComposableInvoker
   @Override
   OrderComposableInvoker expand(String... expand);
 
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getOrderID();
-
-    void setOrderID(java.lang.Integer _orderID);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderDate", 
-                type = "Edm.DateTimeOffset", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.sql.Timestamp getOrderDate();
-
-    void setOrderDate(java.sql.Timestamp _orderDate);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ShelfLife", 
-                type = "Edm.Duration", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.math.BigDecimal getShelfLife();
-
-    void setShelfLife(java.math.BigDecimal _shelfLife);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"OrderShelfLifes", 
-                type = "Edm.Duration", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.math.BigDecimal> 
getOrderShelfLifes();
-
-    void 
setOrderShelfLifes(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.math.BigDecimal>
 _orderShelfLifes);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"LoggedInEmployee", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Employee", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "Employees",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
 getLoggedInEmployee();
-
-    void 
setLoggedInEmployee(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
 _loggedInEmployee);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"CustomerForOrder", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Customer", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "Customers",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
 getCustomerForOrder();
-
-    void 
setCustomerForOrder(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
 _customerForOrder);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"OrderDetails", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.OrderDetail", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "OrderDetails",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
 getOrderDetails();
-
-    void 
setOrderDetails(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
 _orderDetails);
-    
+  @Key
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getOrderID();
+
+  void setOrderID(java.lang.Integer _orderID);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderDate",
+      type = "Edm.DateTimeOffset",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.sql.Timestamp getOrderDate();
+
+  void setOrderDate(java.sql.Timestamp _orderDate);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ShelfLife",
+      type = "Edm.Duration",
+      nullable = true,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.math.BigDecimal getShelfLife();
+
+  void setShelfLife(java.math.BigDecimal _shelfLife);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"OrderShelfLifes",
+      type = "Edm.Duration",
+      nullable = true,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.math.BigDecimal> 
getOrderShelfLifes();
+
+  void 
setOrderShelfLifes(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.math.BigDecimal>
 _orderShelfLifes);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"LoggedInEmployee",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "Employees",
+      containsTarget = false)
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
+      getLoggedInEmployee();
+
+      void
+      setLoggedInEmployee(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee
 _loggedInEmployee);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"CustomerForOrder",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "Customers",
+      containsTarget = false)
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
+      getCustomerForOrder();
+
+      void
+      setCustomerForOrder(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer
 _customerForOrder);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"OrderDetails",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "OrderDetails",
+      containsTarget = false)
+      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
+      getOrderDetails();
+
+      void
+      setOrderDetails(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection
 _orderDetails);
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
index bc1ea43..28b3f45 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
@@ -1,182 +1,180 @@
-/* 
+/*
  * 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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
-//CHECKSTYLE:OFF (Maven checkstyle)
+
+// CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.annotations.Key;
 import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
-//CHECKSTYLE:ON (Maven checkstyle)
+
+// CHECKSTYLE:ON (Maven checkstyle)
 
 @KeyRef(OrderDetailKey.class)
 
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
 @org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "OrderDetail",
-        openType = false,
-        hasStream = false,
-        isAbstract = false)
-public interface OrderDetail 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  org.apache.olingo.ext.proxy.api.EntityType<OrderDetail>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<OrderDetail>   {
-
-
-        
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getOrderID();
-
-    void setOrderID(java.lang.Integer _orderID);
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getProductID();
-
-    void setProductID(java.lang.Integer _productID);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"OrderPlaced", 
-                type = "Edm.DateTimeOffset", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.sql.Timestamp getOrderPlaced();
-
-    void setOrderPlaced(java.sql.Timestamp _orderPlaced);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getQuantity();
-
-    void setQuantity(java.lang.Integer _quantity);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UnitPrice", 
-                type = "Edm.Single", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Float getUnitPrice();
-
-    void setUnitPrice(java.lang.Float _unitPrice);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"ProductOrdered", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Product", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "Products",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection
 getProductOrdered();
-
-    void 
setProductOrdered(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection
 _productOrdered);
-    
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"AssociatedOrder", 
-                type = "Microsoft.Test.OData.Services.ODataWCFService.Order", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "Orders",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order
 getAssociatedOrder();
-
-    void 
setAssociatedOrder(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order
 _associatedOrder);
-    
-
-
-        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 = 
"OrderID",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getOrderIDAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ProductID",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getProductIDAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderPlaced",
-                   type = "Edm.DateTimeOffset")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getOrderPlacedAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Quantity",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getQuantityAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"UnitPrice",
-                   type = "Edm.Single")
-        org.apache.olingo.ext.proxy.api.Annotatable getUnitPriceAnnotations();
-
-
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "ProductOrdered", 
-                  type = 
"Microsoft.Test.OData.Services.ODataWCFService.Product")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getProductOrderedAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "AssociatedOrder", 
-                  type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getAssociatedOrderAnnotations();
-    }
+    openType = false,
+    hasStream = false,
+    isAbstract = false)
+public interface OrderDetail
+    extends org.apache.olingo.ext.proxy.api.Annotatable,
+    org.apache.olingo.ext.proxy.api.EntityType<OrderDetail>,
+    org.apache.olingo.ext.proxy.api.StructuredQuery<OrderDetail> {
+
+  @Key
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getOrderID();
+
+  void setOrderID(java.lang.Integer _orderID);
+
+  @Key
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getProductID();
+
+  void setProductID(java.lang.Integer _productID);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderPlaced",
+      type = "Edm.DateTimeOffset",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.sql.Timestamp getOrderPlaced();
+
+  void setOrderPlaced(java.sql.Timestamp _orderPlaced);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getQuantity();
+
+  void setQuantity(java.lang.Integer _quantity);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UnitPrice",
+      type = "Edm.Single",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Float getUnitPrice();
+
+  void setUnitPrice(java.lang.Float _unitPrice);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"ProductOrdered",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Product",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "Products",
+      containsTarget = false)
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection
+      getProductOrdered();
+
+      void
+      setProductOrdered(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection
 _productOrdered);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"AssociatedOrder",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "Orders",
+      containsTarget = false)
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order
+      getAssociatedOrder();
+
+      void
+      setAssociatedOrder(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order
 _associatedOrder);
+
+  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 = 
"OrderID",
+        type = "Edm.Int32")
+    org.apache.olingo.ext.proxy.api.Annotatable getOrderIDAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"ProductID",
+        type = "Edm.Int32")
+    org.apache.olingo.ext.proxy.api.Annotatable getProductIDAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"OrderPlaced",
+        type = "Edm.DateTimeOffset")
+    org.apache.olingo.ext.proxy.api.Annotatable getOrderPlacedAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Quantity",
+        type = "Edm.Int32")
+    org.apache.olingo.ext.proxy.api.Annotatable getQuantityAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"UnitPrice",
+        type = "Edm.Single")
+    org.apache.olingo.ext.proxy.api.Annotatable getUnitPriceAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "ProductOrdered",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.Product")
+    org.apache.olingo.ext.proxy.api.Annotatable getProductOrderedAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "AssociatedOrder",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
+    org.apache.olingo.ext.proxy.api.Annotatable 
getAssociatedOrderAnnotations();
+  }
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
index 1ed0e55..4001219 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.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.staticservice.microsoft.test.odata.services.odatawcfservice.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 OrderDetailCollection extends 
+public interface OrderDetailCollection
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection>,
-    
org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection>
 {
+org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection>
 {
+
+  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/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java
index 5dfef79..f859295 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.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.staticservice.microsoft.test.odata.services.odatawcfservice.types;
 
-//CHECKSTYLE:OFF (Maven checkstyle)
+// CHECKSTYLE:OFF (Maven checkstyle)
 
-
-public interface OrderDetailCollectionComposableInvoker extends 
+public interface OrderDetailCollectionComposableInvoker
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection.Operations>
 {
 
   @Override

Reply via email to