Merge pull request #143 from velocitycareerlabs/VL-8447-v2.6.8

rewrite executor and credential type schemas fetch
velocitycareerlabs · Oct 23, 2024 · a94a66b · a94a66b
2 parents 452c7dc + 9580542
commit a94a66b
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 65 deletions.
diff --git a/VCL/build.gradle b/VCL/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 34
-        versionName "2.6.7"
-        versionCode 151
+        versionName "2.6.8"
+        versionCode 152
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/VclBlocksProvider.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/VclBlocksProvider.kt
@@ -130,7 +130,7 @@ internal object VclBlocksProvider {
                                         CacheServiceImpl(context)
                                 ),
                                 credentialTypes,
-                                ExecutorImpl()
+                                ExecutorImpl.instance
                         )
                 )
 
@@ -142,7 +142,7 @@ internal object VclBlocksProvider {
                                         NetworkServiceImpl(),
                                         CacheServiceImpl(context)
                                 ),
-                                ExecutorImpl()
+                                ExecutorImpl.instance
                         )
                 )
 
@@ -154,7 +154,7 @@ internal object VclBlocksProvider {
                                         NetworkServiceImpl(),
                                         CacheServiceImpl(context)
                                 ),
-                                ExecutorImpl()
+                                ExecutorImpl.instance
                         )
                 )
 
@@ -175,7 +175,7 @@ internal object VclBlocksProvider {
                                 chooseJwtVerifyService(cryptoServicesDescriptor)
                         ),
                         PresentationRequestByDeepLinkVerifierImpl(),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         @Throws(VCLError::class)
