Skip to content

Commit 8b1e4ee

Browse files
rpanackalrpanackal
committed
Remove BaseApi.invokeApi and handle merging in generated code
1 parent d8df60d commit 8b1e4ee

16 files changed

Lines changed: 174 additions & 232 deletions

File tree

‎datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/petstore/api/DefaultApi.java‎

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public Pet addPet( @Nonnull final PetInput pet )
100100
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
101101
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
102102
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
103-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
103+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
104104
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
105105

106106
final String[] localVarAccepts = { "application/json" };
@@ -112,18 +112,19 @@ public Pet addPet( @Nonnull final PetInput pet )
112112
{
113113
};
114114

115-
return invokeAPI(
116-
localVarPath,
117-
"POST",
118-
localVarQueryParams,
119-
localVarCollectionQueryParams,
120-
localVarQueryStringJoiner.toString(),
121-
pet,
122-
localVarHeaderParams,
123-
localVarFormParams,
124-
localVarAccept,
125-
localVarContentType,
126-
localVarReturnType);
115+
return apiClient
116+
.invokeAPI(
117+
localVarPath,
118+
"POST",
119+
localVarQueryParams,
120+
localVarCollectionQueryParams,
121+
localVarQueryStringJoiner.toString(),
122+
pet,
123+
localVarHeaderParams,
124+
localVarFormParams,
125+
localVarAccept,
126+
localVarContentType,
127+
localVarReturnType);
127128
}
128129

