Skip to content

Commit ef7cd65

Browse files
stackit-pipelinestackit-pipeline
committed
Generate objectstorage
1 parent d7c04ee commit ef7cd65

29 files changed

+244
-59
lines changed

‎services/objectstorage/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ dependencies {
1010
implementation 'com.google.code.gson:gson:2.9.1'
1111
implementation 'io.gsonfire:gson-fire:1.9.0'
1212
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
13-
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
14-
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
13+
implementation 'org.openapitools:jackson-databind-nullable:0.2.8'
14+
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.18.0'
1515
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
1616
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
1717
testImplementation 'org.mockito:mockito-core:3.12.4'

‎services/objectstorage/oas_commit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ed4e4fbee2f5db4d95725108fb3d736e5363fb2f
1+
9fef736cc40e775d0019eca3f77a359c3e4a2344

‎services/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/ApiClient.java‎

Lines changed: 60 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public class ApiClient {
8484
protected InputStream sslCaCert;
8585
protected boolean verifyingSsl;
8686
protected KeyManager[] keyManagers;
87+
protected String tlsServerName;
8788

8889
protected OkHttpClient httpClient;
8990
protected JSON json;
@@ -189,8 +190,8 @@ public String getBasePath() {
189190
/**
190191
* Set base path
191192
*
192-
* @param basePath Base path of the URL (e.g https://object-storage.api.stackit.cloud
193-
* @return An instance of OkHttpClient
193+
* @param basePath Base path of the URL (e.g https://object-storage.api.stackit.cloud)
194+
* @return An instance of ApiClient
194195
*/
195196
public ApiClient setBasePath(String basePath) {
196197
this.basePath = basePath;
@@ -321,6 +322,28 @@ public ApiClient setKeyManagers(KeyManager[] managers) {
321322
return this;
322323
}
323324

325+
/**
326+
* Get TLS server name for SNI (Server Name Indication).
327+
*
328+
* @return The TLS server name
329+
*/
330+
public String getTlsServerName() {
331+
return tlsServerName;
332+
}
333+
334+
/**
335+
* Set TLS server name for SNI (Server Name Indication). This is used to verify the server
336+
* certificate against a specific hostname instead of the hostname in the URL.
337+
*
338+
* @param tlsServerName The TLS server name to use for certificate verification
339+
* @return ApiClient
340+
*/
341+
public ApiClient setTlsServerName(String tlsServerName) {
342+
this.tlsServerName = tlsServerName;
343+
applySslSettings();
344+
return this;
345+
}
346+
324347
/**
325348
* Getter for the field <code>dateFormat</code>.
326349
*
@@ -605,7 +628,7 @@ public List<Pair> parameterToPair(String name, Object value) {
605628
* @param value The value of the parameter.
606629
* @return A list of {@code Pair} objects.
607630
*/
608-
public List<Pair> parameterToPairs(String collectionFormat, String name, Collection value) {
631+
public List<Pair> parameterToPairs(String collectionFormat, String name, Collection<?> value) {
609632
List<Pair> params = new ArrayList<Pair>();
610633

611634
// preconditions
@@ -827,7 +850,17 @@ public <T> T deserialize(Response response, Type returnType) throws ApiException
827850
}
828851
try {
829852
if (isJsonMime(contentType)) {
830-
return JSON.deserialize(respBody.byteStream(), returnType);
853+
if (returnType.equals(String.class)) {
854+
String respBodyString = respBody.string();
855+
if (respBodyString.isEmpty()) {
856+
return null;
857+
}
858+
// Use String-based deserialize for String return type with fallback
859+
return JSON.deserialize(respBodyString, returnType);
860+
} else {
861+
// Use InputStream-based deserialize which supports responses > 2GB
862+
return JSON.deserialize(respBody.byteStream(), returnType);
863+
}
831864
} else if (returnType.equals(String.class)) {
832865
String respBodyString = respBody.string();
833866
if (respBodyString.isEmpty()) {
@@ -1227,8 +1260,10 @@ public String buildUrl(
12271260
if (serverIndex < 0 || serverIndex >= servers.size()) {
12281261
throw new ArrayIndexOutOfBoundsException(
12291262
String.format(
1263+
java.util.Locale.ROOT,
12301264
"Invalid index %d when selecting the host settings. Must be less than %d",
1231-
serverIndex, servers.size()));
1265+
serverIndex,
1266+
servers.size()));
12321267
}
12331268
baseURL = servers.get(serverIndex).URL(serverVariables);
12341269
} else {
@@ -1302,12 +1337,16 @@ public void processHeaderParams(Map<String, String> headerParams, Request.Builde
13021337
public void processCookieParams(Map<String, String> cookieParams, Request.Builder reqBuilder) {
13031338
for (Entry<String, String> param : cookieParams.entrySet()) {
13041339
reqBuilder.addHeader(
1305-
"Cookie", String.format("%s=%s", param.getKey(), param.getValue()));
1340+
"Cookie",
1341+
String.format(
1342+
java.util.Locale.ROOT, "%s=%s", param.getKey(), param.getValue()));
13061343
}
13071344
for (Entry<String, String> param : defaultCookieMap.entrySet()) {
13081345
if (!cookieParams.containsKey(param.getKey())) {
13091346
reqBuilder.addHeader(
1310-
"Cookie", String.format("%s=%s", param.getKey(), param.getValue()));
1347+
"Cookie",
1348+
String.format(
1349+
java.util.Locale.ROOT, "%s=%s", param.getKey(), param.getValue()));
13111350
}
13121351
}
13131352
}
@@ -1495,7 +1534,20 @@ public boolean verify(String hostname, SSLSession session) {
14951534
trustManagerFactory.init(caKeyStore);
14961535
}
14971536
trustManagers = trustManagerFactory.getTrustManagers();
1498-
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1537+
if (tlsServerName != null && !tlsServerName.isEmpty()) {
1538+
hostnameVerifier =
1539+
new HostnameVerifier() {
1540+
@Override
1541+
public boolean verify(String hostname, SSLSession session) {
1542+
// Verify the certificate against tlsServerName instead of the
1543+
// actual hostname
1544+
return OkHostnameVerifier.INSTANCE.verify(
1545+
tlsServerName, session);
1546+
}
1547+
};
1548+
} else {
1549+
hostnameVerifier = OkHostnameVerifier.INSTANCE;
1550+
}
14991551
}
15001552

15011553
SSLContext sslContext = SSLContext.getInstance("TLS");

‎services/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/Pair.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@javax.annotation.Generated(
1616
value = "org.openapitools.codegen.languages.JavaClientCodegen",
17-
comments = "Generator version: 7.15.0")
17+
comments = "Generator version: 7.19.0")
1818
public class Pair {
1919
private final String name;
2020
private final String value;

‎services/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/ServerConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/** Representing a Server configuration. */
1818
@javax.annotation.Generated(
1919
value = "org.openapitools.codegen.languages.JavaClientCodegen",
20-
comments = "Generator version: 7.15.0")
20+
comments = "Generator version: 7.19.0")
2121
public class ServerConfiguration {
2222
public String URL;
2323
public String description;

‎services/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/ServerVariable.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/** Representing a Server Variable for server URL template substitution. */
1818
@javax.annotation.Generated(
1919
value = "org.openapitools.codegen.languages.JavaClientCodegen",
20-
comments = "Generator version: 7.15.0")
20+
comments = "Generator version: 7.19.0")
2121
public class ServerVariable {
2222
public String description;
2323
public String defaultValue;

‎services/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/StringUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@javax.annotation.Generated(
1919
value = "org.openapitools.codegen.languages.JavaClientCodegen",
20-
comments = "Generator version: 7.15.0")
20+
comments = "Generator version: 7.19.0")
2121
public class StringUtil {
2222
/**
2323
* Check if the given array contains the given value (with case-insensitive comparison).

‎services/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/model/AbstractOpenApiSchema.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/** Abstract class for oneOf,anyOf schemas defined in OpenAPI spec */
1919
@javax.annotation.Generated(
2020
value = "org.openapitools.codegen.languages.JavaClientCodegen",
21-
comments = "Generator version: 7.15.0")
21+
comments = "Generator version: 7.19.0")
2222
public abstract class AbstractOpenApiSchema {
2323

2424
// store the actual instance of the schema/object

‎services/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/model/AccessKey.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/** AccessKey */
3434
@javax.annotation.Generated(
3535
value = "org.openapitools.codegen.languages.JavaClientCodegen",
36-
comments = "Generator version: 7.15.0")
36+
comments = "Generator version: 7.19.0")
3737
public class AccessKey {
3838
public static final String SERIALIZED_NAME_DISPLAY_NAME = "displayName";
3939

@@ -225,6 +225,7 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
225225
.isEmpty()) { // has required fields but JSON element is null
226226
throw new IllegalArgumentException(
227227
String.format(
228+
java.util.Locale.ROOT,
228229
"The required field(s) %s in AccessKey is not found in the empty JSON string",
229230
AccessKey.openapiRequiredFields.toString()));
230231
}
@@ -235,26 +236,31 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
235236
if (jsonElement.getAsJsonObject().get(requiredField) == null) {
236237
throw new IllegalArgumentException(
237238
String.format(
239+
java.util.Locale.ROOT,
238240
"The required field `%s` is not found in the JSON string: %s",
239-
requiredField, jsonElement.toString()));
241+
requiredField,
242+
jsonElement.toString()));
240243
}
241244
}
242245
JsonObject jsonObj = jsonElement.getAsJsonObject();
243246
if (!jsonObj.get("displayName").isJsonPrimitive()) {
244247
throw new IllegalArgumentException(
245248
String.format(
249+
java.util.Locale.ROOT,
246250
"Expected the field `displayName` to be a primitive type in the JSON string but got `%s`",
247251
jsonObj.get("displayName").toString()));
248252
}
249253
if (!jsonObj.get("expires").isJsonPrimitive()) {
250254
throw new IllegalArgumentException(
251255
String.format(
256+
java.util.Locale.ROOT,
252257
"Expected the field `expires` to be a primitive type in the JSON string but got `%s`",
253258
jsonObj.get("expires").toString()));
254259
}
255260
if (!jsonObj.get("keyId").isJsonPrimitive()) {
256261
throw new IllegalArgumentException(
257262
String.format(
263+
java.util.Locale.ROOT,
258264
"Expected the field `keyId` to be a primitive type in the JSON string but got `%s`",
259265
jsonObj.get("keyId").toString()));
260266
}
@@ -326,6 +332,7 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
326332
else
327333
throw new IllegalArgumentException(
328334
String.format(
335+
java.util.Locale.ROOT,
329336
"The field `%s` has unknown primitive type. Value: %s",
330337
entry.getKey(),
331338
entry.getValue().toString()));

‎services/objectstorage/src/main/java/cloud/stackit/sdk/objectstorage/model/Bucket.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/** Bucket */
3434
@javax.annotation.Generated(
3535
value = "org.openapitools.codegen.languages.JavaClientCodegen",
36-
comments = "Generator version: 7.15.0")
36+
comments = "Generator version: 7.19.0")
3737
public class Bucket {
3838
public static final String SERIALIZED_NAME_NAME = "name";
3939

@@ -258,6 +258,7 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
258258
.isEmpty()) { // has required fields but JSON element is null
259259
throw new IllegalArgumentException(
260260
String.format(
261+
java.util.Locale.ROOT,
261262
"The required field(s) %s in Bucket is not found in the empty JSON string",
262263
Bucket.openapiRequiredFields.toString()));
263264
}
@@ -268,32 +269,38 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
268269
if (jsonElement.getAsJsonObject().get(requiredField) == null) {
269270
throw new IllegalArgumentException(
270271
String.format(
272+
java.util.Locale.ROOT,
271273
"The required field `%s` is not found in the JSON string: %s",
272-
requiredField, jsonElement.toString()));
274+
requiredField,
275+
jsonElement.toString()));
273276
}
274277
}
275278
JsonObject jsonObj = jsonElement.getAsJsonObject();
276279
if (!jsonObj.get("name").isJsonPrimitive()) {
277280
throw new IllegalArgumentException(
278281
String.format(
282+
java.util.Locale.ROOT,
279283
"Expected the field `name` to be a primitive type in the JSON string but got `%s`",
280284
jsonObj.get("name").toString()));
281285
}
282286
if (!jsonObj.get("region").isJsonPrimitive()) {
283287
throw new IllegalArgumentException(
284288
String.format(
289+
java.util.Locale.ROOT,
285290
"Expected the field `region` to be a primitive type in the JSON string but got `%s`",
286291
jsonObj.get("region").toString()));
287292
}
288293
if (!jsonObj.get("urlPathStyle").isJsonPrimitive()) {
289294
throw new IllegalArgumentException(
290295
String.format(
296+
java.util.Locale.ROOT,
291297
"Expected the field `urlPathStyle` to be a primitive type in the JSON string but got `%s`",
292298
jsonObj.get("urlPathStyle").toString()));
293299
}
294300
if (!jsonObj.get("urlVirtualHostedStyle").isJsonPrimitive()) {
295301
throw new IllegalArgumentException(
296302
String.format(
303+
java.util.Locale.ROOT,
297304
"Expected the field `urlVirtualHostedStyle` to be a primitive type in the JSON string but got `%s`",
298305
jsonObj.get("urlVirtualHostedStyle").toString()));
299306
}
@@ -365,6 +372,7 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
365372
else
366373
throw new IllegalArgumentException(
367374
String.format(
375+
java.util.Locale.ROOT,
368376
"The field `%s` has unknown primitive type. Value: %s",
369377
entry.getKey(),
370378
entry.getValue().toString()));

0 commit comments

Comments
 (0)