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/SubscriptionTemplates.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
index 1f409e9..ca5afce 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
@@ -1,38 +1,39 @@
-/* 
+/*
  * 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;
 
-//CHECKSTYLE:OFF (Maven checkstyle)
+// CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
 
+// CHECKSTYLE:ON (Maven checkstyle)
 
[email protected](name = 
"SubscriptionTemplates",
+    container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
+public interface SubscriptionTemplates
+    extends
+    
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>,
+    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<SubscriptionTemplates>,
+    
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>
 {
 
[email protected](name = 
"SubscriptionTemplates", container = 
"Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface SubscriptionTemplates 
-  extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>,
 
-  
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<SubscriptionTemplates>,
-  
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>
 {
+  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.
+  }
+}

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/package-info.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
index e7fb1fc..f8ea3ce 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
@@ -1,18 +1,18 @@
-/* 
+/*
  * 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.
  */

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/AccessLevel.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
index ed58523..5d527ba 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
@@ -1,46 +1,46 @@
-/* 
+/*
  * 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.commons.api.edm.EdmPrimitiveTypeKind;
-//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.EnumType(name = "AccessLevel",
-          underlyingType = EdmPrimitiveTypeKind.Int32,
-          isFlags = true)
+    underlyingType = EdmPrimitiveTypeKind.Int32,
+    isFlags = true)
 public enum AccessLevel {
-    None(0),
-    Read(1),
-    Write(2),
-    Execute(4),
-    ReadWrite(3);
+  None(0),
+  Read(1),
+  Write(2),
+  Execute(4),
+  ReadWrite(3);
 
-    private java.lang.Integer value;
-    
-    public java.lang.Integer getValue(){
-      return this.value;
-    }
+  private java.lang.Integer value;
 
-    private AccessLevel(final java.lang.Integer value){
-      this.value=value;
-    }
+  public java.lang.Integer getValue() {
+    return value;
+  }
+
+  private AccessLevel(final java.lang.Integer value) {
+    this.value = value;
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
index 30d5fbf..ea640be 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
@@ -1,216 +1,226 @@
-/* 
+/*
  * 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.AbstractEntitySet;
+// CHECKSTYLE:ON (Maven checkstyle)
+import org.apache.olingo.ext.proxy.api.OperationType;
 import org.apache.olingo.ext.proxy.api.annotations.Key;
 import org.apache.olingo.ext.proxy.api.annotations.Parameter;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//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 = "Account",
-        openType = false,
-        hasStream = false,
-        isAbstract = false)
-public interface Account 
-  extends org.apache.olingo.ext.proxy.api.Annotatable,
-  org.apache.olingo.ext.proxy.api.EntityType<Account>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<Account>   {
-
-
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getAccountID();
-
-    void setAccountID(java.lang.Integer _accountID);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country", 
-                type = "Edm.String", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getCountry();
-
-    void setCountry(java.lang.String _country);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"AccountInfo", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.AccountInfo", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
 getAccountInfo();
-
-    void 
setAccountInfo(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
 _accountInfo);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyGiftCard", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.GiftCard", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "", 
-                targetEntitySet = "",
-                containsTarget = true)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
 getMyGiftCard();
-
-    void 
setMyGiftCard(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
 _myGiftCard);
-    
-        
-        
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"AvailableSubscriptionTemplatess", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Subscription", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "SubscriptionTemplates",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
 getAvailableSubscriptionTemplatess();
-
-    void 
setAvailableSubscriptionTemplatess(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
 _availableSubscriptionTemplatess);
-    
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-          
-      @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"GetDefaultPI",
-                    type = OperationType.FUNCTION,
-                    isComposable = false,
-                    referenceType = 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.class,
                    returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
-      
org.apache.olingo.ext.proxy.api.StructuredInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument>
 getDefaultPI(
-            );
-
-          
-      @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"GetAccountInfo",
-                    type = OperationType.FUNCTION,
-                    isComposable = true,
-                    referenceType = 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo.class,
                    returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
-      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoComposableInvoker
 getAccountInfo(
-            );
-
-    
-          
-      @org.apache.olingo.ext.proxy.api.annotations.Operation(name = 
"RefreshDefaultPI",
-                    type = OperationType.ACTION,
-                    referenceType = 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.class,
                    returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
-      
org.apache.olingo.ext.proxy.api.StructuredInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument>
 refreshDefaultPI(
-                @Parameter(name = "newDate", type = "Edm.DateTimeOffset", 
nullable = true) java.sql.Timestamp newDate
-            );
-
-        }
-    Annotations annotations();
-
-    interface Annotations {
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"AccountID",
-                   type = "Edm.Int32")
-        org.apache.olingo.ext.proxy.api.Annotatable getAccountIDAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Country",
-                   type = "Edm.String")
-        org.apache.olingo.ext.proxy.api.Annotatable getCountryAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"AccountInfo",
-                   type = 
"Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getAccountInfoAnnotations();
-
-
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "MyGiftCard", 
-                  type = 
"Microsoft.Test.OData.Services.ODataWCFService.GiftCard")
-        org.apache.olingo.ext.proxy.api.Annotatable getMyGiftCardAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "MyPaymentInstruments", 
-                  type = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getMyPaymentInstrumentsAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "ActiveSubscriptions", 
-                  type = 
"Microsoft.Test.OData.Services.ODataWCFService.Subscription")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getActiveSubscriptionsAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "AvailableSubscriptionTemplatess", 
-                  type = 
"Microsoft.Test.OData.Services.ODataWCFService.Subscription")
-        org.apache.olingo.ext.proxy.api.Annotatable 
getAvailableSubscriptionTemplatessAnnotations();
-    }
-
-      @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyPaymentInstruments", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Subscription", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "SubscriptionTemplates",
-                containsTarget = true)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
 getMyPaymentInstruments();
-    void 
setMyPaymentInstruments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
 _myPaymentInstruments);
-
-            
-    
-    @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"MyPaymentInstruments", contained = true)
-    interface MyPaymentInstruments 
-      extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>,
 
+    openType = false,
+    hasStream = false,
+    isAbstract = false)
+public interface Account
+    extends org.apache.olingo.ext.proxy.api.Annotatable,
+    org.apache.olingo.ext.proxy.api.EntityType<Account>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<Account> {
+
+  @Key
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getAccountID();
+
+  void setAccountID(java.lang.Integer _accountID);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getCountry();
+
+  void setCountry(java.lang.String _country);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
+      nullable = true,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
+      getAccountInfo();
+
+      void
+      setAccountInfo(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
 _accountInfo);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyGiftCard",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "",
+      targetEntitySet = "",
+      containsTarget = true)
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
+      getMyGiftCard();
+
+      void
+      setMyGiftCard(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
 _myGiftCard);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"AvailableSubscriptionTemplatess",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "SubscriptionTemplates",
+      containsTarget = false)
+      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
+      getAvailableSubscriptionTemplatess();
+
+      void
+      setAvailableSubscriptionTemplatess(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
 _availableSubscriptionTemplatess);
+
+  Operations operations();
+
+  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
+
+    @org.apache.olingo.ext.proxy.api.annotations.Operation(
+        name = "GetDefaultPI",
+        type = OperationType.FUNCTION,
+        isComposable = false,
+        referenceType = 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.class,
+        returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
+        
org.apache.olingo.ext.proxy.api.StructuredInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument>
+        getDefaultPI(
+        );
+
+    @org.apache.olingo.ext.proxy.api.annotations.Operation(
+        name = "GetAccountInfo",
+        type = OperationType.FUNCTION,
+        isComposable = true,
+        referenceType = 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo.class,
+        returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
+        
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoComposableInvoker
+        getAccountInfo(
+        );
+
+    @org.apache.olingo.ext.proxy.api.annotations.Operation(
+        name = "RefreshDefaultPI",
+        type = OperationType.ACTION,
+        referenceType = 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.class,
+        returnType = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
+        
org.apache.olingo.ext.proxy.api.StructuredInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument>
+        refreshDefaultPI(
+            @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable 
= true) java.sql.Timestamp newDate
+        );
+
+  }
+
+  Annotations annotations();
+
+  interface Annotations {
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"AccountID",
+        type = "Edm.Int32")
+    org.apache.olingo.ext.proxy.api.Annotatable getAccountIDAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Country",
+        type = "Edm.String")
+    org.apache.olingo.ext.proxy.api.Annotatable getCountryAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"AccountInfo",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
+    org.apache.olingo.ext.proxy.api.Annotatable getAccountInfoAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "MyGiftCard",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard")
+    org.apache.olingo.ext.proxy.api.Annotatable getMyGiftCardAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "MyPaymentInstruments",
+        type = 
"Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
+    org.apache.olingo.ext.proxy.api.Annotatable 
getMyPaymentInstrumentsAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "ActiveSubscriptions",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
+    org.apache.olingo.ext.proxy.api.Annotatable 
getActiveSubscriptionsAnnotations();
+
+    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(
+        name = "AvailableSubscriptionTemplatess",
+        type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
+    org.apache.olingo.ext.proxy.api.Annotatable 
getAvailableSubscriptionTemplatessAnnotations();
+  }
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyPaymentInstruments",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "SubscriptionTemplates",
+      containsTarget = true)
+      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
+      getMyPaymentInstruments();
+
+      void
+      setMyPaymentInstruments(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
 _myPaymentInstruments);
+
+  @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"MyPaymentInstruments", contained = true)
+  interface MyPaymentInstruments
+      extends
+      
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>,
       
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<MyPaymentInstruments>,
-      
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>
 {
-    //No additional methods needed for now.
-    }
-
-        @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"ActiveSubscriptions", 
-                type = "java.lang.Integer", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "SubscriptionTemplates",
-                containsTarget = true)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
 getActiveSubscriptions();
-    void 
setActiveSubscriptions(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
 _activeSubscriptions);
-
-            
-    
-    @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"ActiveSubscriptions", contained = true)
-    interface ActiveSubscriptions 
-      extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>,
 
-      
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ActiveSubscriptions>,
-      
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>
 {
-    //No additional methods needed for now.
-    }
+  
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>
 {
+    // No additional methods needed for now.
+  }
 
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"ActiveSubscriptions",
+      type = "java.lang.Integer",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "SubscriptionTemplates",
+      containsTarget = true)
+      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
+      getActiveSubscriptions();
+
+      void
+      setActiveSubscriptions(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
 _activeSubscriptions);
+
+  @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"ActiveSubscriptions", contained = true)
+  interface ActiveSubscriptions
+      extends
+      
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>,
+      
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ActiveSubscriptions>,
+  
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>
 {
+    // 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/AccountCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
index 4ceede0..2fcdd6f 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.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 AccountCollection extends 
+public interface AccountCollection
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection>,
-    
org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection>
 {
+org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection>
 {
+
+  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/AccountCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java
index 1d62ea8..64928d0 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.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 AccountCollectionComposableInvoker extends 
+public interface AccountCollectionComposableInvoker
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection.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/AccountComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java
index f7a2e9b..6aa8ebd 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java
@@ -1,30 +1,32 @@
-/* 
+/*
  * 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.annotations.Key;
+
+// CHECKSTYLE:OFF (Maven checkstyle)
 import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-//CHECKSTYLE:ON (Maven checkstyle)
 
-public interface AccountComposableInvoker 
-  extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Account, 
Account.Operations>
-   {
+// CHECKSTYLE:ON (Maven checkstyle)
+import org.apache.olingo.ext.proxy.api.annotations.Key;
+
+public interface AccountComposableInvoker
+    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Account, 
Account.Operations>
+{
 
   @Override
   AccountComposableInvoker select(String... select);
@@ -32,117 +34,123 @@ public interface AccountComposableInvoker
   @Override
   AccountComposableInvoker expand(String... expand);
 
-    
-
-    @Key
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID", 
-                type = "Edm.Int32", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.Integer getAccountID();
-
-    void setAccountID(java.lang.Integer _accountID);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country", 
-                type = "Edm.String", 
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getCountry();
-
-    void setCountry(java.lang.String _country);
-    
-    
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"AccountInfo", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.AccountInfo", 
-                nullable = true,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
 getAccountInfo();
-
-    void 
setAccountInfo(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
 _accountInfo);
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyGiftCard", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.GiftCard", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "", 
-                targetEntitySet = "",
-                containsTarget = true)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
 getMyGiftCard();
-
-    void 
setMyGiftCard(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
 _myGiftCard);
-    
-        
-        
-    @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"AvailableSubscriptionTemplatess", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Subscription", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "SubscriptionTemplates",
-                containsTarget = false)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
 getAvailableSubscriptionTemplatess();
-
-    void 
setAvailableSubscriptionTemplatess(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
 _availableSubscriptionTemplatess);
-    
-
-      @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyPaymentInstruments", 
-                type = 
"Microsoft.Test.OData.Services.ODataWCFService.Subscription", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "SubscriptionTemplates",
-                containsTarget = true)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
 getMyPaymentInstruments();
-    void 
setMyPaymentInstruments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
 _myPaymentInstruments);
-
-            
-    
-    @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"MyPaymentInstruments", contained = true)
-    interface MyPaymentInstruments 
-      extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>,
 
+  @Key
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID",
+      type = "Edm.Int32",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.Integer getAccountID();
+
+  void setAccountID(java.lang.Integer _accountID);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getCountry();
+
+  void setCountry(java.lang.String _country);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
+      nullable = true,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
+      getAccountInfo();
+
+      void
+      setAccountInfo(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo
 _accountInfo);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyGiftCard",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "",
+      targetEntitySet = "",
+      containsTarget = true)
+  
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
+      getMyGiftCard();
+
+      void
+      setMyGiftCard(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard
 _myGiftCard);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"AvailableSubscriptionTemplatess",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "SubscriptionTemplates",
+      containsTarget = false)
+      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
+      getAvailableSubscriptionTemplatess();
+
+      void
+      setAvailableSubscriptionTemplatess(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection
 _availableSubscriptionTemplatess);
+
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"MyPaymentInstruments",
+      type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "SubscriptionTemplates",
+      containsTarget = true)
+      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
+      getMyPaymentInstruments();
+
+      void
+      setMyPaymentInstruments(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments
 _myPaymentInstruments);
+
+  @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"MyPaymentInstruments", contained = true)
+  interface MyPaymentInstruments
+      extends
+      
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>,
       
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<MyPaymentInstruments>,
-      
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>
 {
-    //No additional methods needed for now.
-    }
-
-        @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"ActiveSubscriptions", 
-                type = "java.lang.Integer", 
-                targetSchema = 
"Microsoft.Test.OData.Services.ODataWCFService", 
-                targetContainer = "InMemoryEntities", 
-                targetEntitySet = "SubscriptionTemplates",
-                containsTarget = true)
-    
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
 getActiveSubscriptions();
-    void 
setActiveSubscriptions(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
 _activeSubscriptions);
-
-            
-    
-    @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"ActiveSubscriptions", contained = true)
-    interface ActiveSubscriptions 
-      extends 
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>,
 
-      
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ActiveSubscriptions>,
-      
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>
 {
-    //No additional methods needed for now.
-    }
+  
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection>
 {
+    // No additional methods needed for now.
+  }
 
+  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"ActiveSubscriptions",
+      type = "java.lang.Integer",
+      targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+      targetContainer = "InMemoryEntities",
+      targetEntitySet = "SubscriptionTemplates",
+      containsTarget = true)
+      
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
+      getActiveSubscriptions();
+
+      void
+      setActiveSubscriptions(
+          
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions
 _activeSubscriptions);
+
+  @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = 
"ActiveSubscriptions", contained = true)
+  interface ActiveSubscriptions
+      extends
+      
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>,
+      
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ActiveSubscriptions>,
+  
AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription,
 java.lang.Integer, 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection>
 {
+    // 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/AccountInfo.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
index 4b53fe5..700d31e 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
@@ -1,94 +1,84 @@
-/* 
+/*
  * 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.AbstractOpenType;
 import org.apache.olingo.ext.proxy.api.Annotatable;
-//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.ComplexType(name = "AccountInfo",
-        isOpenType = true,
-        isAbstract = false)
-public interface AccountInfo 
-    extends org.apache.olingo.ext.proxy.api.ComplexType<AccountInfo>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<AccountInfo>,AbstractOpenType {
-
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getFirstName();
-
-    void setFirstName(java.lang.String _firstName);
-
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getLastName();
-
-    void setLastName(java.lang.String _lastName);
-
-    
-
-
-    Annotations annotations();
-
-    interface Annotations {
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"FirstName",
-                   type = "Edm.String")
-        Annotatable getFirstNameAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"LastName",
-                   type = "Edm.String")
-        Annotatable getLastNameAnnotations();
-
-
-    }
-
-
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
+    isOpenType = true,
+    isAbstract = false)
+public interface AccountInfo
+    extends org.apache.olingo.ext.proxy.api.ComplexType<AccountInfo>,
+    org.apache.olingo.ext.proxy.api.StructuredQuery<AccountInfo>, 
AbstractOpenType {
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getFirstName();
+
+  void setFirstName(java.lang.String _firstName);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getLastName();
+
+  void setLastName(java.lang.String _lastName);
+
+  Annotations annotations();
+
+  interface Annotations {
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"FirstName",
+        type = "Edm.String")
+    Annotatable getFirstNameAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"LastName",
+        type = "Edm.String")
+    Annotatable getLastNameAnnotations();
+
+  }
+
+  Operations operations();
+
+  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
     //
-        }
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java
index 2e14253..2f19ddb 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.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 AccountInfoCollection extends 
+public interface AccountInfoCollection
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoCollection>,
-    
org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoCollection>
 {
+org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoCollection>
 {
+
+  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/AccountInfoCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java
index 255f34a..895d8e8 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.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 AccountInfoCollectionComposableInvoker extends 
+public interface AccountInfoCollectionComposableInvoker
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoCollection.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/AccountInfoComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java
index 832044a..22715ad 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java
@@ -1,31 +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.AbstractOpenType;
-//CHECKSTYLE:ON (Maven checkstyle)
 
+// CHECKSTYLE:ON (Maven checkstyle)
 
-public interface AccountInfoComposableInvoker 
-  extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<AccountInfo, 
AccountInfo.Operations>
-  ,AbstractOpenType {
+public interface AccountInfoComposableInvoker
+    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<AccountInfo, 
AccountInfo.Operations>
+    , AbstractOpenType {
 
   @Override
   AccountInfoComposableInvoker select(String... select);
@@ -33,42 +33,34 @@ public interface AccountInfoComposableInvoker
   @Override
   AccountInfoComposableInvoker expand(String... expand);
 
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getFirstName();
-
-    void setFirstName(java.lang.String _firstName);
-
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getLastName();
-
-    void setLastName(java.lang.String _lastName);
-
-    
-
-
-
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getFirstName();
+
+  void setFirstName(java.lang.String _firstName);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getLastName();
+
+  void setLastName(java.lang.String _lastName);
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
index cbdfdc5..6928f01 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
@@ -1,114 +1,102 @@
-/* 
+/*
  * 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.Annotatable;
-//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.ComplexType(name = "Address",
-        isOpenType = false,
-        isAbstract = false)
-public interface Address 
-    extends org.apache.olingo.ext.proxy.api.ComplexType<Address>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<Address> {
-
-
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getStreet();
-
-    void setStreet(java.lang.String _street);
-
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getCity();
-
-    void setCity(java.lang.String _city);
-
-    
-
-    @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode", 
-                type = "Edm.String",
-                nullable = false,
-                defaultValue = "",
-                maxLenght = Integer.MAX_VALUE,
-                fixedLenght = false,
-                precision = 0,
-                scale = 0,
-                unicode = true,
-                collation = "",
-                srid = "")
-    java.lang.String getPostalCode();
-
-    void setPostalCode(java.lang.String _postalCode);
-
-    
-
-
-    Annotations annotations();
-
-    interface Annotations {
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Street",
-                   type = "Edm.String")
-        Annotatable getStreetAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"City",
-                   type = "Edm.String")
-        Annotatable getCityAnnotations();
-
-        
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"PostalCode",
-                   type = "Edm.String")
-        Annotatable getPostalCodeAnnotations();
-
-
-    }
-
-
-
-
-        Operations operations();
-
-    interface Operations extends org.apache.olingo.ext.proxy.api.Operations{
-    //No additional methods needed for now.
-        }
+    isOpenType = false,
+    isAbstract = false)
+public interface Address
+    extends org.apache.olingo.ext.proxy.api.ComplexType<Address>,
+    org.apache.olingo.ext.proxy.api.StructuredQuery<Address> {
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getStreet();
+
+  void setStreet(java.lang.String _street);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getCity();
+
+  void setCity(java.lang.String _city);
+
+  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
+      type = "Edm.String",
+      nullable = false,
+      defaultValue = "",
+      maxLenght = Integer.MAX_VALUE,
+      fixedLenght = false,
+      precision = 0,
+      scale = 0,
+      unicode = true,
+      collation = "",
+      srid = "")
+  java.lang.String getPostalCode();
+
+  void setPostalCode(java.lang.String _postalCode);
+
+  Annotations annotations();
+
+  interface Annotations {
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Street",
+        type = "Edm.String")
+    Annotatable getStreetAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"City",
+        type = "Edm.String")
+    Annotatable getCityAnnotations();
+
+    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"PostalCode",
+        type = "Edm.String")
+    Annotatable getPostalCodeAnnotations();
+
+  }
+
+  Operations operations();
+
+  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
+    // No additional methods needed for now.
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java
index a7bfc20..8ab50b3 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.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 AddressCollection extends 
+public interface AddressCollection
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection>,
-    
org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection>
 {
+org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection>
 {
+
+  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/AddressCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java
index 044e772..2235721 100644
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.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 AddressCollectionComposableInvoker extends 
+public interface AddressCollectionComposableInvoker
+    extends
     
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection,
 
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection.Operations>
 {
 
   @Override

Reply via email to