129130
/**
@@ -159,7 +160,7 @@ public OpenApiResponse deletePet( @Nonnull final Long id )
159160
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
160161
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
161162
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
162-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
163+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
163164
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
164165

165166
final String[] localVarAccepts = { "application/json" };
@@ -173,18 +174,19 @@ public OpenApiResponse deletePet( @Nonnull final Long id )
173174
{
174175
};
175176

176-
return invokeAPI(
177-
localVarPath,
178-
"DELETE",
179-
localVarQueryParams,
180-
localVarCollectionQueryParams,
181-
localVarQueryStringJoiner.toString(),
182-
null,
183-
localVarHeaderParams,
184-
localVarFormParams,
185-
localVarAccept,
186-
localVarContentType,
187-
localVarReturnType);
177+
return apiClient
178+
.invokeAPI(
179+
localVarPath,
180+
"DELETE",
181+
localVarQueryParams,
182+
localVarCollectionQueryParams,
183+
localVarQueryStringJoiner.toString(),
184+
null,
185+
localVarHeaderParams,
186+
localVarFormParams,
187+
localVarAccept,
188+
localVarContentType,
189+
localVarReturnType);
188190
}
189191

190192
/**
@@ -220,7 +222,7 @@ public Pet findPetById( @Nonnull final Long id )
220222
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
221223
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
222224
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
223-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
225+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
224226
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
225227

226228
final String[] localVarAccepts = { "application/json", "application/xml", "text/xml", "text/html" };
@@ -234,18 +236,19 @@ public Pet findPetById( @Nonnull final Long id )
234236
{
235237
};
236238

237-
return invokeAPI(
238-
localVarPath,
239-
"GET",
240-
localVarQueryParams,
241-
localVarCollectionQueryParams,
242-
localVarQueryStringJoiner.toString(),
243-
null,
244-
localVarHeaderParams,
245-
localVarFormParams,
246-
localVarAccept,
247-
localVarContentType,
248-
localVarReturnType);
239+
return apiClient
240+
.invokeAPI(
241+
localVarPath,
242+
"GET",
243+
localVarQueryParams,
244+
localVarCollectionQueryParams,
245+
localVarQueryStringJoiner.toString(),
246+
null,
247+
localVarHeaderParams,
248+
localVarFormParams,
249+
localVarAccept,
250+
localVarContentType,
251+
localVarReturnType);
249252
}
250253

251254
/**
@@ -276,7 +279,7 @@ public List<Pet> findPets( @Nullable final List<String> tags, @Nullable final In
276279
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
277280
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
278281
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
279-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
282+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
280283
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
281284

282285
localVarCollectionQueryParams.addAll(ApiClient.parameterToPairs("csv", "tags", tags));
@@ -293,18 +296,19 @@ public List<Pet> findPets( @Nullable final List<String> tags, @Nullable final In
293296
{
294297
};
295298

296-
return invokeAPI(
297-
localVarPath,
298-
"GET",
299-
localVarQueryParams,
300-
localVarCollectionQueryParams,
301-
localVarQueryStringJoiner.toString(),
302-
null,
303-
localVarHeaderParams,
304-
localVarFormParams,
305-
localVarAccept,
306-
localVarContentType,
307-
localVarReturnType);
299+
return apiClient
300+
.invokeAPI(
301+
localVarPath,
302+
"GET",
303+
localVarQueryParams,
304+
localVarCollectionQueryParams,
305+
localVarQueryStringJoiner.toString(),
306+
null,
307+
localVarHeaderParams,
308+
localVarFormParams,
309+
localVarAccept,
310+
localVarContentType,
311+
localVarReturnType);
308312
}
309313

310314
/**

‎datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/sodastore/api/OrdersApi.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public Order ordersPost( @Nonnull final Order order )
9595
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
9696
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
9797
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
98-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
98+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
9999
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
100100

101101
final String[] localVarAccepts = { "application/json" };
@@ -107,17 +107,18 @@ public Order ordersPost( @Nonnull final Order order )
107107
{
108108
};
109109

110-
return invokeAPI(
111-
localVarPath,
112-
"POST",
113-
localVarQueryParams,
114-
localVarCollectionQueryParams,
115-
localVarQueryStringJoiner.toString(),
116-
order,
117-
localVarHeaderParams,
118-
localVarFormParams,
119-
localVarAccept,
120-
localVarContentType,
121-
localVarReturnType);
110+
return apiClient
111+
.invokeAPI(
112+
localVarPath,
113+
"POST",
114+
localVarQueryParams,
115+
localVarCollectionQueryParams,
116+
localVarQueryStringJoiner.toString(),
117+
order,
118+
localVarHeaderParams,
119+
localVarFormParams,
120+
localVarAccept,
121+
localVarContentType,
122+
localVarReturnType);
122123
}
123124
}

‎datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/sodastore/api/SodasApi.java‎

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public byte[] sodasDownloadIdGet( @Nonnull final Long id )
101101
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
102102
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
103103
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
104-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
104+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
105105
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
106106

107107
final String[] localVarAccepts = { "application/octet-stream" };
@@ -115,18 +115,19 @@ public byte[] sodasDownloadIdGet( @Nonnull final Long id )
115115
{
116116
};
117117

118-
return invokeAPI(
119-
localVarPath,
120-
"GET",
121-
localVarQueryParams,
122-
localVarCollectionQueryParams,
123-
localVarQueryStringJoiner.toString(),
124-
null,
125-
localVarHeaderParams,
126-
localVarFormParams,
127-
localVarAccept,
128-
localVarContentType,
129-
localVarReturnType);
118+
return apiClient
119+
.invokeAPI(
120+
localVarPath,
121+
"GET",
122+
localVarQueryParams,
123+
localVarCollectionQueryParams,
124+
localVarQueryStringJoiner.toString(),
125+
null,
126+
localVarHeaderParams,
127+
localVarFormParams,
128+
localVarAccept,
129+
localVarContentType,
130+
localVarReturnType);
130131
}
131132

132133
/**
@@ -151,7 +152,7 @@ public List<SodaWithId> sodasGet()
151152
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
152153
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
153154
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
154-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
155+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
155156
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
156157

157158
final String[] localVarAccepts = { "application/json" };
@@ -165,18 +166,19 @@ public List<SodaWithId> sodasGet()
165166
{
166167
};
167168

168-
return invokeAPI(
169-
localVarPath,
170-
"GET",
171-
localVarQueryParams,
172-
localVarCollectionQueryParams,
173-
localVarQueryStringJoiner.toString(),
174-
null,
175-
localVarHeaderParams,
176-
localVarFormParams,
177-
localVarAccept,
178-
localVarContentType,
179-
localVarReturnType);
169+
return apiClient
170+
.invokeAPI(
171+
localVarPath,
172+
"GET",
173+
localVarQueryParams,
174+
localVarCollectionQueryParams,
175+
localVarQueryStringJoiner.toString(),
176+
null,
177+
localVarHeaderParams,
178+
localVarFormParams,
179+
localVarAccept,
180+
localVarContentType,
181+
localVarReturnType);
180182
}
181183

182184
/**
@@ -212,7 +214,7 @@ public SodaWithId sodasIdGet( @Nonnull final Long id )
212214
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
213215
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
214216
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
215-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
217+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
216218
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
217219

218220
final String[] localVarAccepts = { "application/json" };
@@ -226,18 +228,19 @@ public SodaWithId sodasIdGet( @Nonnull final Long id )
226228
{
227229
};
228230

229-
return invokeAPI(
230-
localVarPath,
231-
"GET",
232-
localVarQueryParams,
233-
localVarCollectionQueryParams,
234-
localVarQueryStringJoiner.toString(),
235-
null,
236-
localVarHeaderParams,
237-
localVarFormParams,
238-
localVarAccept,
239-
localVarContentType,
240-
localVarReturnType);
231+
return apiClient
232+
.invokeAPI(
233+
localVarPath,
234+
"GET",
235+
localVarQueryParams,
236+
localVarCollectionQueryParams,
237+
localVarQueryStringJoiner.toString(),
238+
null,
239+
localVarHeaderParams,
240+
localVarFormParams,
241+
localVarAccept,
242+
localVarContentType,
243+
localVarReturnType);
241244
}
242245

243246
/**
@@ -274,7 +277,7 @@ public Soda sodasPut( @Nonnull final SodaWithId sodaWithId )
274277
final StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
275278
final List<Pair> localVarQueryParams = new ArrayList<Pair>();
276279
final List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
277-
final Map<String, String> localVarHeaderParams = new HashMap<String, String>();
280+
final Map<String, String> localVarHeaderParams = new HashMap<String, String>(defaultHeaders);
278281
final Map<String, Object> localVarFormParams = new HashMap<String, Object>();
279282

280283
final String[] localVarAccepts = { "application/json" };
@@ -286,17 +289,18 @@ public Soda sodasPut( @Nonnull final SodaWithId sodaWithId )
286289
{
287290
};
288291

289-
return invokeAPI(
290-
localVarPath,
291-
"PUT",
292-
localVarQueryParams,
293-
localVarCollectionQueryParams,
294-
localVarQueryStringJoiner.toString(),
295-
sodaWithId,
296-
localVarHeaderParams,
297-
localVarFormParams,
298-
localVarAccept,
299-
localVarContentType,
300-
localVarReturnType);
292+
return apiClient
293+
.invokeAPI(
294+
localVarPath,
295+
"PUT",
296+
localVarQueryParams,
297+
localVarCollectionQueryParams,
298+
localVarQueryStringJoiner.toString(),
299+
sodaWithId,
300+
localVarHeaderParams,
301+
localVarFormParams,
302+
localVarAccept,
303+
localVarContentType,
304+
localVarReturnType);
301305
}
302306
}

0 commit comments

Comments
 (0)