Skip to content

Commit 014d077

Browse files
stackit-pipelinestackit-pipeline
committed
Generate serverbackup
1 parent a4f4534 commit 014d077

26 files changed

+188
-44
lines changed

‎services/serverbackup/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/serverbackup/oas_commit‎

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

‎services/serverbackup/src/main/java/cloud/stackit/sdk/serverbackup/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://server-backup.api.stackit.cloud
193-
* @return An instance of OkHttpClient
193+
* @param basePath Base path of the URL (e.g https://server-backup.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/serverbackup/src/main/java/cloud/stackit/sdk/serverbackup/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/serverbackup/src/main/java/cloud/stackit/sdk/serverbackup/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/serverbackup/src/main/java/cloud/stackit/sdk/serverbackup/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/serverbackup/src/main/java/cloud/stackit/sdk/serverbackup/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/serverbackup/src/main/java/cloud/stackit/sdk/serverbackup/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/serverbackup/src/main/java/cloud/stackit/sdk/serverbackup/model/Backup.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
/** Backup */
3737
@javax.annotation.Generated(
3838
value = "org.openapitools.codegen.languages.JavaClientCodegen",
39-
comments = "Generator version: 7.15.0")
39+
comments = "Generator version: 7.19.0")
4040
public class Backup {
4141
public static final String SERIALIZED_NAME_CREATED_AT = "createdAt";
4242

@@ -451,6 +451,7 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
451451
.isEmpty()) { // has required fields but JSON element is null
452452
throw new IllegalArgumentException(
453453
String.format(
454+
java.util.Locale.ROOT,
454455
"The required field(s) %s in Backup is not found in the empty JSON string",
455456
Backup.openapiRequiredFields.toString()));
456457
}
@@ -461,45 +462,53 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
461462
if (jsonElement.getAsJsonObject().get(requiredField) == null) {
462463
throw new IllegalArgumentException(
463464
String.format(
465+
java.util.Locale.ROOT,
464466
"The required field `%s` is not found in the JSON string: %s",
465-
requiredField, jsonElement.toString()));
467+
requiredField,
468+
jsonElement.toString()));
466469
}
467470
}
468471
JsonObject jsonObj = jsonElement.getAsJsonObject();
469472
if (!jsonObj.get("createdAt").isJsonPrimitive()) {
470473
throw new IllegalArgumentException(
471474
String.format(
475+
java.util.Locale.ROOT,
472476
"Expected the field `createdAt` to be a primitive type in the JSON string but got `%s`",
473477
jsonObj.get("createdAt").toString()));
474478
}
475479
if (!jsonObj.get("expireAt").isJsonPrimitive()) {
476480
throw new IllegalArgumentException(
477481
String.format(
482+
java.util.Locale.ROOT,
478483
"Expected the field `expireAt` to be a primitive type in the JSON string but got `%s`",
479484
jsonObj.get("expireAt").toString()));
480485
}
481486
if (!jsonObj.get("id").isJsonPrimitive()) {
482487
throw new IllegalArgumentException(
483488
String.format(
489+
java.util.Locale.ROOT,
484490
"Expected the field `id` to be a primitive type in the JSON string but got `%s`",
485491
jsonObj.get("id").toString()));
486492
}
487493
if ((jsonObj.get("lastRestoredAt") != null && !jsonObj.get("lastRestoredAt").isJsonNull())
488494
&& !jsonObj.get("lastRestoredAt").isJsonPrimitive()) {
489495
throw new IllegalArgumentException(
490496
String.format(
497+
java.util.Locale.ROOT,
491498
"Expected the field `lastRestoredAt` to be a primitive type in the JSON string but got `%s`",
492499
jsonObj.get("lastRestoredAt").toString()));
493500
}
494501
if (!jsonObj.get("name").isJsonPrimitive()) {
495502
throw new IllegalArgumentException(
496503
String.format(
504+
java.util.Locale.ROOT,
497505
"Expected the field `name` to be a primitive type in the JSON string but got `%s`",
498506
jsonObj.get("name").toString()));
499507
}
500508
if (!jsonObj.get("status").isJsonPrimitive()) {
501509
throw new IllegalArgumentException(
502510
String.format(
511+
java.util.Locale.ROOT,
503512
"Expected the field `status` to be a primitive type in the JSON string but got `%s`",
504513
jsonObj.get("status").toString()));
505514
}
@@ -512,6 +521,7 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
512521
if (!jsonObj.get("volumeBackups").isJsonArray()) {
513522
throw new IllegalArgumentException(
514523
String.format(
524+
java.util.Locale.ROOT,
515525
"Expected the field `volumeBackups` to be an array in the JSON string but got `%s`",
516526
jsonObj.get("volumeBackups").toString()));
517527
}
@@ -591,6 +601,7 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
591601
else
592602
throw new IllegalArgumentException(
593603
String.format(
604+
java.util.Locale.ROOT,
594605
"The field `%s` has unknown primitive type. Value: %s",
595606
entry.getKey(),
596607
entry.getValue().toString()));

‎services/serverbackup/src/main/java/cloud/stackit/sdk/serverbackup/model/BackupJob.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/** BackupJob */
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 BackupJob {
3838
public static final String SERIALIZED_NAME_ID = "id";
3939

@@ -170,6 +170,7 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
170170
.isEmpty()) { // has required fields but JSON element is null
171171
throw new IllegalArgumentException(
172172
String.format(
173+
java.util.Locale.ROOT,
173174
"The required field(s) %s in BackupJob is not found in the empty JSON string",
174175
BackupJob.openapiRequiredFields.toString()));
175176
}
@@ -180,14 +181,17 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
180181
if (jsonElement.getAsJsonObject().get(requiredField) == null) {
181182
throw new IllegalArgumentException(
182183
String.format(
184+
java.util.Locale.ROOT,
183185
"The required field `%s` is not found in the JSON string: %s",
184-
requiredField, jsonElement.toString()));
186+
requiredField,
187+
jsonElement.toString()));
185188
}
186189
}
187190
JsonObject jsonObj = jsonElement.getAsJsonObject();
188191
if (!jsonObj.get("id").isJsonPrimitive()) {
189192
throw new IllegalArgumentException(
190193
String.format(
194+
java.util.Locale.ROOT,
191195
"Expected the field `id` to be a primitive type in the JSON string but got `%s`",
192196
jsonObj.get("id").toString()));
193197
}
@@ -259,6 +263,7 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
259263
else
260264
throw new IllegalArgumentException(
261265
String.format(
266+
java.util.Locale.ROOT,
262267
"The field `%s` has unknown primitive type. Value: %s",
263268
entry.getKey(),
264269
entry.getValue().toString()));

0 commit comments

Comments
 (0)