Skip to content

Commit

Permalink
Upgrade OpenAPI Generator from 7.8.0 to 7.11.0 and fix ApiClient …
Browse files Browse the repository at this point in the history
…concurrency issue (#1599)

* Upgrade OpenAPI Generator to 7.11.0 and fix concurrency issue

* Removed the now unnecessary synchronized keyword on ApiClient::invokeAPI()
  • Loading branch information
arvindkrishnakumar-okta authored Feb 8, 2025
1 parent da636fc commit 46917b3
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 77 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ swaApplicationSettingsApplication.buttonField("btn-login")
SwaApplicationSettings swaApplicationSettings = new SwaApplicationSettings();
swaApplicationSettings.app(swaApplicationSettingsApplication);
BrowserPluginApplication browserPluginApplication = new BrowserPluginApplication();
browserPluginApplication.name(BrowserPluginApplication.NameEnum.SWA);
browserPluginApplication.name(BrowserPluginApplication.NameEnum.TEMPLATE_SWA);
browserPluginApplication.label("Sample Plugin App");
browserPluginApplication.settings(swaApplicationSettings);

Expand Down Expand Up @@ -505,7 +505,6 @@ Map<String, String> cookieParams = new HashMap<String, String>();
Map<String, Object> formParams = new HashMap<String, Object>();
TypeReference<com.okta.sdk.resource.model.User> returnType = new TypeReference<com.okta.sdk.resource.model.User>() {
};

com.okta.sdk.resource.model.User user = client.invokeAPI(
"/api/v1/users",
"POST",
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations.version>1.6.8</swagger-annotations.version>
<openapi-generator.version>7.8.0</openapi-generator.version>
<openapi-generator.version>7.11.0</openapi-generator.version>
<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
<jakarta-annotation.version>2.1.1</jakarta-annotation.version>
<jsr305.version>3.0.2</jsr305.version>
Expand Down
109 changes: 70 additions & 39 deletions api/src/main/resources/custom_templates/ApiClient.mustache

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ private void createSwaApplication() throws ApiException {
SwaApplicationSettings swaApplicationSettings = new SwaApplicationSettings();
swaApplicationSettings.app(swaApplicationSettingsApplication);
BrowserPluginApplication browserPluginApplication = new BrowserPluginApplication();
browserPluginApplication.name(BrowserPluginApplication.NameEnum.SWA);
browserPluginApplication.name(BrowserPluginApplication.NameEnum.TEMPLATE_SWA);
browserPluginApplication.label("Sample Plugin App");
browserPluginApplication.settings(swaApplicationSettings);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import com.okta.sdk.resource.model.SwaApplicationSettingsApplication
import com.okta.sdk.tests.it.util.ITSupport
import com.okta.sdk.resource.api.ApplicationApi
import com.okta.sdk.resource.api.InlineHookApi
import com.okta.sdk.resource.model.*
import org.testng.annotations.Test

import static org.hamcrest.MatcherAssert.assertThat
Expand Down Expand Up @@ -153,7 +152,7 @@ class AppsIT extends ITSupport {
SwaApplicationSettings swaApplicationSettings = new SwaApplicationSettings()
swaApplicationSettings.app(swaApplicationSettingsApplication)
BrowserPluginApplication browserPluginApplication = new BrowserPluginApplication()
browserPluginApplication.name(BrowserPluginApplication.NameEnum.SWA)
browserPluginApplication.name(BrowserPluginApplication.NameEnum.TEMPLATE_SWA)
browserPluginApplication.label(prefix + UUID.randomUUID().toString())
browserPluginApplication.settings(swaApplicationSettings)

Expand Down Expand Up @@ -279,7 +278,7 @@ class AppsIT extends ITSupport {
InlineHookApi inlineHookApi = new InlineHookApi(getClient())
InlineHook inlineHook = new InlineHook()
inlineHook.name(name)
inlineHook.type(InlineHookType.SAML_TOKENS_TRANSFORM)
inlineHook.type(InlineHookType.COM_OKTA_SAML_TOKENS_TRANSFORM)
inlineHook.version(version)
inlineHook.channel(inlineHookChannel)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,12 @@ package com.okta.sdk.tests.it

import com.okta.sdk.resource.api.IdentityProviderUsersApi
import com.okta.sdk.resource.model.IdentityProvider
import com.okta.sdk.resource.model.IdentityProviderApplicationUser
import com.okta.sdk.resource.model.IdentityProviderCredentials
import com.okta.sdk.resource.model.IdentityProviderCredentialsClient
import com.okta.sdk.resource.model.IdentityProviderIssuerMode
import com.okta.sdk.resource.model.IdentityProviderPolicy
import com.okta.sdk.resource.model.IdentityProviderType
import com.okta.sdk.resource.model.IssuerMode
import com.okta.sdk.resource.model.LifecycleStatus
import com.okta.sdk.resource.model.OidcAlgorithms
import com.okta.sdk.resource.model.OidcRequestAlgorithm
import com.okta.sdk.resource.model.PolicyAccountLink
import com.okta.sdk.resource.model.PolicyAccountLinkAction
import com.okta.sdk.resource.model.PolicySubject
Expand Down Expand Up @@ -56,7 +52,6 @@ import com.okta.sdk.resource.model.User
import com.okta.sdk.resource.model.UserIdentityProviderLinkRequest
import com.okta.sdk.tests.it.util.ITSupport
import com.okta.sdk.resource.api.IdentityProviderApi
import com.okta.sdk.resource.model.*
import org.testng.annotations.Test

import static org.hamcrest.MatcherAssert.assertThat
Expand Down Expand Up @@ -114,23 +109,23 @@ class IdpIT extends ITSupport {

ProtocolEndpoints protocolEndpoints = new ProtocolEndpoints()
ProtocolEndpoint protocolEndpointAcs = new ProtocolEndpoint()
protocolEndpointAcs.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointAcs.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointAcs.setType(ProtocolEndpointType.INSTANCE)

ProtocolEndpoint protocolEndpointAuthorization = new ProtocolEndpoint()
protocolEndpointAuthorization.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointAuthorization.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointAuthorization.setUrl("https://idp.example.com/authorize")

ProtocolEndpoint protocolEndpointToken = new ProtocolEndpoint()
protocolEndpointToken.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointToken.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointToken.setUrl("https://idp.example.com/token")

ProtocolEndpoint protocolEndpointUserInfo = new ProtocolEndpoint()
protocolEndpointUserInfo.setBinding(ProtocolEndpointBinding.REDIRECT)
protocolEndpointUserInfo.setBinding(ProtocolEndpointBinding.HTTP_REDIRECT)
protocolEndpointUserInfo.setUrl("https://idp.example.com/userinfo")

ProtocolEndpoint protocolEndpointJwks = new ProtocolEndpoint()
protocolEndpointJwks.setBinding(ProtocolEndpointBinding.REDIRECT)
protocolEndpointJwks.setBinding(ProtocolEndpointBinding.HTTP_REDIRECT)
protocolEndpointJwks.setUrl("https://idp.example.com/keys")

protocolEndpoints.setAcs(protocolEndpointAcs)
Expand Down Expand Up @@ -228,23 +223,23 @@ class IdpIT extends ITSupport {

protocolEndpoints = new ProtocolEndpoints()
protocolEndpointAcs = new ProtocolEndpoint()
protocolEndpointAcs.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointAcs.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointAcs.setType(ProtocolEndpointType.INSTANCE)

protocolEndpointAuthorization = new ProtocolEndpoint()
protocolEndpointAuthorization.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointAuthorization.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointAuthorization.setUrl("https://idp.example.com/authorize_new")

protocolEndpointToken = new ProtocolEndpoint()
protocolEndpointToken.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointToken.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointToken.setUrl("https://idp.example.com/token_new")

protocolEndpointUserInfo = new ProtocolEndpoint()
protocolEndpointUserInfo.setBinding(ProtocolEndpointBinding.REDIRECT)
protocolEndpointUserInfo.setBinding(ProtocolEndpointBinding.HTTP_REDIRECT)
protocolEndpointUserInfo.setUrl("https://idp.example.com/userinfo_new")

protocolEndpointJwks = new ProtocolEndpoint()
protocolEndpointJwks.setBinding(ProtocolEndpointBinding.REDIRECT)
protocolEndpointJwks.setBinding(ProtocolEndpointBinding.HTTP_REDIRECT)
protocolEndpointJwks.setUrl("https://idp.example.com/keys_new")

protocolEndpoints.setAcs(protocolEndpointAcs)
Expand Down Expand Up @@ -360,23 +355,23 @@ class IdpIT extends ITSupport {

ProtocolEndpoints protocolEndpoints = new ProtocolEndpoints()
ProtocolEndpoint protocolEndpointAcs = new ProtocolEndpoint()
protocolEndpointAcs.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointAcs.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointAcs.setType(ProtocolEndpointType.INSTANCE)

ProtocolEndpoint protocolEndpointAuthorization = new ProtocolEndpoint()
protocolEndpointAuthorization.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointAuthorization.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointAuthorization.setUrl("https://idp.example.com/authorize")

ProtocolEndpoint protocolEndpointToken = new ProtocolEndpoint()
protocolEndpointToken.setBinding(ProtocolEndpointBinding.POST)
protocolEndpointToken.setBinding(ProtocolEndpointBinding.HTTP_POST)
protocolEndpointToken.setUrl("https://idp.example.com/token")

ProtocolEndpoint protocolEndpointUserInfo = new ProtocolEndpoint()
protocolEndpointUserInfo.setBinding(ProtocolEndpointBinding.REDIRECT)
protocolEndpointUserInfo.setBinding(ProtocolEndpointBinding.HTTP_REDIRECT)
protocolEndpointUserInfo.setUrl("https://idp.example.com/userinfo")

ProtocolEndpoint protocolEndpointJwks = new ProtocolEndpoint()
protocolEndpointJwks.setBinding(ProtocolEndpointBinding.REDIRECT)
protocolEndpointJwks.setBinding(ProtocolEndpointBinding.HTTP_REDIRECT)
protocolEndpointJwks.setUrl("https://idp.example.com/keys")

protocolEndpoints.setAcs(protocolEndpointAcs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import com.okta.sdk.resource.model.OktaSignOnPolicyRuleActions
import com.okta.sdk.resource.model.OktaSignOnPolicyRuleSignonActions
import com.okta.sdk.resource.model.OpenIdConnectApplicationType
import com.okta.sdk.resource.model.Policy
import com.okta.sdk.resource.model.PolicyAccess
import com.okta.sdk.resource.model.PolicyRuleType
import com.okta.sdk.resource.model.PolicyRuleVerificationMethodType
import com.okta.sdk.resource.model.PolicyType
Expand All @@ -47,7 +46,6 @@ import com.okta.sdk.resource.client.ApiException
import com.okta.sdk.resource.api.ApplicationApi
import com.okta.sdk.resource.api.GroupApi
import com.okta.sdk.resource.api.PolicyApi
import com.okta.sdk.resource.model.*
import org.testng.annotations.Test

import static com.okta.sdk.tests.it.util.Util.expect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ import com.okta.sdk.resource.api.ApplicationGroupsApi
import com.okta.sdk.resource.api.GroupApi
import com.okta.sdk.resource.api.PolicyApi
import com.okta.sdk.resource.api.RoleAssignmentAUserApi
import com.okta.sdk.resource.api.RoleAssignmentClientApi
import com.okta.sdk.resource.api.RoleBTargetAdminApi
import com.okta.sdk.resource.api.RoleBTargetBGroupApi
import com.okta.sdk.resource.api.UserApi
import com.okta.sdk.resource.api.UserCredApi
import com.okta.sdk.resource.api.UserLifecycleApi
Expand All @@ -33,17 +31,14 @@ import com.okta.sdk.resource.group.GroupBuilder
import com.okta.sdk.resource.model.AddGroupRequest
import com.okta.sdk.resource.model.Application
import com.okta.sdk.resource.model.ApplicationGroupAssignment
import com.okta.sdk.resource.model.AssignRoleRequest
import com.okta.sdk.resource.model.AssignRoleToUser201Response
import com.okta.sdk.resource.model.AssignRoleToUserRequest
import com.okta.sdk.resource.model.AuthenticationProvider
import com.okta.sdk.resource.model.AuthenticationProviderType
import com.okta.sdk.resource.model.ChangePasswordRequest
import com.okta.sdk.resource.model.CreateUserRequestType
import com.okta.sdk.resource.model.CreateUserTypeRequest
import com.okta.sdk.resource.model.ForgotPasswordResponse
import com.okta.sdk.resource.model.Group
import com.okta.sdk.resource.model.GroupProfile
import com.okta.sdk.resource.model.ListGroupAssignedRoles200ResponseInner
import com.okta.sdk.resource.model.OktaUserGroupProfile
import com.okta.sdk.resource.model.PasswordCredential
Expand All @@ -59,8 +54,6 @@ import com.okta.sdk.resource.model.PolicyAccess
import com.okta.sdk.resource.model.PolicyNetworkCondition
import com.okta.sdk.resource.model.PolicyNetworkConnection
import com.okta.sdk.resource.model.RecoveryQuestionCredential
import com.okta.sdk.resource.model.ResetPasswordToken
import com.okta.sdk.resource.model.Role
import com.okta.sdk.resource.model.RoleType
import com.okta.sdk.resource.model.SelfServicePasswordResetAction
import com.okta.sdk.resource.model.UpdateUserRequest
Expand All @@ -70,9 +63,9 @@ import com.okta.sdk.resource.model.UserGetSingleton
import com.okta.sdk.resource.model.UserProfile
import com.okta.sdk.resource.model.UserStatus
import com.okta.sdk.resource.model.UserType
import com.okta.sdk.resource.model.UserTypePostRequest
import com.okta.sdk.resource.model.UserTypePutRequest

import com.okta.sdk.resource.user.UserBuilder

import com.okta.sdk.tests.Scenario
import com.okta.sdk.tests.it.util.ITSupport
import org.apache.commons.lang3.RandomStringUtils
Expand Down

0 comments on commit 46917b3

Please sign in to comment.