Merge branch 'dev_openapi_v2.0.0_major_rel' into okta-308935-create-m…

…igration-guide-for-sdk-v2.0.0
okta · Jul 7, 2020 · a343eb4 · a343eb4
2 parents edce132 + 3bc371d
commit a343eb4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/AuthorizationServerIT.groovy
@@ -149,7 +149,8 @@ class AuthorizationServerIT extends ITSupport {
             .setDescription("Test Policy")
             .setPriority(1)
             .setConditions(client.instantiate(PolicyRuleConditions)
-                .setClients(client.instantiate(ClientPolicyCondition).setInclude(["ALL_CLIENTS"])))
+                .setClients(client.instantiate(ClientPolicyCondition)
+                    .setInclude([OAuth2Scope.MetadataPublishEnum.ALL_CLIENTS.name()])))
 
         AuthorizationServer createdAuthorizationServer = client.createAuthorizationServer(
             client.instantiate(AuthorizationServer)
@@ -176,7 +177,8 @@ class AuthorizationServerIT extends ITSupport {
             .setDescription("Test Policy")
             .setPriority(1)
             .setConditions(client.instantiate(PolicyRuleConditions)
-                .setClients(client.instantiate(ClientPolicyCondition).setInclude(["ALL_CLIENTS"])))
+                .setClients(client.instantiate(ClientPolicyCondition)
+                    .setInclude([OAuth2Scope.MetadataPublishEnum.ALL_CLIENTS.name()])))
         registerForCleanup(policy)
 
         AuthorizationServer createdAuthorizationServer = client.createAuthorizationServer(
@@ -207,7 +209,8 @@ class AuthorizationServerIT extends ITSupport {
             .setDescription("Test Policy")
             .setPriority(1)
             .setConditions(client.instantiate(PolicyRuleConditions)
-                .setClients(client.instantiate(ClientPolicyCondition).setInclude(["ALL_CLIENTS"])))
+                .setClients(client.instantiate(ClientPolicyCondition)
+                    .setInclude([OAuth2Scope.MetadataPublishEnum.ALL_CLIENTS.name()])))
         registerForCleanup(policy)
 
         AuthorizationServer createdAuthorizationServer = client.createAuthorizationServer(
@@ -244,7 +247,7 @@ class AuthorizationServerIT extends ITSupport {
             .setDescription("Test Policy")
             .setPriority(1)
             .setConditions(client.instantiate(PolicyRuleConditions)
-                .setClients(client.instantiate(ClientPolicyCondition).setInclude(["ALL_CLIENTS"])))
+                .setClients(client.instantiate(ClientPolicyCondition).setInclude([OAuth2Scope.MetadataPublishEnum.ALL_CLIENTS.name()])))
         registerForCleanup(policy)
 
         AuthorizationServer createdAuthorizationServer = client.createAuthorizationServer(

diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserTypesIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UserTypesIT.groovy
@@ -15,7 +15,7 @@
  */
 package com.okta.sdk.tests.it
 
-import com.okta.sdk.resource.user.type.UserType
+import com.okta.sdk.resource.user.UserType
 import com.okta.sdk.tests.it.util.ITSupport
 import org.testng.annotations.Test
 import wiremock.org.apache.commons.lang3.RandomStringUtils

diff --git a/src/swagger/api.yaml b/src/swagger/api.yaml
@@ -12052,7 +12052,7 @@ definitions:
             src: id
         operationId: replaceUserType
     x-okta-tags:
-      - UserType
+      - User
   VerifyFactorRequest:
     properties:
       activationToken: