diff --git a/edge-api/.openapi-generator/VERSION b/edge-api/.openapi-generator/VERSION index 93c8ddab..09a6d308 100644 --- a/edge-api/.openapi-generator/VERSION +++ b/edge-api/.openapi-generator/VERSION @@ -1 +1 @@ -7.6.0 +7.8.0 diff --git a/edge-api/README.md b/edge-api/README.md index d5a8c67a..e1d6bbc8 100644 --- a/edge-api/README.md +++ b/edge-api/README.md @@ -2,11 +2,11 @@ Ziti Edge Client -- API version: 0.26.20 +- API version: 0.26.27 -- Build date: 2024-06-07T09:12:49.062759-04:00[America/New_York] +- Build date: 2024-09-04T10:11:22.635226-04:00[America/New_York] -- Generator version: 7.6.0 +- Generator version: 7.8.0 OpenZiti Edge Client API @@ -45,7 +45,7 @@ Add this dependency to your project's POM: org.openziti edge-api - 0.26.20 + 0.26.27 compile ``` @@ -55,7 +55,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "org.openziti:edge-api:0.26.20" +compile "org.openziti:edge-api:0.26.27" ``` ### Others @@ -68,7 +68,7 @@ mvn clean package Then manually install the following JARs: -- `target/edge-api-0.26.20.jar` +- `target/edge-api-0.26.27.jar` - `target/lib/*.jar` ## Getting Started diff --git a/edge-api/api/openapi.yaml b/edge-api/api/openapi.yaml index cd7cd964..6f51a4a0 100644 --- a/edge-api/api/openapi.yaml +++ b/edge-api/api/openapi.yaml @@ -9,7 +9,7 @@ info: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html title: Ziti Edge Client - version: 0.26.20 + version: 0.26.27 servers: - url: https://demo.ziti.dev/edge/client/v1 paths: @@ -2627,10 +2627,6 @@ paths: $ref: "#/components/schemas/apiErrorEnvelope" description: The resource requested is rate limited and the rate limit has been exceeded - security: - - ztSession: [] - - oauth2: - - openid summary: List Client Authentication External JWT tags: - External JWT Signer @@ -4336,6 +4332,8 @@ components: type: string ipAddress: type: string + isCertExtendable: + type: boolean isMfaComplete: type: boolean isMfaRequired: @@ -4352,6 +4350,7 @@ components: - identity - identityId - ipAddress + - isCertExtendable - isMfaComplete - isMfaRequired - token @@ -4449,6 +4448,8 @@ components: $ref: "#/components/schemas/entityRef" identityId: type: string + isIssuedByNetwork: + type: boolean method: type: string username: @@ -4480,6 +4481,7 @@ components: fingerprint: fingerprint certPem: certPem id: id + isIssuedByNetwork: true tags: {} updatedAt: 2000-01-23T04:56:07.000+00:00 username: username @@ -4577,12 +4579,19 @@ components: allOf: - $ref: "#/components/schemas/baseEntity" - properties: + clientId: + nullable: true + type: string externalAuthUrl: format: url type: string name: example: MyApps Signer type: string + scopes: + items: + type: string + type: array required: - externalAuthUrl - name @@ -4590,6 +4599,7 @@ components: description: A External JWT Signer resource example: createdAt: 2000-01-23T04:56:07.000+00:00 + clientId: clientId externalAuthUrl: http://example.com/aeiou _links: key: @@ -4598,6 +4608,9 @@ components: href: https://openapi-generator.tech name: MyApps Signer id: id + scopes: + - scopes + - scopes tags: {} updatedAt: 2000-01-23T04:56:07.000+00:00 clientExternalJwtSignerList: @@ -4909,6 +4922,7 @@ components: identityId: identityId authenticatorId: authenticatorId id: id + isCertExtendable: true updatedAt: 2000-01-23T04:56:07.000+00:00 currentApiSessionDetailEnvelope: example: @@ -4958,6 +4972,7 @@ components: identityId: identityId authenticatorId: authenticatorId id: id + isCertExtendable: true updatedAt: 2000-01-23T04:56:07.000+00:00 meta: apiEnrollmentVersion: apiEnrollmentVersion @@ -5157,6 +5172,7 @@ components: fingerprint: fingerprint certPem: certPem id: id + isIssuedByNetwork: true tags: {} updatedAt: 2000-01-23T04:56:07.000+00:00 username: username @@ -6245,6 +6261,7 @@ components: fingerprint: fingerprint certPem: certPem id: id + isIssuedByNetwork: true tags: {} updatedAt: 2000-01-23T04:56:07.000+00:00 username: username @@ -6268,6 +6285,7 @@ components: fingerprint: fingerprint certPem: certPem id: id + isIssuedByNetwork: true tags: {} updatedAt: 2000-01-23T04:56:07.000+00:00 username: username @@ -6294,6 +6312,7 @@ components: example: data: - createdAt: 2000-01-23T04:56:07.000+00:00 + clientId: clientId externalAuthUrl: http://example.com/aeiou _links: key: @@ -6302,9 +6321,13 @@ components: href: https://openapi-generator.tech name: MyApps Signer id: id + scopes: + - scopes + - scopes tags: {} updatedAt: 2000-01-23T04:56:07.000+00:00 - createdAt: 2000-01-23T04:56:07.000+00:00 + clientId: clientId externalAuthUrl: http://example.com/aeiou _links: key: @@ -6313,6 +6336,9 @@ components: href: https://openapi-generator.tech name: MyApps Signer id: id + scopes: + - scopes + - scopes tags: {} updatedAt: 2000-01-23T04:56:07.000+00:00 meta: diff --git a/edge-api/build.gradle b/edge-api/build.gradle index 2eb93460..c55c07e2 100644 --- a/edge-api/build.gradle +++ b/edge-api/build.gradle @@ -89,4 +89,6 @@ tasks.named('spotlessApply').get().mustRunAfter(':openApiGenerate') tasks.named('spotlessJava').get().mustRunAfter(':openApiGenerate') tasks.named('spotlessMisc').get().mustRunAfter(':openApiGenerate') +apply from: rootProject.file('publish.gradle') + diff --git a/edge-api/docs/ApiSessionDetail.md b/edge-api/docs/ApiSessionDetail.md index 227866a5..12c99626 100644 --- a/edge-api/docs/ApiSessionDetail.md +++ b/edge-api/docs/ApiSessionDetail.md @@ -20,6 +20,7 @@ An API Session object |**identity** | [**EntityRef**](EntityRef.md) | | | |**identityId** | **String** | | | |**ipAddress** | **String** | | | +|**isCertExtendable** | **Boolean** | | | |**isMfaComplete** | **Boolean** | | | |**isMfaRequired** | **Boolean** | | | |**lastActivityAt** | **OffsetDateTime** | | [optional] | diff --git a/edge-api/docs/AuthenticatorDetail.md b/edge-api/docs/AuthenticatorDetail.md index ccf8bd8a..672f9d56 100644 --- a/edge-api/docs/AuthenticatorDetail.md +++ b/edge-api/docs/AuthenticatorDetail.md @@ -17,6 +17,7 @@ A singular authenticator resource |**fingerprint** | **String** | | [optional] | |**identity** | [**EntityRef**](EntityRef.md) | | | |**identityId** | **String** | | | +|**isIssuedByNetwork** | **Boolean** | | [optional] | |**method** | **String** | | | |**username** | **String** | | [optional] | diff --git a/edge-api/docs/ClientExternalJwtSignerDetail.md b/edge-api/docs/ClientExternalJwtSignerDetail.md index 15a1b97d..0cffaf6f 100644 --- a/edge-api/docs/ClientExternalJwtSignerDetail.md +++ b/edge-api/docs/ClientExternalJwtSignerDetail.md @@ -13,8 +13,10 @@ A External JWT Signer resource |**id** | **String** | | | |**tags** | [**Tags**](Tags.md) | | [optional] | |**updatedAt** | **OffsetDateTime** | | | +|**clientId** | **String** | | [optional] | |**externalAuthUrl** | **String** | | | |**name** | **String** | | | +|**scopes** | **List<String>** | | [optional] | diff --git a/edge-api/docs/CurrentApiSessionDetail.md b/edge-api/docs/CurrentApiSessionDetail.md index 0a7217c7..00a06664 100644 --- a/edge-api/docs/CurrentApiSessionDetail.md +++ b/edge-api/docs/CurrentApiSessionDetail.md @@ -20,6 +20,7 @@ An API Session object for the current API session |**identity** | [**EntityRef**](EntityRef.md) | | | |**identityId** | **String** | | | |**ipAddress** | **String** | | | +|**isCertExtendable** | **Boolean** | | | |**isMfaComplete** | **Boolean** | | | |**isMfaRequired** | **Boolean** | | | |**lastActivityAt** | **OffsetDateTime** | | [optional] | diff --git a/edge-api/docs/ExternalJwtSignerApi.md b/edge-api/docs/ExternalJwtSignerApi.md index f80f2880..ec21fd04 100644 --- a/edge-api/docs/ExternalJwtSignerApi.md +++ b/edge-api/docs/ExternalJwtSignerApi.md @@ -24,7 +24,6 @@ Retrieves a list of external JWT signers for authentication import org.openziti.edge.ApiClient; import org.openziti.edge.ApiException; import org.openziti.edge.Configuration; -import org.openziti.edge.auth.*; import org.openziti.edge.models.*; import org.openziti.edge.api.ExternalJwtSignerApi; import java.util.concurrent.CompletableFuture; @@ -33,16 +32,6 @@ public class Example { public static void main(String[] args) { ApiClient defaultClient = Configuration.getDefaultApiClient(); defaultClient.setBasePath("https://demo.ziti.dev/edge/client/v1"); - - // Configure API key authorization: ztSession - ApiKeyAuth ztSession = (ApiKeyAuth) defaultClient.getAuthentication("ztSession"); - ztSession.setApiKey("YOUR API KEY"); - // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) - //ztSession.setApiKeyPrefix("Token"); - - // Configure OAuth2 access token for authorization: oauth2 - OAuth oauth2 = (OAuth) defaultClient.getAuthentication("oauth2"); - oauth2.setAccessToken("YOUR ACCESS TOKEN"); ExternalJwtSignerApi apiInstance = new ExternalJwtSignerApi(defaultClient); Integer limit = 56; // Integer | @@ -78,7 +67,7 @@ CompletableFuture<[**ListClientExternalJwtSignersEnvelope**](ListClientExternalJ ### Authorization -[ztSession](../README.md#ztSession), [oauth2](../README.md#oauth2) +No authorization required ### HTTP request headers @@ -109,7 +98,6 @@ import org.openziti.edge.ApiClient; import org.openziti.edge.ApiException; import org.openziti.edge.ApiResponse; import org.openziti.edge.Configuration; -import org.openziti.edge.auth.*; import org.openziti.edge.models.*; import org.openziti.edge.api.ExternalJwtSignerApi; import java.util.concurrent.CompletableFuture; @@ -118,16 +106,6 @@ public class Example { public static void main(String[] args) { ApiClient defaultClient = Configuration.getDefaultApiClient(); defaultClient.setBasePath("https://demo.ziti.dev/edge/client/v1"); - - // Configure API key authorization: ztSession - ApiKeyAuth ztSession = (ApiKeyAuth) defaultClient.getAuthentication("ztSession"); - ztSession.setApiKey("YOUR API KEY"); - // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) - //ztSession.setApiKeyPrefix("Token"); - - // Configure OAuth2 access token for authorization: oauth2 - OAuth oauth2 = (OAuth) defaultClient.getAuthentication("oauth2"); - oauth2.setAccessToken("YOUR ACCESS TOKEN"); ExternalJwtSignerApi apiInstance = new ExternalJwtSignerApi(defaultClient); Integer limit = 56; // Integer | @@ -172,7 +150,7 @@ CompletableFuture { private final int statusCode; private final Map> headers; diff --git a/edge-api/src/main/java/org/openziti/edge/Configuration.java b/edge-api/src/main/java/org/openziti/edge/Configuration.java index ac72614f..cb30adcc 100644 --- a/edge-api/src/main/java/org/openziti/edge/Configuration.java +++ b/edge-api/src/main/java/org/openziti/edge/Configuration.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -14,10 +14,10 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Configuration { - public static final String VERSION = "0.26.20"; + public static final String VERSION = "0.26.27"; private static ApiClient defaultApiClient = new ApiClient(); diff --git a/edge-api/src/main/java/org/openziti/edge/JSON.java b/edge-api/src/main/java/org/openziti/edge/JSON.java index fb278d9a..be87ebb8 100644 --- a/edge-api/src/main/java/org/openziti/edge/JSON.java +++ b/edge-api/src/main/java/org/openziti/edge/JSON.java @@ -1,3 +1,15 @@ +/* + * Ziti Edge Client + * OpenZiti Edge Client API + * + * The version of the OpenAPI document: 0.26.27 + * Contact: help@openziti.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + package org.openziti.edge; import com.fasterxml.jackson.annotation.*; @@ -14,8 +26,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class JSON { private ObjectMapper mapper; @@ -73,8 +85,8 @@ public static Class getClassForElement(JsonNode node, Class modelClass) { /** Helper class to register the discriminator mappings. */ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") private static class ClassDiscriminatorMapping { // The model class name. Class modelClass; diff --git a/edge-api/src/main/java/org/openziti/edge/Pair.java b/edge-api/src/main/java/org/openziti/edge/Pair.java index cf846267..07bec409 100644 --- a/edge-api/src/main/java/org/openziti/edge/Pair.java +++ b/edge-api/src/main/java/org/openziti/edge/Pair.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -14,8 +14,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Pair { private String name = ""; private String value = ""; diff --git a/edge-api/src/main/java/org/openziti/edge/RFC3339DateFormat.java b/edge-api/src/main/java/org/openziti/edge/RFC3339DateFormat.java index 542561c1..fbb061e9 100644 --- a/edge-api/src/main/java/org/openziti/edge/RFC3339DateFormat.java +++ b/edge-api/src/main/java/org/openziti/edge/RFC3339DateFormat.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,8 +23,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class RFC3339DateFormat extends DateFormat { private static final long serialVersionUID = 1L; private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); diff --git a/edge-api/src/main/java/org/openziti/edge/ServerConfiguration.java b/edge-api/src/main/java/org/openziti/edge/ServerConfiguration.java index 9f334c07..ae8b8248 100644 --- a/edge-api/src/main/java/org/openziti/edge/ServerConfiguration.java +++ b/edge-api/src/main/java/org/openziti/edge/ServerConfiguration.java @@ -1,3 +1,15 @@ +/* + * Ziti Edge Client + * OpenZiti Edge Client API + * + * The version of the OpenAPI document: 0.26.27 + * Contact: help@openziti.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + package org.openziti.edge; import java.util.Map; @@ -5,8 +17,8 @@ /** Representing a Server configuration. */ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ServerConfiguration { public String URL; public String description; diff --git a/edge-api/src/main/java/org/openziti/edge/ServerVariable.java b/edge-api/src/main/java/org/openziti/edge/ServerVariable.java index ca38ec73..d2d2e1f1 100644 --- a/edge-api/src/main/java/org/openziti/edge/ServerVariable.java +++ b/edge-api/src/main/java/org/openziti/edge/ServerVariable.java @@ -1,3 +1,15 @@ +/* + * Ziti Edge Client + * OpenZiti Edge Client API + * + * The version of the OpenAPI document: 0.26.27 + * Contact: help@openziti.org + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + package org.openziti.edge; import java.util.HashSet; @@ -5,8 +17,8 @@ /** Representing a Server Variable for server URL template substitution. */ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ServerVariable { public String description; public String defaultValue; diff --git a/edge-api/src/main/java/org/openziti/edge/api/AuthenticationApi.java b/edge-api/src/main/java/org/openziti/edge/api/AuthenticationApi.java index a6cb641f..ef6fb079 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/AuthenticationApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/AuthenticationApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -37,8 +37,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class AuthenticationApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/ControllersApi.java b/edge-api/src/main/java/org/openziti/edge/api/ControllersApi.java index 245d2d56..5680abe8 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/ControllersApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/ControllersApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -34,8 +34,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ControllersApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/CurrentApiSessionApi.java b/edge-api/src/main/java/org/openziti/edge/api/CurrentApiSessionApi.java index 2e9a9998..c225be29 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/CurrentApiSessionApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/CurrentApiSessionApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -47,8 +47,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentApiSessionApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/CurrentIdentityApi.java b/edge-api/src/main/java/org/openziti/edge/api/CurrentIdentityApi.java index 9fc9134e..464c99a9 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/CurrentIdentityApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/CurrentIdentityApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -36,8 +36,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentIdentityApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/EdgeRouterApi.java b/edge-api/src/main/java/org/openziti/edge/api/EdgeRouterApi.java index f69cb988..6cf64990 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/EdgeRouterApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/EdgeRouterApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -30,8 +30,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class EdgeRouterApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/EnrollApi.java b/edge-api/src/main/java/org/openziti/edge/api/EnrollApi.java index 28bb578f..d3b0ee9a 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/EnrollApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/EnrollApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -46,8 +46,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class EnrollApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/ExtendEnrollmentApi.java b/edge-api/src/main/java/org/openziti/edge/api/ExtendEnrollmentApi.java index 1f94c24b..885a9e02 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/ExtendEnrollmentApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/ExtendEnrollmentApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -35,8 +35,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ExtendEnrollmentApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/ExternalJwtSignerApi.java b/edge-api/src/main/java/org/openziti/edge/api/ExternalJwtSignerApi.java index 3a8566d7..877d17d9 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/ExternalJwtSignerApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/ExternalJwtSignerApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -34,8 +34,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ExternalJwtSignerApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/InformationalApi.java b/edge-api/src/main/java/org/openziti/edge/api/InformationalApi.java index f0c5640b..01c07521 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/InformationalApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/InformationalApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -35,8 +35,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class InformationalApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/MfaApi.java b/edge-api/src/main/java/org/openziti/edge/api/MfaApi.java index 0d680625..4722d553 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/MfaApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/MfaApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -34,8 +34,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class MfaApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/PostureChecksApi.java b/edge-api/src/main/java/org/openziti/edge/api/PostureChecksApi.java index 653084be..bc0b0465 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/PostureChecksApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/PostureChecksApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -32,8 +32,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class PostureChecksApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/ServiceApi.java b/edge-api/src/main/java/org/openziti/edge/api/ServiceApi.java index 3d400310..bf239676 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/ServiceApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/ServiceApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -40,8 +40,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ServiceApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/ServicesApi.java b/edge-api/src/main/java/org/openziti/edge/api/ServicesApi.java index a6259b6d..d120b79c 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/ServicesApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/ServicesApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -30,8 +30,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ServicesApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/SessionApi.java b/edge-api/src/main/java/org/openziti/edge/api/SessionApi.java index e864b87e..40e0b870 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/SessionApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/SessionApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -38,8 +38,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class SessionApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/api/WellKnownApi.java b/edge-api/src/main/java/org/openziti/edge/api/WellKnownApi.java index 6e36ed58..533cc021 100644 --- a/edge-api/src/main/java/org/openziti/edge/api/WellKnownApi.java +++ b/edge-api/src/main/java/org/openziti/edge/api/WellKnownApi.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -29,8 +29,8 @@ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class WellKnownApi { private final HttpClient memberVarHttpClient; private final ObjectMapper memberVarObjectMapper; diff --git a/edge-api/src/main/java/org/openziti/edge/model/AbstractOpenApiSchema.java b/edge-api/src/main/java/org/openziti/edge/model/AbstractOpenApiSchema.java index 126af0f2..f595d735 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/AbstractOpenApiSchema.java +++ b/edge-api/src/main/java/org/openziti/edge/model/AbstractOpenApiSchema.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,8 +19,8 @@ /** Abstract class for oneOf,anyOf schemas defined in OpenAPI spec */ @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public abstract class AbstractOpenApiSchema { // store the actual instance of the schema/object diff --git a/edge-api/src/main/java/org/openziti/edge/model/ApiAddress.java b/edge-api/src/main/java/org/openziti/edge/model/ApiAddress.java index 3e30f343..7b7b2818 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ApiAddress.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ApiAddress.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,13 +19,14 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ApiAddress */ @JsonPropertyOrder({ApiAddress.JSON_PROPERTY_URL, ApiAddress.JSON_PROPERTY_VERSION}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ApiAddress { public static final String JSON_PROPERTY_URL = "url"; private String url; @@ -160,7 +161,9 @@ public String toUrlQueryString(String prefix) { "%surl%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUrl()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUrl()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -171,7 +174,9 @@ public String toUrlQueryString(String prefix) { "%sversion%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getVersion()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getVersion()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ApiError.java b/edge-api/src/main/java/org/openziti/edge/model/ApiError.java index 8dd7afcf..08000eb2 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ApiError.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ApiError.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ApiError */ @JsonPropertyOrder({ @@ -34,8 +35,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ApiError { public static final String JSON_PROPERTY_ARGS = "args"; private ApiErrorArgs args; @@ -329,7 +330,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCauseMessage()), + ApiClient.valueToString(getCauseMessage()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -341,7 +342,9 @@ public String toUrlQueryString(String prefix) { "%scode%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCode()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCode()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -359,7 +362,7 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getData().get(_key), URLEncoder.encode( - String.valueOf(getData().get(_key)), + ApiClient.valueToString(getData().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -372,7 +375,9 @@ public String toUrlQueryString(String prefix) { "%smessage%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getMessage()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getMessage()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -384,7 +389,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getRequestId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getRequestId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ApiErrorArgs.java b/edge-api/src/main/java/org/openziti/edge/model/ApiErrorArgs.java index 3873fcf5..f9f5b35a 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ApiErrorArgs.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ApiErrorArgs.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,13 +21,14 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ApiErrorArgs */ @JsonPropertyOrder({ApiErrorArgs.JSON_PROPERTY_URL_VARS}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ApiErrorArgs { public static final String JSON_PROPERTY_URL_VARS = "urlVars"; private Map urlVars = new HashMap<>(); @@ -149,7 +150,7 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getUrlVars().get(_key), URLEncoder.encode( - String.valueOf(getUrlVars().get(_key)), + ApiClient.valueToString(getUrlVars().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ApiErrorCause.java b/edge-api/src/main/java/org/openziti/edge/model/ApiErrorCause.java index 18fbcc72..552d5893 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ApiErrorCause.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ApiErrorCause.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ApiErrorCause */ @JsonPropertyOrder({ @@ -37,8 +38,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ApiErrorCause { public static final String JSON_PROPERTY_FIELD = "field"; private String field; @@ -406,7 +407,9 @@ public String toUrlQueryString(String prefix) { "%sfield%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getField()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getField()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -417,7 +420,9 @@ public String toUrlQueryString(String prefix) { "%sreason%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getReason()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getReason()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -428,7 +433,9 @@ public String toUrlQueryString(String prefix) { "%svalue%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getValue()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getValue()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -450,7 +457,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCauseMessage()), + ApiClient.valueToString(getCauseMessage()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -462,7 +469,9 @@ public String toUrlQueryString(String prefix) { "%scode%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCode()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCode()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -480,7 +489,7 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getData().get(_key), URLEncoder.encode( - String.valueOf(getData().get(_key)), + ApiClient.valueToString(getData().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -493,7 +502,9 @@ public String toUrlQueryString(String prefix) { "%smessage%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getMessage()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getMessage()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -505,7 +516,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getRequestId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getRequestId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ApiErrorEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ApiErrorEnvelope.java index 03d8108b..70c05c74 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ApiErrorEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ApiErrorEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,8 +22,8 @@ @JsonPropertyOrder({ApiErrorEnvelope.JSON_PROPERTY_ERROR, ApiErrorEnvelope.JSON_PROPERTY_META}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ApiErrorEnvelope { public static final String JSON_PROPERTY_ERROR = "error"; private ApiError error; diff --git a/edge-api/src/main/java/org/openziti/edge/model/ApiFieldError.java b/edge-api/src/main/java/org/openziti/edge/model/ApiFieldError.java index 17c93436..1f02f41c 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ApiFieldError.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ApiFieldError.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ApiFieldError */ @JsonPropertyOrder({ @@ -28,8 +29,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ApiFieldError { public static final String JSON_PROPERTY_FIELD = "field"; private String field; @@ -192,7 +193,9 @@ public String toUrlQueryString(String prefix) { "%sfield%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getField()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getField()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -203,7 +206,9 @@ public String toUrlQueryString(String prefix) { "%sreason%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getReason()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getReason()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -214,7 +219,9 @@ public String toUrlQueryString(String prefix) { "%svalue%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getValue()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getValue()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ApiSessionDetail.java b/edge-api/src/main/java/org/openziti/edge/model/ApiSessionDetail.java index d928f36c..626ad428 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ApiSessionDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ApiSessionDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** An API Session object */ @JsonPropertyOrder({ @@ -39,6 +40,7 @@ ApiSessionDetail.JSON_PROPERTY_IDENTITY, ApiSessionDetail.JSON_PROPERTY_IDENTITY_ID, ApiSessionDetail.JSON_PROPERTY_IP_ADDRESS, + ApiSessionDetail.JSON_PROPERTY_IS_CERT_EXTENDABLE, ApiSessionDetail.JSON_PROPERTY_IS_MFA_COMPLETE, ApiSessionDetail.JSON_PROPERTY_IS_MFA_REQUIRED, ApiSessionDetail.JSON_PROPERTY_LAST_ACTIVITY_AT, @@ -46,8 +48,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ApiSessionDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -85,6 +87,9 @@ public class ApiSessionDetail { public static final String JSON_PROPERTY_IP_ADDRESS = "ipAddress"; private String ipAddress; + public static final String JSON_PROPERTY_IS_CERT_EXTENDABLE = "isCertExtendable"; + private Boolean isCertExtendable; + public static final String JSON_PROPERTY_IS_MFA_COMPLETE = "isMfaComplete"; private Boolean isMfaComplete; @@ -399,6 +404,29 @@ public void setIpAddress(String ipAddress) { this.ipAddress = ipAddress; } + public ApiSessionDetail isCertExtendable(Boolean isCertExtendable) { + this.isCertExtendable = isCertExtendable; + return this; + } + + /** + * Get isCertExtendable + * + * @return isCertExtendable + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_IS_CERT_EXTENDABLE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Boolean getIsCertExtendable() { + return isCertExtendable; + } + + @JsonProperty(JSON_PROPERTY_IS_CERT_EXTENDABLE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setIsCertExtendable(Boolean isCertExtendable) { + this.isCertExtendable = isCertExtendable; + } + public ApiSessionDetail isMfaComplete(Boolean isMfaComplete) { this.isMfaComplete = isMfaComplete; return this; @@ -513,6 +541,7 @@ public boolean equals(Object o) { && Objects.equals(this.identity, apiSessionDetail.identity) && Objects.equals(this.identityId, apiSessionDetail.identityId) && Objects.equals(this.ipAddress, apiSessionDetail.ipAddress) + && Objects.equals(this.isCertExtendable, apiSessionDetail.isCertExtendable) && Objects.equals(this.isMfaComplete, apiSessionDetail.isMfaComplete) && Objects.equals(this.isMfaRequired, apiSessionDetail.isMfaRequired) && Objects.equals(this.lastActivityAt, apiSessionDetail.lastActivityAt) @@ -534,6 +563,7 @@ public int hashCode() { identity, identityId, ipAddress, + isCertExtendable, isMfaComplete, isMfaRequired, lastActivityAt, @@ -558,6 +588,7 @@ public String toString() { sb.append(" identity: ").append(toIndentedString(identity)).append("\n"); sb.append(" identityId: ").append(toIndentedString(identityId)).append("\n"); sb.append(" ipAddress: ").append(toIndentedString(ipAddress)).append("\n"); + sb.append(" isCertExtendable: ").append(toIndentedString(isCertExtendable)).append("\n"); sb.append(" isMfaComplete: ").append(toIndentedString(isMfaComplete)).append("\n"); sb.append(" isMfaRequired: ").append(toIndentedString(isMfaRequired)).append("\n"); sb.append(" lastActivityAt: ").append(toIndentedString(lastActivityAt)).append("\n"); @@ -640,7 +671,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -651,7 +683,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -668,7 +702,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -703,7 +738,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getAuthenticatorId()), + ApiClient.valueToString(getAuthenticatorId()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -716,7 +751,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCachedLastActivityAt()), + ApiClient.valueToString(getCachedLastActivityAt()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -734,7 +769,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getConfigTypes().get(i)), + ApiClient.valueToString(getConfigTypes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -753,7 +788,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIdentityId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIdentityId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -765,7 +801,21 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIpAddress()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIpAddress()), + StandardCharsets.UTF_8) + .replaceAll("\\+", "%20"))); + } + + // add `isCertExtendable` to the URL query string + if (getIsCertExtendable() != null) { + joiner.add( + String.format( + "%sisCertExtendable%s=%s", + prefix, + suffix, + URLEncoder.encode( + ApiClient.valueToString(getIsCertExtendable()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -777,7 +827,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsMfaComplete()), + ApiClient.valueToString(getIsMfaComplete()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -790,7 +840,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsMfaRequired()), + ApiClient.valueToString(getIsMfaRequired()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -803,7 +853,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getLastActivityAt()), + ApiClient.valueToString(getLastActivityAt()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -815,7 +865,9 @@ public String toUrlQueryString(String prefix) { "%stoken%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getToken()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getToken()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ApiVersion.java b/edge-api/src/main/java/org/openziti/edge/model/ApiVersion.java index c16e774c..c5bcf17c 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ApiVersion.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ApiVersion.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ApiVersion */ @JsonPropertyOrder({ @@ -30,8 +31,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ApiVersion { public static final String JSON_PROPERTY_API_BASE_URLS = "apiBaseUrls"; private List apiBaseUrls = new ArrayList<>(); @@ -208,7 +209,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getApiBaseUrls().get(i)), + ApiClient.valueToString(getApiBaseUrls().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -221,7 +222,9 @@ public String toUrlQueryString(String prefix) { "%spath%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPath()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPath()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -232,7 +235,9 @@ public String toUrlQueryString(String prefix) { "%sversion%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getVersion()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getVersion()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/AuthQueryDetail.java b/edge-api/src/main/java/org/openziti/edge/model/AuthQueryDetail.java index 6310cc80..8e3ff2af 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/AuthQueryDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/AuthQueryDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** AuthQueryDetail */ @JsonPropertyOrder({ @@ -32,8 +33,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class AuthQueryDetail { public static final String JSON_PROPERTY_FORMAT = "format"; private MfaFormats format; @@ -308,7 +309,9 @@ public String toUrlQueryString(String prefix) { "%sformat%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getFormat()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getFormat()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -320,7 +323,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getHttpMethod()), StandardCharsets.UTF_8) + ApiClient.valueToString(getHttpMethod()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -331,7 +335,9 @@ public String toUrlQueryString(String prefix) { "%shttpUrl%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getHttpUrl()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getHttpUrl()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -343,7 +349,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getMaxLength()), StandardCharsets.UTF_8) + ApiClient.valueToString(getMaxLength()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -355,7 +362,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getMinLength()), StandardCharsets.UTF_8) + ApiClient.valueToString(getMinLength()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -366,7 +374,9 @@ public String toUrlQueryString(String prefix) { "%sprovider%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getProvider()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getProvider()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -377,7 +387,9 @@ public String toUrlQueryString(String prefix) { "%stypeId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTypeId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTypeId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/Authenticate.java b/edge-api/src/main/java/org/openziti/edge/model/Authenticate.java index 557beb44..8f4abdfd 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Authenticate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Authenticate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** * A generic authenticate object meant for use with the /authenticate path. Required fields depend @@ -35,8 +36,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Authenticate { public static final String JSON_PROPERTY_CONFIG_TYPES = "configTypes"; private List configTypes = new ArrayList<>(); @@ -269,7 +270,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getConfigTypes().get(i)), + ApiClient.valueToString(getConfigTypes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -287,7 +288,9 @@ public String toUrlQueryString(String prefix) { "%spassword%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPassword()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPassword()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -303,7 +306,9 @@ public String toUrlQueryString(String prefix) { "%susername%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUsername()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUsername()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorDetail.java b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorDetail.java index 53984ce4..75131bc0 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** A singular authenticator resource */ @JsonPropertyOrder({ @@ -34,13 +35,14 @@ AuthenticatorDetail.JSON_PROPERTY_FINGERPRINT, AuthenticatorDetail.JSON_PROPERTY_IDENTITY, AuthenticatorDetail.JSON_PROPERTY_IDENTITY_ID, + AuthenticatorDetail.JSON_PROPERTY_IS_ISSUED_BY_NETWORK, AuthenticatorDetail.JSON_PROPERTY_METHOD, AuthenticatorDetail.JSON_PROPERTY_USERNAME }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class AuthenticatorDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -69,6 +71,9 @@ public class AuthenticatorDetail { public static final String JSON_PROPERTY_IDENTITY_ID = "identityId"; private String identityId; + public static final String JSON_PROPERTY_IS_ISSUED_BY_NETWORK = "isIssuedByNetwork"; + private Boolean isIssuedByNetwork; + public static final String JSON_PROPERTY_METHOD = "method"; private String method; @@ -292,6 +297,29 @@ public void setIdentityId(String identityId) { this.identityId = identityId; } + public AuthenticatorDetail isIssuedByNetwork(Boolean isIssuedByNetwork) { + this.isIssuedByNetwork = isIssuedByNetwork; + return this; + } + + /** + * Get isIssuedByNetwork + * + * @return isIssuedByNetwork + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_IS_ISSUED_BY_NETWORK) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getIsIssuedByNetwork() { + return isIssuedByNetwork; + } + + @JsonProperty(JSON_PROPERTY_IS_ISSUED_BY_NETWORK) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIsIssuedByNetwork(Boolean isIssuedByNetwork) { + this.isIssuedByNetwork = isIssuedByNetwork; + } + public AuthenticatorDetail method(String method) { this.method = method; return this; @@ -357,6 +385,7 @@ public boolean equals(Object o) { && Objects.equals(this.fingerprint, authenticatorDetail.fingerprint) && Objects.equals(this.identity, authenticatorDetail.identity) && Objects.equals(this.identityId, authenticatorDetail.identityId) + && Objects.equals(this.isIssuedByNetwork, authenticatorDetail.isIssuedByNetwork) && Objects.equals(this.method, authenticatorDetail.method) && Objects.equals(this.username, authenticatorDetail.username); } @@ -373,6 +402,7 @@ public int hashCode() { fingerprint, identity, identityId, + isIssuedByNetwork, method, username); } @@ -390,6 +420,9 @@ public String toString() { sb.append(" fingerprint: ").append(toIndentedString(fingerprint)).append("\n"); sb.append(" identity: ").append(toIndentedString(identity)).append("\n"); sb.append(" identityId: ").append(toIndentedString(identityId)).append("\n"); + sb.append(" isIssuedByNetwork: ") + .append(toIndentedString(isIssuedByNetwork)) + .append("\n"); sb.append(" method: ").append(toIndentedString(method)).append("\n"); sb.append(" username: ").append(toIndentedString(username)).append("\n"); sb.append("}"); @@ -470,7 +503,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -481,7 +515,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -498,7 +534,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -509,7 +546,9 @@ public String toUrlQueryString(String prefix) { "%scertPem%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCertPem()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCertPem()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -521,7 +560,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getFingerprint()), + ApiClient.valueToString(getFingerprint()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -539,7 +578,21 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIdentityId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIdentityId()), + StandardCharsets.UTF_8) + .replaceAll("\\+", "%20"))); + } + + // add `isIssuedByNetwork` to the URL query string + if (getIsIssuedByNetwork() != null) { + joiner.add( + String.format( + "%sisIssuedByNetwork%s=%s", + prefix, + suffix, + URLEncoder.encode( + ApiClient.valueToString(getIsIssuedByNetwork()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -550,7 +603,9 @@ public String toUrlQueryString(String prefix) { "%smethod%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getMethod()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getMethod()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -561,7 +616,9 @@ public String toUrlQueryString(String prefix) { "%susername%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUsername()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUsername()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorPatch.java b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorPatch.java index da8f681a..357db768 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorPatch.java +++ b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorPatch.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,6 +22,7 @@ import java.util.Objects; import java.util.StringJoiner; import org.openapitools.jackson.nullable.JsonNullable; +import org.openziti.edge.ApiClient; /** All of the fields on an authenticator that may be updated */ @JsonPropertyOrder({ @@ -31,8 +32,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class AuthenticatorPatch { public static final String JSON_PROPERTY_PASSWORD = "password"; private JsonNullable password = JsonNullable.undefined(); @@ -227,7 +228,9 @@ public String toUrlQueryString(String prefix) { "%spassword%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPassword()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPassword()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -243,7 +246,9 @@ public String toUrlQueryString(String prefix) { "%susername%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUsername()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUsername()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorPatchWithCurrent.java b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorPatchWithCurrent.java index 811f0fc1..70f70e92 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorPatchWithCurrent.java +++ b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorPatchWithCurrent.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,6 +22,7 @@ import java.util.Objects; import java.util.StringJoiner; import org.openapitools.jackson.nullable.JsonNullable; +import org.openziti.edge.ApiClient; /** All of the fields on an authenticator that may be updated */ @JsonPropertyOrder({ @@ -32,8 +33,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class AuthenticatorPatchWithCurrent { public static final String JSON_PROPERTY_PASSWORD = "password"; private JsonNullable password = JsonNullable.undefined(); @@ -259,7 +260,9 @@ public String toUrlQueryString(String prefix) { "%spassword%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPassword()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPassword()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -275,7 +278,9 @@ public String toUrlQueryString(String prefix) { "%susername%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUsername()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUsername()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -287,7 +292,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCurrentPassword()), + ApiClient.valueToString(getCurrentPassword()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorUpdate.java b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorUpdate.java index e1093fa6..6b119a2a 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorUpdate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorUpdate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** All of the fields on an authenticator that will be updated */ @JsonPropertyOrder({ @@ -28,8 +29,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class AuthenticatorUpdate { public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -192,7 +193,9 @@ public String toUrlQueryString(String prefix) { "%spassword%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPassword()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPassword()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -208,7 +211,9 @@ public String toUrlQueryString(String prefix) { "%susername%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUsername()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUsername()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorUpdateWithCurrent.java b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorUpdateWithCurrent.java index e67625bb..0e7c78c6 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorUpdateWithCurrent.java +++ b/edge-api/src/main/java/org/openziti/edge/model/AuthenticatorUpdateWithCurrent.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** All of the fields on an authenticator that will be updated */ @JsonPropertyOrder({ @@ -29,8 +30,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class AuthenticatorUpdateWithCurrent { public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -223,7 +224,9 @@ public String toUrlQueryString(String prefix) { "%spassword%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPassword()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPassword()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -239,7 +242,9 @@ public String toUrlQueryString(String prefix) { "%susername%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUsername()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUsername()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -251,7 +256,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCurrentPassword()), + ApiClient.valueToString(getCurrentPassword()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/BaseEntity.java b/edge-api/src/main/java/org/openziti/edge/model/BaseEntity.java index 2a676429..f63bfb68 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/BaseEntity.java +++ b/edge-api/src/main/java/org/openziti/edge/model/BaseEntity.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** Fields shared by all Edge API entities */ @JsonPropertyOrder({ @@ -33,8 +34,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class BaseEntity { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -285,7 +286,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -296,7 +298,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -313,7 +317,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/Capabilities.java b/edge-api/src/main/java/org/openziti/edge/model/Capabilities.java index 19aeaac6..fc765245 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Capabilities.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Capabilities.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/edge-api/src/main/java/org/openziti/edge/model/ClientExternalJwtSignerDetail.java b/edge-api/src/main/java/org/openziti/edge/model/ClientExternalJwtSignerDetail.java index 0f683d67..f458e831 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ClientExternalJwtSignerDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ClientExternalJwtSignerDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -12,16 +12,22 @@ package org.openziti.edge.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openapitools.jackson.nullable.JsonNullable; +import org.openziti.edge.ApiClient; /** A External JWT Signer resource */ @JsonPropertyOrder({ @@ -30,13 +36,15 @@ ClientExternalJwtSignerDetail.JSON_PROPERTY_ID, ClientExternalJwtSignerDetail.JSON_PROPERTY_TAGS, ClientExternalJwtSignerDetail.JSON_PROPERTY_UPDATED_AT, + ClientExternalJwtSignerDetail.JSON_PROPERTY_CLIENT_ID, ClientExternalJwtSignerDetail.JSON_PROPERTY_EXTERNAL_AUTH_URL, - ClientExternalJwtSignerDetail.JSON_PROPERTY_NAME + ClientExternalJwtSignerDetail.JSON_PROPERTY_NAME, + ClientExternalJwtSignerDetail.JSON_PROPERTY_SCOPES }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ClientExternalJwtSignerDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -53,12 +61,18 @@ public class ClientExternalJwtSignerDetail { public static final String JSON_PROPERTY_UPDATED_AT = "updatedAt"; private OffsetDateTime updatedAt; + public static final String JSON_PROPERTY_CLIENT_ID = "clientId"; + private JsonNullable clientId = JsonNullable.undefined(); + public static final String JSON_PROPERTY_EXTERNAL_AUTH_URL = "externalAuthUrl"; private String externalAuthUrl; public static final String JSON_PROPERTY_NAME = "name"; private String name; + public static final String JSON_PROPERTY_SCOPES = "scopes"; + private List scopes = new ArrayList<>(); + public ClientExternalJwtSignerDetail() {} public ClientExternalJwtSignerDetail links(Map links) { @@ -184,6 +198,37 @@ public void setUpdatedAt(OffsetDateTime updatedAt) { this.updatedAt = updatedAt; } + public ClientExternalJwtSignerDetail clientId(String clientId) { + this.clientId = JsonNullable.of(clientId); + return this; + } + + /** + * Get clientId + * + * @return clientId + */ + @javax.annotation.Nullable + @JsonIgnore + public String getClientId() { + return clientId.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_CLIENT_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public JsonNullable getClientId_JsonNullable() { + return clientId; + } + + @JsonProperty(JSON_PROPERTY_CLIENT_ID) + public void setClientId_JsonNullable(JsonNullable clientId) { + this.clientId = clientId; + } + + public void setClientId(String clientId) { + this.clientId = JsonNullable.of(clientId); + } + public ClientExternalJwtSignerDetail externalAuthUrl(String externalAuthUrl) { this.externalAuthUrl = externalAuthUrl; return this; @@ -230,6 +275,37 @@ public void setName(String name) { this.name = name; } + public ClientExternalJwtSignerDetail scopes(List scopes) { + this.scopes = scopes; + return this; + } + + public ClientExternalJwtSignerDetail addScopesItem(String scopesItem) { + if (this.scopes == null) { + this.scopes = new ArrayList<>(); + } + this.scopes.add(scopesItem); + return this; + } + + /** + * Get scopes + * + * @return scopes + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SCOPES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getScopes() { + return scopes; + } + + @JsonProperty(JSON_PROPERTY_SCOPES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setScopes(List scopes) { + this.scopes = scopes; + } + /** Return true if this clientExternalJwtSignerDetail object is equal to o. */ @Override public boolean equals(Object o) { @@ -246,14 +322,41 @@ public boolean equals(Object o) { && Objects.equals(this.id, clientExternalJwtSignerDetail.id) && Objects.equals(this.tags, clientExternalJwtSignerDetail.tags) && Objects.equals(this.updatedAt, clientExternalJwtSignerDetail.updatedAt) + && equalsNullable(this.clientId, clientExternalJwtSignerDetail.clientId) && Objects.equals( this.externalAuthUrl, clientExternalJwtSignerDetail.externalAuthUrl) - && Objects.equals(this.name, clientExternalJwtSignerDetail.name); + && Objects.equals(this.name, clientExternalJwtSignerDetail.name) + && Objects.equals(this.scopes, clientExternalJwtSignerDetail.scopes); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b + || (a != null + && b != null + && a.isPresent() + && b.isPresent() + && Objects.deepEquals(a.get(), b.get())); } @Override public int hashCode() { - return Objects.hash(links, createdAt, id, tags, updatedAt, externalAuthUrl, name); + return Objects.hash( + links, + createdAt, + id, + tags, + updatedAt, + hashCodeNullable(clientId), + externalAuthUrl, + name, + scopes); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[] {a.get()}) : 31; } @Override @@ -265,8 +368,10 @@ public String toString() { sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); sb.append(" updatedAt: ").append(toIndentedString(updatedAt)).append("\n"); + sb.append(" clientId: ").append(toIndentedString(clientId)).append("\n"); sb.append(" externalAuthUrl: ").append(toIndentedString(externalAuthUrl)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" scopes: ").append(toIndentedString(scopes)).append("\n"); sb.append("}"); return sb.toString(); } @@ -345,7 +450,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -356,7 +462,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -373,7 +481,21 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) + .replaceAll("\\+", "%20"))); + } + + // add `clientId` to the URL query string + if (getClientId() != null) { + joiner.add( + String.format( + "%sclientId%s=%s", + prefix, + suffix, + URLEncoder.encode( + ApiClient.valueToString(getClientId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -385,7 +507,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getExternalAuthUrl()), + ApiClient.valueToString(getExternalAuthUrl()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -397,10 +519,31 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } + // add `scopes` to the URL query string + if (getScopes() != null) { + for (int i = 0; i < getScopes().size(); i++) { + joiner.add( + String.format( + "%sscopes%s%s=%s", + prefix, + suffix, + "".equals(suffix) + ? "" + : String.format( + "%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode( + ApiClient.valueToString(getScopes().get(i)), + StandardCharsets.UTF_8) + .replaceAll("\\+", "%20"))); + } + } + return joiner.toString(); } } diff --git a/edge-api/src/main/java/org/openziti/edge/model/CommonEdgeRouterProperties.java b/edge-api/src/main/java/org/openziti/edge/model/CommonEdgeRouterProperties.java index ab7e3bcc..f1acf266 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CommonEdgeRouterProperties.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CommonEdgeRouterProperties.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** CommonEdgeRouterProperties */ @JsonPropertyOrder({ @@ -36,8 +37,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CommonEdgeRouterProperties { public static final String JSON_PROPERTY_APP_DATA = "appData"; private Tags appData; @@ -394,7 +395,9 @@ public String toUrlQueryString(String prefix) { "%scost%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCost()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCost()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -405,7 +408,9 @@ public String toUrlQueryString(String prefix) { "%sdisabled%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getDisabled()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getDisabled()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -416,7 +421,9 @@ public String toUrlQueryString(String prefix) { "%shostname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getHostname()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getHostname()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -427,7 +434,9 @@ public String toUrlQueryString(String prefix) { "%sisOnline%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getIsOnline()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getIsOnline()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -438,7 +447,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -450,7 +461,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getNoTraversal()), + ApiClient.valueToString(getNoTraversal()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -469,7 +480,8 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getSupportedProtocols().get(_key), URLEncoder.encode( - String.valueOf(getSupportedProtocols().get(_key)), + ApiClient.valueToString( + getSupportedProtocols().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -483,7 +495,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getSyncStatus()), StandardCharsets.UTF_8) + ApiClient.valueToString(getSyncStatus()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ControllerDetail.java b/edge-api/src/main/java/org/openziti/edge/model/ControllerDetail.java index 60e512da..23b74562 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ControllerDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ControllerDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -26,6 +26,7 @@ import java.util.Objects; import java.util.StringJoiner; import org.openapitools.jackson.nullable.JsonNullable; +import org.openziti.edge.ApiClient; /** A controller resource */ @JsonPropertyOrder({ @@ -44,8 +45,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ControllerDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -536,7 +537,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -547,7 +549,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -564,7 +568,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -582,7 +587,8 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getApiAddresses().get(_key), URLEncoder.encode( - String.valueOf(getApiAddresses().get(_key)), + ApiClient.valueToString( + getApiAddresses().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -595,7 +601,9 @@ public String toUrlQueryString(String prefix) { "%scertPem%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCertPem()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCertPem()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -607,7 +615,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCtrlAddress()), + ApiClient.valueToString(getCtrlAddress()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -620,7 +628,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getFingerprint()), + ApiClient.valueToString(getFingerprint()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -632,7 +640,9 @@ public String toUrlQueryString(String prefix) { "%sisOnline%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getIsOnline()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getIsOnline()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -644,7 +654,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getLastJoinedAt()), + ApiClient.valueToString(getLastJoinedAt()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -656,7 +666,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/CreateCurrentApiSessionCertificateEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/CreateCurrentApiSessionCertificateEnvelope.java index f78c4f20..add58d23 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CreateCurrentApiSessionCertificateEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CreateCurrentApiSessionCertificateEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CreateCurrentApiSessionCertificateEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private CurrentApiSessionCertificateCreateResponse data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/CreateEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/CreateEnvelope.java index 105f727a..bcce26bc 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CreateEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CreateEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,8 +22,8 @@ @JsonPropertyOrder({CreateEnvelope.JSON_PROPERTY_DATA, CreateEnvelope.JSON_PROPERTY_META}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CreateEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private CreateLocation data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/CreateLocation.java b/edge-api/src/main/java/org/openziti/edge/model/CreateLocation.java index da426c58..17291079 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CreateLocation.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CreateLocation.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,13 +21,14 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** CreateLocation */ @JsonPropertyOrder({CreateLocation.JSON_PROPERTY_LINKS, CreateLocation.JSON_PROPERTY_ID}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CreateLocation { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -193,7 +194,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateCreate.java b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateCreate.java index 6e4334c6..df87f619 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateCreate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateCreate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,13 +19,14 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** CurrentApiSessionCertificateCreate */ @JsonPropertyOrder({CurrentApiSessionCertificateCreate.JSON_PROPERTY_CSR}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentApiSessionCertificateCreate { public static final String JSON_PROPERTY_CSR = "csr"; private String csr; @@ -133,7 +134,9 @@ public String toUrlQueryString(String prefix) { "%scsr%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCsr()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCsr()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateCreateResponse.java b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateCreateResponse.java index 805e47b3..daff7be5 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateCreateResponse.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateCreateResponse.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** CurrentApiSessionCertificateCreateResponse */ @JsonPropertyOrder({ @@ -31,8 +32,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentApiSessionCertificateCreateResponse { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -256,7 +257,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -267,7 +270,9 @@ public String toUrlQueryString(String prefix) { "%scas%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCas()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCas()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -279,7 +284,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCertificate()), + ApiClient.valueToString(getCertificate()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateDetail.java b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateDetail.java index 919923f1..81b251c7 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionCertificateDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** CurrentApiSessionCertificateDetail */ @JsonPropertyOrder({ @@ -38,8 +39,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentApiSessionCertificateDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -441,7 +442,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -452,7 +454,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -469,7 +473,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -481,7 +486,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCertificate()), + ApiClient.valueToString(getCertificate()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -494,7 +499,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getFingerprint()), + ApiClient.valueToString(getFingerprint()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -506,7 +511,9 @@ public String toUrlQueryString(String prefix) { "%ssubject%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getSubject()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getSubject()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -518,7 +525,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getValidFrom()), StandardCharsets.UTF_8) + ApiClient.valueToString(getValidFrom()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -529,7 +537,9 @@ public String toUrlQueryString(String prefix) { "%svalidTo%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getValidTo()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getValidTo()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionDetail.java b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionDetail.java index eecc9fba..436e8799 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** An API Session object for the current API session */ @JsonPropertyOrder({ @@ -39,6 +40,7 @@ CurrentApiSessionDetail.JSON_PROPERTY_IDENTITY, CurrentApiSessionDetail.JSON_PROPERTY_IDENTITY_ID, CurrentApiSessionDetail.JSON_PROPERTY_IP_ADDRESS, + CurrentApiSessionDetail.JSON_PROPERTY_IS_CERT_EXTENDABLE, CurrentApiSessionDetail.JSON_PROPERTY_IS_MFA_COMPLETE, CurrentApiSessionDetail.JSON_PROPERTY_IS_MFA_REQUIRED, CurrentApiSessionDetail.JSON_PROPERTY_LAST_ACTIVITY_AT, @@ -48,8 +50,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentApiSessionDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -87,6 +89,9 @@ public class CurrentApiSessionDetail { public static final String JSON_PROPERTY_IP_ADDRESS = "ipAddress"; private String ipAddress; + public static final String JSON_PROPERTY_IS_CERT_EXTENDABLE = "isCertExtendable"; + private Boolean isCertExtendable; + public static final String JSON_PROPERTY_IS_MFA_COMPLETE = "isMfaComplete"; private Boolean isMfaComplete; @@ -407,6 +412,29 @@ public void setIpAddress(String ipAddress) { this.ipAddress = ipAddress; } + public CurrentApiSessionDetail isCertExtendable(Boolean isCertExtendable) { + this.isCertExtendable = isCertExtendable; + return this; + } + + /** + * Get isCertExtendable + * + * @return isCertExtendable + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_IS_CERT_EXTENDABLE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public Boolean getIsCertExtendable() { + return isCertExtendable; + } + + @JsonProperty(JSON_PROPERTY_IS_CERT_EXTENDABLE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setIsCertExtendable(Boolean isCertExtendable) { + this.isCertExtendable = isCertExtendable; + } + public CurrentApiSessionDetail isMfaComplete(Boolean isMfaComplete) { this.isMfaComplete = isMfaComplete; return this; @@ -568,6 +596,7 @@ public boolean equals(Object o) { && Objects.equals(this.identity, currentApiSessionDetail.identity) && Objects.equals(this.identityId, currentApiSessionDetail.identityId) && Objects.equals(this.ipAddress, currentApiSessionDetail.ipAddress) + && Objects.equals(this.isCertExtendable, currentApiSessionDetail.isCertExtendable) && Objects.equals(this.isMfaComplete, currentApiSessionDetail.isMfaComplete) && Objects.equals(this.isMfaRequired, currentApiSessionDetail.isMfaRequired) && Objects.equals(this.lastActivityAt, currentApiSessionDetail.lastActivityAt) @@ -591,6 +620,7 @@ public int hashCode() { identity, identityId, ipAddress, + isCertExtendable, isMfaComplete, isMfaRequired, lastActivityAt, @@ -617,6 +647,7 @@ public String toString() { sb.append(" identity: ").append(toIndentedString(identity)).append("\n"); sb.append(" identityId: ").append(toIndentedString(identityId)).append("\n"); sb.append(" ipAddress: ").append(toIndentedString(ipAddress)).append("\n"); + sb.append(" isCertExtendable: ").append(toIndentedString(isCertExtendable)).append("\n"); sb.append(" isMfaComplete: ").append(toIndentedString(isMfaComplete)).append("\n"); sb.append(" isMfaRequired: ").append(toIndentedString(isMfaRequired)).append("\n"); sb.append(" lastActivityAt: ").append(toIndentedString(lastActivityAt)).append("\n"); @@ -703,7 +734,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -714,7 +746,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -731,7 +765,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -766,7 +801,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getAuthenticatorId()), + ApiClient.valueToString(getAuthenticatorId()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -779,7 +814,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCachedLastActivityAt()), + ApiClient.valueToString(getCachedLastActivityAt()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -797,7 +832,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getConfigTypes().get(i)), + ApiClient.valueToString(getConfigTypes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -816,7 +851,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIdentityId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIdentityId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -828,7 +864,21 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIpAddress()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIpAddress()), + StandardCharsets.UTF_8) + .replaceAll("\\+", "%20"))); + } + + // add `isCertExtendable` to the URL query string + if (getIsCertExtendable() != null) { + joiner.add( + String.format( + "%sisCertExtendable%s=%s", + prefix, + suffix, + URLEncoder.encode( + ApiClient.valueToString(getIsCertExtendable()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -840,7 +890,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsMfaComplete()), + ApiClient.valueToString(getIsMfaComplete()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -853,7 +903,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsMfaRequired()), + ApiClient.valueToString(getIsMfaRequired()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -866,7 +916,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getLastActivityAt()), + ApiClient.valueToString(getLastActivityAt()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -878,7 +928,9 @@ public String toUrlQueryString(String prefix) { "%stoken%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getToken()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getToken()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -890,7 +942,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getExpirationSeconds()), + ApiClient.valueToString(getExpirationSeconds()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -903,7 +955,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getExpiresAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getExpiresAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionDetailEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionDetailEnvelope.java index 705ccda7..05c43061 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionDetailEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionDetailEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentApiSessionDetailEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private CurrentApiSessionDetail data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionServiceUpdateList.java b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionServiceUpdateList.java index a47774b6..e3eadd01 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionServiceUpdateList.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CurrentApiSessionServiceUpdateList.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,13 +20,14 @@ import java.time.OffsetDateTime; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** CurrentApiSessionServiceUpdateList */ @JsonPropertyOrder({CurrentApiSessionServiceUpdateList.JSON_PROPERTY_LAST_CHANGE_AT}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentApiSessionServiceUpdateList { public static final String JSON_PROPERTY_LAST_CHANGE_AT = "lastChangeAt"; private OffsetDateTime lastChangeAt; @@ -135,7 +136,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getLastChangeAt()), + ApiClient.valueToString(getLastChangeAt()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/CurrentIdentityDetailEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/CurrentIdentityDetailEnvelope.java index 84903c94..d6e9ea5e 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CurrentIdentityDetailEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CurrentIdentityDetailEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentIdentityDetailEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private IdentityDetail data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/CurrentIdentityEdgeRouterDetail.java b/edge-api/src/main/java/org/openziti/edge/model/CurrentIdentityEdgeRouterDetail.java index 8d83064e..c8cb9e01 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/CurrentIdentityEdgeRouterDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/CurrentIdentityEdgeRouterDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** A detail edge router resource */ @JsonPropertyOrder({ @@ -42,8 +43,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class CurrentIdentityEdgeRouterDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -574,7 +575,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -585,7 +587,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -602,7 +606,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -618,7 +623,9 @@ public String toUrlQueryString(String prefix) { "%scost%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCost()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCost()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -629,7 +636,9 @@ public String toUrlQueryString(String prefix) { "%sdisabled%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getDisabled()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getDisabled()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -640,7 +649,9 @@ public String toUrlQueryString(String prefix) { "%shostname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getHostname()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getHostname()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -651,7 +662,9 @@ public String toUrlQueryString(String prefix) { "%sisOnline%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getIsOnline()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getIsOnline()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -662,7 +675,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -674,7 +689,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getNoTraversal()), + ApiClient.valueToString(getNoTraversal()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -693,7 +708,8 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getSupportedProtocols().get(_key), URLEncoder.encode( - String.valueOf(getSupportedProtocols().get(_key)), + ApiClient.valueToString( + getSupportedProtocols().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -707,7 +723,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getSyncStatus()), StandardCharsets.UTF_8) + ApiClient.valueToString(getSyncStatus()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailAuthenticatorEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/DetailAuthenticatorEnvelope.java index 1ec429f3..f8096d73 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailAuthenticatorEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailAuthenticatorEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailAuthenticatorEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private AuthenticatorDetail data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailCurrentApiSessionCertificateEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/DetailCurrentApiSessionCertificateEnvelope.java index 16ee36d9..3ac82c22 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailCurrentApiSessionCertificateEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailCurrentApiSessionCertificateEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailCurrentApiSessionCertificateEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private CurrentApiSessionCertificateDetail data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailMfa.java b/edge-api/src/main/java/org/openziti/edge/model/DetailMfa.java index 16c9d17a..3aa3d8a3 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailMfa.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailMfa.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** DetailMfa */ @JsonPropertyOrder({ @@ -38,8 +39,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailMfa { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -383,7 +384,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -394,7 +396,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -411,7 +415,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -423,7 +428,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsVerified()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIsVerified()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -435,7 +441,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getProvisioningUrl()), + ApiClient.valueToString(getProvisioningUrl()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -453,7 +459,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getRecoveryCodes().get(i)), + ApiClient.valueToString(getRecoveryCodes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailMfaEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/DetailMfaEnvelope.java index 4716b659..e1cbea9f 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailMfaEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailMfaEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,8 +22,8 @@ @JsonPropertyOrder({DetailMfaEnvelope.JSON_PROPERTY_DATA, DetailMfaEnvelope.JSON_PROPERTY_META}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailMfaEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private DetailMfa data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailMfaRecoveryCodes.java b/edge-api/src/main/java/org/openziti/edge/model/DetailMfaRecoveryCodes.java index 59f1554e..220574c9 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailMfaRecoveryCodes.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailMfaRecoveryCodes.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** DetailMfaRecoveryCodes */ @JsonPropertyOrder({ @@ -36,8 +37,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailMfaRecoveryCodes { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -324,7 +325,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -335,7 +337,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -352,7 +356,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -369,7 +374,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getRecoveryCodes().get(i)), + ApiClient.valueToString(getRecoveryCodes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailMfaRecoveryCodesEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/DetailMfaRecoveryCodesEnvelope.java index f97bfbc9..1f4fc1ac 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailMfaRecoveryCodesEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailMfaRecoveryCodesEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailMfaRecoveryCodesEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private DetailMfaRecoveryCodes data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailServiceEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/DetailServiceEnvelope.java index d3e183bf..c54be6ad 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailServiceEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailServiceEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailServiceEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private ServiceDetail data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailSessionEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/DetailSessionEnvelope.java index 451408c8..b412ed4a 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailSessionEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailSessionEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailSessionEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private SessionDetail data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailSpecBodyEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/DetailSpecBodyEnvelope.java index 2bc2c6b3..4da464fe 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailSpecBodyEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailSpecBodyEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** DetailSpecBodyEnvelope */ @JsonPropertyOrder({ @@ -27,8 +28,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailSpecBodyEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private String data; @@ -163,7 +164,9 @@ public String toUrlQueryString(String prefix) { "%sdata%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getData()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getData()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/DetailSpecEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/DetailSpecEnvelope.java index 14ba4549..9acf62b5 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DetailSpecEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DetailSpecEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,8 +22,8 @@ @JsonPropertyOrder({DetailSpecEnvelope.JSON_PROPERTY_DATA, DetailSpecEnvelope.JSON_PROPERTY_META}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class DetailSpecEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private SpecDetail data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/DialBind.java b/edge-api/src/main/java/org/openziti/edge/model/DialBind.java index 1873f78c..b4fee645 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/DialBind.java +++ b/edge-api/src/main/java/org/openziti/edge/model/DialBind.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/edge-api/src/main/java/org/openziti/edge/model/Empty.java b/edge-api/src/main/java/org/openziti/edge/model/Empty.java index f1e14606..0179134a 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Empty.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Empty.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,13 +19,14 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** Empty */ @JsonPropertyOrder({Empty.JSON_PROPERTY_DATA, Empty.JSON_PROPERTY_META}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Empty { public static final String JSON_PROPERTY_DATA = "data"; private Object data; @@ -159,7 +160,9 @@ public String toUrlQueryString(String prefix) { "%sdata%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getData()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getData()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/EnrollUpdbRequest.java b/edge-api/src/main/java/org/openziti/edge/model/EnrollUpdbRequest.java index ce9e7e11..a7c79d87 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/EnrollUpdbRequest.java +++ b/edge-api/src/main/java/org/openziti/edge/model/EnrollUpdbRequest.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** EnrollUpdbRequest */ @JsonPropertyOrder({ @@ -27,8 +28,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class EnrollUpdbRequest { public static final String JSON_PROPERTY_PASSWORD = "password"; private String password; @@ -163,7 +164,9 @@ public String toUrlQueryString(String prefix) { "%spassword%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPassword()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPassword()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -174,7 +177,9 @@ public String toUrlQueryString(String prefix) { "%susername%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUsername()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUsername()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/EnrollmentCerts.java b/edge-api/src/main/java/org/openziti/edge/model/EnrollmentCerts.java index 240a78dd..529082c7 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/EnrollmentCerts.java +++ b/edge-api/src/main/java/org/openziti/edge/model/EnrollmentCerts.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** EnrollmentCerts */ @JsonPropertyOrder({ @@ -28,8 +29,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class EnrollmentCerts { public static final String JSON_PROPERTY_CA = "ca"; private String ca; @@ -192,7 +193,9 @@ public String toUrlQueryString(String prefix) { "%sca%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCa()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCa()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -203,7 +206,9 @@ public String toUrlQueryString(String prefix) { "%scert%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCert()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCert()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -215,7 +220,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getServerCert()), StandardCharsets.UTF_8) + ApiClient.valueToString(getServerCert()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/EnrollmentCertsEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/EnrollmentCertsEnvelope.java index f3960abd..85e7d38b 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/EnrollmentCertsEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/EnrollmentCertsEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class EnrollmentCertsEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private EnrollmentCerts data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/EntityRef.java b/edge-api/src/main/java/org/openziti/edge/model/EntityRef.java index 1d5401cc..6c488bda 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/EntityRef.java +++ b/edge-api/src/main/java/org/openziti/edge/model/EntityRef.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** A reference to another resource and links to interact with it */ @JsonPropertyOrder({ @@ -31,8 +32,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class EntityRef { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -254,7 +255,9 @@ public String toUrlQueryString(String prefix) { "%sentity%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getEntity()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getEntity()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -265,7 +268,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -276,7 +281,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/EnvInfo.java b/edge-api/src/main/java/org/openziti/edge/model/EnvInfo.java index ab35bf66..3c36ab1d 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/EnvInfo.java +++ b/edge-api/src/main/java/org/openziti/edge/model/EnvInfo.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** Environment information an authenticating client may provide */ @JsonPropertyOrder({ @@ -31,8 +32,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class EnvInfo { public static final String JSON_PROPERTY_ARCH = "arch"; private String arch; @@ -279,7 +280,9 @@ public String toUrlQueryString(String prefix) { "%sarch%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getArch()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getArch()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -290,7 +293,9 @@ public String toUrlQueryString(String prefix) { "%sdomain%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getDomain()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getDomain()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -301,7 +306,9 @@ public String toUrlQueryString(String prefix) { "%shostname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getHostname()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getHostname()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -312,7 +319,9 @@ public String toUrlQueryString(String prefix) { "%sos%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getOs()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getOs()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -324,7 +333,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getOsRelease()), StandardCharsets.UTF_8) + ApiClient.valueToString(getOsRelease()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -336,7 +346,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getOsVersion()), StandardCharsets.UTF_8) + ApiClient.valueToString(getOsVersion()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ErOttEnrollmentRequest.java b/edge-api/src/main/java/org/openziti/edge/model/ErOttEnrollmentRequest.java index b4be4f53..31e24bab 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ErOttEnrollmentRequest.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ErOttEnrollmentRequest.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ErOttEnrollmentRequest */ @JsonPropertyOrder({ @@ -28,8 +29,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ErOttEnrollmentRequest { public static final String JSON_PROPERTY_CLIENT_CSR = "clientCsr"; private String clientCsr; @@ -193,7 +194,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getClientCsr()), StandardCharsets.UTF_8) + ApiClient.valueToString(getClientCsr()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -205,7 +207,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getServerCsr()), StandardCharsets.UTF_8) + ApiClient.valueToString(getServerCsr()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -216,7 +219,9 @@ public String toUrlQueryString(String prefix) { "%stoken%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getToken()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getToken()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticators.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticators.java index ff2443e0..4eafe306 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticators.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticators.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityAuthenticators { public static final String JSON_PROPERTY_CERT = "cert"; private IdentityAuthenticatorsCert cert; diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticatorsCert.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticatorsCert.java index 14de28b1..8b68cc01 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticatorsCert.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticatorsCert.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** IdentityAuthenticatorsCert */ @JsonPropertyOrder({ @@ -27,8 +28,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityAuthenticatorsCert { public static final String JSON_PROPERTY_FINGERPRINT = "fingerprint"; private String fingerprint; @@ -164,7 +165,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getFingerprint()), + ApiClient.valueToString(getFingerprint()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -176,7 +177,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticatorsUpdb.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticatorsUpdb.java index 78185ab6..9aef8d52 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticatorsUpdb.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityAuthenticatorsUpdb.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** IdentityAuthenticatorsUpdb */ @JsonPropertyOrder({ @@ -27,8 +28,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityAuthenticatorsUpdb { public static final String JSON_PROPERTY_ID = "id"; private String id; @@ -163,7 +164,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -174,7 +177,9 @@ public String toUrlQueryString(String prefix) { "%susername%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUsername()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUsername()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityDetail.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityDetail.java index c9c2ae55..91e1273d 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,6 +27,7 @@ import java.util.Objects; import java.util.StringJoiner; import org.openapitools.jackson.nullable.JsonNullable; +import org.openziti.edge.ApiClient; /** Detail of a specific identity */ @JsonPropertyOrder({ @@ -62,8 +63,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -1089,7 +1090,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1100,7 +1102,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1117,7 +1121,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1139,7 +1144,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getAuthPolicyId()), + ApiClient.valueToString(getAuthPolicyId()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1157,7 +1162,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getDefaultHostingCost()), + ApiClient.valueToString(getDefaultHostingCost()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1170,7 +1175,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getDefaultHostingPrecedence()), + ApiClient.valueToString(getDefaultHostingPrecedence()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1182,7 +1187,9 @@ public String toUrlQueryString(String prefix) { "%sdisabled%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getDisabled()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getDisabled()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1194,7 +1201,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getDisabledAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getDisabledAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1206,7 +1214,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getDisabledUntil()), + ApiClient.valueToString(getDisabledUntil()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1229,7 +1237,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getExternalId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getExternalId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1241,7 +1250,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getHasApiSession()), + ApiClient.valueToString(getHasApiSession()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1254,7 +1263,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getHasEdgeRouterConnection()), + ApiClient.valueToString(getHasEdgeRouterConnection()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1266,7 +1275,9 @@ public String toUrlQueryString(String prefix) { "%sisAdmin%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getIsAdmin()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getIsAdmin()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1278,7 +1289,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsDefaultAdmin()), + ApiClient.valueToString(getIsDefaultAdmin()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1291,7 +1302,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsMfaEnabled()), + ApiClient.valueToString(getIsMfaEnabled()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1303,7 +1314,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1320,7 +1333,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getRoleAttributes().get(i)), + ApiClient.valueToString(getRoleAttributes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1345,7 +1358,8 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getServiceHostingCosts().get(_key), URLEncoder.encode( - String.valueOf(getServiceHostingCosts().get(_key)), + ApiClient.valueToString( + getServiceHostingCosts().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1365,7 +1379,7 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getServiceHostingPrecedences().get(_key), URLEncoder.encode( - String.valueOf( + ApiClient.valueToString( getServiceHostingPrecedences().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); @@ -1384,7 +1398,9 @@ public String toUrlQueryString(String prefix) { "%stypeId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTypeId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTypeId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollments.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollments.java index 16edf584..7c63c36d 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollments.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollments.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -26,8 +26,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityEnrollments { public static final String JSON_PROPERTY_OTT = "ott"; private IdentityEnrollmentsOtt ott; diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollmentsOtt.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollmentsOtt.java index 2295a2d6..938ead2e 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollmentsOtt.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollmentsOtt.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,6 +20,7 @@ import java.time.OffsetDateTime; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** IdentityEnrollmentsOtt */ @JsonPropertyOrder({ @@ -30,8 +31,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityEnrollmentsOtt { public static final String JSON_PROPERTY_EXPIRES_AT = "expiresAt"; private OffsetDateTime expiresAt; @@ -223,7 +224,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getExpiresAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getExpiresAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -234,7 +236,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -245,7 +249,9 @@ public String toUrlQueryString(String prefix) { "%sjwt%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getJwt()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getJwt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -256,7 +262,9 @@ public String toUrlQueryString(String prefix) { "%stoken%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getToken()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getToken()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollmentsOttca.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollmentsOttca.java index 6b28e0af..2721b87b 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollmentsOttca.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityEnrollmentsOttca.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,6 +20,7 @@ import java.time.OffsetDateTime; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** IdentityEnrollmentsOttca */ @JsonPropertyOrder({ @@ -32,8 +33,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityEnrollmentsOttca { public static final String JSON_PROPERTY_CA = "ca"; private EntityRef ca; @@ -285,7 +286,9 @@ public String toUrlQueryString(String prefix) { "%scaId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCaId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCaId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -297,7 +300,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getExpiresAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getExpiresAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -308,7 +312,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -319,7 +325,9 @@ public String toUrlQueryString(String prefix) { "%sjwt%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getJwt()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getJwt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -330,7 +338,9 @@ public String toUrlQueryString(String prefix) { "%stoken%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getToken()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getToken()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendCerts.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendCerts.java index b9c5c21a..e8d90c13 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendCerts.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendCerts.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** IdentityExtendCerts */ @JsonPropertyOrder({ @@ -27,8 +28,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityExtendCerts { public static final String JSON_PROPERTY_CA = "ca"; private String ca; @@ -163,7 +164,9 @@ public String toUrlQueryString(String prefix) { "%sca%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCa()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCa()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -175,7 +178,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getClientCert()), StandardCharsets.UTF_8) + ApiClient.valueToString(getClientCert()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendEnrollmentEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendEnrollmentEnvelope.java index b6a619d3..6fc042bc 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendEnrollmentEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendEnrollmentEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityExtendEnrollmentEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private IdentityExtendCerts data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendEnrollmentRequest.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendEnrollmentRequest.java index bf479de4..59221379 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendEnrollmentRequest.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendEnrollmentRequest.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,13 +19,14 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** IdentityExtendEnrollmentRequest */ @JsonPropertyOrder({IdentityExtendEnrollmentRequest.JSON_PROPERTY_CLIENT_CERT_CSR}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityExtendEnrollmentRequest { public static final String JSON_PROPERTY_CLIENT_CERT_CSR = "clientCertCsr"; private String clientCertCsr; @@ -134,7 +135,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getClientCertCsr()), + ApiClient.valueToString(getClientCertCsr()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendValidateEnrollmentRequest.java b/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendValidateEnrollmentRequest.java index 29c2ab46..9625b484 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendValidateEnrollmentRequest.java +++ b/edge-api/src/main/java/org/openziti/edge/model/IdentityExtendValidateEnrollmentRequest.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,13 +19,14 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** IdentityExtendValidateEnrollmentRequest */ @JsonPropertyOrder({IdentityExtendValidateEnrollmentRequest.JSON_PROPERTY_CLIENT_CERT}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class IdentityExtendValidateEnrollmentRequest { public static final String JSON_PROPERTY_CLIENT_CERT = "clientCert"; private String clientCert; @@ -134,7 +135,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getClientCert()), StandardCharsets.UTF_8) + ApiClient.valueToString(getClientCert()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/Jwk.java b/edge-api/src/main/java/org/openziti/edge/model/Jwk.java index 7107a540..31bd3f32 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Jwk.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Jwk.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** Jwk */ @JsonPropertyOrder({ @@ -48,8 +49,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Jwk { public static final String JSON_PROPERTY_ALG = "alg"; private String alg; @@ -761,7 +762,9 @@ public String toUrlQueryString(String prefix) { "%salg%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getAlg()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getAlg()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -772,7 +775,9 @@ public String toUrlQueryString(String prefix) { "%scrv%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCrv()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCrv()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -783,7 +788,8 @@ public String toUrlQueryString(String prefix) { "%sd%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getD()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getD()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -794,7 +800,9 @@ public String toUrlQueryString(String prefix) { "%sdp%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getDp()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getDp()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -805,7 +813,9 @@ public String toUrlQueryString(String prefix) { "%sdq%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getDq()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getDq()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -816,7 +826,8 @@ public String toUrlQueryString(String prefix) { "%se%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getE()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getE()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -833,7 +844,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getKeyOps().get(i)), + ApiClient.valueToString(getKeyOps().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -846,7 +857,9 @@ public String toUrlQueryString(String prefix) { "%skid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getKid()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getKid()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -857,7 +870,9 @@ public String toUrlQueryString(String prefix) { "%skty%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getKty()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getKty()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -868,7 +883,8 @@ public String toUrlQueryString(String prefix) { "%sn%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getN()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getN()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -901,7 +917,8 @@ public String toUrlQueryString(String prefix) { "%sp%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getP()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getP()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -912,7 +929,8 @@ public String toUrlQueryString(String prefix) { "%sq%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getQ()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getQ()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -923,7 +941,9 @@ public String toUrlQueryString(String prefix) { "%sqi%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getQi()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getQi()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -934,7 +954,9 @@ public String toUrlQueryString(String prefix) { "%suse%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUse()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUse()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -945,7 +967,8 @@ public String toUrlQueryString(String prefix) { "%sx%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getX()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getX()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -962,7 +985,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getX5c().get(i)), + ApiClient.valueToString(getX5c().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -975,7 +998,9 @@ public String toUrlQueryString(String prefix) { "%sx5t%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getX5t()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getX5t()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -987,7 +1012,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getX5tHashS256()), + ApiClient.valueToString(getX5tHashS256()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -999,7 +1024,9 @@ public String toUrlQueryString(String prefix) { "%sx5u%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getX5u()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getX5u()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -1010,7 +1037,8 @@ public String toUrlQueryString(String prefix) { "%sy%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getY()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getY()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/Jwks.java b/edge-api/src/main/java/org/openziti/edge/model/Jwks.java index 0bf87bb4..91c47dc8 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Jwks.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Jwks.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,8 +24,8 @@ @JsonPropertyOrder({Jwks.JSON_PROPERTY_KEYS}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Jwks { public static final String JSON_PROPERTY_KEYS = "keys"; private List keys = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/Link.java b/edge-api/src/main/java/org/openziti/edge/model/Link.java index fd32fe25..efbe8883 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Link.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Link.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,13 +20,14 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** A link to another resource */ @JsonPropertyOrder({Link.JSON_PROPERTY_COMMENT, Link.JSON_PROPERTY_HREF, Link.JSON_PROPERTY_METHOD}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Link { public static final String JSON_PROPERTY_COMMENT = "comment"; private String comment; @@ -189,7 +190,9 @@ public String toUrlQueryString(String prefix) { "%scomment%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getComment()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getComment()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -200,7 +203,9 @@ public String toUrlQueryString(String prefix) { "%shref%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getHref()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getHref()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -211,7 +216,9 @@ public String toUrlQueryString(String prefix) { "%smethod%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getMethod()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getMethod()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListAuthenticatorsEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListAuthenticatorsEnvelope.java index d1de543d..5d5aee9e 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListAuthenticatorsEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListAuthenticatorsEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListAuthenticatorsEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListClientExternalJwtSignersEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListClientExternalJwtSignersEnvelope.java index 47f6f5b3..058bf3e1 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListClientExternalJwtSignersEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListClientExternalJwtSignersEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListClientExternalJwtSignersEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListClientTerminatorsEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListClientTerminatorsEnvelope.java index 1aea4194..cb26ffef 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListClientTerminatorsEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListClientTerminatorsEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListClientTerminatorsEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListControllersEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListControllersEnvelope.java index 78b5ecd9..b7fde160 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListControllersEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListControllersEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListControllersEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListCurrentApiSessionCertificatesEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListCurrentApiSessionCertificatesEnvelope.java index 72d18e48..a1a2bcc1 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListCurrentApiSessionCertificatesEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListCurrentApiSessionCertificatesEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListCurrentApiSessionCertificatesEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListCurrentApiSessionServiceUpdatesEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListCurrentApiSessionServiceUpdatesEnvelope.java index ab0ced24..dacb1019 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListCurrentApiSessionServiceUpdatesEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListCurrentApiSessionServiceUpdatesEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListCurrentApiSessionServiceUpdatesEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private CurrentApiSessionServiceUpdateList data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListCurrentIdentityEdgeRoutersEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListCurrentIdentityEdgeRoutersEnvelope.java index 73564eff..b92c3aaf 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListCurrentIdentityEdgeRoutersEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListCurrentIdentityEdgeRoutersEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListCurrentIdentityEdgeRoutersEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListEnumeratedCapabilitiesEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListEnumeratedCapabilitiesEnvelope.java index bd594e04..6123a642 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListEnumeratedCapabilitiesEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListEnumeratedCapabilitiesEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ListEnumeratedCapabilitiesEnvelope */ @JsonPropertyOrder({ @@ -29,8 +30,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListEnumeratedCapabilitiesEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); @@ -181,7 +182,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getData().get(i)), + ApiClient.valueToString(getData().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListProtocolsEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListProtocolsEnvelope.java index 9ffa1e93..bb5f3cb8 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListProtocolsEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListProtocolsEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListProtocolsEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private Map data = new HashMap<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListServiceEdgeRoutersEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListServiceEdgeRoutersEnvelope.java index 4b01f1d9..60e0079b 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListServiceEdgeRoutersEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListServiceEdgeRoutersEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListServiceEdgeRoutersEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private ServiceEdgeRouters data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListServicesEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListServicesEnvelope.java index db26587a..3b8c2ba1 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListServicesEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListServicesEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListServicesEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListSessionsEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListSessionsEnvelope.java index c2309cbf..0b735b7a 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListSessionsEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListSessionsEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -27,8 +27,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListSessionsEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListSpecsEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListSpecsEnvelope.java index 25def0c2..70396241 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListSpecsEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListSpecsEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,8 +24,8 @@ @JsonPropertyOrder({ListSpecsEnvelope.JSON_PROPERTY_DATA, ListSpecsEnvelope.JSON_PROPERTY_META}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListSpecsEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private List data = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ListVersionEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/ListVersionEnvelope.java index 23af5749..a00e699d 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ListVersionEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ListVersionEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,8 +22,8 @@ @JsonPropertyOrder({ListVersionEnvelope.JSON_PROPERTY_DATA, ListVersionEnvelope.JSON_PROPERTY_META}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ListVersionEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private Version data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/Meta.java b/edge-api/src/main/java/org/openziti/edge/model/Meta.java index 96dd960d..713668d7 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Meta.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Meta.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** Meta */ @JsonPropertyOrder({ @@ -31,8 +32,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Meta { public static final String JSON_PROPERTY_API_ENROLLMENT_VERSION = "apiEnrollmentVersion"; private String apiEnrollmentVersion; @@ -234,7 +235,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getApiEnrollmentVersion()), + ApiClient.valueToString(getApiEnrollmentVersion()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -247,7 +248,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getApiVersion()), StandardCharsets.UTF_8) + ApiClient.valueToString(getApiVersion()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -264,7 +266,8 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getFilterableFields().get(i)), + ApiClient.valueToString( + getFilterableFields().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/MfaCode.java b/edge-api/src/main/java/org/openziti/edge/model/MfaCode.java index 4a774f4d..f4a1b148 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/MfaCode.java +++ b/edge-api/src/main/java/org/openziti/edge/model/MfaCode.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,13 +19,14 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** MfaCode */ @JsonPropertyOrder({MfaCode.JSON_PROPERTY_CODE}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class MfaCode { public static final String JSON_PROPERTY_CODE = "code"; private String code; @@ -132,7 +133,9 @@ public String toUrlQueryString(String prefix) { "%scode%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCode()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCode()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/MfaFormats.java b/edge-api/src/main/java/org/openziti/edge/model/MfaFormats.java index 13c52e30..985c73a1 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/MfaFormats.java +++ b/edge-api/src/main/java/org/openziti/edge/model/MfaFormats.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,7 +21,7 @@ public enum MfaFormats { ALPHA("alpha"), - ALPHANUMERIC("alphaNumeric"); + ALPHA_NUMERIC("alphaNumeric"); private String value; diff --git a/edge-api/src/main/java/org/openziti/edge/model/MfaProviders.java b/edge-api/src/main/java/org/openziti/edge/model/MfaProviders.java index c8b37370..7914ba58 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/MfaProviders.java +++ b/edge-api/src/main/java/org/openziti/edge/model/MfaProviders.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/edge-api/src/main/java/org/openziti/edge/model/NonceChallenge.java b/edge-api/src/main/java/org/openziti/edge/model/NonceChallenge.java index 7dfa1ee0..3bdd8151 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/NonceChallenge.java +++ b/edge-api/src/main/java/org/openziti/edge/model/NonceChallenge.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,13 +20,14 @@ import java.util.Objects; import java.util.StringJoiner; import java.util.UUID; +import org.openziti.edge.ApiClient; /** NonceChallenge */ @JsonPropertyOrder({NonceChallenge.JSON_PROPERTY_KEY_ID, NonceChallenge.JSON_PROPERTY_NONCE}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class NonceChallenge { public static final String JSON_PROPERTY_KEY_ID = "keyId"; private String keyId; @@ -161,7 +162,9 @@ public String toUrlQueryString(String prefix) { "%skeyId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getKeyId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getKeyId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -172,7 +175,9 @@ public String toUrlQueryString(String prefix) { "%snonce%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getNonce()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getNonce()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/NonceSignature.java b/edge-api/src/main/java/org/openziti/edge/model/NonceSignature.java index c57ae4b9..7b5fdfb1 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/NonceSignature.java +++ b/edge-api/src/main/java/org/openziti/edge/model/NonceSignature.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** NonceSignature */ @JsonPropertyOrder({ @@ -29,8 +30,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class NonceSignature { public static final String JSON_PROPERTY_ALGORITHM = "algorithm"; private String algorithm; @@ -222,7 +223,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getAlgorithm()), StandardCharsets.UTF_8) + ApiClient.valueToString(getAlgorithm()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -233,7 +235,9 @@ public String toUrlQueryString(String prefix) { "%scaPool%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCaPool()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCaPool()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -244,7 +248,9 @@ public String toUrlQueryString(String prefix) { "%skid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getKid()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getKid()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -256,7 +262,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getSignature()), StandardCharsets.UTF_8) + ApiClient.valueToString(getSignature()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/OsType.java b/edge-api/src/main/java/org/openziti/edge/model/OsType.java index cf07e13e..fc329741 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/OsType.java +++ b/edge-api/src/main/java/org/openziti/edge/model/OsType.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,15 +19,15 @@ public enum OsType { WINDOWS("Windows"), - WINDOWSSERVER("WindowsServer"), + WINDOWS_SERVER("WindowsServer"), ANDROID("Android"), - IOS("iOS"), + I_OS("iOS"), LINUX("Linux"), - MACOS("macOS"); + MAC_OS("macOS"); private String value; diff --git a/edge-api/src/main/java/org/openziti/edge/model/OtherPrime.java b/edge-api/src/main/java/org/openziti/edge/model/OtherPrime.java index 21ec4501..56364c4c 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/OtherPrime.java +++ b/edge-api/src/main/java/org/openziti/edge/model/OtherPrime.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** OtherPrime */ @JsonPropertyOrder({ @@ -28,8 +29,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class OtherPrime { public static final String JSON_PROPERTY_D = "d"; private String d; @@ -192,7 +193,8 @@ public String toUrlQueryString(String prefix) { "%sd%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getD()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getD()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -203,7 +205,8 @@ public String toUrlQueryString(String prefix) { "%sr%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getR()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getR()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -214,7 +217,8 @@ public String toUrlQueryString(String prefix) { "%st%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getT()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getT()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/OttEnrollmentRequest.java b/edge-api/src/main/java/org/openziti/edge/model/OttEnrollmentRequest.java index d6f1b0a7..49d46d6c 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/OttEnrollmentRequest.java +++ b/edge-api/src/main/java/org/openziti/edge/model/OttEnrollmentRequest.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** OttEnrollmentRequest */ @JsonPropertyOrder({ @@ -27,8 +28,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class OttEnrollmentRequest { public static final String JSON_PROPERTY_CLIENT_CSR = "clientCsr"; private String clientCsr; @@ -164,7 +165,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getClientCsr()), StandardCharsets.UTF_8) + ApiClient.valueToString(getClientCsr()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -175,7 +177,9 @@ public String toUrlQueryString(String prefix) { "%stoken%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getToken()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getToken()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/Pagination.java b/edge-api/src/main/java/org/openziti/edge/model/Pagination.java index 6f60849f..41bdb23c 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Pagination.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Pagination.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,6 +20,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** Pagination */ @JsonPropertyOrder({ @@ -29,8 +30,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Pagination { public static final String JSON_PROPERTY_LIMIT = "limit"; private BigDecimal limit; @@ -193,7 +194,9 @@ public String toUrlQueryString(String prefix) { "%slimit%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getLimit()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getLimit()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -204,7 +207,9 @@ public String toUrlQueryString(String prefix) { "%soffset%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getOffset()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getOffset()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -216,7 +221,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getTotalCount()), StandardCharsets.UTF_8) + ApiClient.valueToString(getTotalCount()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureCheckType.java b/edge-api/src/main/java/org/openziti/edge/model/PostureCheckType.java index 2abc84d9..c499e7fd 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureCheckType.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureCheckType.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureQueries.java b/edge-api/src/main/java/org/openziti/edge/model/PostureQueries.java index a094702c..e9d6df1b 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureQueries.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureQueries.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** PostureQueries */ @JsonPropertyOrder({ @@ -31,8 +32,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class PostureQueries { public static final String JSON_PROPERTY_IS_PASSING = "isPassing"; private Boolean isPassing; @@ -232,7 +233,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsPassing()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIsPassing()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -243,7 +245,9 @@ public String toUrlQueryString(String prefix) { "%spolicyId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPolicyId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPolicyId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -255,7 +259,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getPolicyType()), StandardCharsets.UTF_8) + ApiClient.valueToString(getPolicyType()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureQuery.java b/edge-api/src/main/java/org/openziti/edge/model/PostureQuery.java index 06ffbd15..0b8c4c2d 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureQuery.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureQuery.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** PostureQuery */ @JsonPropertyOrder({ @@ -41,8 +42,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class PostureQuery { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -480,7 +481,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -491,7 +493,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -508,7 +512,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -520,7 +525,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsPassing()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIsPassing()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -560,7 +566,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getQueryType()), StandardCharsets.UTF_8) + ApiClient.valueToString(getQueryType()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -571,7 +578,9 @@ public String toUrlQueryString(String prefix) { "%stimeout%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTimeout()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTimeout()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -583,7 +592,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getTimeoutRemaining()), + ApiClient.valueToString(getTimeoutRemaining()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureQueryProcess.java b/edge-api/src/main/java/org/openziti/edge/model/PostureQueryProcess.java index 0edd4850..f58a450a 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureQueryProcess.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureQueryProcess.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** PostureQueryProcess */ @JsonPropertyOrder({ @@ -27,8 +28,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class PostureQueryProcess { public static final String JSON_PROPERTY_OS_TYPE = "osType"; private OsType osType; @@ -163,7 +164,9 @@ public String toUrlQueryString(String prefix) { "%sosType%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getOsType()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getOsType()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -174,7 +177,9 @@ public String toUrlQueryString(String prefix) { "%spath%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPath()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPath()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponse.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponse.java index 706a504d..bcf477be 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponse.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponse.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,8 +24,8 @@ @JsonPropertyOrder({PostureResponse.JSON_PROPERTY_SERVICES}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class PostureResponse { public static final String JSON_PROPERTY_SERVICES = "services"; private List services = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseCreate.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseCreate.java index 8c401c43..4a83b737 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseCreate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseCreate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; import org.openziti.edge.JSON; /** PostureResponseCreate */ @@ -33,8 +34,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") @JsonIgnoreProperties( value = "typeId", // ignore manually set typeId, it will be automatically generated by // Jackson during serialization @@ -196,7 +197,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -207,7 +210,9 @@ public String toUrlQueryString(String prefix) { "%stypeId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTypeId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTypeId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseDomainCreate.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseDomainCreate.java index 6a945f84..763e781a 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseDomainCreate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseDomainCreate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,14 +23,15 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; import org.openziti.edge.JSON; /** PostureResponseDomainCreate */ @JsonPropertyOrder({PostureResponseDomainCreate.JSON_PROPERTY_DOMAIN}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") @JsonIgnoreProperties( value = "typeId", // ignore manually set typeId, it will be automatically generated by // Jackson during serialization @@ -70,6 +71,12 @@ public void setDomain(String domain) { this.domain = domain; } + @Override + public PostureResponseDomainCreate id(String id) { + this.setId(id); + return this; + } + @Override public PostureResponseDomainCreate typeId(PostureCheckType typeId) { this.setTypeId(typeId); @@ -154,7 +161,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -165,7 +174,9 @@ public String toUrlQueryString(String prefix) { "%stypeId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTypeId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTypeId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -176,7 +187,9 @@ public String toUrlQueryString(String prefix) { "%sdomain%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getDomain()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getDomain()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseEndpointStateCreate.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseEndpointStateCreate.java index dec1fe4c..de2e0dcd 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseEndpointStateCreate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseEndpointStateCreate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,6 +23,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; import org.openziti.edge.JSON; /** PostureResponseEndpointStateCreate */ @@ -32,8 +33,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") @JsonIgnoreProperties( value = "typeId", // ignore manually set typeId, it will be automatically generated by // Jackson during serialization @@ -99,6 +100,12 @@ public void setWoken(Boolean woken) { this.woken = woken; } + @Override + public PostureResponseEndpointStateCreate id(String id) { + this.setId(id); + return this; + } + @Override public PostureResponseEndpointStateCreate typeId(PostureCheckType typeId) { this.setTypeId(typeId); @@ -187,7 +194,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -198,7 +207,9 @@ public String toUrlQueryString(String prefix) { "%stypeId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTypeId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTypeId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -209,7 +220,9 @@ public String toUrlQueryString(String prefix) { "%sunlocked%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getUnlocked()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getUnlocked()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -220,7 +233,9 @@ public String toUrlQueryString(String prefix) { "%swoken%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getWoken()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getWoken()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseEnvelope.java index d6986f09..9523a429 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class PostureResponseEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private PostureResponse data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseMacAddressCreate.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseMacAddressCreate.java index 26a3a728..b7b87e04 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseMacAddressCreate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseMacAddressCreate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,14 +25,15 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; import org.openziti.edge.JSON; /** PostureResponseMacAddressCreate */ @JsonPropertyOrder({PostureResponseMacAddressCreate.JSON_PROPERTY_MAC_ADDRESSES}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") @JsonIgnoreProperties( value = "typeId", // ignore manually set typeId, it will be automatically generated by // Jackson during serialization @@ -80,6 +81,12 @@ public void setMacAddresses(List macAddresses) { this.macAddresses = macAddresses; } + @Override + public PostureResponseMacAddressCreate id(String id) { + this.setId(id); + return this; + } + @Override public PostureResponseMacAddressCreate typeId(PostureCheckType typeId) { this.setTypeId(typeId); @@ -166,7 +173,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -177,7 +186,9 @@ public String toUrlQueryString(String prefix) { "%stypeId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTypeId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTypeId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -194,7 +205,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getMacAddresses().get(i)), + ApiClient.valueToString(getMacAddresses().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseOperatingSystemCreate.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseOperatingSystemCreate.java index f0081603..ca6cff60 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseOperatingSystemCreate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseOperatingSystemCreate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,6 +23,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; import org.openziti.edge.JSON; /** PostureResponseOperatingSystemCreate */ @@ -33,8 +34,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") @JsonIgnoreProperties( value = "typeId", // ignore manually set typeId, it will be automatically generated by // Jackson during serialization @@ -126,6 +127,12 @@ public void setVersion(String version) { this.version = version; } + @Override + public PostureResponseOperatingSystemCreate id(String id) { + this.setId(id); + return this; + } + @Override public PostureResponseOperatingSystemCreate typeId(PostureCheckType typeId) { this.setTypeId(typeId); @@ -216,7 +223,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -227,7 +236,9 @@ public String toUrlQueryString(String prefix) { "%stypeId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTypeId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTypeId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -238,7 +249,9 @@ public String toUrlQueryString(String prefix) { "%sbuild%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getBuild()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getBuild()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -249,7 +262,9 @@ public String toUrlQueryString(String prefix) { "%stype%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getType()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getType()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -260,7 +275,9 @@ public String toUrlQueryString(String prefix) { "%sversion%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getVersion()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getVersion()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseProcessCreate.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseProcessCreate.java index 136e1dd2..bbda06c1 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseProcessCreate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseProcessCreate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; import org.openziti.edge.JSON; /** PostureResponseProcessCreate */ @@ -36,8 +37,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") @JsonIgnoreProperties( value = "typeId", // ignore manually set typeId, it will be automatically generated by // Jackson during serialization @@ -163,6 +164,12 @@ public void setSignerFingerprints(List signerFingerprints) { this.signerFingerprints = signerFingerprints; } + @Override + public PostureResponseProcessCreate id(String id) { + this.setId(id); + return this; + } + @Override public PostureResponseProcessCreate typeId(PostureCheckType typeId) { this.setTypeId(typeId); @@ -258,7 +265,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -269,7 +278,9 @@ public String toUrlQueryString(String prefix) { "%stypeId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTypeId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTypeId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -280,7 +291,9 @@ public String toUrlQueryString(String prefix) { "%shash%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getHash()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getHash()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -292,7 +305,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIsRunning()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIsRunning()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -303,7 +317,9 @@ public String toUrlQueryString(String prefix) { "%spath%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getPath()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getPath()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -320,7 +336,8 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getSignerFingerprints().get(i)), + ApiClient.valueToString( + getSignerFingerprints().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseService.java b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseService.java index 7f9a91c4..2a257fe8 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/PostureResponseService.java +++ b/edge-api/src/main/java/org/openziti/edge/model/PostureResponseService.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** PostureResponseService */ @JsonPropertyOrder({ @@ -30,8 +31,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class PostureResponseService { public static final String JSON_PROPERTY_ID = "id"; private String id; @@ -250,7 +251,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -261,7 +264,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -273,7 +278,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getPostureQueryType()), + ApiClient.valueToString(getPostureQueryType()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -285,7 +290,9 @@ public String toUrlQueryString(String prefix) { "%stimeout%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getTimeout()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getTimeout()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -297,7 +304,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getTimeoutRemaining()), + ApiClient.valueToString(getTimeoutRemaining()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/Protocol.java b/edge-api/src/main/java/org/openziti/edge/model/Protocol.java index 1075464d..aa17536d 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Protocol.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Protocol.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,13 +19,14 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** Protocol */ @JsonPropertyOrder({Protocol.JSON_PROPERTY_ADDRESS}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Protocol { public static final String JSON_PROPERTY_ADDRESS = "address"; private String address; @@ -132,7 +133,9 @@ public String toUrlQueryString(String prefix) { "%saddress%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getAddress()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getAddress()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/RouterExtendEnrollmentRequest.java b/edge-api/src/main/java/org/openziti/edge/model/RouterExtendEnrollmentRequest.java index a3939ebf..53ed1b44 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/RouterExtendEnrollmentRequest.java +++ b/edge-api/src/main/java/org/openziti/edge/model/RouterExtendEnrollmentRequest.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** RouterExtendEnrollmentRequest */ @JsonPropertyOrder({ @@ -27,8 +28,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class RouterExtendEnrollmentRequest { public static final String JSON_PROPERTY_CERT_CSR = "certCsr"; private String certCsr; @@ -164,7 +165,9 @@ public String toUrlQueryString(String prefix) { "%scertCsr%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCertCsr()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCertCsr()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -176,7 +179,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getServerCertCsr()), + ApiClient.valueToString(getServerCertCsr()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/SdkInfo.java b/edge-api/src/main/java/org/openziti/edge/model/SdkInfo.java index e069122a..87be6510 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/SdkInfo.java +++ b/edge-api/src/main/java/org/openziti/edge/model/SdkInfo.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** SDK information an authenticating client may provide */ @JsonPropertyOrder({ @@ -31,8 +32,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class SdkInfo { public static final String JSON_PROPERTY_APP_ID = "appId"; private String appId; @@ -279,7 +280,9 @@ public String toUrlQueryString(String prefix) { "%sappId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getAppId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getAppId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -291,7 +294,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getAppVersion()), StandardCharsets.UTF_8) + ApiClient.valueToString(getAppVersion()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -302,7 +306,9 @@ public String toUrlQueryString(String prefix) { "%sbranch%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getBranch()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getBranch()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -313,7 +319,9 @@ public String toUrlQueryString(String prefix) { "%srevision%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getRevision()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getRevision()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -324,7 +332,9 @@ public String toUrlQueryString(String prefix) { "%stype%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getType()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getType()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -335,7 +345,9 @@ public String toUrlQueryString(String prefix) { "%sversion%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getVersion()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getVersion()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ServiceDetail.java b/edge-api/src/main/java/org/openziti/edge/model/ServiceDetail.java index b561b92f..cfdb3c0c 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ServiceDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ServiceDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ServiceDetail */ @JsonPropertyOrder({ @@ -44,8 +45,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ServiceDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -610,7 +611,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -621,7 +623,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -638,7 +642,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -656,7 +661,7 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getConfig().get(_key), URLEncoder.encode( - String.valueOf(getConfig().get(_key)), + ApiClient.valueToString(getConfig().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -675,7 +680,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getConfigs().get(i)), + ApiClient.valueToString(getConfigs().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -689,7 +694,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getEncryptionRequired()), + ApiClient.valueToString(getEncryptionRequired()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -702,7 +707,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getMaxIdleTimeMillis()), + ApiClient.valueToString(getMaxIdleTimeMillis()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -714,7 +719,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -732,7 +739,8 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getPermissions().get(i)), + ApiClient.valueToString( + getPermissions().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -775,7 +783,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getRoleAttributes().get(i)), + ApiClient.valueToString(getRoleAttributes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -789,7 +797,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getTerminatorStrategy()), + ApiClient.valueToString(getTerminatorStrategy()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ServiceEdgeRouters.java b/edge-api/src/main/java/org/openziti/edge/model/ServiceEdgeRouters.java index d6cbf764..6779dcfd 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ServiceEdgeRouters.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ServiceEdgeRouters.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,8 +24,8 @@ @JsonPropertyOrder({ServiceEdgeRouters.JSON_PROPERTY_EDGE_ROUTERS}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ServiceEdgeRouters { public static final String JSON_PROPERTY_EDGE_ROUTERS = "edgeRouters"; private List edgeRouters = new ArrayList<>(); diff --git a/edge-api/src/main/java/org/openziti/edge/model/ServicePatch.java b/edge-api/src/main/java/org/openziti/edge/model/ServicePatch.java index 43baffea..c8806335 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ServicePatch.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ServicePatch.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ServicePatch */ @JsonPropertyOrder({ @@ -34,8 +35,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ServicePatch { public static final String JSON_PROPERTY_CONFIGS = "configs"; private List configs = new ArrayList<>(); @@ -346,7 +347,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getConfigs().get(i)), + ApiClient.valueToString(getConfigs().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -360,7 +361,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getEncryptionRequired()), + ApiClient.valueToString(getEncryptionRequired()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -373,7 +374,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getMaxIdleTimeMillis()), + ApiClient.valueToString(getMaxIdleTimeMillis()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -385,7 +386,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -402,7 +405,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getRoleAttributes().get(i)), + ApiClient.valueToString(getRoleAttributes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -421,7 +424,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getTerminatorStrategy()), + ApiClient.valueToString(getTerminatorStrategy()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/ServiceUpdate.java b/edge-api/src/main/java/org/openziti/edge/model/ServiceUpdate.java index 75faccb5..3900fd52 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/ServiceUpdate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/ServiceUpdate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** ServiceUpdate */ @JsonPropertyOrder({ @@ -34,8 +35,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class ServiceUpdate { public static final String JSON_PROPERTY_CONFIGS = "configs"; private List configs = new ArrayList<>(); @@ -346,7 +347,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getConfigs().get(i)), + ApiClient.valueToString(getConfigs().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -360,7 +361,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getEncryptionRequired()), + ApiClient.valueToString(getEncryptionRequired()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -373,7 +374,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getMaxIdleTimeMillis()), + ApiClient.valueToString(getMaxIdleTimeMillis()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -385,7 +386,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -402,7 +405,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getRoleAttributes().get(i)), + ApiClient.valueToString(getRoleAttributes().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -421,7 +424,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getTerminatorStrategy()), + ApiClient.valueToString(getTerminatorStrategy()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/SessionCreate.java b/edge-api/src/main/java/org/openziti/edge/model/SessionCreate.java index f8fb0160..0d8b8db2 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/SessionCreate.java +++ b/edge-api/src/main/java/org/openziti/edge/model/SessionCreate.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** SessionCreate */ @JsonPropertyOrder({ @@ -28,8 +29,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class SessionCreate { public static final String JSON_PROPERTY_SERVICE_ID = "serviceId"; private String serviceId; @@ -193,7 +194,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getServiceId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getServiceId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -209,7 +211,9 @@ public String toUrlQueryString(String prefix) { "%stype%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getType()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getType()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/SessionCreateEnvelope.java b/edge-api/src/main/java/org/openziti/edge/model/SessionCreateEnvelope.java index 00127237..2c050837 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/SessionCreateEnvelope.java +++ b/edge-api/src/main/java/org/openziti/edge/model/SessionCreateEnvelope.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,8 +25,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class SessionCreateEnvelope { public static final String JSON_PROPERTY_DATA = "data"; private SessionDetail data; diff --git a/edge-api/src/main/java/org/openziti/edge/model/SessionDetail.java b/edge-api/src/main/java/org/openziti/edge/model/SessionDetail.java index 198e1bfc..5fc91413 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/SessionDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/SessionDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** SessionDetail */ @JsonPropertyOrder({ @@ -43,8 +44,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class SessionDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -540,7 +541,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -551,7 +553,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -568,7 +572,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -585,7 +590,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getApiSessionId()), + ApiClient.valueToString(getApiSessionId()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -621,7 +626,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getIdentityId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getIdentityId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -638,7 +644,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getServiceId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getServiceId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -649,7 +656,9 @@ public String toUrlQueryString(String prefix) { "%stoken%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getToken()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getToken()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -660,7 +669,9 @@ public String toUrlQueryString(String prefix) { "%stype%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getType()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getType()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/SessionEdgeRouter.java b/edge-api/src/main/java/org/openziti/edge/model/SessionEdgeRouter.java index c756d747..10936160 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/SessionEdgeRouter.java +++ b/edge-api/src/main/java/org/openziti/edge/model/SessionEdgeRouter.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** SessionEdgeRouter */ @JsonPropertyOrder({ @@ -37,8 +38,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class SessionEdgeRouter { public static final String JSON_PROPERTY_APP_DATA = "appData"; private Tags appData; @@ -430,7 +431,9 @@ public String toUrlQueryString(String prefix) { "%scost%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getCost()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getCost()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -441,7 +444,9 @@ public String toUrlQueryString(String prefix) { "%sdisabled%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getDisabled()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getDisabled()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -452,7 +457,9 @@ public String toUrlQueryString(String prefix) { "%shostname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getHostname()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getHostname()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -463,7 +470,9 @@ public String toUrlQueryString(String prefix) { "%sisOnline%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getIsOnline()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getIsOnline()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -474,7 +483,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -486,7 +497,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getNoTraversal()), + ApiClient.valueToString(getNoTraversal()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -505,7 +516,8 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getSupportedProtocols().get(_key), URLEncoder.encode( - String.valueOf(getSupportedProtocols().get(_key)), + ApiClient.valueToString( + getSupportedProtocols().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -519,7 +531,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getSyncStatus()), StandardCharsets.UTF_8) + ApiClient.valueToString(getSyncStatus()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -537,7 +550,7 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getUrls().get(_key), URLEncoder.encode( - String.valueOf(getUrls().get(_key)), + ApiClient.valueToString(getUrls().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/SpecDetail.java b/edge-api/src/main/java/org/openziti/edge/model/SpecDetail.java index dd3197b4..d69bf326 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/SpecDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/SpecDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** SpecDetail */ @JsonPropertyOrder({ @@ -34,8 +35,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class SpecDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -314,7 +315,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -325,7 +327,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -342,7 +346,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -353,7 +358,9 @@ public String toUrlQueryString(String prefix) { "%sname%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getName()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/Tags.java b/edge-api/src/main/java/org/openziti/edge/model/Tags.java index 16cc42d1..455042cd 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Tags.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Tags.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,8 +23,8 @@ @JsonPropertyOrder({}) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Tags { public Tags() {} diff --git a/edge-api/src/main/java/org/openziti/edge/model/TerminatorClientDetail.java b/edge-api/src/main/java/org/openziti/edge/model/TerminatorClientDetail.java index 630f0c05..ffcfc3df 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/TerminatorClientDetail.java +++ b/edge-api/src/main/java/org/openziti/edge/model/TerminatorClientDetail.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** TerminatorClientDetail */ @JsonPropertyOrder({ @@ -37,8 +38,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class TerminatorClientDetail { public static final String JSON_PROPERTY_LINKS = "_links"; private Map links = new HashMap<>(); @@ -402,7 +403,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getCreatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getCreatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -413,7 +415,9 @@ public String toUrlQueryString(String prefix) { "%sid%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -430,7 +434,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getUpdatedAt()), StandardCharsets.UTF_8) + ApiClient.valueToString(getUpdatedAt()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -441,7 +446,9 @@ public String toUrlQueryString(String prefix) { "%sidentity%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getIdentity()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getIdentity()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -452,7 +459,9 @@ public String toUrlQueryString(String prefix) { "%srouterId%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getRouterId()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getRouterId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -469,7 +478,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getServiceId()), StandardCharsets.UTF_8) + ApiClient.valueToString(getServiceId()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/edge-api/src/main/java/org/openziti/edge/model/TerminatorPrecedence.java b/edge-api/src/main/java/org/openziti/edge/model/TerminatorPrecedence.java index 25499a4f..f33ecb7a 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/TerminatorPrecedence.java +++ b/edge-api/src/main/java/org/openziti/edge/model/TerminatorPrecedence.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/edge-api/src/main/java/org/openziti/edge/model/Version.java b/edge-api/src/main/java/org/openziti/edge/model/Version.java index 0709afbc..fdeba1c6 100644 --- a/edge-api/src/main/java/org/openziti/edge/model/Version.java +++ b/edge-api/src/main/java/org/openziti/edge/model/Version.java @@ -2,7 +2,7 @@ * Ziti Edge Client * OpenZiti Edge Client API * - * The version of the OpenAPI document: 0.26.20 + * The version of the OpenAPI document: 0.26.27 * Contact: help@openziti.org * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,6 +23,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import org.openziti.edge.ApiClient; /** Version */ @JsonPropertyOrder({ @@ -35,8 +36,8 @@ }) @javax.annotation.Generated( value = "org.openapitools.codegen.languages.JavaClientCodegen", - date = "2024-06-07T09:12:49.062759-04:00[America/New_York]", - comments = "Generator version: 7.6.0") + date = "2024-09-04T10:11:22.635226-04:00[America/New_York]", + comments = "Generator version: 7.8.0") public class Version { public static final String JSON_PROPERTY_API_VERSIONS = "apiVersions"; private Map> apiVersions = new HashMap<>(); @@ -307,7 +308,7 @@ public String toUrlQueryString(String prefix) { "%s%d%s", containerPrefix, _key, containerSuffix), getApiVersions().get(_key), URLEncoder.encode( - String.valueOf(getApiVersions().get(_key)), + ApiClient.valueToString(getApiVersions().get(_key)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -321,7 +322,8 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getBuildDate()), StandardCharsets.UTF_8) + ApiClient.valueToString(getBuildDate()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -338,7 +340,7 @@ public String toUrlQueryString(String prefix) { : String.format( "%s%d%s", containerPrefix, i, containerSuffix), URLEncoder.encode( - String.valueOf(getCapabilities().get(i)), + ApiClient.valueToString(getCapabilities().get(i)), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -351,7 +353,9 @@ public String toUrlQueryString(String prefix) { "%srevision%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getRevision()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getRevision()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -363,7 +367,7 @@ public String toUrlQueryString(String prefix) { prefix, suffix, URLEncoder.encode( - String.valueOf(getRuntimeVersion()), + ApiClient.valueToString(getRuntimeVersion()), StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } @@ -375,7 +379,9 @@ public String toUrlQueryString(String prefix) { "%sversion%s=%s", prefix, suffix, - URLEncoder.encode(String.valueOf(getVersion()), StandardCharsets.UTF_8) + URLEncoder.encode( + ApiClient.valueToString(getVersion()), + StandardCharsets.UTF_8) .replaceAll("\\+", "%20"))); } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index da58a697..d6b99344 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ tls-channel = "0.9.1" jjwt = "0.12.6" netty = "4.1.113.Final" springboot = "3.2.5" -ziti-api = "0.26.20" +ziti-api = "0.26.28" jackson = "2.17.2" jakarta-annotation = "1.3.5" okhttp3 = "4.12.0"