V6 improvements (#45)

* Rename SettingsValue to SettingValue

* Hashed Start/Ends with length trim fixed

* userAttributeToString Float fix

* Added missing exception throw to getKeyAndValue

* Prerequisite Flag result type and value checks added. Fix SettingValue type equals

* Fix typo

* Update version to 9.1.0

* Syntax update in docs

* Added extra test cases

* Typo fix

Author: novalisdenahi

gradle.properties

@@ -1 +1 @@
-version=9.0.1
+version=9.1.0

src/main/java/com/configcat/ConfigCatClient.java

@@ -191,7 +191,7 @@ public CompletableFuture<Map<String, Object>> getAllValuesAsync(User user) {
                         for (String key : keys) {
                             Setting setting = settings.get(key);
 
-                            SettingsValue evaluated = this.rolloutEvaluator.evaluate(setting, key, getEvaluateUser(user), settings, new EvaluateLogger(this.clientLogLevel)).value;
+                            SettingValue evaluated = this.rolloutEvaluator.evaluate(setting, key, getEvaluateUser(user), settings, new EvaluateLogger(this.clientLogLevel)).value;
                             Object value = this.parseObject(this.classBySettingType(setting.getType()), evaluated, setting.getType());
                             result.put(key, value);
                         }
@@ -528,6 +528,8 @@ private <T> Map.Entry<String, T> getKeyAndValueFromSettingsMap(Class<T> classOfT
                                 return new AbstractMap.SimpleEntry<>(settingKey, (T) this.parseObject(classOfT, percentageRule.getValue(), setting.getType()));
                             }
                         }
+                    } else {
+                        throw new UnsupportedOperationException("Targeting rule THEN part is missing or invalid.");
                     }
                 }
 
@@ -546,16 +548,16 @@ private <T> Map.Entry<String, T> getKeyAndValueFromSettingsMap(Class<T> classOfT
         }
     }
 
