fix: [ODatav4] Support for property name properties

Author: CharlesDuboisSAP

datamodel/odata-v4/odata-v4-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/sample/namespaces/sdkgrocerystore/Receipt.java

@@ -117,6 +117,26 @@ public class Receipt extends VdmEntity<Receipt> implements VdmEntitySet
             Receipt.class,
             "ProductCounts",
             ProductCount.class);
+    /**
+     * Constraints: Nullable
+     * <p>
+     * Original property name from the Odata EDM: <b>properties</b>
+     * </p>
+     *
+     * @return The properties contained in this {@link VdmEntity}.
+     */
+    @Nullable
+    @ElementName( "properties" )
+    private java.util.Collection<ProductCount> properties;
+    /**
+     * Use with available request builders to apply the <b>properties</b> complex property to query operations.
+     *
+     */
+    public final static com.sap.cloud.sdk.datamodel.odatav4.core.ComplexProperty.Collection<Receipt, ProductCount> PROPERTIES =
+        new com.sap.cloud.sdk.datamodel.odatav4.core.ComplexProperty.Collection<Receipt, ProductCount>(
+            Receipt.class,
+            "properties",
+            ProductCount.class);
     /**
      * Navigation property <b>Customer</b> for <b>Receipt</b> to single <b>Customer</b>.
      *
@@ -203,6 +223,21 @@ public void setProductCounts( @Nullable final java.util.Collection<ProductCount>
         this.productCounts = productCounts;
     }
 
+    /**
+     * Constraints: Nullable
+     * <p>
+     * Original property name from the Odata EDM: <b>properties</b>
+     * </p>
+     *
+     * @param properties
+     *            The properties to set.
+     */
+    public void setProperties( @Nullable final java.util.Collection<ProductCount> properties )
+    {
+        rememberChangedField("properties", this.properties);
+        this.properties = properties;
+    }
+
     @Override
     protected String getEntityCollection()
     {
@@ -227,6 +262,7 @@ protected Map<String, Object> toMapOfFields()
         cloudSdkValues.put("CustomerId", getCustomerId());
         cloudSdkValues.put("TotalAmount", getTotalAmount());
         cloudSdkValues.put("ProductCounts", getProductCounts());
+        cloudSdkValues.put("properties", getProperties());
         return cloudSdkValues;
     }
 
@@ -261,8 +297,8 @@ protected void fromMap( final Map<String, Object> inputValues )
                 final Object value = cloudSdkValues.remove("ProductCounts");
                 if( value instanceof Iterable ) {
                     final LinkedList<ProductCount> productCounts = new LinkedList<ProductCount>();
-                    for( Object properties : ((Iterable<?>) value) ) {
-                        if( properties instanceof Map ) {
+                    for( Object cloudSdkProperties : ((Iterable<?>) value) ) {
+                        if( cloudSdkProperties instanceof Map ) {
                             final ProductCount item = new ProductCount();
                             @SuppressWarnings( "unchecked" )
                             final Map<String, Object> inputMap = ((Map<String, Object>) value);
@@ -276,6 +312,25 @@ protected void fromMap( final Map<String, Object> inputValues )
                     setProductCounts(null);
                 }
             }
+            if( cloudSdkValues.containsKey("properties") ) {
+                final Object value = cloudSdkValues.remove("properties");
+                if( value instanceof Iterable ) {
+                    final LinkedList<ProductCount> properties = new LinkedList<ProductCount>();
+                    for( Object cloudSdkProperties : ((Iterable<?>) value) ) {
+                        if( cloudSdkProperties instanceof Map ) {
+                            final ProductCount item = new ProductCount();
+                            @SuppressWarnings( "unchecked" )
+                            final Map<String, Object> inputMap = ((Map<String, Object>) value);
+                            item.fromMap(inputMap);
+                            properties.add(item);
+                        }
+                    }
+                    setProperties(properties);
+                }
+                if( (value == null) && (getProperties() != null) ) {
+                    setProperties(null);
+                }
+            }
         }
         // navigation properties
         {

datamodel/odata-v4/odata-v4-api-sample/src/main/resources/SDK_Grocery_Store.edmx

@@ -60,6 +60,7 @@
                 <Property Name="CustomerId" Type="Edm.Int32" Nullable="false"/>
                 <Property Name="TotalAmount" Type="Edm.Decimal" Nullable="false"/>
                 <Property Name="ProductCounts" Type="Collection(GroceryStore.ProductCount)" Nullable="false"/>
+                <Property Name="properties" Type="Collection(GroceryStore.ProductCount)"/>
                 <NavigationProperty Name="Customer" Type="GroceryStore.Customer" Partner="Receipts"/>
             </EntityType>
             <EntityType Name="Address">

datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/NamespaceClassGenerator.java

@@ -721,7 +721,7 @@ else if( isPrimitive ) {
                 final JBlock ifValueIsList = ifFoundBody._if(value._instanceof(typeIterable))._then();
                 final JVar listInst = ifValueIsList.decl(JMod.FINAL, listType, javaFieldName, JExpr._new(listType));
                 final JExpression iter = JExpr.cast(typeIterable.narrow(codeModel.wildcard()), value);
-                final JForEach forEach = ifValueIsList.forEach(typeObject, "properties", iter);
+                final JForEach forEach = ifValueIsList.forEach(typeObject, "cloudSdkProperties", iter);
                 final JBlock isMap = forEach.body()._if(forEach.var()._instanceof(codeModel.ref(Map.class)))._then();
                 final JVar item = isMap.decl(JMod.FINAL, javaType, "item", JExpr._new(javaType));
                 isMap.directStatement("@SuppressWarnings(\"unchecked\")");