Merge branch 'development' of https://github.com/stomt/stomt-unreal-p…

…lugin into development

Source/StomtPlugin/Private/StomtAPI.cpp

@@ -216,7 +216,7 @@ void UStomtAPI::SendStomtLabels(UStomt * stomt)
 		this->Request->ResetRequestData();
 
 		UE_LOG(LogTemp, Warning, TEXT("nice1"));
-		this->Request->SetVerb(ERequestVerb::POST);
+		this->Request->SetVerb(StomtEnumRequestVerb::POST);
 		this->Request->SetHeader(TEXT("appid"), this->GetAppID() );
 
 		this->Request->GetRequestObject()->SetField(TEXT("name"),	UStomtJsonValue::ConstructJsonValueString(	this, TEXT("newlabeltest")	));
@@ -238,7 +238,7 @@ UStomtRestRequest* UStomtAPI::RequestSession(FString Accesstoken)
 	request->OnRequestComplete.AddDynamic(this, &UStomtAPI::OnRequestSessionResponse);
 	request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed);
 
-	request->SetVerb(ERequestVerb::GET);
+	request->SetVerb(StomtEnumRequestVerb::GET);
 	request->SetHeader(TEXT("appid"), this->GetAppID());
 
 	request->SetHeader(TEXT("accesstoken"), this->Config->GetAccessToken());
@@ -280,7 +280,7 @@ UStomtRestRequest* UStomtAPI::RequestTargetByAppID()
 	request->OnRequestComplete.AddDynamic(this, &UStomtAPI::OnRequestTargetResponse);
 	request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed);
 
-	request->SetVerb(ERequestVerb::GET);
+	request->SetVerb(StomtEnumRequestVerb::GET);
 	request->SetHeader(TEXT("appid"), this->GetAppID());
 
 	request->ProcessURL(this->GetRestURL().Append("/targets/"));
@@ -294,7 +294,7 @@ UStomtRestRequest* UStomtAPI::RequestTarget(FString TargetID)
 	request->OnRequestComplete.AddDynamic(this, &UStomtAPI::OnRequestTargetResponse);
 	request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed);
 
-	request->SetVerb(ERequestVerb::GET);
+	request->SetVerb(StomtEnumRequestVerb::GET);
 	request->SetHeader(TEXT("appid"), this->GetAppID());
 
 	request->ProcessURL(this->GetRestURL().Append("/targets/").Append(TargetID));
@@ -954,7 +954,7 @@ UStomtRestRequest* UStomtAPI::SetupNewPostRequest()
 	UStomtRestRequest* request = NewObject<UStomtRestRequest>();
 	request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed);
 
-	request->SetVerb(ERequestVerb::POST);
+	request->SetVerb(StomtEnumRequestVerb::POST);
 	request->SetHeader(TEXT("appid"), this->GetAppID());
 
 	this->AddAccesstokenToRequest(request);
@@ -967,7 +967,7 @@ UStomtRestRequest * UStomtAPI::SetupNewDeleteRequest()
 	UStomtRestRequest* request = NewObject<UStomtRestRequest>();
 	request->OnRequestFail.AddDynamic(this, &UStomtAPI::OnARequestFailed);
 
-	request->SetVerb(ERequestVerb::DEL);
+	request->SetVerb(StomtEnumRequestVerb::DEL);
 	request->SetHeader(TEXT("appid"), this->GetAppID());
 
 	this->AddAccesstokenToRequest(request);

Source/StomtPlugin/Private/StomtJsonObject.cpp

