Skip to content

Commit 9eef08a

Browse files
CharlesDuboisSAPCharlesDuboisSAP
authored
[OData] Renamed internal variable values to cloudSdkValues (#668)
1 parent 4eacad5 commit 9eef08a

File tree

128 files changed

+2516
-2514
lines changed

Some content is hidden

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

128 files changed

+2516
-2514
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: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -303,68 +303,68 @@ protected ODataEntityKey getKey()
303303
@Override
304304
protected Map<java.lang.String, Object> toMapOfFields()
305305
{
306-
final Map<java.lang.String, Object> values = super.toMapOfFields();
307-
values.put("Id", getId());
308-
values.put("Street", getStreet());
309-
values.put("City", getCity());
310-
values.put("State", getState());
311-
values.put("Country", getCountry());
312-
values.put("PostalCode", getPostalCode());
313-
values.put("Latitude", getLatitude());
314-
values.put("Longitude", getLongitude());
315-
return values;
306+
final Map<java.lang.String, Object> cloudSdkValues = super.toMapOfFields();
307+
cloudSdkValues.put("Id", getId());
308+
cloudSdkValues.put("Street", getStreet());
309+
cloudSdkValues.put("City", getCity());
310+
cloudSdkValues.put("State", getState());
311+
cloudSdkValues.put("Country", getCountry());
312+
cloudSdkValues.put("PostalCode", getPostalCode());
313+
cloudSdkValues.put("Latitude", getLatitude());
314+
cloudSdkValues.put("Longitude", getLongitude());
315+
return cloudSdkValues;
316316
}
317317

318318
@Override
319319
protected void fromMap( final Map<java.lang.String, Object> inputValues )
320320
{
321-
final Map<java.lang.String, Object> values = Maps.newHashMap(inputValues);
321+
final Map<java.lang.String, Object> cloudSdkValues = Maps.newHashMap(inputValues);
322322
// simple properties
323323
{
324-
if( values.containsKey("Id") ) {
325-
final Object value = values.remove("Id");
324+
if( cloudSdkValues.containsKey("Id") ) {
325+
final Object value = cloudSdkValues.remove("Id");
326326
if( (value == null) || (!value.equals(getId())) ) {
327327
setId(((Integer) value));
328328
}
329329
}
330-
if( values.containsKey("Street") ) {
331-
final Object value = values.remove("Street");
330+
if( cloudSdkValues.containsKey("Street") ) {
331+
final Object value = cloudSdkValues.remove("Street");
332332
if( (value == null) || (!value.equals(getStreet())) ) {
333333
setStreet(((java.lang.String) value));
334334
}
335335
}
336-
if( values.containsKey("City") ) {
337-
final Object value = values.remove("City");
336+
if( cloudSdkValues.containsKey("City") ) {
337+
final Object value = cloudSdkValues.remove("City");
338338
if( (value == null) || (!value.equals(getCity())) ) {
339339
setCity(((java.lang.String) value));
340340
}
341341
}
342-
if( values.containsKey("State") ) {
343-
final Object value = values.remove("State");
342+
if( cloudSdkValues.containsKey("State") ) {
343+
final Object value = cloudSdkValues.remove("State");
344344
if( (value == null) || (!value.equals(getState())) ) {
345345
setState(((java.lang.String) value));
346346
}
347347
}
348-
if( values.containsKey("Country") ) {
349-
final Object value = values.remove("Country");
348+
if( cloudSdkValues.containsKey("Country") ) {
349+
final Object value = cloudSdkValues.remove("Country");
350350
if( (value == null) || (!value.equals(getCountry())) ) {
351351
setCountry(((java.lang.String) value));
352352
}
353353
}
354-
if( values.containsKey("PostalCode") ) {
355-
final Object value = values.remove("PostalCode");
354+
if( cloudSdkValues.containsKey("PostalCode") ) {
355+
final Object value = cloudSdkValues.remove("PostalCode");
356356
if( (value == null) || (!value.equals(getPostalCode())) ) {
357357
setPostalCode(((java.lang.String) value));
358358
}
359359
}
360-
if( values.containsKey("Latitude") ) {
361-
final Object value = values.remove("Latitude");
360+
if( cloudSdkValues.containsKey("Latitude") ) {
361+
final Object value = cloudSdkValues.remove("Latitude");
362362
if( (value == null) || (!value.equals(getLatitude())) ) {
363363
setLatitude(((Double) value));
364364
}
365365
}
366-
if( values.containsKey("Longitude") ) {
367-
final Object value = values.remove("Longitude");
366+
if( cloudSdkValues.containsKey("Longitude") ) {
367+
final Object value = cloudSdkValues.remove("Longitude");
368368
if( (value == null) || (!value.equals(getLongitude())) ) {
369369
setLongitude(((Double) value));
370370
}
@@ -376,7 +376,7 @@ protected void fromMap( final Map<java.lang.String, Object> inputValues )
376376
// navigation properties
377377
{
378378
}
379-
super.fromMap(values);
379+
super.fromMap(cloudSdkValues);
380380
}
381381

382382
@Override

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -215,40 +215,40 @@ protected ODataEntityKey getKey()
215215
@Override
216216
protected Map<java.lang.String, Object> toMapOfFields()
217217
{
218-
final Map<java.lang.String, Object> values = super.toMapOfFields();
219-
values.put("Id", getId());
220-
values.put("Name", getName());
221-
values.put("Email", getEmail());
222-
values.put("AddressId", getAddressId());
223-
return values;
218+
final Map<java.lang.String, Object> cloudSdkValues = super.toMapOfFields();
219+
cloudSdkValues.put("Id", getId());
220+
cloudSdkValues.put("Name", getName());
221+
cloudSdkValues.put("Email", getEmail());
222+
cloudSdkValues.put("AddressId", getAddressId());
223+
return cloudSdkValues;
224224
}
225225

226226
@Override
227227
protected void fromMap( final Map<java.lang.String, Object> inputValues )
228228
{
229-
final Map<java.lang.String, Object> values = Maps.newHashMap(inputValues);
229+
final Map<java.lang.String, Object> cloudSdkValues = Maps.newHashMap(inputValues);
230230
// simple properties
231231
{
232-
if( values.containsKey("Id") ) {
233-
final Object value = values.remove("Id");
232+
if( cloudSdkValues.containsKey("Id") ) {
233+
final Object value = cloudSdkValues.remove("Id");
234234
if( (value == null) || (!value.equals(getId())) ) {
235235
setId(((Integer) value));
236236
}
237237
}
238-
if( values.containsKey("Name") ) {
239-
final Object value = values.remove("Name");
238+
if( cloudSdkValues.containsKey("Name") ) {
239+
final Object value = cloudSdkValues.remove("Name");
240240
if( (value == null) || (!value.equals(getName())) ) {
241241
setName(((java.lang.String) value));
242242
}
243243
}
244-
if( values.containsKey("Email") ) {
245-
final Object value = values.remove("Email");
244+
if( cloudSdkValues.containsKey("Email") ) {
245+
final Object value = cloudSdkValues.remove("Email");
246246
if( (value == null) || (!value.equals(getEmail())) ) {
247247
setEmail(((java.lang.String) value));
248248
}
249249
}
250-
if( values.containsKey("AddressId") ) {
251-
final Object value = values.remove("AddressId");
250+
if( cloudSdkValues.containsKey("AddressId") ) {
251+
final Object value = cloudSdkValues.remove("AddressId");
252252
if( (value == null) || (!value.equals(getAddressId())) ) {
253253
setAddressId(((Integer) value));
254254
}
@@ -259,8 +259,8 @@ protected void fromMap( final Map<java.lang.String, Object> inputValues )
259259
}
260260
// navigation properties
261261
{
262-
if( (values).containsKey("Address") ) {
263-
final Object value = (values).remove("Address");
262+
if( (cloudSdkValues).containsKey("Address") ) {
263+
final Object value = (cloudSdkValues).remove("Address");
264264
if( value instanceof Map ) {
265265
if( toAddress == null ) {
266266
toAddress = new Address();
@@ -271,7 +271,7 @@ protected void fromMap( final Map<java.lang.String, Object> inputValues )
271271
}
272272
}
273273
}
274-
super.fromMap(values);
274+
super.fromMap(cloudSdkValues);
275275
}
276276

277277
@Override
@@ -284,11 +284,11 @@ protected java.lang.String getDefaultServicePath()
284284
@Override
285285
protected Map<java.lang.String, Object> toMapOfNavigationProperties()
286286
{
287-
final Map<java.lang.String, Object> values = super.toMapOfNavigationProperties();
287+
final Map<java.lang.String, Object> cloudSdkValues = super.toMapOfNavigationProperties();
288288
if( toAddress != null ) {
289-
(values).put("Address", toAddress);
289+
(cloudSdkValues).put("Address", toAddress);
290290
}
291-
return values;
291+
return cloudSdkValues;
292292
}
293293

294294
/**

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,26 @@ public Class<DateRange> getType()
8484
@Override
8585
protected Map<String, Object> toMapOfFields()
8686
{
87-
final Map<String, Object> values = super.toMapOfFields();
88-
values.put("Start", getStart());
89-
values.put("End", getEnd());
90-
return values;
87+
final Map<String, Object> cloudSdkValues = super.toMapOfFields();
88+
cloudSdkValues.put("Start", getStart());
89+
cloudSdkValues.put("End", getEnd());
90+
return cloudSdkValues;
9191
}
9292

9393
@Override
9494
protected void fromMap( final Map<String, Object> inputValues )
9595
{
96-
final Map<String, Object> values = Maps.newHashMap(inputValues);
96+
final Map<String, Object> cloudSdkValues = Maps.newHashMap(inputValues);
9797
// simple properties
9898
{
99-
if( values.containsKey("Start") ) {
100-
final Object value = values.remove("Start");
99+
if( cloudSdkValues.containsKey("Start") ) {
100+
final Object value = cloudSdkValues.remove("Start");
101101
if( (value == null) || (!value.equals(getStart())) ) {
102102
setStart(((OffsetDateTime) value));
103103
}
104104
}
105-
if( values.containsKey("End") ) {
106-
final Object value = values.remove("End");
105+
if( cloudSdkValues.containsKey("End") ) {
106+
final Object value = cloudSdkValues.remove("End");
107107
if( (value == null) || (!value.equals(getEnd())) ) {
108108
setEnd(((OffsetDateTime) value));
109109
}
@@ -115,7 +115,7 @@ protected void fromMap( final Map<String, Object> inputValues )
115115
// navigation properties
116116
{
117117
}
118-
super.fromMap(values);
118+
super.fromMap(cloudSdkValues);
119119
}
120120

121121
@Nonnull

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,26 +134,26 @@ protected ODataEntityKey getKey()
134134
@Override
135135
protected Map<java.lang.String, Object> toMapOfFields()
136136
{
137-
final Map<java.lang.String, Object> values = super.toMapOfFields();
138-
values.put("Id", getId());
139-
values.put("ImageUri", getImageUri());
140-
return values;
137+
final Map<java.lang.String, Object> cloudSdkValues = super.toMapOfFields();
138+
cloudSdkValues.put("Id", getId());
139+
cloudSdkValues.put("ImageUri", getImageUri());
140+
return cloudSdkValues;
141141
}
142142

143143
@Override
144144
protected void fromMap( final Map<java.lang.String, Object> inputValues )
145145
{
146-
final Map<java.lang.String, Object> values = Maps.newHashMap(inputValues);
146+
final Map<java.lang.String, Object> cloudSdkValues = Maps.newHashMap(inputValues);
147147
// simple properties
148148
{
149-
if( values.containsKey("Id") ) {
150-
final Object value = values.remove("Id");
149+
if( cloudSdkValues.containsKey("Id") ) {
150+
final Object value = cloudSdkValues.remove("Id");
151151
if( (value == null) || (!value.equals(getId())) ) {
152152
setId(((Integer) value));
153153
}
154154
}
155-
if( values.containsKey("ImageUri") ) {
156-
final Object value = values.remove("ImageUri");
155+
if( cloudSdkValues.containsKey("ImageUri") ) {
156+
final Object value = cloudSdkValues.remove("ImageUri");
157157
if( (value == null) || (!value.equals(getImageUri())) ) {
158158
setImageUri(((java.lang.String) value));
159159
}
@@ -165,15 +165,15 @@ protected void fromMap( final Map<java.lang.String, Object> inputValues )
165165
// navigation properties
166166
{
167167
}
168-
super.fromMap(values);
168+
super.fromMap(cloudSdkValues);
169169
}
170170

171171
@Nonnull
172172
@Override
173173
protected Map<java.lang.String, Object> toMapOfNavigationProperties()
174174
{
175-
final Map<java.lang.String, Object> values = super.toMapOfNavigationProperties();
176-
return values;
175+
final Map<java.lang.String, Object> cloudSdkValues = super.toMapOfNavigationProperties();
176+
return cloudSdkValues;
177177
}
178178

179179
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -195,40 +195,40 @@ protected ODataEntityKey getKey()
195195
@Override
196196
protected Map<String, Object> toMapOfFields()
197197
{
198-
final Map<String, Object> values = super.toMapOfFields();
199-
values.put("Id", getId());
200-
values.put("DayOfWeek", getDayOfWeek());
201-
values.put("OpenTime", getOpenTime());
202-
values.put("CloseTime", getCloseTime());
203-
return values;
198+
final Map<String, Object> cloudSdkValues = super.toMapOfFields();
199+
cloudSdkValues.put("Id", getId());
200+
cloudSdkValues.put("DayOfWeek", getDayOfWeek());
201+
cloudSdkValues.put("OpenTime", getOpenTime());
202+
cloudSdkValues.put("CloseTime", getCloseTime());
203+
return cloudSdkValues;
204204
}
205205

206206
@Override
207207
protected void fromMap( final Map<String, Object> inputValues )
208208
{
209-
final Map<String, Object> values = Maps.newHashMap(inputValues);
209+
final Map<String, Object> cloudSdkValues = Maps.newHashMap(inputValues);
210210
// simple properties
211211
{
212-
if( values.containsKey("Id") ) {
213-
final Object value = values.remove("Id");
212+
if( cloudSdkValues.containsKey("Id") ) {
213+
final Object value = cloudSdkValues.remove("Id");
214214
if( (value == null) || (!value.equals(getId())) ) {
215215
setId(((Integer) value));
216216
}
217217
}
218-
if( values.containsKey("DayOfWeek") ) {
219-
final Object value = values.remove("DayOfWeek");
218+
if( cloudSdkValues.containsKey("DayOfWeek") ) {
219+
final Object value = cloudSdkValues.remove("DayOfWeek");
220220
if( (value == null) || (!value.equals(getDayOfWeek())) ) {
221221
setDayOfWeek(((Integer) value));
222222
}
223223
}
224-
if( values.containsKey("OpenTime") ) {
225-
final Object value = values.remove("OpenTime");
224+
if( cloudSdkValues.containsKey("OpenTime") ) {
225+
final Object value = cloudSdkValues.remove("OpenTime");
226226
if( (value == null) || (!value.equals(getOpenTime())) ) {
227227
setOpenTime(((LocalTime) value));
228228
}
229229
}
230-
if( values.containsKey("CloseTime") ) {
231-
final Object value = values.remove("CloseTime");
230+
if( cloudSdkValues.containsKey("CloseTime") ) {
231+
final Object value = cloudSdkValues.remove("CloseTime");
232232
if( (value == null) || (!value.equals(getCloseTime())) ) {
233233
setCloseTime(((LocalTime) value));
234234
}
@@ -240,7 +240,7 @@ protected void fromMap( final Map<String, Object> inputValues )
240240
// navigation properties
241241
{
242242
}
243-
super.fromMap(values);
243+
super.fromMap(cloudSdkValues);
244244
}
245245

246246
@Override

0 commit comments

Comments
 (0)