Merge pull request #18 from MobileID-Strong-Authentication/develop

Geofencing custom policy property types switch to String - for release 1.5.6

Author: thomas4v

mid-java-client-core/src/main/java/ch/swisscom/mid/client/model/GeofencingAdditionalService.java

@@ -19,7 +19,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Specific class to use when requesting the Geofencing additional service to Mobile ID. Please also see the
@@ -34,10 +33,10 @@ public GeofencingAdditionalService() {
 
     private List<String> countryWhiteList = new ArrayList<>();
     private List<String> countryBlackList = new ArrayList<>();
-    private float minDeviceConfidence;
-    private float minLocationConfidence;
-    private int maxTimestampMinutes;
-    private int maxAccuracyMeters;
+    private String minDeviceConfidence;
+    private String minLocationConfidence;
+    private String maxTimestampMinutes;
+    private String maxAccuracyMeters;
 
     public List<String> getCountryWhiteList() {
         return countryWhiteList;
@@ -55,46 +54,46 @@ public void setCountryBlackList(List<String> countryBlackList) {
         this.countryBlackList = countryBlackList;
     }
 
-    public float getMinDeviceConfidence() {
+    public String getMinDeviceConfidence() {
         return minDeviceConfidence;
     }
 
-    public void setMinDeviceConfidence(float minDeviceConfidence) {
+    public void setMinDeviceConfidence(String minDeviceConfidence) {
         this.minDeviceConfidence = minDeviceConfidence;
     }
 
-    public float getMinLocationConfidence() {
+    public String getMinLocationConfidence() {
         return minLocationConfidence;
     }
 
-    public void setMinLocationConfidence(float minLocationConfidence) {
+    public void setMinLocationConfidence(String minLocationConfidence) {
         this.minLocationConfidence = minLocationConfidence;
     }
 
-    public int getMaxTimestampMinutes() {
+    public String getMaxTimestampMinutes() {
         return maxTimestampMinutes;
     }
 
-    public void setMaxTimestampMinutes(int maxTimestampMinutes) {
+    public void setMaxTimestampMinutes(String maxTimestampMinutes) {
         this.maxTimestampMinutes = maxTimestampMinutes;
     }
 
-    public int getMaxAccuracyMeters() {
+    public String getMaxAccuracyMeters() {
         return maxAccuracyMeters;
     }
 
-    public void setMaxAccuracyMeters(int maxAccuracyMeters) {
+    public void setMaxAccuracyMeters(String maxAccuracyMeters) {
         this.maxAccuracyMeters = maxAccuracyMeters;
     }
 
 
     public boolean isDefined() {
         if(countryWhiteList!=null && !countryBlackList.isEmpty()) return true;
         if(countryBlackList!=null && !countryBlackList.isEmpty()) return true;
-        if(maxAccuracyMeters!=0) return true;
-        if(maxTimestampMinutes!=0) return true;
-        if(minDeviceConfidence>0) return true;
-        if(minLocationConfidence>0) return true;
+        if (minDeviceConfidence != null && !minDeviceConfidence.isEmpty() && !minDeviceConfidence.equalsIgnoreCase("0")) return true;
+        if (minLocationConfidence != null && !minLocationConfidence.isEmpty() && !minLocationConfidence.equalsIgnoreCase("0")) return true;
+        if (maxAccuracyMeters != null && !maxAccuracyMeters.isEmpty()) return true;
+        if (maxTimestampMinutes != null && !maxTimestampMinutes.isEmpty()) return true;
         return false;
     }
 }

mid-java-client-rest/src/main/java/ch/swisscom/mid/client/rest/model/signreq/AdditionalServiceGeofencing.java

@@ -8,7 +8,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
     "Description",
-    "GeoFeancingRequest"
+    "GeoFencingRequest"
 
 })
 public class AdditionalServiceGeofencing extends AdditionalService {

mid-java-client-rest/src/main/java/ch/swisscom/mid/client/rest/model/signreq/GeoFencingRequest.java

@@ -27,11 +27,11 @@ public class GeoFencingRequest {
     @JsonProperty("countryblacklist")
     private List<String> countryBlackList;
     @JsonProperty("mindeviceconfidence")
-    private float minDeviceConfidence;
+    private String minDeviceConfidence;
     @JsonProperty("minlocationconfidence")
-    private float minLocationConfidence;
+    private String minLocationConfidence;
     @JsonProperty("maxtimestampminutes")
-    private int maxTimestampMinutes;
+    private String maxTimestampMinutes;
     @JsonProperty("maxaccuracymeters")
-    private int maxAccuracyMeters;
+    private String maxAccuracyMeters;
 }