wrappers new classes

Source/ConfigCat/Private/ConfigCatSubsystem.cpp

@@ -20,8 +20,8 @@
 #include "ConfigCatSettings.h"
 #include "Wrapper/ConfigCatSettingsWrapper.h"
 #include "Wrapper/ConfigCatEvaluationWrapper.h"
-#include "Wrapper/ConfigCatUserWrapper.h"
-#include "Wrapper/ConfigCatValueWrapper.h"
+#include "Wrappers/ConfigCatUserWrapper.h"
+#include "Wrappers/ConfigCatValueWrapper.h"
 
 using namespace configcat;
 

Source/ConfigCat/Private/Wrapper/ConfigCatEvaluationWrapper.cpp

@@ -2,7 +2,7 @@
 
 #include "Wrapper/ConfigCatEvaluationWrapper.h"
 
-#include "Wrapper/ConfigCatValueWrapper.h"
+#include "Wrappers/ConfigCatValueWrapper.h"
 
 using namespace configcat;
 

Source/ConfigCat/Private/Wrapper/ConfigCatUserWrapper.cpp → Source/ConfigCat/Private/Wrappers/ConfigCatUserWrapper.cpp

@@ -1,6 +1,6 @@
 // Copyright (c) ConfigCat 2024. All Rights Reserved.
 
-#include "Wrapper/ConfigCatUserWrapper.h"
+#include "Wrappers/ConfigCatUserWrapper.h"
 
 #include <ConfigCatCppSDK/Include/configcatuser.h>
 

Source/ConfigCat/Private/Wrapper/ConfigCatValueWrapper.cpp → Source/ConfigCat/Private/Wrappers/ConfigCatValueWrapper.cpp

@@ -1,9 +1,14 @@
 // Copyright (c) ConfigCat 2024. All Rights Reserved.
 
+#include "Wrappers/ConfigCatValueWrapper.h"
 
-#include "Wrapper/ConfigCatValueWrapper.h"
+UConfigCatValueWrapper* UConfigCatValueWrapper::CreateValue(const configcat::SettingValue& InValue)
+{
+	// This leverages the operator std::optional<Value> from configcat::SettingValue  
+	return CreateValue(std::optional<configcat::Value>(InValue));
+}
 
-UConfigCatValueWrapper* UConfigCatValueWrapper::CreateValue(configcat::Value InValue)
+UConfigCatValueWrapper* UConfigCatValueWrapper::CreateValue(const configcat::Value& InValue)
 {
 	return CreateValue(std::make_optional(InValue));
 }

Source/ConfigCat/Public/Wrapper/ConfigCatValueWrapper.h → Source/ConfigCat/Public/Wrappers/ConfigCatValueWrapper.h

@@ -8,59 +8,33 @@
 
 #include "ConfigCatValueWrapper.generated.h"
 
-UCLASS(DisplayName="Config Cat Value", Hidden)
+UCLASS(DisplayName="Config Cat SettingValue", Hidden)
 class CONFIGCAT_API UConfigCatValueWrapper : public UObject
 {
 	GENERATED_BODY()
 
 public:
-	static UConfigCatValueWrapper* CreateValue(configcat::Value InValue);
+	static UConfigCatValueWrapper* CreateValue(const configcat::SettingValue& InValue);
+	static UConfigCatValueWrapper* CreateValue(const configcat::Value& InValue);
 	static UConfigCatValueWrapper* CreateValue(const std::optional<configcat::Value>& InValue);
 
-	/**
-	 * Checks if the struct holds any type value
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	bool HasAnyValue() const;
-	/**
-	 * Checks if the struct holds a boolean value
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	bool HasBooleanValue() const;
-	/**
-	 * Checks if the struct holds a string value
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	bool HasStringValue() const;
-	/**
-	 * Checks if the struct holds an integer value
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	bool HasIntegerValue() const;
-	/**
-	 * Checks if the struct holds a decimal (double) value
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	bool HasDecimalValue() const;
 
-	/**
-	 * Returns the boolean value stored in the struct, if it holds one
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	bool GetBooleanValue() const;
-	/**
-	 * Returns the string value stored in the struct, if it holds one
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	FString GetStringValue() const;
-	/**
-	 * Returns the integer value stored in the struct, if it holds one
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	int GetIntegerValue() const;
-	/**
-	 * Returns the decimal (double) value stored in the struct, if it holds one
-	 */
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Value")
 	double GetDecimalValue() const;