Add proper runtime JSON validation

GDi4K · Jul 31, 2021 · deac5f0 · deac5f0
1 parent b7d03b7
commit deac5f0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Refer to the following examples for more usage:<br/>
 **For JSON**
 
 * [Check for there's a key or not](https://blueprintue.com/blueprint/okwmyljw/)
-* [Runtime JSON Validation](https://blueprintue.com/blueprint/foc1vk8h/)
+* [Runtime JSON Validation](https://blueprintue.com/blueprint/dnpnrs8m/)
 
 ## Functional Test Suite
 

diff --git a/UnrealFetchDevApp/Content/Tests/SimpleJson/DetectInvalidJson.uasset b/UnrealFetchDevApp/Content/Tests/SimpleJson/DetectInvalidJson.uasset
diff --git a/UnrealFetchDevApp/Content/Tests/SimpleJson/SimpleJsonTests.umap b/UnrealFetchDevApp/Content/Tests/SimpleJson/SimpleJsonTests.umap
diff --git a/UnrealFetchDevApp/Plugins/Fetch/Source/Fetch/Private/SimpleJson.cpp b/UnrealFetchDevApp/Plugins/Fetch/Source/Fetch/Private/SimpleJson.cpp
@@ -16,7 +16,10 @@ USimpleJsonValue* USimpleJson::MakeJson(FString InputJson)
 
 	TSharedRef<TJsonReader<>> Reader2 = TJsonReaderFactory<>::Create("{}");
 	FJsonSerializer::Deserialize(Reader2, ParsedJSON);
-	return USimpleJsonValue::Get(ParsedJSON);
+	USimpleJsonValue* InvalidJson =  USimpleJsonValue::Get(ParsedJSON);
+	InvalidJson->InvalidJson = true;
+
+	return InvalidJson;
 }
 
 USimpleJsonValue* USimpleJson::MakeJsonNumber(float Value)

diff --git a/UnrealFetchDevApp/Plugins/Fetch/Source/Fetch/Private/SimpleJsonValue.cpp b/UnrealFetchDevApp/Plugins/Fetch/Source/Fetch/Private/SimpleJsonValue.cpp
@@ -42,6 +42,11 @@ bool USimpleJsonValue::IsNull()
 	return Original->IsNull();
 }
 
+bool USimpleJsonValue::IsValid()
+{
+	return !InvalidJson;
+}
+
 USimpleJsonValue* USimpleJsonValue::Get(TSharedPtr<FJsonValue> Original)
 {
 	USimpleJsonValue* JsonValue = NewObject<USimpleJsonValue>();

diff --git a/UnrealFetchDevApp/Plugins/Fetch/Source/Fetch/Public/SimpleJsonValue.h b/UnrealFetchDevApp/Plugins/Fetch/Source/Fetch/Public/SimpleJsonValue.h
@@ -35,8 +35,12 @@ class FETCH_API USimpleJsonValue : public UObject
 	UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Fetch | SimpleJsonValue")
 		bool IsNull();
 
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Fetch | SimpleJsonValue")
+        bool IsValid();
+
 	static USimpleJsonValue* Get(TSharedPtr<FJsonValue> JsonValue);
 
 public:
 	TSharedPtr<FJsonValue> Original;
+	bool InvalidJson = false;
 };