@@ -191,15 +191,15 @@ internal object VclBlocksProvider {
                                 chooseJwtSignService(context, cryptoServicesDescriptor),
                                 chooseJwtVerifyService(cryptoServicesDescriptor)
                         ),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         fun provideOrganizationsUseCase(): OrganizationsUseCase =
                 OrganizationsUseCaseImpl(
                         OrganizationsRepositoryImpl(
                                 NetworkServiceImpl()
                         ),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         @Throws(VCLError::class)
@@ -219,7 +219,7 @@ internal object VclBlocksProvider {
                                 chooseJwtVerifyService(cryptoServicesDescriptor)
                         ),
                         CredentialManifestByDeepLinkVerifierImpl(),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         @Throws(VCLError::class)
@@ -235,15 +235,15 @@ internal object VclBlocksProvider {
                                 chooseJwtSignService(context, cryptoServicesDescriptor),
                                 chooseJwtVerifyService(cryptoServicesDescriptor)
                         ),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         fun provideExchangeProgressUseCase(): ExchangeProgressUseCase =
                 ExchangeProgressUseCaseImpl(
                         ExchangeProgressRepositoryImpl(
                                 NetworkServiceImpl()
                         ),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         fun provideGenerateOffersUseCase(): GenerateOffersUseCase =
@@ -252,7 +252,7 @@ internal object VclBlocksProvider {
                                 NetworkServiceImpl()
                         ),
                         OffersByDeepLinkVerifierImpl(),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         @Throws(VCLError::class)
@@ -281,7 +281,7 @@ internal object VclBlocksProvider {
                         credentialIssuerVerifier,
                         CredentialDidVerifierImpl(),
                         CredentialsByDeepLinkVerifierImpl(),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
         }
 
@@ -290,15 +290,15 @@ internal object VclBlocksProvider {
                         CredentialTypesUIFormSchemaRepositoryImpl(
                                 NetworkServiceImpl()
                         ),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         fun provideVerifiedProfileUseCase(): VerifiedProfileUseCase =
                 VerifiedProfileUseCaseImpl(
                         VerifiedProfileRepositoryImpl(
                                 NetworkServiceImpl()
                         ),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         @Throws(VCLError::class)
@@ -311,7 +311,7 @@ internal object VclBlocksProvider {
                                 chooseJwtSignService(context, cryptoServicesDescriptor),
                                 chooseJwtVerifyService(cryptoServicesDescriptor)
                         ),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 
         @Throws(VCLError::class)
@@ -323,6 +323,6 @@ internal object VclBlocksProvider {
                         KeyServiceRepositoryImpl(
                                 chooseKeyService(context, cryptoServicesDescriptor)
                         ),
-                        ExecutorImpl()
+                        ExecutorImpl.instance
                 )
 }
diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/data/infrastructure/executors/ExecutorImpl.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/data/infrastructure/executors/ExecutorImpl.kt
@@ -13,9 +13,8 @@ import io.velocitycareerlabs.impl.domain.infrastructure.executors.Executor
 import io.velocitycareerlabs.impl.utils.VCLLog
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
 
-internal class ExecutorImpl : Executor {
+internal class ExecutorImpl private constructor() : Executor {
 
     private val TAG = ExecutorImpl::class.simpleName
 
@@ -43,15 +42,7 @@ internal class ExecutorImpl : Executor {
         }
     }
 
-    override fun shutdown() {
-        executorService.shutdown()
-        try {
-            if (!executorService.awaitTermination(60 * 3, TimeUnit.SECONDS)) {
-                executorService.shutdownNow() // Force shutdown if not completed within 3 minutes
-            }
-        } catch (e: InterruptedException) {
-            executorService.shutdownNow() // Force shutdown on interruption
-            Thread.currentThread().interrupt()
-        }
+    companion object {
+        val instance: ExecutorImpl by lazy { ExecutorImpl() }
     }
 }
diff --git a/...rc/main/java/io/velocitycareerlabs/impl/data/usecases/CredentialTypeSchemasUseCaseImpl.kt b/...rc/main/java/io/velocitycareerlabs/impl/data/usecases/CredentialTypeSchemasUseCaseImpl.kt
@@ -12,6 +12,8 @@ import io.velocitycareerlabs.impl.domain.infrastructure.executors.Executor
 import io.velocitycareerlabs.impl.domain.repositories.CredentialTypeSchemaRepository
 import io.velocitycareerlabs.impl.domain.usecases.CredentialTypeSchemasUseCase
 import io.velocitycareerlabs.impl.utils.VCLLog
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.ConcurrentHashMap
 
 internal class CredentialTypeSchemasUseCaseImpl (
     private val credentialTypeSchemaRepository: CredentialTypeSchemaRepository,
@@ -25,34 +27,38 @@ internal class CredentialTypeSchemasUseCaseImpl (
         cacheSequence: Int,
         completionBlock: (VCLResult<VCLCredentialTypeSchemas>) -> Unit
     ) {
-        val credentialTypeSchemasMap = HashMap<String, VCLCredentialTypeSchema>()
-        var credentialTypeSchemasMapIsEmpty = true
-
-        val schemaNamesArr =
-            this.credentialTypes.all?.filter { it.schemaName != null }?.map { it.schemaName }
-                ?: listOf()
-
-        schemaNamesArr.forEach { schemaName ->
-            schemaName?.let {
-                executor.runOnBackground {
-                    credentialTypeSchemaRepository.getCredentialTypeSchema(
-                        schemaName,
-                        cacheSequence
-                    ) { result ->
-                        result.data?.let { credentialTypeSchemasMap[schemaName] = it }
-                        credentialTypeSchemasMapIsEmpty =
-                            credentialTypeSchemasMap.isEmpty() // like in Swift
+        executor.runOnBackground {
+            val credentialTypeSchemasMap = ConcurrentHashMap<String, VCLCredentialTypeSchema>()
+
+            val schemaNamesArr =
+                credentialTypes.all?.filter { it.schemaName != null }?.map { it.schemaName }
+                    ?: listOf()
+
+            val completableFutures = schemaNamesArr.mapNotNull { schemaName ->
+                schemaName?.let {
+                    CompletableFuture.supplyAsync {
+                        credentialTypeSchemaRepository.getCredentialTypeSchema(
+                            schemaName,
+                            cacheSequence
+                        ) { result ->
+                            result.data?.let { credentialTypeSchemasMap[schemaName] = it }
+                        }
                     }
                 }
             }
-        }
-        executor.shutdown()
 
-        if (credentialTypeSchemasMapIsEmpty) {
-            VCLLog.e(TAG, "Credential type schemas were not fount.")
-        }
-        executor.runOnMain {
-            completionBlock(VCLResult.Success(VCLCredentialTypeSchemas(credentialTypeSchemasMap)))
+            val allFutures = CompletableFuture.allOf(*completableFutures.toTypedArray())
+            allFutures.join()
+
+            if (credentialTypeSchemasMap.isEmpty()) {
+                VCLLog.e(TAG, "Credential type schemas were not fount.")
+            } else {
+                executor.runOnMain {
+                    completionBlock(VCLResult.Success(
+                        VCLCredentialTypeSchemas(credentialTypeSchemasMap)
+                    ))
+                }
+            }
         }
     }
-}
+}
diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/domain/infrastructure/executors/Executor.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/domain/infrastructure/executors/Executor.kt
@@ -10,5 +10,4 @@ package io.velocitycareerlabs.impl.domain.infrastructure.executors
 internal interface Executor {
     fun runOnMain(block: () -> Unit)
     fun runOnBackground(block: () -> Unit)
-    fun shutdown()
 }
diff --git a/VCL/src/test/java/io/velocitycareerlabs/infrastructure/resources/EmptyExecutor.kt b/VCL/src/test/java/io/velocitycareerlabs/infrastructure/resources/EmptyExecutor.kt
@@ -17,7 +17,4 @@ internal class EmptyExecutor: Executor {
     override fun runOnBackground(block: () -> Unit) {
         block()
     }
-
-    override fun shutdown() {
-    }
 }
diff --git a/VCL/src/test/java/io/velocitycareerlabs/usecases/CountriesUseCaseTest.kt b/VCL/src/test/java/io/velocitycareerlabs/usecases/CountriesUseCaseTest.kt
@@ -40,7 +40,7 @@ class CountriesUseCaseTest {
                 ),
                 EmptyCacheService()
             ),
-            ExecutorImpl()
+            ExecutorImpl.instance
         )
 
         subject.getCountries(0) {

diff --git a/VCL/src/test/java/io/velocitycareerlabs/verifiers/ProfileServiceTypeVerifierTest.kt b/VCL/src/test/java/io/velocitycareerlabs/verifiers/ProfileServiceTypeVerifierTest.kt
@@ -35,47 +35,47 @@ class ProfileServiceTypeVerifierTest {
                 VerifiedProfileRepositoryImpl(
                     NetworkServiceSuccess(VerifiedProfileMocks.VerifiedProfileIssuerInspectorJsonStr)
                 ),
-                ExecutorImpl()
+                ExecutorImpl.instance
             )
         )
         subject2 = ProfileServiceTypeVerifier(
             VerifiedProfileUseCaseImpl(
                 VerifiedProfileRepositoryImpl(
                     NetworkServiceSuccess(VerifiedProfileMocks.VerifiedProfileInspectorJsonStr)
                 ),
-                ExecutorImpl()
+                ExecutorImpl.instance
             )
         )
         subject3 = ProfileServiceTypeVerifier(
             VerifiedProfileUseCaseImpl(
                 VerifiedProfileRepositoryImpl(
                     NetworkServiceSuccess(VerifiedProfileMocks.VerifiedProfileNotaryIssuerJsonStr)
                 ),
-                ExecutorImpl()
+                ExecutorImpl.instance
             )
         )
         subject4 = ProfileServiceTypeVerifier(
             VerifiedProfileUseCaseImpl(
                 VerifiedProfileRepositoryImpl(
                     NetworkServiceSuccess(VerifiedProfileMocks.VerifiedProfileNotaryIssuerJsonStr)
                 ),
-                ExecutorImpl()
+                ExecutorImpl.instance
             )
         )
         subject5 = ProfileServiceTypeVerifier(
             VerifiedProfileUseCaseImpl(
                 VerifiedProfileRepositoryImpl(
                     NetworkServiceSuccess(VerifiedProfileMocks.VerifiedProfileIssuerJsonStr1)
                 ),
-                ExecutorImpl()
+                ExecutorImpl.instance
             )
         )
         subject6 = ProfileServiceTypeVerifier(
             VerifiedProfileUseCaseImpl(
                 VerifiedProfileRepositoryImpl(
                     NetworkServiceSuccess(VerifiedProfileMocks.VerifiedProfileIssuerInspectorJsonStr)
                 ),
-                ExecutorImpl()
+                ExecutorImpl.instance
             )
         )
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,4 @@ internal class EmptyExecutor: Executor { @@
         override fun runOnBackground(block: () -> Unit) {
             block()
         }
-        override fun shutdown() {
-        }
     }