Small fixes

configcat · Oct 7, 2018 · 5baeb56 · 5baeb56
1 parent f5b3a50
commit 5baeb56
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=1.2.3
+version=1.2.4
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/main/java/com/configcat/RolloutEvaluator.java b/src/main/java/com/configcat/RolloutEvaluator.java
@@ -64,7 +64,7 @@ public JsonElement evaluate(JsonObject json, String key, User user) {
             for (JsonElement rule: percentageRules) {
                 JsonObject ruleObject = rule.getAsJsonObject();
 
-                bucket += ruleObject.get("Percentage").getAsFloat();
+                bucket += ruleObject.get("Percentage").getAsInt();
                 if(scaled < bucket)
                     return ruleObject.get("Value");
             }

diff --git a/src/main/java/com/configcat/User.java b/src/main/java/com/configcat/User.java
@@ -18,8 +18,12 @@ private User(String identifier, String email, String country,  Map<String, Strin
         this.identifier = identifier;
         this.attributes = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         this.attributes.put("identifier", identifier);
-        this.attributes.put("country", country);
-        this.attributes.put("email", email);
+
+        if(country != null && !country.isEmpty())
+            this.attributes.put("country", country);
+
+        if(email != null && !email.isEmpty())
+            this.attributes.put("email", email);
 
         if(custom != null)
             this.attributes.putAll(custom);

diff --git a/src/test/.DS_Store b/src/test/.DS_Store