From ffe4c2888e3f3fb32ee7c1ea07437c15f961b904 Mon Sep 17 00:00:00 2001 From: Vladimir Alyamkin Date: Sun, 1 Nov 2015 19:52:02 +0300 Subject: [PATCH 1/6] x-www-form-urlencoded params moved from url to request body --- Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp b/Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp index 4d4d7b22..45304d68 100644 --- a/Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp +++ b/Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp @@ -276,15 +276,15 @@ void UVaRestRequestJSON::ProcessRequest(TSharedRef HttpRequest) if (!Key.IsEmpty() && !Value.IsEmpty()) { - UrlParams += ParamIdx == 0 ? "?" : "&"; + UrlParams += ParamIdx == 0 ? "" : "&"; UrlParams += UVaRestRequestJSON::PercentEncode(Key) + "=" + UVaRestRequestJSON::PercentEncode(Value); } ParamIdx++; } - // Apply params to the url - HttpRequest->SetURL(HttpRequest->GetURL() + UrlParams); + // Apply params + HttpRequest->SetContentAsString(UrlParams); break; } From 981a72a24a6ec866220a9a53d0f1581c7c6b4148 Mon Sep 17 00:00:00 2001 From: Unktomi Date: Thu, 19 Nov 2015 14:23:42 -0800 Subject: [PATCH 2/6] fixed bug where multiple break json nodes couldn't have the same field names --- .../Private/VaRest_BreakJson.cpp | 85 ++++++++----------- 1 file changed, 35 insertions(+), 50 deletions(-) diff --git a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp index 84113df2..bef426e9 100644 --- a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp +++ b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp @@ -1,8 +1,15 @@ -// Copyright 2015 Vladimir Alyamkin. All Rights Reserved. -// Original code by https://github.com/unktomi - #include "VaRestEditorPluginPrivatePCH.h" +#include "KismetCompiler.h" #include "VaRest_BreakJson.h" +#include "EditorCategoryUtils.h" +#include "EdGraph/EdGraph.h" +#include "EdGraph/EdGraphNodeUtils.h" // for FNodeTextCache +#include "EdGraphSchema_K2.h" +#include "BlueprintNodeSpawner.h" +#include "BlueprintActionDatabaseRegistrar.h" +#include "BlueprintFieldNodeSpawner.h" +#include "EditorCategoryUtils.h" +#include "BlueprintActionFilter.h" #define LOCTEXT_NAMESPACE "VaRest_BreakJson" @@ -18,7 +25,6 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor virtual void Compile(FKismetFunctionContext& Context, UEdGraphNode* Node) override { UEdGraphPin* InputPin = NULL; - for (int32 PinIndex = 0; PinIndex < Node->Pins.Num(); ++PinIndex) { UEdGraphPin* Pin = Node->Pins[PinIndex]; @@ -28,16 +34,13 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor break; } } - UEdGraphPin *InNet = FEdGraphUtilities::GetNetFromPin(InputPin); UClass *Class = Cast(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRestPlugin.VaRestJsonObject'"))); - FBPTerminal **SourceTerm = Context.NetMap.Find(InNet); if (SourceTerm == nullptr) { return; } - for (int32 PinIndex = 0; PinIndex < Node->Pins.Num(); ++PinIndex) { UEdGraphPin* Pin = Node->Pins[PinIndex]; @@ -47,23 +50,17 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor { continue; } - FBPTerminal **Target = Context.NetMap.Find(Pin); - const FString &FieldName = Pin->PinName; const FString &FieldType = Pin->PinType.PinCategory; - FBPTerminal* FieldNameTerm = Context.CreateLocalTerminal(ETerminalSpecification::TS_Literal); FieldNameTerm->Type.PinCategory = CompilerContext.GetSchema()->PC_String; FieldNameTerm->Source = Pin; FieldNameTerm->Name = FieldName; FieldNameTerm->TextLiteral = FText::FromString(FieldName); - FBlueprintCompiledStatement& Statement = Context.AppendStatementForNode(Node); FName FunctionName; - bool bIsArray = Pin->PinType.bIsArray; - if (FieldType == CompilerContext.GetSchema()->PC_Boolean) { FunctionName = bIsArray ? TEXT("GetBoolArrayField") : TEXT("GetBoolField"); @@ -98,7 +95,7 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor FBPTerminal* RegisterInputTerm(FKismetFunctionContext& Context, UVaRest_BreakJson* Node) { - // Find input pin + //Find input pin UEdGraphPin* InputPin = NULL; for (int32 PinIndex = 0; PinIndex < Node->Pins.Num(); ++PinIndex) { @@ -111,25 +108,22 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor } check(NULL != InputPin); - // Find structure source net + //Find structure source net UEdGraphPin* Net = FEdGraphUtilities::GetNetFromPin(InputPin); FBPTerminal **TermPtr = Context.NetMap.Find(Net); - if (!TermPtr) { FBPTerminal *Term = Context.CreateLocalTerminalFromPinAutoChooseScope(Net, Context.NetNameMap->MakeValidName(Net)); - Context.NetMap.Add(Net, Term); - return Term; } - return *TermPtr; } void RegisterOutputTerm(FKismetFunctionContext& Context, UEdGraphPin* OutputPin, FBPTerminal* ContextTerm) { - FBPTerminal *Term = Context.CreateLocalTerminalFromPinAutoChooseScope(OutputPin, OutputPin->PinName); + FBPTerminal *Term = Context.CreateLocalTerminalFromPinAutoChooseScope(OutputPin, Context.NetNameMap->MakeValidName(OutputPin)); + Term->Context = ContextTerm; Context.NetMap.Add(OutputPin, Term); } @@ -137,7 +131,6 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor { UVaRest_BreakJson* Node = Cast(InNode); FNodeHandlingFunctor::RegisterNets(Context, Node); - check(NULL != Node); if (FBPTerminal* StructContextTerm = RegisterInputTerm(Context, Node)) @@ -154,9 +147,7 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor } }; -/** - * Main node class - */ + UVaRest_BreakJson::UVaRest_BreakJson(const FObjectInitializer &ObjectInitializer) : Super(ObjectInitializer) { @@ -170,12 +161,9 @@ FNodeHandlingFunctor* UVaRest_BreakJson::CreateNodeHandler(class FKismetCompiler void UVaRest_BreakJson::AllocateDefaultPins() { const UEdGraphSchema_K2* K2Schema = GetDefault(); - UClass *Class = Cast(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRestPlugin.VaRestJsonObject'"))); UEdGraphPin* Pin = CreatePin(EGPD_Input, K2Schema->PC_Object, TEXT(""), Class, false, false, TEXT("Target")); - K2Schema->SetPinDefaultValueBasedOnType(Pin); - CreateProjectionPins(Pin); } @@ -186,8 +174,8 @@ FLinearColor UVaRest_BreakJson::GetNodeTitleColor() const void UVaRest_BreakJson::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) { - bool bIsDirty = false; + bool bIsDirty = false; FName PropertyName = (PropertyChangedEvent.Property != NULL) ? PropertyChangedEvent.Property->GetFName() : NAME_None; if (true || PropertyName == TEXT("Outputs")) { @@ -199,9 +187,11 @@ void UVaRest_BreakJson::PostEditChangeProperty(struct FPropertyChangedEvent& Pro ReconstructNode(); GetGraph()->NotifyGraphChanged(); } - Super::PostEditChangeProperty(PropertyChangedEvent); } +// End UEdGraphNode interface. + +// Begin UK2Node interface void UVaRest_BreakJson::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegistrar) const { @@ -210,7 +200,6 @@ void UVaRest_BreakJson::GetMenuActions(FBlueprintActionDatabaseRegistrar& Action // mutated (or removed)... here we use the node's class (so if the node // type disappears, then the action should go with it) UClass* ActionKey = GetClass(); - // to keep from needlessly instantiating a UBlueprintNodeSpawner, first // check to make sure that the registrar is looking for actions of this type // (could be regenerating actions for a specific asset, and therefore the @@ -227,7 +216,6 @@ void UVaRest_BreakJson::GetMenuActions(FBlueprintActionDatabaseRegistrar& Action FText UVaRest_BreakJson::GetMenuCategory() const { static FNodeTextCache CachedCategory; - if (CachedCategory.IsOutOfDate(this)) { // FText::Format() is slow, so we cache this to save on performance @@ -235,37 +223,33 @@ FText UVaRest_BreakJson::GetMenuCategory() const } return CachedCategory; } +// End UK2Node interface. + void UVaRest_BreakJson::CreateProjectionPins(UEdGraphPin *Source) { const UEdGraphSchema_K2* K2Schema = GetDefault(); UClass *Class = Cast(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRestPlugin.VaRestJsonObject'"))); - for (TArray::TIterator it(Outputs); it; ++it) { FString Type; UObject *Subtype = nullptr; FString FieldName = (*it).Name; - switch ((*it).Type) { - case EVaRest_JsonType::JSON_Bool: - Type = K2Schema->PC_Boolean; - break; - - case EVaRest_JsonType::JSON_Number: - Type = K2Schema->PC_Float; - break; - - case EVaRest_JsonType::JSON_String: - Type = K2Schema->PC_String; - break; - - case EVaRest_JsonType::JSON_Object: - Type = K2Schema->PC_Object; - Subtype = Class; - break; + case EVaRest_JsonType::JSON_Bool: + Type = K2Schema->PC_Boolean; + break; + case EVaRest_JsonType::JSON_Number: + Type = K2Schema->PC_Float; + break; + case EVaRest_JsonType::JSON_String: + Type = K2Schema->PC_String; + break; + case EVaRest_JsonType::JSON_Object: + Type = K2Schema->PC_Object; + Subtype = Class; + break; } - UEdGraphPin *OutputPin = CreatePin(EGPD_Output, Type, TEXT(""), Subtype, (*it).bIsArray, false, (*it).Name); } } @@ -274,3 +258,4 @@ FText UVaRest_BreakJson::GetNodeTitle(ENodeTitleType::Type TitleType) const { return LOCTEXT("VaRest_Break_Json.NodeTitle", "Break Json"); } + From 36b3fe4091e847e01135597786a549991c1232d8 Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Thu, 19 Nov 2015 22:30:30 +0000 Subject: [PATCH 3/6] redo previous fix --- .../Private/VaRest_BreakJson.cpp | 83 +++++++++++-------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp index bef426e9..317a4a95 100644 --- a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp +++ b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp @@ -1,15 +1,8 @@ +// Copyright 2015 Vladimir Alyamkin. All Rights Reserved. +// Original code by https://github.com/unktomi + #include "VaRestEditorPluginPrivatePCH.h" -#include "KismetCompiler.h" #include "VaRest_BreakJson.h" -#include "EditorCategoryUtils.h" -#include "EdGraph/EdGraph.h" -#include "EdGraph/EdGraphNodeUtils.h" // for FNodeTextCache -#include "EdGraphSchema_K2.h" -#include "BlueprintNodeSpawner.h" -#include "BlueprintActionDatabaseRegistrar.h" -#include "BlueprintFieldNodeSpawner.h" -#include "EditorCategoryUtils.h" -#include "BlueprintActionFilter.h" #define LOCTEXT_NAMESPACE "VaRest_BreakJson" @@ -25,6 +18,7 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor virtual void Compile(FKismetFunctionContext& Context, UEdGraphNode* Node) override { UEdGraphPin* InputPin = NULL; + for (int32 PinIndex = 0; PinIndex < Node->Pins.Num(); ++PinIndex) { UEdGraphPin* Pin = Node->Pins[PinIndex]; @@ -34,13 +28,16 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor break; } } + UEdGraphPin *InNet = FEdGraphUtilities::GetNetFromPin(InputPin); UClass *Class = Cast(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRestPlugin.VaRestJsonObject'"))); + FBPTerminal **SourceTerm = Context.NetMap.Find(InNet); if (SourceTerm == nullptr) { return; } + for (int32 PinIndex = 0; PinIndex < Node->Pins.Num(); ++PinIndex) { UEdGraphPin* Pin = Node->Pins[PinIndex]; @@ -50,17 +47,23 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor { continue; } + FBPTerminal **Target = Context.NetMap.Find(Pin); + const FString &FieldName = Pin->PinName; const FString &FieldType = Pin->PinType.PinCategory; + FBPTerminal* FieldNameTerm = Context.CreateLocalTerminal(ETerminalSpecification::TS_Literal); FieldNameTerm->Type.PinCategory = CompilerContext.GetSchema()->PC_String; FieldNameTerm->Source = Pin; FieldNameTerm->Name = FieldName; FieldNameTerm->TextLiteral = FText::FromString(FieldName); + FBlueprintCompiledStatement& Statement = Context.AppendStatementForNode(Node); FName FunctionName; + bool bIsArray = Pin->PinType.bIsArray; + if (FieldType == CompilerContext.GetSchema()->PC_Boolean) { FunctionName = bIsArray ? TEXT("GetBoolArrayField") : TEXT("GetBoolField"); @@ -95,7 +98,7 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor FBPTerminal* RegisterInputTerm(FKismetFunctionContext& Context, UVaRest_BreakJson* Node) { - //Find input pin + // Find input pin UEdGraphPin* InputPin = NULL; for (int32 PinIndex = 0; PinIndex < Node->Pins.Num(); ++PinIndex) { @@ -108,22 +111,25 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor } check(NULL != InputPin); - //Find structure source net + // Find structure source net UEdGraphPin* Net = FEdGraphUtilities::GetNetFromPin(InputPin); FBPTerminal **TermPtr = Context.NetMap.Find(Net); + if (!TermPtr) { FBPTerminal *Term = Context.CreateLocalTerminalFromPinAutoChooseScope(Net, Context.NetNameMap->MakeValidName(Net)); + Context.NetMap.Add(Net, Term); + return Term; } + return *TermPtr; } void RegisterOutputTerm(FKismetFunctionContext& Context, UEdGraphPin* OutputPin, FBPTerminal* ContextTerm) { FBPTerminal *Term = Context.CreateLocalTerminalFromPinAutoChooseScope(OutputPin, Context.NetNameMap->MakeValidName(OutputPin)); - Term->Context = ContextTerm; Context.NetMap.Add(OutputPin, Term); } @@ -131,6 +137,7 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor { UVaRest_BreakJson* Node = Cast(InNode); FNodeHandlingFunctor::RegisterNets(Context, Node); + check(NULL != Node); if (FBPTerminal* StructContextTerm = RegisterInputTerm(Context, Node)) @@ -147,7 +154,9 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor } }; - +/** + * Main node class + */ UVaRest_BreakJson::UVaRest_BreakJson(const FObjectInitializer &ObjectInitializer) : Super(ObjectInitializer) { @@ -161,9 +170,12 @@ FNodeHandlingFunctor* UVaRest_BreakJson::CreateNodeHandler(class FKismetCompiler void UVaRest_BreakJson::AllocateDefaultPins() { const UEdGraphSchema_K2* K2Schema = GetDefault(); + UClass *Class = Cast(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRestPlugin.VaRestJsonObject'"))); UEdGraphPin* Pin = CreatePin(EGPD_Input, K2Schema->PC_Object, TEXT(""), Class, false, false, TEXT("Target")); + K2Schema->SetPinDefaultValueBasedOnType(Pin); + CreateProjectionPins(Pin); } @@ -174,8 +186,8 @@ FLinearColor UVaRest_BreakJson::GetNodeTitleColor() const void UVaRest_BreakJson::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) { - bool bIsDirty = false; + FName PropertyName = (PropertyChangedEvent.Property != NULL) ? PropertyChangedEvent.Property->GetFName() : NAME_None; if (true || PropertyName == TEXT("Outputs")) { @@ -187,11 +199,9 @@ void UVaRest_BreakJson::PostEditChangeProperty(struct FPropertyChangedEvent& Pro ReconstructNode(); GetGraph()->NotifyGraphChanged(); } + Super::PostEditChangeProperty(PropertyChangedEvent); } -// End UEdGraphNode interface. - -// Begin UK2Node interface void UVaRest_BreakJson::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegistrar) const { @@ -200,6 +210,7 @@ void UVaRest_BreakJson::GetMenuActions(FBlueprintActionDatabaseRegistrar& Action // mutated (or removed)... here we use the node's class (so if the node // type disappears, then the action should go with it) UClass* ActionKey = GetClass(); + // to keep from needlessly instantiating a UBlueprintNodeSpawner, first // check to make sure that the registrar is looking for actions of this type // (could be regenerating actions for a specific asset, and therefore the @@ -216,6 +227,7 @@ void UVaRest_BreakJson::GetMenuActions(FBlueprintActionDatabaseRegistrar& Action FText UVaRest_BreakJson::GetMenuCategory() const { static FNodeTextCache CachedCategory; + if (CachedCategory.IsOutOfDate(this)) { // FText::Format() is slow, so we cache this to save on performance @@ -223,33 +235,37 @@ FText UVaRest_BreakJson::GetMenuCategory() const } return CachedCategory; } -// End UK2Node interface. - void UVaRest_BreakJson::CreateProjectionPins(UEdGraphPin *Source) { const UEdGraphSchema_K2* K2Schema = GetDefault(); UClass *Class = Cast(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRestPlugin.VaRestJsonObject'"))); + for (TArray::TIterator it(Outputs); it; ++it) { FString Type; UObject *Subtype = nullptr; FString FieldName = (*it).Name; + switch ((*it).Type) { - case EVaRest_JsonType::JSON_Bool: - Type = K2Schema->PC_Boolean; - break; - case EVaRest_JsonType::JSON_Number: - Type = K2Schema->PC_Float; - break; - case EVaRest_JsonType::JSON_String: - Type = K2Schema->PC_String; - break; - case EVaRest_JsonType::JSON_Object: - Type = K2Schema->PC_Object; - Subtype = Class; - break; + case EVaRest_JsonType::JSON_Bool: + Type = K2Schema->PC_Boolean; + break; + + case EVaRest_JsonType::JSON_Number: + Type = K2Schema->PC_Float; + break; + + case EVaRest_JsonType::JSON_String: + Type = K2Schema->PC_String; + break; + + case EVaRest_JsonType::JSON_Object: + Type = K2Schema->PC_Object; + Subtype = Class; + break; } + UEdGraphPin *OutputPin = CreatePin(EGPD_Output, Type, TEXT(""), Subtype, (*it).bIsArray, false, (*it).Name); } } @@ -258,4 +274,3 @@ FText UVaRest_BreakJson::GetNodeTitle(ENodeTitleType::Type TitleType) const { return LOCTEXT("VaRest_Break_Json.NodeTitle", "Break Json"); } - From c97d77289da9cf16ef751f47225ea72850f4cdad Mon Sep 17 00:00:00 2001 From: "v.alyamkin" Date: Mon, 30 Nov 2015 18:24:01 +0300 Subject: [PATCH 4/6] Add selection between body and url params placement for urlencoded requests --- .../Classes/Json/VaRestRequestJSON.h | 3 +- .../Private/Json/VaRestRequestJSON.cpp | 31 +++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h b/Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h index 60279f95..0bfc3f50 100644 --- a/Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h +++ b/Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h @@ -79,7 +79,8 @@ namespace ERequestContentType { enum Type { - x_www_form_urlencoded, + x_www_form_urlencoded_url UMETA(DisplayName = "x-www-form-urlencoded (URL)"), + x_www_form_urlencoded_body UMETA(DisplayName = "x-www-form-urlencoded (Content Body)"), json, binary }; diff --git a/Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp b/Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp index 45304d68..be4cc09c 100644 --- a/Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp +++ b/Source/VaRestPlugin/Private/Json/VaRestRequestJSON.cpp @@ -17,7 +17,7 @@ UVaRestRequestJSON::UVaRestRequestJSON(const class FObjectInitializer& PCIP) BinaryContentType(TEXT("application/octet-stream")) { RequestVerb = ERequestVerb::GET; - RequestContentType = ERequestContentType::x_www_form_urlencoded; + RequestContentType = ERequestContentType::x_www_form_urlencoded_url; ResetData(); } @@ -261,7 +261,34 @@ void UVaRestRequestJSON::ProcessRequest(TSharedRef HttpRequest) // Set content-type switch (RequestContentType) { - case ERequestContentType::x_www_form_urlencoded: + case ERequestContentType::x_www_form_urlencoded_url: + { + HttpRequest->SetHeader("Content-Type", "application/x-www-form-urlencoded"); + + FString UrlParams = ""; + uint16 ParamIdx = 0; + + // Loop through all the values and prepare additional url part + for (auto RequestIt = RequestJsonObj->GetRootObject()->Values.CreateIterator(); RequestIt; ++RequestIt) + { + FString Key = RequestIt.Key(); + FString Value = RequestIt.Value().Get()->AsString(); + + if (!Key.IsEmpty() && !Value.IsEmpty()) + { + UrlParams += ParamIdx == 0 ? "?" : "&"; + UrlParams += UVaRestRequestJSON::PercentEncode(Key) + "=" + UVaRestRequestJSON::PercentEncode(Value); + } + + ParamIdx++; + } + + // Apply params + HttpRequest->SetURL(HttpRequest->GetURL() + UrlParams); + + break; + } + case ERequestContentType::x_www_form_urlencoded_body: { HttpRequest->SetHeader("Content-Type", "application/x-www-form-urlencoded"); From 8e94853c2bd78cae978ffefa9cfc9f4244276a54 Mon Sep 17 00:00:00 2001 From: "v.alyamkin" Date: Mon, 30 Nov 2015 18:28:36 +0300 Subject: [PATCH 5/6] Minor method rename --- Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h b/Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h index 0bfc3f50..84c03549 100644 --- a/Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h +++ b/Source/VaRestPlugin/Classes/Json/VaRestRequestJSON.h @@ -80,7 +80,7 @@ namespace ERequestContentType enum Type { x_www_form_urlencoded_url UMETA(DisplayName = "x-www-form-urlencoded (URL)"), - x_www_form_urlencoded_body UMETA(DisplayName = "x-www-form-urlencoded (Content Body)"), + x_www_form_urlencoded_body UMETA(DisplayName = "x-www-form-urlencoded (Request Body)"), json, binary }; From ec63d3462e3cd627c386b0489ea63ef8783f84cf Mon Sep 17 00:00:00 2001 From: Vladimir Alyamkin Date: Sat, 5 Dec 2015 19:25:07 +0300 Subject: [PATCH 6/6] Prepare plugin info for v1.1-r12 release --- README.md | 2 +- VaRestPlugin.uplugin | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cc6f9a28..c05eab9d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Key features: Check the [Wiki](https://github.com/ufna/VaRest/wiki) tab for plugin usage examples and installation notes. -Current version: **1.1 R 11** (UE 4.8-4.10) +Current version: **1.1 R 12** (UE 4.8-4.10) ![SCREENSHOT](SCREENSHOT.jpg) diff --git a/VaRestPlugin.uplugin b/VaRestPlugin.uplugin index 314afb88..00d908cc 100644 --- a/VaRestPlugin.uplugin +++ b/VaRestPlugin.uplugin @@ -2,8 +2,8 @@ "FileVersion" : 3, "FriendlyName" : "VaRest", - "Version" : 11, - "VersionName" : "1.1-r11", + "Version" : 12, + "VersionName" : "1.1-r12", "CreatedBy" : "Vladimir Alyamkin", "CreatedByURL" : "http://alyamkin.com", "EngineVersion" : 1579795,