-    private Object parseObject(Class<?> classOfT, SettingsValue settingsValue, SettingType settingType) {
+    private Object parseObject(Class<?> classOfT, SettingValue settingValue, SettingType settingType) {
         validateReturnType(classOfT);
-        if ((classOfT == String.class) && settingsValue.getStringValue() != null && SettingType.STRING.equals(settingType)) {
-            return settingsValue.getStringValue();
-        } else if ((classOfT == Integer.class || classOfT == int.class) && settingsValue.getIntegerValue() != null && SettingType.INT.equals(settingType)) {
-            return settingsValue.getIntegerValue();
-        } else if ((classOfT == Double.class || classOfT == double.class) && settingsValue.getDoubleValue() != null && SettingType.DOUBLE.equals(settingType)) {
-            return settingsValue.getDoubleValue();
-        } else if ((classOfT == Boolean.class || classOfT == boolean.class) && settingsValue.getBooleanValue() != null && SettingType.BOOLEAN.equals(settingType)) {
-            return settingsValue.getBooleanValue();
+        if ((classOfT == String.class) && settingValue.getStringValue() != null && SettingType.STRING.equals(settingType)) {
+            return settingValue.getStringValue();
+        } else if ((classOfT == Integer.class || classOfT == int.class) && settingValue.getIntegerValue() != null && SettingType.INT.equals(settingType)) {
+            return settingValue.getIntegerValue();
+        } else if ((classOfT == Double.class || classOfT == double.class) && settingValue.getDoubleValue() != null && SettingType.DOUBLE.equals(settingType)) {
+            return settingValue.getDoubleValue();
+        } else if ((classOfT == Boolean.class || classOfT == boolean.class) && settingValue.getBooleanValue() != null && SettingType.BOOLEAN.equals(settingType)) {
+            return settingValue.getBooleanValue();
         }
         throw new IllegalArgumentException("The type of a setting must match the type of the specified default value. "
                 + "Setting's type was {" + settingType + "} but the default value's type was {" + classOfT + "}. "

src/main/java/com/configcat/Constants.java

@@ -7,7 +7,7 @@ private Constants() { /* prevent from instantiation*/ }
     static final long DISTANT_PAST = 0;
     static final String CONFIG_JSON_NAME = "config_v6.json";
     static final String SERIALIZATION_FORMAT_VERSION = "v2";
-    static final String VERSION = "9.0.1";
+    static final String VERSION = "9.1.0";
 
     static final String SDK_KEY_PROXY_PREFIX = "configcat-proxy/";
     static final String SDK_KEY_PREFIX = "configcat-sdk-1";

src/main/java/com/configcat/EvaluateLogger.java

@@ -177,11 +177,11 @@ public void logTargetingRuleConsequence(TargetingRule targetingRule, String erro
         decreaseIndentLevel();
     }
 
-    public void logPercentageEvaluationReturnValue(int hashValue, int i, int percentage, SettingsValue settingsValue) {
+    public void logPercentageEvaluationReturnValue(int hashValue, int i, int percentage, SettingValue settingValue) {
         if (!isLoggable) {
             return;
         }
-        String percentageOptionValue = settingsValue != null ? settingsValue.toString() : INVALID_VALUE;
+        String percentageOptionValue = settingValue != null ? settingValue.toString() : INVALID_VALUE;
         newLine();
         append("- Hash value " + hashValue + " selects % option " + (i + 1) + " (" + percentage + "%), '" + percentageOptionValue + "'.");
     }
@@ -236,7 +236,7 @@ public void logPrerequisiteFlagEvaluationStart(String prerequisiteFlagKey) {
         append("Evaluating prerequisite flag '" + prerequisiteFlagKey + "':");
     }
 
-    public void logPrerequisiteFlagEvaluationResult(PrerequisiteFlagCondition prerequisiteFlagCondition, SettingsValue prerequisiteFlagValue, boolean result) {
+    public void logPrerequisiteFlagEvaluationResult(PrerequisiteFlagCondition prerequisiteFlagCondition, SettingValue prerequisiteFlagValue, boolean result) {
         if (!isLoggable) {
             return;
         }
@@ -385,7 +385,7 @@ public static String formatPrerequisiteFlagCondition(PrerequisiteFlagCondition p
         if (prerequisiteComparator == null) {
             throw new IllegalArgumentException("Prerequisite Flag comparison operator is invalid.");
         }
-        SettingsValue prerequisiteValue = prerequisiteFlagCondition.getValue();
+        SettingValue prerequisiteValue = prerequisiteFlagCondition.getValue();
         String comparisonValue = prerequisiteValue == null ? INVALID_VALUE : prerequisiteValue.toString();
         return "Flag '" + prerequisiteFlagKey + "' " + prerequisiteComparator.getName() + " '" + comparisonValue + "'";
     }

src/main/java/com/configcat/EvaluationResult.java

@@ -1,12 +1,12 @@
 package com.configcat;
 
 class EvaluationResult {
-    public final SettingsValue value;
+    public final SettingValue value;
     public final String variationId;
     public final TargetingRule matchedTargetingRule;
     public final PercentageOption matchedPercentageOption;
 
-    EvaluationResult(SettingsValue value, String variationId, TargetingRule matchedTargetingRule, PercentageOption matchedPercentageOption) {
+    EvaluationResult(SettingValue value, String variationId, TargetingRule matchedTargetingRule, PercentageOption matchedPercentageOption) {
         this.value = value;
         this.variationId = variationId;
         this.matchedTargetingRule = matchedTargetingRule;

src/main/java/com/configcat/LocalFileDataSource.java

@@ -84,32 +84,32 @@ private void reloadFileContent() {
 
     private Setting convertJsonToSettingsValue(JsonElement jsonElement) {
         Setting setting = new Setting();
-        SettingsValue settingsValue = new SettingsValue();
+        SettingValue settingValue = new SettingValue();
         SettingType settingType;
         if (!jsonElement.isJsonPrimitive()) {
             throw new IllegalArgumentException("Invalid Config Json content: " + jsonElement);
         }
         JsonPrimitive primitive = jsonElement.getAsJsonPrimitive();
         if (primitive.isBoolean()) {
-            settingsValue.setBooleanValue(primitive.getAsBoolean());
+            settingValue.setBooleanValue(primitive.getAsBoolean());
             settingType = SettingType.BOOLEAN;
         } else if (primitive.isString()) {
-            settingsValue.setStringValue(primitive.getAsString());
+            settingValue.setStringValue(primitive.getAsString());
             settingType = SettingType.STRING;
         } else {
             // primitive should be a number, try to cast int to see its not a double
             String numberAsSting = primitive.getAsString();
             try {
-                settingsValue.setIntegerValue(Integer.parseInt(numberAsSting));
+                settingValue.setIntegerValue(Integer.parseInt(numberAsSting));
                 settingType = SettingType.INT;
             } catch (NumberFormatException e) {
                 // if int parse failed try double parse
-                settingsValue.setDoubleValue(Double.parseDouble(numberAsSting));
+                settingValue.setDoubleValue(Double.parseDouble(numberAsSting));
                 settingType = SettingType.DOUBLE;
             }
         }
 
-        setting.setSettingsValue(settingsValue);
+        setting.setSettingsValue(settingValue);
         setting.setType(settingType);
         return setting;
     }

src/main/java/com/configcat/LocalMapDataSource.java

@@ -23,23 +23,23 @@ public Map<String, Setting> getLocalConfiguration() {
 
     private Setting convertToSetting(Object object) {
         Setting setting = new Setting();
-        SettingsValue settingsValue = new SettingsValue();
+        SettingValue settingValue = new SettingValue();
         if (object instanceof String) {
             setting.setType(SettingType.STRING);
-            settingsValue.setStringValue((String) object);
+            settingValue.setStringValue((String) object);
         } else if (object instanceof Boolean) {
             setting.setType(SettingType.BOOLEAN);
-            settingsValue.setBooleanValue((Boolean) object);
+            settingValue.setBooleanValue((Boolean) object);
         } else if (object instanceof Integer) {
             setting.setType(SettingType.INT);
-            settingsValue.setIntegerValue((Integer) object);
+            settingValue.setIntegerValue((Integer) object);
         } else if (object instanceof Double) {
             setting.setType(SettingType.DOUBLE);
-            settingsValue.setDoubleValue((Double) object);
+            settingValue.setDoubleValue((Double) object);
         } else {
             throw new IllegalArgumentException("Only String, Integer, Double or Boolean types are supported.");
         }
-        setting.setSettingsValue(settingsValue);
+        setting.setSettingsValue(settingValue);
         return setting;
     }
 }

src/main/java/com/configcat/PercentageOption.java

@@ -10,7 +10,7 @@ public class PercentageOption {
     @SerializedName(value = "p")
     private int percentage;
     @SerializedName(value = "v")
-    private SettingsValue value;
+    private SettingValue value;
     @SerializedName(value = "i")
     private String variationId;
 
@@ -25,7 +25,7 @@ public int getPercentage() {
      * The value associated with the percentage option.
      * Can be a value of the following types: {@link Boolean}, {@link String}, {@link Integer} or {@link Double}.
      */
-    public SettingsValue getValue() {
+    public SettingValue getValue() {
         return value;
     }
 

src/main/java/com/configcat/PrerequisiteComparator.java

@@ -5,11 +5,11 @@
  */
 public enum PrerequisiteComparator {
     /**
-     * EQUALS - It matches when the evaluated value of the specified prerequisite flag is equal to the comparison value.
+     * EQUALS - Checks whether the evaluated value of the specified prerequisite flag is equal to the comparison value.
      */
     EQUALS(0, "EQUALS"),
     /**
-     * NOT EQUALS - It matches when the evaluated value of the specified prerequisite flag is not equal to the comparison value.
+     * NOT EQUALS - Checks whether the evaluated value of the specified prerequisite flag is not equal to the comparison value.
      */
     NOT_EQUALS(1, "NOT EQUALS");
 

src/main/java/com/configcat/PrerequisiteFlagCondition.java

@@ -12,7 +12,7 @@ public class PrerequisiteFlagCondition {
     @SerializedName(value = "c")
     private int prerequisiteComparator;
     @SerializedName(value = "v")
-    private SettingsValue value;
+    private SettingValue value;
 
     /**
      * The key of the prerequisite flag that the condition is based on.
@@ -32,7 +32,7 @@ public int getPrerequisiteComparator() {
      * The value that the evaluated value of the prerequisite flag is compared to.
      * Can be a value of the following types: {@link Boolean}, {@link String}, {@link Integer} or {@link Double}.
      */
-    public SettingsValue getValue() {
+    public SettingValue getValue() {
         return value;
     }
 }