From 3bc371d9dfc93c7b479a8effddfc38f452c17dce Mon Sep 17 00:00:00 2001
From: Arvind Krishnakumar
 <61501885+arvindkrishnakumar-okta@users.noreply.github.com>
Date: Tue, 7 Jul 2020 09:37:24 -0700
Subject: [PATCH] minor improvements (#427)

---
 .../okta/sdk/tests/it/AuthorizationServerIT.groovy    | 11 +++++++----
 .../groovy/com/okta/sdk/tests/it/UserTypesIT.groovy   |  2 +-
 src/swagger/api.yaml                                  |  2 +-
 3 files changed, 9 insertions(+), 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
index 94a7d5f95f5..0f112ba68d4 100644
--- 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
index b0548de39b6..2661c260b1d 100644
--- 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
index f9bda2597ca..458a2f70b6f 100644
--- 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: