From 88484c17249e38d5b9b1fc1d92d73a5fc6508cbf Mon Sep 17 00:00:00 2001 From: Sergejs Luhmirins Date: Wed, 3 Dec 2025 11:07:40 +0200 Subject: [PATCH] MS-1269 Fully enable SimFace in all builds --- face/infra/bio-sdk-resolver/build.gradle.kts | 4 +-- .../ResolveSimFaceVersionUseCase.kt | 4 --- .../infra/biosdkresolver/SimFaceBioSdk.kt | 0 .../ResolveSimFaceVersionUseCase.kt | 15 ---------- .../infra/biosdkresolver/SimFaceBioSdk.kt | 30 ------------------- .../ResolveSimFaceVersionUseCase.kt | 15 ---------- .../infra/biosdkresolver/SimFaceBioSdk.kt | 29 ------------------ 7 files changed, 1 insertion(+), 96 deletions(-) rename face/infra/bio-sdk-resolver/src/{debug => main}/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt (60%) rename face/infra/bio-sdk-resolver/src/{debug => main}/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt (100%) delete mode 100644 face/infra/bio-sdk-resolver/src/release/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt delete mode 100644 face/infra/bio-sdk-resolver/src/release/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt delete mode 100644 face/infra/bio-sdk-resolver/src/staging/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt delete mode 100644 face/infra/bio-sdk-resolver/src/staging/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt diff --git a/face/infra/bio-sdk-resolver/build.gradle.kts b/face/infra/bio-sdk-resolver/build.gradle.kts index a9e28bf05f..55f0b9b37f 100644 --- a/face/infra/bio-sdk-resolver/build.gradle.kts +++ b/face/infra/bio-sdk-resolver/build.gradle.kts @@ -10,7 +10,5 @@ dependencies { implementation(project(":face:infra:base-bio-sdk")) implementation(project(":face:infra:roc-v1")) api(project(":face:infra:roc-v3")) - - stagingImplementation(project(":face:infra:simface")) - debugImplementation(project(":face:infra:simface")) + implementation(project(":face:infra:simface")) } diff --git a/face/infra/bio-sdk-resolver/src/debug/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt b/face/infra/bio-sdk-resolver/src/main/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt similarity index 60% rename from face/infra/bio-sdk-resolver/src/debug/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt rename to face/infra/bio-sdk-resolver/src/main/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt index 73720ad762..2ebd258142 100644 --- a/face/infra/bio-sdk-resolver/src/debug/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt +++ b/face/infra/bio-sdk-resolver/src/main/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt @@ -2,10 +2,6 @@ package com.simprints.face.infra.biosdkresolver import javax.inject.Inject -/** - * At the moment this is just a wrapper to make it simpler to stub it in different source sets. - * In future we could actually need custom resolution logic. - */ internal class ResolveSimFaceVersionUseCase @Inject constructor( private val simFaceBioSdk: SimFaceBioSdk, ) { diff --git a/face/infra/bio-sdk-resolver/src/debug/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt b/face/infra/bio-sdk-resolver/src/main/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt similarity index 100% rename from face/infra/bio-sdk-resolver/src/debug/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt rename to face/infra/bio-sdk-resolver/src/main/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt diff --git a/face/infra/bio-sdk-resolver/src/release/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt b/face/infra/bio-sdk-resolver/src/release/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt deleted file mode 100644 index 1fa2bdaf54..0000000000 --- a/face/infra/bio-sdk-resolver/src/release/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.simprints.face.infra.biosdkresolver - -import com.simprints.core.ExcludedFromGeneratedTestCoverageReports -import javax.inject.Inject - -/** - * Class interfaces in the different build types must be identical for it to work, - * therefore we have to stub the whole class for now. - */ -@ExcludedFromGeneratedTestCoverageReports("Stubs for build types") -internal class ResolveSimFaceVersionUseCase @Inject constructor( - private val simFaceBioSdk: SimFaceBioSdk, -) { - operator fun invoke(): FaceBioSDK = TODO("SimFace is not available in release build") -} diff --git a/face/infra/bio-sdk-resolver/src/release/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt b/face/infra/bio-sdk-resolver/src/release/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt deleted file mode 100644 index bdec404d40..0000000000 --- a/face/infra/bio-sdk-resolver/src/release/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.simprints.face.infra.biosdkresolver - -import com.simprints.core.ExcludedFromGeneratedTestCoverageReports -import com.simprints.core.domain.sample.CaptureSample -import com.simprints.face.infra.basebiosdk.detection.FaceDetector -import com.simprints.face.infra.basebiosdk.initialization.FaceBioSdkInitializer -import com.simprints.face.infra.basebiosdk.matching.FaceMatcher -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Class interfaces in the different build types must be identical for it to work, - * therefore we have to stub the whole class for now. - */ -@ExcludedFromGeneratedTestCoverageReports("Stubs for build types") -@Singleton -class SimFaceBioSdk @Inject constructor() : FaceBioSDK { - override val initializer: FaceBioSdkInitializer - get() = TODO() - override val detector: FaceDetector - get() = TODO() - - override fun version(): String = TODO() - - override fun templateFormat(): String = TODO() - - override fun matcherName(): String = TODO() - - override fun createMatcher(probeSamples: List): FaceMatcher = TODO() -} diff --git a/face/infra/bio-sdk-resolver/src/staging/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt b/face/infra/bio-sdk-resolver/src/staging/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt deleted file mode 100644 index e376145fc8..0000000000 --- a/face/infra/bio-sdk-resolver/src/staging/java/com/simprints/face/infra/biosdkresolver/ResolveSimFaceVersionUseCase.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.simprints.face.infra.biosdkresolver - -import com.simprints.core.ExcludedFromGeneratedTestCoverageReports -import javax.inject.Inject - -/** - * Class interfaces in the different build types must be identical for it to work, - * therefore we have to stub the whole class for now. - */ -@ExcludedFromGeneratedTestCoverageReports("Stubs for build types") -internal class ResolveSimFaceVersionUseCase @Inject constructor( - private val simFaceBioSdk: SimFaceBioSdk, -) { - operator fun invoke(): FaceBioSDK = simFaceBioSdk -} diff --git a/face/infra/bio-sdk-resolver/src/staging/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt b/face/infra/bio-sdk-resolver/src/staging/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt deleted file mode 100644 index a792f85449..0000000000 --- a/face/infra/bio-sdk-resolver/src/staging/java/com/simprints/face/infra/biosdkresolver/SimFaceBioSdk.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.simprints.face.infra.biosdkresolver - -import com.simprints.biometrics.simface.SimFace -import com.simprints.core.domain.sample.CaptureSample -import com.simprints.face.infra.basebiosdk.matching.FaceMatcher -import com.simprints.face.infra.simface.detection.SimFaceDetector -import com.simprints.face.infra.simface.initialization.SimFaceInitializer -import com.simprints.face.infra.simface.matching.SimFaceMatcher -import javax.inject.Inject -import javax.inject.Singleton - -/** - * Class interfaces in the different build types must be identical for it to work, - * therefore we have to stub the whole class for now. - */ -@Singleton -class SimFaceBioSdk @Inject constructor( - override val initializer: SimFaceInitializer, - override val detector: SimFaceDetector, - private val simFace: SimFace, -) : FaceBioSDK { - override fun version(): String = "1" - - override fun templateFormat(): String = simFace.getTemplateVersion() - - override fun matcherName(): String = "SIM_FACE" - - override fun createMatcher(probeSamples: List): FaceMatcher = SimFaceMatcher(simFace, probeSamples) -}