From add83ce287a44684f428f4bd2a0a7ec041b7d3cf Mon Sep 17 00:00:00 2001 From: James Harrison Date: Thu, 31 Dec 2015 14:41:01 +0000 Subject: [PATCH 1/4] NIFI-1338 - Clarifying documentation for InvokeHTTP --- .../org/apache/nifi/processors/standard/InvokeHTTP.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java index 6d38bcebd517..6fb052f6e9d0 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java @@ -95,7 +95,8 @@ @SupportsBatching @Tags({"http", "https", "rest", "client"}) @InputRequirement(Requirement.INPUT_ALLOWED) -@CapabilityDescription("An HTTP client processor which converts FlowFile attributes to HTTP headers, with configurable HTTP method, url, etc.") +@CapabilityDescription("An HTTP client processor which can interact with a configurable HTTP Endpoint. The destination URL and HTTP Method are configurable." + +" FlowFile attributes are converted to HTTP headers and the FlowFile contents included as the body of the request (if the HTTP Method is PUT or POST).") @WritesAttributes({ @WritesAttribute(attribute = "invokehttp.status.code", description = "The status code that is returned"), @WritesAttribute(attribute = "invokehttp.status.message", description = "The status message that is returned"), @@ -130,8 +131,8 @@ public final class InvokeHTTP extends AbstractProcessor { // properties public static final PropertyDescriptor PROP_METHOD = new PropertyDescriptor.Builder() .name("HTTP Method") - .description("HTTP request method (GET, POST, PUT, DELETE, HEAD, OPTIONS). Arbitrary methods are also supported but will " - + "be sent without a message body.") + .description("HTTP request method (GET, POST, PUT, DELETE, HEAD, OPTIONS). Arbitrary methods are also supported. " + + "Methods other than POST and PUT be sent without a message body.") .required(true) .defaultValue("GET") .expressionLanguageSupported(true) From 5658f058c8232d41d13b1ea2e3981524aa149f95 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Thu, 31 Dec 2015 14:51:44 +0000 Subject: [PATCH 2/4] NIFI-1338 Now with better grammar! --- .../java/org/apache/nifi/processors/standard/InvokeHTTP.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java index 6fb052f6e9d0..6edd421af2e9 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java @@ -132,7 +132,7 @@ public final class InvokeHTTP extends AbstractProcessor { public static final PropertyDescriptor PROP_METHOD = new PropertyDescriptor.Builder() .name("HTTP Method") .description("HTTP request method (GET, POST, PUT, DELETE, HEAD, OPTIONS). Arbitrary methods are also supported. " - + "Methods other than POST and PUT be sent without a message body.") + + "Methods other than POST and PUT will be sent without a message body.") .required(true) .defaultValue("GET") .expressionLanguageSupported(true) From cb5889fe5cfa5b28500990f6db694f8e28072db1 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Thu, 31 Dec 2015 14:54:15 +0000 Subject: [PATCH 3/4] NIFI-1338 - Another missing word --- .../java/org/apache/nifi/processors/standard/InvokeHTTP.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java index 6edd421af2e9..e9d7487d3451 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java @@ -96,7 +96,7 @@ @Tags({"http", "https", "rest", "client"}) @InputRequirement(Requirement.INPUT_ALLOWED) @CapabilityDescription("An HTTP client processor which can interact with a configurable HTTP Endpoint. The destination URL and HTTP Method are configurable." - +" FlowFile attributes are converted to HTTP headers and the FlowFile contents included as the body of the request (if the HTTP Method is PUT or POST).") + +" FlowFile attributes are converted to HTTP headers and the FlowFile contents are included as the body of the request (if the HTTP Method is PUT or POST).") @WritesAttributes({ @WritesAttribute(attribute = "invokehttp.status.code", description = "The status code that is returned"), @WritesAttribute(attribute = "invokehttp.status.message", description = "The status message that is returned"), From c40f4edbcea19e97b83aab96fd9d4f76f85e9612 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Thu, 31 Dec 2015 16:30:48 +0000 Subject: [PATCH 4/4] Hopefully fixing checkstyle issue --- .../java/org/apache/nifi/processors/standard/InvokeHTTP.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java index e9d7487d3451..2eef3c6fffe1 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java @@ -96,7 +96,7 @@ @Tags({"http", "https", "rest", "client"}) @InputRequirement(Requirement.INPUT_ALLOWED) @CapabilityDescription("An HTTP client processor which can interact with a configurable HTTP Endpoint. The destination URL and HTTP Method are configurable." - +" FlowFile attributes are converted to HTTP headers and the FlowFile contents are included as the body of the request (if the HTTP Method is PUT or POST).") + + " FlowFile attributes are converted to HTTP headers and the FlowFile contents are included as the body of the request (if the HTTP Method is PUT or POST).") @WritesAttributes({ @WritesAttribute(attribute = "invokehttp.status.code", description = "The status code that is returned"), @WritesAttribute(attribute = "invokehttp.status.message", description = "The status message that is returned"), @@ -132,7 +132,7 @@ public final class InvokeHTTP extends AbstractProcessor { public static final PropertyDescriptor PROP_METHOD = new PropertyDescriptor.Builder() .name("HTTP Method") .description("HTTP request method (GET, POST, PUT, DELETE, HEAD, OPTIONS). Arbitrary methods are also supported. " - + "Methods other than POST and PUT will be sent without a message body.") + + "Methods other than POST and PUT will be sent without a message body.") .required(true) .defaultValue("GET") .expressionLanguageSupported(true)