Skip to content

Commit 7424648

Browse files
committed
Update to OpenAPI Generator v7.9
1 parent facccb2 commit 7424648

28 files changed

+296
-263
lines changed

sessionize-java-client/src/generated/java/software/xdev/sessionize/api/AllApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public AllResult getAll(String endpointId, Map<String, String> additionalHeaders
7070

7171
// create path and map variables
7272
String localVarPath = "/api/v2/{endpointId}/view/All"
73-
.replaceAll("\\{" + "endpointId" + "\\}", apiClient.escapeString(endpointId.toString()));
73+
.replaceAll("\\{" + "endpointId" + "\\}", apiClient.escapeString(apiClient.parameterToString(endpointId)));
7474

7575
StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
7676
String localVarQueryParameterBaseName;

sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SessionsApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public List<SessionGroup> getAllSessions(String endpointId, Map<String, String>
7070

7171
// create path and map variables
7272
String localVarPath = "/api/v2/{endpointId}/view/Sessions"
73-
.replaceAll("\\{" + "endpointId" + "\\}", apiClient.escapeString(endpointId.toString()));
73+
.replaceAll("\\{" + "endpointId" + "\\}", apiClient.escapeString(apiClient.parameterToString(endpointId)));
7474

7575
StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
7676
String localVarQueryParameterBaseName;

sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SpeakersApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public List<Speaker> getAllSpeakers(String endpointId, Map<String, String> addit
7171

7272
// create path and map variables
7373
String localVarPath = "/api/v2/{endpointId}/view/Speakers"
74-
.replaceAll("\\{" + "endpointId" + "\\}", apiClient.escapeString(endpointId.toString()));
74+
.replaceAll("\\{" + "endpointId" + "\\}", apiClient.escapeString(apiClient.parameterToString(endpointId)));
7575

7676
StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
7777
String localVarQueryParameterBaseName;
@@ -153,7 +153,7 @@ public List<SpeakerWithEmail> getAllSpeakersEmails(String endpointId, String s,
153153

154154
// create path and map variables
155155
String localVarPath = "/api/v2/{endpointId}/view/SpeakersEmails"
156-
.replaceAll("\\{" + "endpointId" + "\\}", apiClient.escapeString(endpointId.toString()));
156+
.replaceAll("\\{" + "endpointId" + "\\}", apiClient.escapeString(apiClient.parameterToString(endpointId)));
157157

158158
StringJoiner localVarQueryStringJoiner = new StringJoiner("&");
159159
String localVarQueryParameterBaseName;

sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiClient.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import java.util.Date;
5757
import java.util.function.Supplier;
5858
import java.util.TimeZone;
59+
import java.util.concurrent.ConcurrentHashMap;
5960
import java.util.regex.Matcher;
6061
import java.util.regex.Pattern;
6162

@@ -100,8 +101,8 @@ public class ApiClient extends JavaTimeFormatter {
100101

101102
private Map<String, Authentication> authentications;
102103

103-
private int statusCode;
104-
private Map<String, List<String>> responseHeaders;
104+
private Map<Long, Integer> lastStatusCodeByThread = new ConcurrentHashMap<>();
105+
private Map<Long, Map<String, List<String>>> lastResponseHeadersByThread = new ConcurrentHashMap<>();
105106

106107
private DateFormat dateFormat;
107108

@@ -245,16 +246,18 @@ public ApiClient setServerVariables(Map<String, String> serverVariables) {
245246
*
246247
* @return Status code
247248
*/
249+
@Deprecated
248250
public int getStatusCode() {
249-
return statusCode;
251+
return lastStatusCodeByThread.get(Thread.currentThread().getId());
250252
}
251253

252254
/**
253255
* Gets the response headers of the previous request
254256
* @return Response headers
255257
*/
258+
@Deprecated
256259
public Map<String, List<String>> getResponseHeaders() {
257-
return responseHeaders;
260+
return lastResponseHeadersByThread.get(Thread.currentThread().getId());
258261
}
259262

260263
/**
@@ -713,10 +716,11 @@ public <T> T deserialize(CloseableHttpResponse response, TypeReference<T> valueT
713716
}
714717

715718
return objectMapper.readValue(content, valueType);
716-
} else if ("text/plain".equalsIgnoreCase(mimeType)) {
719+
} else if (mimeType.toLowerCase().startsWith("text/")) {
717720
// convert input stream to string
718721
return (T) EntityUtils.toString(entity);
719722
} else {
723+
Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
720724
throw new ApiException(
721725
"Deserialization for content type '" + mimeType + "' not supported for type '" + valueType + "'",
722726
response.getCode(),
@@ -862,12 +866,15 @@ protected Cookie buildCookie(String key, String value, URI uri) {
862866
}
863867

864868
protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
865-
statusCode = response.getCode();
869+
int statusCode = response.getCode();
870+
lastStatusCodeByThread.put(Thread.currentThread().getId(), statusCode);
866871
if (statusCode == HttpStatus.SC_NO_CONTENT) {
867872
return null;
868873
}
869874

870-
responseHeaders = transformResponseHeaders(response.getHeaders());
875+
Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
876+
lastResponseHeadersByThread.put(Thread.currentThread().getId(), responseHeaders);
877+
871878
if (isSuccessfulStatus(statusCode)) {
872879
return this.deserialize(response, returnType);
873880
} else {

sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ServerConfiguration.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
/*
2+
* Sessionize JSON-REST API
3+
* Sessionize JSON-REST API documentation by XDEV Software
4+
*
5+
* The version of the OpenAPI document: 2.0
6+
*
7+
*
8+
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
9+
* https://openapi-generator.tech
10+
* Do not edit the class manually.
11+
*/
12+
13+
114
package software.xdev.sessionize.client;
215

316
import java.util.Map;

sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ServerVariable.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
/*
2+
* Sessionize JSON-REST API
3+
* Sessionize JSON-REST API documentation by XDEV Software
4+
*
5+
* The version of the OpenAPI document: 2.0
6+
*
7+
*
8+
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
9+
* https://openapi-generator.tech
10+
* Do not edit the class manually.
11+
*/
12+
13+
114
package software.xdev.sessionize.client;
215

316
import java.util.HashSet;

sessionize-java-client/src/generated/java/software/xdev/sessionize/model/AllResult.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ public AllResult addSessionsItem(SessionAll sessionsItem) {
7777
return this;
7878
}
7979

80-
/**
80+
/**
8181
* Get sessions
8282
* @return sessions
83-
**/
83+
*/
8484
@jakarta.annotation.Nonnull
8585
@JsonProperty(JSON_PROPERTY_SESSIONS)
8686
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -110,10 +110,10 @@ public AllResult addSpeakersItem(SpeakerAll speakersItem) {
110110
return this;
111111
}
112112

113-
/**
113+
/**
114114
* Get speakers
115115
* @return speakers
116-
**/
116+
*/
117117
@jakarta.annotation.Nonnull
118118
@JsonProperty(JSON_PROPERTY_SPEAKERS)
119119
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -143,10 +143,10 @@ public AllResult addQuestionsItem(Question questionsItem) {
143143
return this;
144144
}
145145

146-
/**
146+
/**
147147
* Get questions
148148
* @return questions
149-
**/
149+
*/
150150
@jakarta.annotation.Nonnull
151151
@JsonProperty(JSON_PROPERTY_QUESTIONS)
152152
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -176,10 +176,10 @@ public AllResult addCategoriesItem(CategoryAll categoriesItem) {
176176
return this;
177177
}
178178

179-
/**
179+
/**
180180
* Get categories
181181
* @return categories
182-
**/
182+
*/
183183
@jakarta.annotation.Nonnull
184184
@JsonProperty(JSON_PROPERTY_CATEGORIES)
185185
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -209,10 +209,10 @@ public AllResult addRoomsItem(Room roomsItem) {
209209
return this;
210210
}
211211

212-
/**
212+
/**
213213
* Get rooms
214214
* @return rooms
215-
**/
215+
*/
216216
@jakarta.annotation.Nonnull
217217
@JsonProperty(JSON_PROPERTY_ROOMS)
218218
@JsonInclude(value = JsonInclude.Include.ALWAYS)

sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseCategory.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public BaseCategory id(Integer id) {
4949
return this;
5050
}
5151

52-
/**
52+
/**
5353
* Get id
5454
* @return id
55-
**/
55+
*/
5656
@jakarta.annotation.Nonnull
5757
@JsonProperty(JSON_PROPERTY_ID)
5858
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -74,10 +74,10 @@ public BaseCategory sort(Integer sort) {
7474
return this;
7575
}
7676

77-
/**
77+
/**
7878
* Get sort
7979
* @return sort
80-
**/
80+
*/
8181
@jakarta.annotation.Nonnull
8282
@JsonProperty(JSON_PROPERTY_SORT)
8383
@JsonInclude(value = JsonInclude.Include.ALWAYS)

sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSession.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ public BaseSession id(String id) {
9999
return this;
100100
}
101101

102-
/**
102+
/**
103103
* Get id
104104
* @return id
105-
**/
105+
*/
106106
@jakarta.annotation.Nonnull
107107
@JsonProperty(JSON_PROPERTY_ID)
108108
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -124,10 +124,10 @@ public BaseSession title(String title) {
124124
return this;
125125
}
126126

127-
/**
127+
/**
128128
* Get title
129129
* @return title
130-
**/
130+
*/
131131
@jakarta.annotation.Nonnull
132132
@JsonProperty(JSON_PROPERTY_TITLE)
133133
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -149,10 +149,10 @@ public BaseSession description(String description) {
149149
return this;
150150
}
151151

152-
/**
152+
/**
153153
* Get description
154154
* @return description
155-
**/
155+
*/
156156
@jakarta.annotation.Nullable
157157
@JsonIgnore
158158

@@ -182,10 +182,10 @@ public BaseSession startsAt(OffsetDateTime startsAt) {
182182
return this;
183183
}
184184

185-
/**
185+
/**
186186
* Get startsAt
187187
* @return startsAt
188-
**/
188+
*/
189189
@jakarta.annotation.Nullable
190190
@JsonProperty(JSON_PROPERTY_STARTS_AT)
191191
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -207,10 +207,10 @@ public BaseSession endsAt(OffsetDateTime endsAt) {
207207
return this;
208208
}
209209

210-
/**
210+
/**
211211
* Get endsAt
212212
* @return endsAt
213-
**/
213+
*/
214214
@jakarta.annotation.Nullable
215215
@JsonProperty(JSON_PROPERTY_ENDS_AT)
216216
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -232,10 +232,10 @@ public BaseSession isServiceSession(Boolean isServiceSession) {
232232
return this;
233233
}
234234

235-
/**
235+
/**
236236
* Get isServiceSession
237237
* @return isServiceSession
238-
**/
238+
*/
239239
@jakarta.annotation.Nonnull
240240
@JsonProperty(JSON_PROPERTY_IS_SERVICE_SESSION)
241241
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -257,10 +257,10 @@ public BaseSession isPlenumSession(Boolean isPlenumSession) {
257257
return this;
258258
}
259259

260-
/**
260+
/**
261261
* Get isPlenumSession
262262
* @return isPlenumSession
263-
**/
263+
*/
264264
@jakarta.annotation.Nonnull
265265
@JsonProperty(JSON_PROPERTY_IS_PLENUM_SESSION)
266266
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -290,10 +290,10 @@ public BaseSession addCategoryItemsItem(Integer categoryItemsItem) {
290290
return this;
291291
}
292292

293-
/**
293+
/**
294294
* Get categoryItems
295295
* @return categoryItems
296-
**/
296+
*/
297297
@jakarta.annotation.Nonnull
298298
@JsonProperty(JSON_PROPERTY_CATEGORY_ITEMS)
299299
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -315,10 +315,10 @@ public BaseSession roomId(Integer roomId) {
315315
return this;
316316
}
317317

318-
/**
318+
/**
319319
* Get roomId
320320
* @return roomId
321-
**/
321+
*/
322322
@jakarta.annotation.Nullable
323323
@JsonProperty(JSON_PROPERTY_ROOM_ID)
324324
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -340,10 +340,10 @@ public BaseSession liveUrl(URI liveUrl) {
340340
return this;
341341
}
342342

343-
/**
343+
/**
344344
* Get liveUrl
345345
* @return liveUrl
346-
**/
346+
*/
347347
@jakarta.annotation.Nullable
348348
@JsonIgnore
349349

@@ -373,10 +373,10 @@ public BaseSession recordingUrl(URI recordingUrl) {
373373
return this;
374374
}
375375

376-
/**
376+
/**
377377
* Get recordingUrl
378378
* @return recordingUrl
379-
**/
379+
*/
380380
@jakarta.annotation.Nullable
381381
@JsonIgnore
382382

@@ -406,10 +406,10 @@ public BaseSession status(Status status) {
406406
return this;
407407
}
408408

409-
/**
409+
/**
410410
* Get status
411411
* @return status
412-
**/
412+
*/
413413
@jakarta.annotation.Nonnull
414414
@JsonProperty(JSON_PROPERTY_STATUS)
415415
@JsonInclude(value = JsonInclude.Include.ALWAYS)

0 commit comments

Comments
 (0)