[nifi-minifi-cpp] branch master updated: MINIFICPP-711 Adjust display name of proxy username for InvokeHTTP

[aldrin]

This is an automated email from the ASF dual-hosted git repository.

aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 86a3639  MINIFICPP-711 Adjust display name of proxy username for 
InvokeHTTP
86a3639 is described below

commit 86a36391d9db7bc7085cadde91845ea45d07d6ed
Author: Aldrin Piri <ald...@apache.org>
AuthorDate: Fri Jan 11 10:51:42 2019 -0500

    MINIFICPP-711 Adjust display name of proxy username for InvokeHTTP
    
    This closes #473.
    
    Signed-off-by: Aldrin Piri <ald...@apache.org>
---
 extensions/http-curl/processors/InvokeHTTP.cpp | 5 +++--
 extensions/http-curl/processors/InvokeHTTP.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/http-curl/processors/InvokeHTTP.cpp 
b/extensions/http-curl/processors/InvokeHTTP.cpp
index a2cd332..483cfa3 100644
--- a/extensions/http-curl/processors/InvokeHTTP.cpp
+++ b/extensions/http-curl/processors/InvokeHTTP.cpp
@@ -80,7 +80,8 @@ core::Property InvokeHTTP::SSLContext(
         ->asType<minifi::controllers::SSLContextService>()->build());
 core::Property InvokeHTTP::ProxyHost("Proxy Host", "The fully qualified 
hostname or IP address of the proxy server", "");
 core::Property InvokeHTTP::ProxyPort("Proxy Port", "The port of the proxy 
server", "");
-core::Property InvokeHTTP::ProxyUser("invokehttp-proxy-user", "Username to set 
when authenticating against proxy", "");
+core::Property InvokeHTTP::ProxyUsername(
+    core::PropertyBuilder::createProperty("invokehttp-proxy-username", "Proxy 
Username")->withDescription("Username to set when authenticating against 
proxy")->isRequired(false)->build());
 core::Property InvokeHTTP::ProxyPassword(
     core::PropertyBuilder::createProperty("invokehttp-proxy-password", "Proxy 
Password")->withDescription("Password to set when authenticating against 
proxy")->isRequired(false)->build());
 core::Property InvokeHTTP::ContentType("Content-type", "The Content-Type to 
specify for when content is being transmitted through a PUT, "
@@ -139,7 +140,7 @@ void InvokeHTTP::initialize() {
   properties.insert(SSLContext);
   properties.insert(ProxyHost);
   properties.insert(ProxyPort);
-  properties.insert(ProxyUser);
+  properties.insert(ProxyUsername);
   properties.insert(UseChunkedEncoding);
   properties.insert(ProxyPassword);
   properties.insert(ContentType);
diff --git a/extensions/http-curl/processors/InvokeHTTP.h 
b/extensions/http-curl/processors/InvokeHTTP.h
index 3b83d9c..3da3c75 100644
--- a/extensions/http-curl/processors/InvokeHTTP.h
+++ b/extensions/http-curl/processors/InvokeHTTP.h
@@ -79,7 +79,7 @@ class InvokeHTTP : public core::Processor {
   static core::Property SSLContext;
   static core::Property ProxyHost;
   static core::Property ProxyPort;
-  static core::Property ProxyUser;
+  static core::Property ProxyUsername;
   static core::Property ProxyPassword;
   static core::Property ContentType;
   static core::Property SendBody;