@@ -250,30 +250,30 @@ void UStomtRestJsonObject::SetArrayField(const FString& FieldName, const TArray<
 
 		switch (InVal->GetType())
 		{
-		case EVaJson::None:
+		case StomtEnumJson::None:
 			break;
 
-		case EVaJson::Null:
+		case StomtEnumJson::Null:
 			ValArray.Add(MakeShareable(new FJsonValueNull()));
 			break;
 
-		case EVaJson::String:
+		case StomtEnumJson::String:
 			ValArray.Add(MakeShareable(new FJsonValueString(JsonVal->AsString())));
 			break;
 
-		case EVaJson::Number:
+		case StomtEnumJson::Number:
 			ValArray.Add(MakeShareable(new FJsonValueNumber(JsonVal->AsNumber())));
 			break;
 
-		case EVaJson::Boolean:
+		case StomtEnumJson::Boolean:
 			ValArray.Add(MakeShareable(new FJsonValueBoolean(JsonVal->AsBool())));
 			break;
 
-		case EVaJson::Array:
+		case StomtEnumJson::Array:
 			ValArray.Add(MakeShareable(new FJsonValueArray(JsonVal->AsArray())));
 			break;
 
-		case EVaJson::Object:
+		case StomtEnumJson::Object:
 			ValArray.Add(MakeShareable(new FJsonValueObject(JsonVal->AsObject())));
 			break;
 

Source/StomtPlugin/Private/StomtJsonValue.cpp

@@ -77,38 +77,38 @@ void UStomtJsonValue::SetRootValue(TSharedPtr<FJsonValue>& JsonValue)
 ////////////////////////////////////////////////////////////////////////////
 //// FJsonValue API
 
-EVaJson::Type UStomtJsonValue::GetType() const
+StomtEnumJson::Type UStomtJsonValue::GetType() const
 {
 	if (!(JsonVal.IsValid()))
 	{
-		return EVaJson::None;
+		return StomtEnumJson::None;
 	}
 
 	switch (JsonVal->Type)
 	{
 	case EJson::None:
-		return EVaJson::None;
+		return StomtEnumJson::None;
 
 	case EJson::Null:
-		return EVaJson::Null;
+		return StomtEnumJson::Null;
 
 	case EJson::String:
-		return EVaJson::String;
+		return StomtEnumJson::String;
 
 	case EJson::Number:
-		return EVaJson::Number;
+		return StomtEnumJson::Number;
 
 	case EJson::Boolean:
-		return EVaJson::Boolean;
+		return StomtEnumJson::Boolean;
 
 	case EJson::Array:
-		return EVaJson::Array;
+		return StomtEnumJson::Array;
 
 	case EJson::Object:
-		return EVaJson::Object;
+		return StomtEnumJson::Object;
 
 	default:
-		return EVaJson::None;
+		return StomtEnumJson::None;
 	}
 }
 

Source/StomtPlugin/Private/StomtRestRequest.cpp

@@ -27,7 +27,7 @@ UStomtRestRequest * UStomtRestRequest::ConstructRequest()
 	return nullptr;
 }
 
-void UStomtRestRequest::SetVerb(ERequestVerb::Type Verb)
+void UStomtRestRequest::SetVerb(StomtEnumRequestVerb::Type Verb)
 {
 	this->RequestVerb = Verb;
 }
@@ -117,19 +117,19 @@ void UStomtRestRequest::ProcessRequest(TSharedRef<IHttpRequest> HttpRequest)
 	// Set verb
 	switch (RequestVerb)
 	{
-		case ERequestVerb::GET:
+		case StomtEnumRequestVerb::GET:
 			HttpRequest->SetVerb(TEXT("GET"));
 			break;
 
-		case ERequestVerb::POST:
+		case StomtEnumRequestVerb::POST:
 			HttpRequest->SetVerb(TEXT("POST"));
 			break;
 
-		case ERequestVerb::PUT:
+		case StomtEnumRequestVerb::PUT:
 			HttpRequest->SetVerb(TEXT("PUT"));
 			break;
 
-		case ERequestVerb::DEL:
+		case StomtEnumRequestVerb::DEL:
 			HttpRequest->SetVerb(TEXT("DELETE"));
 			break;
 
@@ -268,7 +268,7 @@ void UStomtRestRequest::OnProcessRequestComplete(FHttpRequestPtr Request, FHttpR
 	// Finish the latent action
 	if (ContinueAction)
 	{
-		FVaRestLatentAction<UStomtRestJsonObject*> *K = ContinueAction;
+		StomtLatentAction<UStomtRestJsonObject*> *K = ContinueAction;
 		ContinueAction = nullptr;
 
 		K->Call(ResponseJsonObj);

Source/StomtPlugin/Public/StomtJsonValue.h

@@ -8,7 +8,7 @@
  * Represents all the types a Json Value can be.
  */
 UENUM(BlueprintType)
-namespace EVaJson
+namespace StomtEnumJson
 {
 	enum Type
 	{
@@ -64,7 +64,7 @@ class UStomtJsonValue : public UObject
 
 	/** Get type of Json value (Enum) */
 	UFUNCTION(BlueprintCallable, Category = "Stomt|Json")
-		EVaJson::Type GetType() const;
+		StomtEnumJson::Type GetType() const;
 
 	/** Get type of Json value (String) */
 	UFUNCTION(BlueprintCallable, Category = "Stomt|Json")

Source/StomtPlugin/Public/StomtRestRequest.h

@@ -8,7 +8,7 @@
 /**
 * @author Original latent action class by https://github.com/unktomi
 */
-template <class T> class FVaRestLatentAction : public FPendingLatentAction
+template <class T> class StomtLatentAction : public FPendingLatentAction
 {
 public:
 
@@ -25,7 +25,7 @@ template <class T> class FVaRestLatentAction : public FPendingLatentAction
 
 	void Cancel();
 
-	FVaRestLatentAction(FWeakObjectPtr RequestObj, T& ResultParam, const FLatentActionInfo& LatentInfo) :
+	StomtLatentAction(FWeakObjectPtr RequestObj, T& ResultParam, const FLatentActionInfo& LatentInfo) :
 		Called(false),
 		Request(RequestObj),
 		ExecutionFunction(LatentInfo.ExecutionFunction),
@@ -64,7 +64,7 @@ template <class T> class FVaRestLatentAction : public FPendingLatentAction
 
  /** Verb (GET, PUT, POST) */
 UENUM(BlueprintType)
-namespace ERequestVerb
+namespace StomtEnumRequestVerb
 {
 	enum Type
 	{
@@ -95,7 +95,7 @@ class UStomtRestRequest : public UObject
 	static UStomtRestRequest* ConstructRequest();
 
 	/** Set verb to the Request */
-	void SetVerb(ERequestVerb::Type Verb);
+	void SetVerb(StomtEnumRequestVerb::Type Verb);
 
 	/** Sets header info */
 	void SetHeader(const FString &HeaderName, const FString &HeaderValue);
@@ -206,7 +206,7 @@ class UStomtRestRequest : public UObject
 	FString StaticJsonOutputString;
 
 	/** Latent action helper */
-	FVaRestLatentAction <UStomtRestJsonObject*> *ContinueAction;
+	StomtLatentAction <UStomtRestJsonObject*> *ContinueAction;
 
 	/** Internal Request data stored as JSON */
 	UPROPERTY()
@@ -217,7 +217,7 @@ class UStomtRestRequest : public UObject
 	UStomtRestJsonObject* ResponseJsonObj;
 
 	/** Verb for making Request (GET,POST,etc) */
-	ERequestVerb::Type RequestVerb;
+	StomtEnumRequestVerb::Type RequestVerb;
 
 	/** Mapping of header section to values. Used to generate final header string for Request */
 	TMap<FString, FString> RequestHeaders;