Merge branch 'develop' into release-1.2.0.1

Signed-off-by: JanardhanBS-SyncByte <[email protected]>
mosip · Mar 19, 2024 · 817db7c · 817db7c
2 parents c87fb90 + 4860f05
commit 817db7c
Show file tree

Hide file tree

Showing 16 changed files with 182 additions and 182 deletions.
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -123,7 +123,7 @@ jobs:
     secrets:
       OSSRH_USER: ${{ secrets.OSSRH_USER }}
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
-      OSSRH_URL: ${{ secrets.RELEASE_URL }}
+      OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

diff --git a/MockMDS/application.properties b/MockMDS/application.properties
@@ -5,7 +5,7 @@ cors.headers.allowed.methods="OPTIONS, RCAPTURE, CAPTURE, MOSIPDINFO, MOSIPDISC,
 cors.headers.allowed.origin="*"
 
 mosip.mock.sbi.allowed.admin.apis="admin/score, admin/delay, admin/status, admin/profile"
-mosip.mock.sbi.quality.score=44
+mosip.mock.sbi.quality.score=44.00
 
 mosip.mock.sbi.device.purpose.registration=Registration
 mosip.mock.sbi.device.purpose.auth=Auth

diff --git a/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/SBICaptureInfo.java b/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/SBICaptureInfo.java
@@ -11,7 +11,7 @@ public abstract class SBICaptureInfo {
     private SBIBioExceptionInfo bioExceptionInfo = null;
     public abstract void initCaptureInfo ();
 	public abstract void deInitCaptureInfo ();
-	private int requestScore;
+	private float requestScore;
 	private String[] bioSubType;
 	private int bioCount; //Finger (10)/Iris count(2), in case of face max is set to 1
     private HashMap<String, String> biometricData = new HashMap<> ();
@@ -62,10 +62,10 @@ public SBIBioExceptionInfo getBioExceptionInfo() {
 	public void setBioExceptionInfo(SBIBioExceptionInfo bioExceptionInfo) {
 		this.bioExceptionInfo = bioExceptionInfo;
 	}
-	public int getRequestScore() {
+	public float getRequestScore() {
 		return requestScore;
 	}
-	public void setRequestScore(int requestScore) {
+	public void setRequestScore(float requestScore) {
 		this.requestScore = requestScore;
 	}
 	public String[] getBioSubType() {

diff --git a/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/SBIDeviceHelper.java b/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/SBIDeviceHelper.java
@@ -53,7 +53,7 @@ public abstract class SBIDeviceHelper {
 	private DeviceInfoDto deviceInfoDto;
     private HashMap<String, String> statusMap = new HashMap<> ();
     private HashMap<String, Long> delayMap = new HashMap<> ();
-    protected int qualityScore;
+    protected float qualityScore;
     protected boolean isQualityScoreSet;
     private boolean scoreFromIso = false;
     private SBICaptureInfo captureInfo;
@@ -761,14 +761,14 @@ public void setDeviceSubId(int deviceSubId) {
 		this.deviceSubId = deviceSubId;
 	}
 
-	public int getQualityScore() {
-		if (this.qualityScore <= 0 || this.qualityScore > 100)
-			this.qualityScore = Integer.parseInt(ApplicationPropertyHelper.getPropertyKeyValue(SBIConstant.MOSIP_MOCK_SBI_QUALITY_SCORE));
+	public float getQualityScore() {
+		if (this.qualityScore <= 0.0f || this.qualityScore > 100.0f)
+			this.qualityScore = Float.parseFloat(ApplicationPropertyHelper.getPropertyKeyValue(SBIConstant.MOSIP_MOCK_SBI_QUALITY_SCORE));
 
         return this.qualityScore;
 	}
 
-	public void setQualityScore(int qualityScore) {
+	public void setQualityScore(float qualityScore) {
         this.qualityScore = qualityScore;
 	}
 

diff --git a/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/face/SBIFaceCaptureInfo.java b/MockMDS/src/main/java/io/mosip/mock/sbi/devicehelper/face/SBIFaceCaptureInfo.java
@@ -10,8 +10,8 @@ public class SBIFaceCaptureInfo extends SBICaptureInfo {
 
 	private String bioValueFace;
 	private String bioSubTypeFace;
-	private int requestScoreFace;
-	private int captureScoreFace;
+	private float requestScoreFace;
+	private float captureScoreFace;
 	private boolean isCaptureFace;
 
 	private String bioValueExceptionPhoto;
@@ -61,19 +61,19 @@ public void setBioSubTypeFace(String bioSubTypeFace) {
 		this.bioSubTypeFace = bioSubTypeFace;
 	}
 
-	public int getRequestScoreFace() {
+	public float getRequestScoreFace() {
 		return requestScoreFace;
 	}
 
-	public void setRequestScoreFace(int requestScoreFace) {
+	public void setRequestScoreFace(float requestScoreFace) {
 		this.requestScoreFace = requestScoreFace;
 	}
 
-	public int getCaptureScoreFace() {
+	public float getCaptureScoreFace() {
 		return captureScoreFace;
 	}
 
-	public void setCaptureScoreFace(int captureScoreFace) {
+	public void setCaptureScoreFace(float captureScoreFace) {
 		this.captureScoreFace = captureScoreFace;
 	}