Skip to content

Commit

Permalink
Merge pull request #26 from configcat/bugfix/configcat-category-white…
Browse files Browse the repository at this point in the history
…space

Removed white spaces from auto generated ConfigCat display names
  • Loading branch information
pasotee authored Aug 12, 2024
2 parents 255ab88 + b70a3b7 commit 1e3a3ee
Show file tree
Hide file tree
Showing 15 changed files with 164 additions and 107 deletions.
2 changes: 1 addition & 1 deletion ConfigCat.uplugin
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"VersionName": "2.1.5",
"VersionName": "2.1.6",
"EngineVersion": "5.4",
"FriendlyName": "ConfigCat",
"Description": "ConfigCat is a hosted service for feature flag and configuration management. It lets you decouple feature releases from code deployments.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ bool UConfigCatSettingWrapper::HasInvalidType() const
return Setting.hasInvalidType();
}

EConfigCatSettingTypeWrapper UConfigCatSettingWrapper::GetType() const
EConfigCatSettingType UConfigCatSettingWrapper::GetType() const
{
return static_cast<EConfigCatSettingTypeWrapper>(Setting.type);
return static_cast<EConfigCatSettingType>(Setting.type);
}

FString UConfigCatSettingWrapper::GetPercentageOptionsAttribute() const
Expand Down
2 changes: 1 addition & 1 deletion Source/ConfigCat/Public/ConfigCatSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ enum class EOverrideBehaviour : uint8
/**
* Holds configuration for integrating the ConfigCat feature flags SDK
*/
UCLASS(DefaultConfig, Config = ConfigCat)
UCLASS(DefaultConfig, Config = ConfigCat, meta = (DisplayName = "ConfigCat Settings"))
class CONFIGCAT_API UConfigCatSettings : public UDeveloperSettings
{
GENERATED_BODY()
Expand Down
40 changes: 20 additions & 20 deletions Source/ConfigCat/Public/ConfigCatSubsystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnErrorBp, const FString&, Error,
/**
* Wrapper for accessing the configcat client. This subsystem is responsible for initializing and managing the client's lifecycle.
*/
UCLASS()
UCLASS(meta = (DisplayName = "ConfigCat Subsystem"))
class CONFIGCAT_API UConfigCatSubsystem : public UGameInstanceSubsystem
{
GENERATED_BODY()
Expand All @@ -47,97 +47,97 @@ class CONFIGCAT_API UConfigCatSubsystem : public UGameInstanceSubsystem
/**
* Gets a feature flag of boolean value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Value (Boolean)", Category = "ConfigCat", meta = (AdvancedDisplay = "bDefaultValue, User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Value (Boolean)", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "bDefaultValue, User", AutoCreateRefTerm = "User"))
bool GetBoolValue(const FString& Key, bool bDefaultValue, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets a feature flag of integer value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Value (Integer)", Category = "ConfigCat", meta = (AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Value (Integer)", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
int32 GetIntValue(const FString& Key, int32 DefaultValue, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets a feature flag of decimal (double) value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Value (Double)", Category = "ConfigCat", meta = (AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Value (Double)", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
double GetDoubleValue(const FString& Key, double DefaultValue, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets a feature flag of string value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Value (String)", Category = "ConfigCat", meta = (AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Value (String)", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
FString GetStringValue(const FString& Key, const FString& DefaultValue, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets a feature flag of variant value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Config Value", Category = "ConfigCat", meta = (AdvancedDisplay = "User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Config Value", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "User", AutoCreateRefTerm = "User"))
UConfigCatValueWrapper* GetConfigValue(const FString& Key, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets the evaluation details of a feature flag of bool value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Value Details(Boolean)", Category = "ConfigCat", meta = (AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Value Details(Boolean)", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UConfigCatEvaluationWrapper* GetBoolValueDetails(const FString& Key, bool DefaultValue, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets the evaluation details of a feature flag of integer value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Value Details(Integer)", Category = "ConfigCat", meta = (AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Value Details(Integer)", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UConfigCatEvaluationWrapper* GetIntValueDetails(const FString& Key, int DefaultValue, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets the evaluation details of a feature flag of decimal (double) value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Value Details(Double)", Category = "ConfigCat", meta = (AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Value Details(Double)", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UConfigCatEvaluationWrapper* GetDoubleValueDetails(const FString& Key, double DefaultValue, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets the evaluation details of a feature flag of string value for a specific key. Optionally takes in a target user.
*/
UFUNCTION(BlueprintPure, DisplayName = "Get Value Details(String)", Category = "ConfigCat", meta = (AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, DisplayName = "Get Value Details(String)", Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "DefaultValue, User", AutoCreateRefTerm = "User"))
UConfigCatEvaluationWrapper* GetStringValueDetails(const FString& Key, const FString& DefaultValue, const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets all the setting keys.
*/
UFUNCTION(BlueprintPure, Category = "ConfigCat")
UFUNCTION(BlueprintPure, Category = "FeatureFlags", meta = (Keywords = "ConfigCat"))
TArray<FString> GetAllKeys() const;
/**
* Gets the key of a setting and it's value identified by the given Variation ID (analytics)
*/
UFUNCTION(BlueprintPure, Category = "ConfigCat")
UFUNCTION(BlueprintPure, Category = "FeatureFlags", meta = (Keywords = "ConfigCat"))
bool GetKeyAndValue(const FString& VariationId, FString& OutKey, UConfigCatValueWrapper*& OutValue) const;
/**
* Gets the values of all feature flags or settings.
*/
UFUNCTION(BlueprintPure, Category = "ConfigCat", meta = (AdvancedDisplay = "User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "User", AutoCreateRefTerm = "User"))
TMap<FString, UConfigCatValueWrapper*> GetAllValues(const UConfigCatUserWrapper* User = nullptr) const;
/**
* Gets the values along with evaluation details of all feature flags and settings.
*/
UFUNCTION(BlueprintPure, Category = "ConfigCat", meta = (AdvancedDisplay = "User", AutoCreateRefTerm = "User"))
UFUNCTION(BlueprintPure, Category = "FeatureFlags", meta = (Keywords = "ConfigCat", AdvancedDisplay = "User", AutoCreateRefTerm = "User"))
TArray<UConfigCatEvaluationWrapper*> GetAllValueDetails(const UConfigCatUserWrapper* User = nullptr) const;
/**
* Initiates a force refresh synchronously on the cached configuration.
*/
UFUNCTION(BlueprintCallable, Category = "ConfigCat")
UFUNCTION(BlueprintCallable, Category = "FeatureFlags", meta = (Keywords = "ConfigCat"))
void ForceRefresh();
/**
* Sets the default user.
*/
UFUNCTION(BlueprintCallable, Category = "ConfigCat")
UFUNCTION(BlueprintCallable, Category = "Targeting", meta = (Keywords = "ConfigCat"))
void SetDefaultUser(const UConfigCatUserWrapper* User = nullptr);
/**
* Sets the default user to nullptr.
*/
UFUNCTION(BlueprintCallable, Category = "ConfigCat")
UFUNCTION(BlueprintCallable, Category = "Targeting", meta = (Keywords = "ConfigCat"))
void ClearDefaultUser();
/**
* Configures the SDK to allow HTTP requests.
*/
UFUNCTION(BlueprintCallable, Category = "ConfigCat")
UFUNCTION(BlueprintCallable, Category = "Connection", meta = (Keywords = "ConfigCat"))
void SetOnline();
/**
* Configures the SDK to not initiate HTTP requests and work only from its cache.
*/
UFUNCTION(BlueprintCallable, Category = "ConfigCat")
UFUNCTION(BlueprintCallable, Category = "Connection", meta = (Keywords = "ConfigCat"))
void SetOffline();
/**
* true when the SDK is configured not to initiate HTTP requests, otherwise false.
*/
UFUNCTION(BlueprintPure, Category = "ConfigCat")
UFUNCTION(BlueprintPure, Category = "Connection", meta = (Keywords = "ConfigCat"))
bool IsOffline() const;
/**
* Executed when the configcat client is fully initialized.
Expand Down
22 changes: 11 additions & 11 deletions Source/ConfigCat/Public/Wrappers/ConfigCatEvaluationWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,33 @@ class UConfigCatTargetingRuleWrapper;
class UConfigCatUserWrapper;
class UConfigCatValueWrapper;

UCLASS(DisplayName="Config Cat Evaluation")
UCLASS(meta = (DisplayName = "ConfigCat Evaluation"))
class CONFIGCAT_API UConfigCatEvaluationWrapper : public UObject
{
GENERATED_BODY()

public:
static UConfigCatEvaluationWrapper* CreateEvaluation(const configcat::EvaluationDetailsBase& InEvaluationDetails);

UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
FString GetKey() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
FString GetVariationId() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
FDateTime GetFetchTime() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
UConfigCatUserWrapper* GetUser() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
bool IsDefaultValue() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
FString GetError() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
FString GetException() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
UConfigCatTargetingRuleWrapper* GetMatchedTargetingRule() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
UConfigCatPercentageOptionWrapper* GetMatchedPercentageOption() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|EvaluationDetails")
UFUNCTION(BlueprintPure, Category = "EvaluationDetails", meta = (Keywords = "ConfigCat"))
UConfigCatValueWrapper* GetValue() const;

std::shared_ptr<configcat::EvaluationDetails<>> EvaluationDetails;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@

class UConfigCatValueWrapper;

UCLASS(DisplayName="Config Cat Percentage Option")
UCLASS(meta = (DisplayName = "ConfigCat Percentage Option"))
class CONFIGCAT_API UConfigCatPercentageOptionWrapper : public UObject
{
GENERATED_BODY()

public:
static UConfigCatPercentageOptionWrapper* CreatePercentageOption(const configcat::PercentageOption& InPercentageOption);

UFUNCTION(BlueprintPure, Category = "ConfigCat|PercentageOption")
UFUNCTION(BlueprintPure, Category = "PercentageOption", meta = (Keywords = "ConfigCat"))
uint8 GetPercentage() const;

UFUNCTION(BlueprintPure, Category = "ConfigCat|PercentageOption")
UFUNCTION(BlueprintPure, Category = "PercentageOption", meta = (Keywords = "ConfigCat"))
FString GetVariationId() const;

UFUNCTION(BlueprintPure, Category = "ConfigCat|PercentageOption")
UFUNCTION(BlueprintPure, Category = "PercentageOption", meta = (Keywords = "ConfigCat"))
UConfigCatValueWrapper* GetValue() const;

configcat::PercentageOption PercentageOption;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
#include "ConfigCatSettingValueContainerWrapper.generated.h"

class UConfigCatValueWrapper;
UCLASS(DisplayName="Config Cat Setting Value Container")
UCLASS(meta = (DisplayName = "ConfigCat Setting Value Container"))
class CONFIGCAT_API UConfigCatSettingValueContainerWrapper : public UObject
{
GENERATED_BODY()

public:
static UConfigCatSettingValueContainerWrapper* CreateSettingValue(const configcat::SettingValueContainer& SettingValueContainer);

UFUNCTION(BlueprintPure, Category = "ConfigCat|SettingValueContainer")
UFUNCTION(BlueprintPure, Category = "SettingValueContainer", meta = (Keywords = "ConfigCat"))
FString GetVariationId() const;
UFUNCTION(BlueprintPure, Category = "ConfigCat|SettingValueContainer")
UFUNCTION(BlueprintPure, Category = "SettingValueContainer", meta = (Keywords = "ConfigCat"))
UConfigCatValueWrapper* GetValue() const;

configcat::SettingValueContainer SettingValueContainer;
Expand Down
26 changes: 13 additions & 13 deletions Source/ConfigCat/Public/Wrappers/ConfigCatSettingsWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,56 @@ class UConfigCatPercentageOptionWrapper;
class UConfigCatTargetingRuleWrapper;
class UConfigCatValueWrapper;

UENUM(BlueprintType)
enum class EConfigCatSettingTypeWrapper : uint8
UENUM(BlueprintType, meta = (DisplayName = "ConfigCat Setting Type"))
enum class EConfigCatSettingType : uint8
{
Bool = 0,
String = 1,
Int = 2,
Double = 3,
};

UCLASS(DisplayName="Config Cat Setting")
UCLASS(meta = (DisplayName = "ConfigCat Setting"))
class CONFIGCAT_API UConfigCatSettingWrapper : public UObject
{
GENERATED_BODY()

public:
static UConfigCatSettingWrapper* CreateSetting(const configcat::Setting& InSetting);

UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
UFUNCTION(BlueprintPure, Category = "Setting", meta = (Keywords = "ConfigCat"))
FString GetVariationId() const;

UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
UFUNCTION(BlueprintPure, Category = "Setting", meta = (Keywords = "ConfigCat"))
FString GetPercentageOptionsAttribute() const;

UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
UFUNCTION(BlueprintPure, Category = "Setting", meta = (Keywords = "ConfigCat"))
bool HasInvalidType() const;

UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
EConfigCatSettingTypeWrapper GetType() const;
UFUNCTION(BlueprintPure, Category = "Setting", meta = (Keywords = "ConfigCat"))
EConfigCatSettingType GetType() const;

UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
UFUNCTION(BlueprintPure, Category = "Setting", meta = (Keywords = "ConfigCat"))
UConfigCatValueWrapper* GetValue() const;

UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
UFUNCTION(BlueprintPure, Category = "Setting", meta = (Keywords = "ConfigCat"))
TArray<UConfigCatTargetingRuleWrapper*> GetTargetingRules() const;

UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
UFUNCTION(BlueprintPure, Category = "Setting", meta = (Keywords = "ConfigCat"))
TArray<UConfigCatPercentageOptionWrapper*> GetPercentageOptions() const;

configcat::Setting Setting;
};

UCLASS(DisplayName="Config Cat Settings")
UCLASS(meta = (DisplayName = "ConfigCat Settings"))
class CONFIGCAT_API UConfigCatSettingsWrapper : public UObject
{
GENERATED_BODY()

public:
static UConfigCatSettingsWrapper* CreateSettings(const std::shared_ptr<const configcat::Settings>& InSettings);

UFUNCTION(BlueprintPure, Category = "ConfigCat|Settings")
UFUNCTION(BlueprintPure, Category = "Settings", meta = (Keywords = "ConfigCat"))
TMap<FString, UConfigCatSettingWrapper*> GetSettings() const;

std::shared_ptr<const configcat::Settings> Settings;
Expand Down
Loading

0 comments on commit 1e3a3ee

Please sign in to comment.