From 86989c0aaa9524374e0dd197fd7602513f082472 Mon Sep 17 00:00:00 2001 From: Anshul Gupta Date: Wed, 30 Nov 2022 15:49:45 -0600 Subject: [PATCH] lint fix --- .../auth/cognito/RealAWSCognitoAuthPlugin.kt | 8 ++++---- .../SignUpTestCaseGenerator.kt | 18 +++++++++--------- .../utilities/CognitoMockFactory.kt | 4 +++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt index b84a594ede..cc4da10521 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt @@ -138,16 +138,16 @@ import com.amplifyframework.statemachine.codegen.states.SRPSignInState import com.amplifyframework.statemachine.codegen.states.SignInChallengeState import com.amplifyframework.statemachine.codegen.states.SignInState import com.amplifyframework.statemachine.codegen.states.SignOutState -import kotlinx.coroutines.DelicateCoroutinesApi -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.async -import kotlinx.coroutines.launch import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference import kotlin.coroutines.resume import kotlin.coroutines.resumeWithException import kotlin.coroutines.suspendCoroutine +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.async +import kotlinx.coroutines.launch internal class RealAWSCognitoAuthPlugin( private val configuration: AuthConfiguration, diff --git a/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/featuretest/generators/testcasegenerators/SignUpTestCaseGenerator.kt b/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/featuretest/generators/testcasegenerators/SignUpTestCaseGenerator.kt index 39d4582433..0e5b26c405 100644 --- a/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/featuretest/generators/testcasegenerators/SignUpTestCaseGenerator.kt +++ b/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/featuretest/generators/testcasegenerators/SignUpTestCaseGenerator.kt @@ -106,7 +106,7 @@ object SignUpTestCaseGenerator : SerializableProvider { val signupSuccessCase = baseCase.copy( description = "Sign up finishes if user is confirmed in the first step", - preConditions = baseCase.preConditions.copy ( + preConditions = baseCase.preConditions.copy( mockedResponses = listOf( MockResponse( CognitoType.CognitoIdentityProvider, @@ -131,15 +131,15 @@ object SignUpTestCaseGenerator : SerializableProvider { apiName = AuthAPI.signUp, responseType = ResponseType.Success, response = - AuthSignUpResult( - true, - AuthNextSignUpStep( - AuthSignUpStep.DONE, - emptyMap(), + AuthSignUpResult( + true, + AuthNextSignUpStep( + AuthSignUpStep.DONE, + emptyMap(), + null + ), null - ), - null - ).toJsonElement() + ).toJsonElement() ) ) ) diff --git a/aws-auth-cognito/src/test/java/featureTest/utilities/CognitoMockFactory.kt b/aws-auth-cognito/src/test/java/featureTest/utilities/CognitoMockFactory.kt index 1bd57a26ba..de657cb440 100644 --- a/aws-auth-cognito/src/test/java/featureTest/utilities/CognitoMockFactory.kt +++ b/aws-auth-cognito/src/test/java/featureTest/utilities/CognitoMockFactory.kt @@ -68,7 +68,9 @@ class CognitoMockFactory( setupError(mockResponse, responseObject) SignUpResponse.invoke { this.codeDeliveryDetails = parseCodeDeliveryDetails(responseObject) - this.userConfirmed = if(responseObject.containsKey("userConfirmed")){(responseObject["userConfirmed"] as JsonPrimitive).boolean} else false + this.userConfirmed = if (responseObject.containsKey("userConfirmed")) { + (responseObject["userConfirmed"] as? JsonPrimitive)?.boolean ?: false + } else false } } }