Skip to content

Commit b54417c

Browse files
CharlesDuboisSAPCharlesDuboisSAP
authored
fix: [ODatav4] Support for property name properties (#886)
1 parent 1ea9278 commit b54417c

File tree

50 files changed

+651
-593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+651
-593
lines changed

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -322,51 +322,51 @@ protected void fromMap( final Map<java.lang.String, Object> inputValues )
322322
// simple properties
323323
{
324324
if( cloudSdkValues.containsKey("Id") ) {
325-
final Object value = cloudSdkValues.remove("Id");
326-
if( (value == null) || (!value.equals(getId())) ) {
327-
setId(((Integer) value));
325+
final Object cloudSdkValue = cloudSdkValues.remove("Id");
326+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getId())) ) {
327+
setId(((Integer) cloudSdkValue));
328328
}
329329
}
330330
if( cloudSdkValues.containsKey("Street") ) {
331-
final Object value = cloudSdkValues.remove("Street");
332-
if( (value == null) || (!value.equals(getStreet())) ) {
333-
setStreet(((java.lang.String) value));
331+
final Object cloudSdkValue = cloudSdkValues.remove("Street");
332+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getStreet())) ) {
333+
setStreet(((java.lang.String) cloudSdkValue));
334334
}
335335
}
336336
if( cloudSdkValues.containsKey("City") ) {
337-
final Object value = cloudSdkValues.remove("City");
338-
if( (value == null) || (!value.equals(getCity())) ) {
339-
setCity(((java.lang.String) value));
337+
final Object cloudSdkValue = cloudSdkValues.remove("City");
338+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getCity())) ) {
339+
setCity(((java.lang.String) cloudSdkValue));
340340
}
341341
}
342342
if( cloudSdkValues.containsKey("State") ) {
343-
final Object value = cloudSdkValues.remove("State");
344-
if( (value == null) || (!value.equals(getState())) ) {
345-
setState(((java.lang.String) value));
343+
final Object cloudSdkValue = cloudSdkValues.remove("State");
344+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getState())) ) {
345+
setState(((java.lang.String) cloudSdkValue));
346346
}
347347
}
348348
if( cloudSdkValues.containsKey("Country") ) {
349-
final Object value = cloudSdkValues.remove("Country");
350-
if( (value == null) || (!value.equals(getCountry())) ) {
351-
setCountry(((java.lang.String) value));
349+
final Object cloudSdkValue = cloudSdkValues.remove("Country");
350+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getCountry())) ) {
351+
setCountry(((java.lang.String) cloudSdkValue));
352352
}
353353
}
354354
if( cloudSdkValues.containsKey("PostalCode") ) {
355-
final Object value = cloudSdkValues.remove("PostalCode");
356-
if( (value == null) || (!value.equals(getPostalCode())) ) {
357-
setPostalCode(((java.lang.String) value));
355+
final Object cloudSdkValue = cloudSdkValues.remove("PostalCode");
356+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getPostalCode())) ) {
357+
setPostalCode(((java.lang.String) cloudSdkValue));
358358
}
359359
}
360360
if( cloudSdkValues.containsKey("Latitude") ) {
361-
final Object value = cloudSdkValues.remove("Latitude");
362-
if( (value == null) || (!value.equals(getLatitude())) ) {
363-
setLatitude(((Double) value));
361+
final Object cloudSdkValue = cloudSdkValues.remove("Latitude");
362+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getLatitude())) ) {
363+
setLatitude(((Double) cloudSdkValue));
364364
}
365365
}
366366
if( cloudSdkValues.containsKey("Longitude") ) {
367-
final Object value = cloudSdkValues.remove("Longitude");
368-
if( (value == null) || (!value.equals(getLongitude())) ) {
369-
setLongitude(((Double) value));
367+
final Object cloudSdkValue = cloudSdkValues.remove("Longitude");
368+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getLongitude())) ) {
369+
setLongitude(((Double) cloudSdkValue));
370370
}
371371
}
372372
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -230,27 +230,27 @@ protected void fromMap( final Map<java.lang.String, Object> inputValues )
230230
// simple properties
231231
{
232232
if( cloudSdkValues.containsKey("Id") ) {
233-
final Object value = cloudSdkValues.remove("Id");
234-
if( (value == null) || (!value.equals(getId())) ) {
235-
setId(((Integer) value));
233+
final Object cloudSdkValue = cloudSdkValues.remove("Id");
234+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getId())) ) {
235+
setId(((Integer) cloudSdkValue));
236236
}
237237
}
238238
if( cloudSdkValues.containsKey("Name") ) {
239-
final Object value = cloudSdkValues.remove("Name");
240-
if( (value == null) || (!value.equals(getName())) ) {
241-
setName(((java.lang.String) value));
239+
final Object cloudSdkValue = cloudSdkValues.remove("Name");
240+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getName())) ) {
241+
setName(((java.lang.String) cloudSdkValue));
242242
}
243243
}
244244
if( cloudSdkValues.containsKey("Email") ) {
245-
final Object value = cloudSdkValues.remove("Email");
246-
if( (value == null) || (!value.equals(getEmail())) ) {
247-
setEmail(((java.lang.String) value));
245+
final Object cloudSdkValue = cloudSdkValues.remove("Email");
246+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getEmail())) ) {
247+
setEmail(((java.lang.String) cloudSdkValue));
248248
}
249249
}
250250
if( cloudSdkValues.containsKey("AddressId") ) {
251-
final Object value = cloudSdkValues.remove("AddressId");
252-
if( (value == null) || (!value.equals(getAddressId())) ) {
253-
setAddressId(((Integer) value));
251+
final Object cloudSdkValue = cloudSdkValues.remove("AddressId");
252+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getAddressId())) ) {
253+
setAddressId(((Integer) cloudSdkValue));
254254
}
255255
}
256256
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ protected void fromMap( final Map<String, Object> inputValues )
9797
// simple properties
9898
{
9999
if( cloudSdkValues.containsKey("Start") ) {
100-
final Object value = cloudSdkValues.remove("Start");
101-
if( (value == null) || (!value.equals(getStart())) ) {
102-
setStart(((OffsetDateTime) value));
100+
final Object cloudSdkValue = cloudSdkValues.remove("Start");
101+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getStart())) ) {
102+
setStart(((OffsetDateTime) cloudSdkValue));
103103
}
104104
}
105105
if( cloudSdkValues.containsKey("End") ) {
106-
final Object value = cloudSdkValues.remove("End");
107-
if( (value == null) || (!value.equals(getEnd())) ) {
108-
setEnd(((OffsetDateTime) value));
106+
final Object cloudSdkValue = cloudSdkValues.remove("End");
107+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getEnd())) ) {
108+
setEnd(((OffsetDateTime) cloudSdkValue));
109109
}
110110
}
111111
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,15 @@ protected void fromMap( final Map<java.lang.String, Object> inputValues )
147147
// simple properties
148148
{
149149
if( cloudSdkValues.containsKey("Id") ) {
150-
final Object value = cloudSdkValues.remove("Id");
151-
if( (value == null) || (!value.equals(getId())) ) {
152-
setId(((Integer) value));
150+
final Object cloudSdkValue = cloudSdkValues.remove("Id");
151+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getId())) ) {
152+
setId(((Integer) cloudSdkValue));
153153
}
154154
}
155155
if( cloudSdkValues.containsKey("ImageUri") ) {
156-
final Object value = cloudSdkValues.remove("ImageUri");
157-
if( (value == null) || (!value.equals(getImageUri())) ) {
158-
setImageUri(((java.lang.String) value));
156+
final Object cloudSdkValue = cloudSdkValues.remove("ImageUri");
157+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getImageUri())) ) {
158+
setImageUri(((java.lang.String) cloudSdkValue));
159159
}
160160
}
161161
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -210,27 +210,27 @@ protected void fromMap( final Map<String, Object> inputValues )
210210
// simple properties
211211
{
212212
if( cloudSdkValues.containsKey("Id") ) {
213-
final Object value = cloudSdkValues.remove("Id");
214-
if( (value == null) || (!value.equals(getId())) ) {
215-
setId(((Integer) value));
213+
final Object cloudSdkValue = cloudSdkValues.remove("Id");
214+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getId())) ) {
215+
setId(((Integer) cloudSdkValue));
216216
}
217217
}
218218
if( cloudSdkValues.containsKey("DayOfWeek") ) {
219-
final Object value = cloudSdkValues.remove("DayOfWeek");
220-
if( (value == null) || (!value.equals(getDayOfWeek())) ) {
221-
setDayOfWeek(((Integer) value));
219+
final Object cloudSdkValue = cloudSdkValues.remove("DayOfWeek");
220+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getDayOfWeek())) ) {
221+
setDayOfWeek(((Integer) cloudSdkValue));
222222
}
223223
}
224224
if( cloudSdkValues.containsKey("OpenTime") ) {
225-
final Object value = cloudSdkValues.remove("OpenTime");
226-
if( (value == null) || (!value.equals(getOpenTime())) ) {
227-
setOpenTime(((LocalTime) value));
225+
final Object cloudSdkValue = cloudSdkValues.remove("OpenTime");
226+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getOpenTime())) ) {
227+
setOpenTime(((LocalTime) cloudSdkValue));
228228
}
229229
}
230230
if( cloudSdkValues.containsKey("CloseTime") ) {
231-
final Object value = cloudSdkValues.remove("CloseTime");
232-
if( (value == null) || (!value.equals(getCloseTime())) ) {
233-
setCloseTime(((LocalTime) value));
231+
final Object cloudSdkValue = cloudSdkValues.remove("CloseTime");
232+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getCloseTime())) ) {
233+
setCloseTime(((LocalTime) cloudSdkValue));
234234
}
235235
}
236236
}

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -307,46 +307,46 @@ protected void fromMap( final Map<java.lang.String, Object> inputValues )
307307
// simple properties
308308
{
309309
if( cloudSdkValues.containsKey("Id") ) {
310-
final Object value = cloudSdkValues.remove("Id");
311-
if( (value == null) || (!value.equals(getId())) ) {
312-
setId(((Integer) value));
310+
final Object cloudSdkValue = cloudSdkValues.remove("Id");
311+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getId())) ) {
312+
setId(((Integer) cloudSdkValue));
313313
}
314314
}
315315
if( cloudSdkValues.containsKey("Name") ) {
316-
final Object value = cloudSdkValues.remove("Name");
317-
if( (value == null) || (!value.equals(getName())) ) {
318-
setName(((java.lang.String) value));
316+
final Object cloudSdkValue = cloudSdkValues.remove("Name");
317+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getName())) ) {
318+
setName(((java.lang.String) cloudSdkValue));
319319
}
320320
}
321321
if( cloudSdkValues.containsKey("ShelfId") ) {
322-
final Object value = cloudSdkValues.remove("ShelfId");
323-
if( (value == null) || (!value.equals(getShelfId())) ) {
324-
setShelfId(((Integer) value));
322+
final Object cloudSdkValue = cloudSdkValues.remove("ShelfId");
323+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getShelfId())) ) {
324+
setShelfId(((Integer) cloudSdkValue));
325325
}
326326
}
327327
if( cloudSdkValues.containsKey("VendorId") ) {
328-
final Object value = cloudSdkValues.remove("VendorId");
329-
if( (value == null) || (!value.equals(getVendorId())) ) {
330-
setVendorId(((Integer) value));
328+
final Object cloudSdkValue = cloudSdkValues.remove("VendorId");
329+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getVendorId())) ) {
330+
setVendorId(((Integer) cloudSdkValue));
331331
}
332332
}
333333
if( cloudSdkValues.containsKey("Price") ) {
334-
final Object value = cloudSdkValues.remove("Price");
335-
if( (value == null) || (!value.equals(getPrice())) ) {
336-
setPrice(((BigDecimal) value));
334+
final Object cloudSdkValue = cloudSdkValues.remove("Price");
335+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getPrice())) ) {
336+
setPrice(((BigDecimal) cloudSdkValue));
337337
}
338338
}
339339
if( cloudSdkValues.containsKey("Categories") ) {
340-
final Object value = cloudSdkValues.remove("Categories");
341-
if( (value == null) && (getCategories() != null) ) {
340+
final Object cloudSdkValue = cloudSdkValues.remove("Categories");
341+
if( (cloudSdkValue == null) && (getCategories() != null) ) {
342342
setCategories(null);
343343
}
344-
if( value instanceof Iterable ) {
344+
if( cloudSdkValue instanceof Iterable ) {
345345
final LinkedList<ProductCategory> categories = new LinkedList<ProductCategory>();
346-
for( Object item : ((Iterable<?>) value) ) {
347-
if( item instanceof java.lang.String ) {
346+
for( Object cloudSdkItem : ((Iterable<?>) cloudSdkValue) ) {
347+
if( cloudSdkItem instanceof java.lang.String ) {
348348
final ProductCategory enumConstant =
349-
VdmEnum.getConstant(ProductCategory.class, ((java.lang.String) item));
349+
VdmEnum.getConstant(ProductCategory.class, ((java.lang.String) cloudSdkItem));
350350
categories.add(enumConstant);
351351
}
352352
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ protected void fromMap( final Map<String, Object> inputValues )
100100
// simple properties
101101
{
102102
if( cloudSdkValues.containsKey("ProductId") ) {
103-
final Object value = cloudSdkValues.remove("ProductId");
104-
if( (value == null) || (!value.equals(getProductId())) ) {
105-
setProductId(((Integer) value));
103+
final Object cloudSdkValue = cloudSdkValues.remove("ProductId");
104+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getProductId())) ) {
105+
setProductId(((Integer) cloudSdkValue));
106106
}
107107
}
108108
if( cloudSdkValues.containsKey("Quantity") ) {
109-
final Object value = cloudSdkValues.remove("Quantity");
110-
if( (value == null) || (!value.equals(getQuantity())) ) {
111-
setQuantity(((Integer) value));
109+
final Object cloudSdkValue = cloudSdkValues.remove("Quantity");
110+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getQuantity())) ) {
111+
setQuantity(((Integer) cloudSdkValue));
112112
}
113113
}
114114
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,25 +105,25 @@ protected void fromMap( final Map<String, Object> inputValues )
105105
// simple properties
106106
{
107107
if( cloudSdkValues.containsKey("ReceiptId") ) {
108-
final Object value = cloudSdkValues.remove("ReceiptId");
109-
if( (value == null) || (!value.equals(getReceiptId())) ) {
110-
setReceiptId(((Integer) value));
108+
final Object cloudSdkValue = cloudSdkValues.remove("ReceiptId");
109+
if( (cloudSdkValue == null) || (!cloudSdkValue.equals(getReceiptId())) ) {
110+
setReceiptId(((Integer) cloudSdkValue));
111111
}
112112
}
113113
}
114114
// structured properties
115115
{
116116
if( cloudSdkValues.containsKey("ProductCount") ) {
117-
final Object value = cloudSdkValues.remove("ProductCount");
118-
if( value instanceof Map ) {
117+
final Object cloudSdkValue = cloudSdkValues.remove("ProductCount");
118+
if( cloudSdkValue instanceof Map ) {
119119
if( getProductCount() == null ) {
120120
setProductCount(new ProductCount());
121121
}
122122
@SuppressWarnings( "unchecked" )
123-
final Map<String, Object> inputMap = ((Map<String, Object>) value);
123+
final Map<String, Object> inputMap = ((Map<String, Object>) cloudSdkValue);
124124
getProductCount().fromMap(inputMap);
125125
}
126-
if( (value == null) && (getProductCount() != null) ) {
126+
if( (cloudSdkValue == null) && (getProductCount() != null) ) {
127127
setProductCount(null);
128128
}
129129
}

0 commit comments

Comments
 (0)