You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2019/02/15 22:09:51 UTC
[nifi] branch master updated: NIFI-6018 Marking GetHTTP and
PostHTTP deprecated. Adding info about deprecation to processors
descriptions. Fix small mistake in developer-guide. Suppressed deprecation
warnings in TestGetHTTP, TestPostHTTP, TestGetHTTPGroovy,
and TestPostHTTPGroovy. The annotation suppresses some warnings,
but until Java 9, explicit FQCN imports are needed to avoid all warnings.
This is an automated email from the ASF dual-hosted git repository.
alopresto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 9e0687a NIFI-6018 Marking GetHTTP and PostHTTP deprecated. Adding info about deprecation to processors descriptions. Fix small mistake in developer-guide. Suppressed deprecation warnings in TestGetHTTP, TestPostHTTP, TestGetHTTPGroovy, and TestPostHTTPGroovy. The annotation suppresses some warnings, but until Java 9, explicit FQCN imports are needed to avoid all warnings.
9e0687a is described below
commit 9e0687ab6b3bb3923aa334e9d4b86712e5982ff3
Author: Aleksandr Salatich <sa...@gmail.com>
AuthorDate: Fri Feb 15 18:27:43 2019 +0300
NIFI-6018 Marking GetHTTP and PostHTTP deprecated. Adding info about deprecation to processors descriptions. Fix small mistake in developer-guide.
Suppressed deprecation warnings in TestGetHTTP, TestPostHTTP, TestGetHTTPGroovy, and TestPostHTTPGroovy. The annotation suppresses some warnings, but until Java 9, explicit FQCN imports are needed to avoid all warnings.
This closes #3312.
Signed-off-by: Andy LoPresto <al...@apache.org>
---
nifi-docs/src/main/asciidoc/developer-guide.adoc | 2 +-
.../apache/nifi/processors/standard/GetHTTP.java | 6 +-
.../apache/nifi/processors/standard/PostHTTP.java | 5 +-
.../processors/standard/TestGetHTTPGroovy.groovy | 17 +-
.../processors/standard/TestPostHTTPGroovy.groovy | 19 +-
.../nifi/processors/standard/TestGetHTTP.java | 218 ++++++++++-----------
.../nifi/processors/standard/TestPostHTTP.java | 150 +++++++-------
7 files changed, 213 insertions(+), 204 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi-docs/src/main/asciidoc/developer-guide.adoc
index d357822..67c827b 100644
--- a/nifi-docs/src/main/asciidoc/developer-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/developer-guide.adoc
@@ -2521,7 +2521,7 @@ logged to help avoid this bad practice.
[[deprecation]]
== Deprecating a Component
Sometimes it may be desirable to deprecate a component. Whenever this occurs the developer may use the
- @DeprecationNotice annotation to indicate that a component has been deprecated, aloowing the developer
+ @DeprecationNotice annotation to indicate that a component has been deprecated, allowing the developer
to describe a reason for the deprecation and suggest alternative components. An example of how to do this can
be found below:
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
index b061e52..6469d30 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
@@ -72,6 +72,7 @@ import org.apache.nifi.annotation.behavior.Stateful;
import org.apache.nifi.annotation.behavior.WritesAttribute;
import org.apache.nifi.annotation.behavior.WritesAttributes;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.AllowableValue;
@@ -103,9 +104,12 @@ import org.apache.nifi.ssl.SSLContextService.ClientAuth;
import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.Tuple;
+@Deprecated
+@DeprecationNotice(alternatives = {InvokeHTTP.class}, reason = "This processor is deprecated and may be removed in future releases.")
@Tags({"get", "fetch", "poll", "http", "https", "ingest", "source", "input"})
@InputRequirement(Requirement.INPUT_FORBIDDEN)
-@CapabilityDescription("Fetches data from an HTTP or HTTPS URL and writes the data to the content of a FlowFile. Once the content has been fetched, the ETag and Last Modified "
+@CapabilityDescription("Please be aware this processor is deprecated and may be removed in the near future. Use InvokeHTTP instead. "
+ + "Fetches data from an HTTP or HTTPS URL and writes the data to the content of a FlowFile. Once the content has been fetched, the ETag and Last Modified "
+ "dates are remembered (if the web server supports these concepts). This allows the Processor to fetch new data only if the remote data has changed or until the state is cleared. That is, "
+ "once the content has been fetched from the given URL, it will not be fetched again until the content on the remote server changes. Note that due to limitations on state "
+ "management, stored \"last modified\" and etag fields never expire. If the URL in GetHttp uses Expression Language that is unbounded, there "
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
index ee28c0c..38e5ccc 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
@@ -98,6 +98,7 @@ import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
@@ -134,10 +135,12 @@ import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.StringUtils;
+@Deprecated
+@DeprecationNotice(alternatives = {InvokeHTTP.class}, reason = "This processor is deprecated and may be removed in future releases.")
@SupportsBatching
@InputRequirement(Requirement.INPUT_REQUIRED)
@Tags({"http", "https", "remote", "copy", "archive"})
-@CapabilityDescription("Performs an HTTP Post with the content of the FlowFile. "
+@CapabilityDescription("Please be aware this processor is deprecated and may be removed in the near future. Use InvokeHTTP instead. Performs an HTTP Post with the content of the FlowFile. "
+ "Uses a connection pool with max number of connections equal to "
+ "the number of possible endpoints multiplied by the Concurrent Tasks configuration.")
public class PostHTTP extends AbstractProcessor {
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy
index 4cf8964..408e691 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy
@@ -56,6 +56,7 @@ import javax.net.ssl.TrustManager
import javax.net.ssl.X509TrustManager
import java.security.Security
+@SuppressWarnings("deprecation")
@RunWith(JUnit4.class)
class TestGetHTTPGroovy extends GroovyTestCase {
private static final Logger logger = LoggerFactory.getLogger(TestGetHTTPGroovy.class)
@@ -186,7 +187,7 @@ class TestGetHTTPGroovy extends GroovyTestCase {
] as HostnameVerifier
// Configure the test runner
- TestRunner runner = TestRunners.newTestRunner(GetHTTP.class)
+ TestRunner runner = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class)
final SSLContextService sslContextService = new StandardSSLContextService()
runner.addControllerService("ssl-context", sslContextService)
runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, TRUSTSTORE_PATH)
@@ -194,8 +195,8 @@ class TestGetHTTPGroovy extends GroovyTestCase {
runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, KEYSTORE_TYPE)
runner.enableControllerService(sslContextService)
- runner.setProperty(GetHTTP.URL, GET_URL)
- runner.setProperty(GetHTTP.SSL_CONTEXT_SERVICE, "ssl-context")
+ runner.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, GET_URL)
+ runner.setProperty(org.apache.nifi.processors.standard.GetHTTP.SSL_CONTEXT_SERVICE, "ssl-context")
runner
}
@@ -216,7 +217,7 @@ class TestGetHTTPGroovy extends GroovyTestCase {
HttpsURLConnection.setDefaultSSLSocketFactory(socketFactory)
HttpsURLConnection.setDefaultHostnameVerifier(nullHostnameVerifier)
- runner.setProperty(GetHTTP.FILENAME, "mockFlowfile_${System.currentTimeMillis()}")
+ runner.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "mockFlowfile_${System.currentTimeMillis()}")
(runner as StandardProcessorTestRunner).clearQueue()
}
@@ -377,7 +378,7 @@ class TestGetHTTPGroovy extends GroovyTestCase {
// Arrange
// Connect to a server that still runs TLSv1/1.1/1.2
- runner.setProperty(GetHTTP.URL, TLS_1_URL)
+ runner.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, TLS_1_URL)
// Act
[TLSv1, TLSv1_1, TLSv1_2].each { String tlsVersion ->
@@ -389,7 +390,7 @@ class TestGetHTTPGroovy extends GroovyTestCase {
// Assert
logger.info("Queue size (after run): ${runner.queueSize}")
- runner.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS, 1)
+ runner.assertAllFlowFilesTransferred(REL_SUCCESS, 1)
runner.clearTransferState()
logger.info("Ran successfully")
}
@@ -434,7 +435,7 @@ class TestGetHTTPGroovy extends GroovyTestCase {
runner.run()
// Assert
- runner.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS)
+ runner.assertAllFlowFilesTransferred(REL_SUCCESS)
runner.clearTransferState()
logger.info("Ran successfully")
}
@@ -478,7 +479,7 @@ class TestGetHTTPGroovy extends GroovyTestCase {
runner.run()
// Assert
- runner.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS)
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS)
runner.clearTransferState()
logger.info("Ran successfully")
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
index e13482d..6022b8c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
@@ -53,6 +53,7 @@ import javax.net.ssl.TrustManager
import javax.net.ssl.X509TrustManager
import java.security.Security
+@SuppressWarnings("deprecation")
@RunWith(JUnit4.class)
class TestPostHTTPGroovy extends GroovyTestCase {
private static final Logger logger = LoggerFactory.getLogger(TestPostHTTPGroovy.class)
@@ -178,7 +179,7 @@ class TestPostHTTPGroovy extends GroovyTestCase {
] as HostnameVerifier
// Configure the test runner
- TestRunner runner = TestRunners.newTestRunner(PostHTTP.class)
+ TestRunner runner = TestRunners.newTestRunner(org.apache.nifi.processors.standard.PostHTTP.class)
final SSLContextService sslContextService = new StandardSSLContextService()
runner.addControllerService("ssl-context", sslContextService)
runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, TRUSTSTORE_PATH)
@@ -186,9 +187,9 @@ class TestPostHTTPGroovy extends GroovyTestCase {
runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, KEYSTORE_TYPE)
runner.enableControllerService(sslContextService)
- runner.setProperty(PostHTTP.URL, POST_URL)
- runner.setProperty(PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context")
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false")
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, POST_URL)
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context")
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false")
runner
}
@@ -355,7 +356,7 @@ class TestPostHTTPGroovy extends GroovyTestCase {
runner.run()
// Assert
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS, 1)
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS, 1)
runner.clearTransferState()
logger.info("Ran successfully")
}
@@ -383,7 +384,7 @@ class TestPostHTTPGroovy extends GroovyTestCase {
runner.run()
// Assert
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_FAILURE, 1)
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_FAILURE, 1)
runner.clearTransferState()
logger.expected("Unable to connect")
@@ -394,7 +395,7 @@ class TestPostHTTPGroovy extends GroovyTestCase {
runner.run()
// Assert
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS, 1)
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS, 1)
runner.clearTransferState()
logger.info("Ran successfully")
}
@@ -422,7 +423,7 @@ class TestPostHTTPGroovy extends GroovyTestCase {
runner.run()
// Assert
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_FAILURE, 1)
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_FAILURE, 1)
runner.clearTransferState()
logger.expected("Unable to connect")
}
@@ -433,7 +434,7 @@ class TestPostHTTPGroovy extends GroovyTestCase {
runner.run()
// Assert
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS, 1)
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS, 1)
runner.clearTransferState()
logger.info("Ran successfully")
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
index 6666f19..0bc97cb 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
@@ -16,31 +16,31 @@
*/
package org.apache.nifi.processors.standard;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
import org.apache.nifi.components.state.Scope;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.web.util.TestServer;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.ssl.StandardSSLContextService;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
+import org.apache.nifi.web.util.TestServer;
import org.eclipse.jetty.servlet.ServletHandler;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
/**
*
*/
+@SuppressWarnings("deprecation")
public class TestGetHTTP {
private TestRunner controller;
@@ -70,25 +70,25 @@ public class TestGetHTTP {
String destination = server.getUrl();
// set up NiFi mock controller
- controller = TestRunners.newTestRunner(GetHTTP.class);
- controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
- controller.setProperty(GetHTTP.URL, destination);
- controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
-
- controller.getStateManager().assertStateNotSet(GetHTTP.ETAG, Scope.LOCAL);
- controller.getStateManager().assertStateNotSet(GetHTTP.LAST_MODIFIED, Scope.LOCAL);
+ controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "5 secs");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "testFile");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+
+ controller.getStateManager().assertStateNotSet(org.apache.nifi.processors.standard.GetHTTP.ETAG, Scope.LOCAL);
+ controller.getStateManager().assertStateNotSet(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED, Scope.LOCAL);
controller.run(2);
// verify the lastModified and entityTag are updated
- controller.getStateManager().assertStateNotEquals(GetHTTP.ETAG+":"+destination, "", Scope.LOCAL);
- controller.getStateManager().assertStateNotEquals(GetHTTP.LAST_MODIFIED+":"+destination, "Thu, 01 Jan 1970 00:00:00 GMT", Scope.LOCAL);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.ETAG+":"+destination, "", Scope.LOCAL);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED+":"+destination, "Thu, 01 Jan 1970 00:00:00 GMT", Scope.LOCAL);
// ran twice, but got one...which is good
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
// verify remote.source flowfile attribute
- controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).get(0).assertAttributeEquals("gethttp.remote.source", "localhost");
+ controller.getFlowFilesForRelationship(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS).get(0).assertAttributeEquals("gethttp.remote.source", "localhost");
controller.clearTransferState();
// turn off checking for etag and lastModified
@@ -97,21 +97,21 @@ public class TestGetHTTP {
controller.run(2);
// ran twice, got two...which is good
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 2);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 2);
controller.clearTransferState();
// turn on checking for etag
RESTServiceContentModified.IGNORE_ETAG = false;
controller.run(2);
// ran twice, got 0...which is good
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 0);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 0);
// turn on checking for lastModified, but off for etag
RESTServiceContentModified.IGNORE_LAST_MODIFIED = false;
RESTServiceContentModified.IGNORE_ETAG = true;
controller.run(2);
// ran twice, got 0...which is good
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 0);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 0);
// turn off checking for lastModified, turn on checking for etag, but change the value
RESTServiceContentModified.IGNORE_LAST_MODIFIED = true;
@@ -120,21 +120,21 @@ public class TestGetHTTP {
controller.run(2);
// ran twice, got 1...but should have new cached etag
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
- String eTagStateValue = controller.getStateManager().getState(Scope.LOCAL).get(GetHTTP.ETAG+":"+destination);
- assertEquals("1",GetHTTP.parseStateValue(eTagStateValue).getValue());
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
+ String eTagStateValue = controller.getStateManager().getState(Scope.LOCAL).get(org.apache.nifi.processors.standard.GetHTTP.ETAG+":"+destination);
+ assertEquals("1",org.apache.nifi.processors.standard.GetHTTP.parseStateValue(eTagStateValue).getValue());
controller.clearTransferState();
// turn off checking for Etag, turn on checking for lastModified, but change value
RESTServiceContentModified.IGNORE_LAST_MODIFIED = false;
RESTServiceContentModified.IGNORE_ETAG = true;
RESTServiceContentModified.modificationDate = System.currentTimeMillis() / 1000 * 1000 + 5000;
- String lastMod = controller.getStateManager().getState(Scope.LOCAL).get(GetHTTP.LAST_MODIFIED+":"+destination);
+ String lastMod = controller.getStateManager().getState(Scope.LOCAL).get(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED+":"+destination);
controller.run(2);
// ran twice, got 1...but should have new cached etag
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
- controller.getStateManager().assertStateNotEquals(GetHTTP.LAST_MODIFIED+":"+destination, lastMod, Scope.LOCAL);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED+":"+destination, lastMod, Scope.LOCAL);
controller.clearTransferState();
} finally {
@@ -169,39 +169,39 @@ public class TestGetHTTP {
String destination2 = server2.getUrl();
// set up NiFi mock controller
- controller = TestRunners.newTestRunner(GetHTTP.class);
- controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
- controller.setProperty(GetHTTP.URL, destination1);
- controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
-
- controller.getStateManager().assertStateNotSet(GetHTTP.ETAG+":"+destination1, Scope.LOCAL);
- controller.getStateManager().assertStateNotSet(GetHTTP.LAST_MODIFIED+":"+destination1, Scope.LOCAL);
+ controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "5 secs");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination1);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "testFile");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+
+ controller.getStateManager().assertStateNotSet(org.apache.nifi.processors.standard.GetHTTP.ETAG+":"+destination1, Scope.LOCAL);
+ controller.getStateManager().assertStateNotSet(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED+":"+destination1, Scope.LOCAL);
controller.run(2);
// verify the lastModified and entityTag are updated
- controller.getStateManager().assertStateNotEquals(GetHTTP.ETAG+":"+destination1, "", Scope.LOCAL);
- controller.getStateManager().assertStateNotEquals(GetHTTP.LAST_MODIFIED+":"+destination1, "Thu, 01 Jan 1970 00:00:00 GMT", Scope.LOCAL);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.ETAG+":"+destination1, "", Scope.LOCAL);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED+":"+destination1, "Thu, 01 Jan 1970 00:00:00 GMT", Scope.LOCAL);
// ran twice, but got one...which is good
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
controller.clearTransferState();
- controller.setProperty(GetHTTP.URL, destination2);
- controller.getStateManager().assertStateNotSet(GetHTTP.ETAG+":"+destination2, Scope.LOCAL);
- controller.getStateManager().assertStateNotSet(GetHTTP.LAST_MODIFIED+":"+destination2, Scope.LOCAL);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination2);
+ controller.getStateManager().assertStateNotSet(org.apache.nifi.processors.standard.GetHTTP.ETAG+":"+destination2, Scope.LOCAL);
+ controller.getStateManager().assertStateNotSet(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED+":"+destination2, Scope.LOCAL);
controller.run(2);
// ran twice, but got one...which is good
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
// verify the lastModified's and entityTags are updated
- controller.getStateManager().assertStateNotEquals(GetHTTP.ETAG+":"+destination1, "", Scope.LOCAL);
- controller.getStateManager().assertStateNotEquals(GetHTTP.LAST_MODIFIED+":"+destination1, "Thu, 01 Jan 1970 00:00:00 GMT", Scope.LOCAL);
- controller.getStateManager().assertStateNotEquals(GetHTTP.ETAG+":"+destination2, "", Scope.LOCAL);
- controller.getStateManager().assertStateNotEquals(GetHTTP.LAST_MODIFIED+":"+destination2, "Thu, 01 Jan 1970 00:00:00 GMT", Scope.LOCAL);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.ETAG+":"+destination1, "", Scope.LOCAL);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED+":"+destination1, "Thu, 01 Jan 1970 00:00:00 GMT", Scope.LOCAL);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.ETAG+":"+destination2, "", Scope.LOCAL);
+ controller.getStateManager().assertStateNotEquals(org.apache.nifi.processors.standard.GetHTTP.LAST_MODIFIED+":"+destination2, "Thu, 01 Jan 1970 00:00:00 GMT", Scope.LOCAL);
} finally {
// shutdown web services
@@ -226,18 +226,18 @@ public class TestGetHTTP {
String destination = server.getUrl();
// set up NiFi mock controller
- controller = TestRunners.newTestRunner(GetHTTP.class);
- controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
- controller.setProperty(GetHTTP.URL, destination);
- controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "5 secs");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "testFile");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
controller.run();
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 0);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 0);
- controller.setProperty(GetHTTP.USER_AGENT, "testUserAgent");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.USER_AGENT, "testUserAgent");
controller.run();
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
// shutdown web service
} finally {
@@ -261,17 +261,17 @@ public class TestGetHTTP {
String destination = server.getUrl();
// set up NiFi mock controller
- controller = TestRunners.newTestRunner(GetHTTP.class);
- controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
- controller.setProperty(GetHTTP.URL, destination);
- controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
- controller.setProperty(GetHTTP.USER_AGENT, "testUserAgent");
+ controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "5 secs");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "testFile");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.USER_AGENT, "testUserAgent");
controller.setProperty("Static-Header", "StaticHeaderValue");
controller.setProperty("EL-Header", "${now()}");
controller.run();
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
// shutdown web service
} finally {
@@ -295,17 +295,17 @@ public class TestGetHTTP {
String destination = server.getUrl();
// set up NiFi mock controller
- controller = TestRunners.newTestRunner(GetHTTP.class);
- controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
- controller.setProperty(GetHTTP.URL, destination+"/test_${literal(1)}.pdf");
- controller.setProperty(GetHTTP.FILENAME, "test_${now():format('yyyy/MM/dd_HH:mm:ss')}");
- controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
- controller.setProperty(GetHTTP.USER_AGENT, "testUserAgent");
+ controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "5 secs");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination+"/test_${literal(1)}.pdf");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "test_${now():format('yyyy/MM/dd_HH:mm:ss')}");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.USER_AGENT, "testUserAgent");
controller.run();
- controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
+ controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
- MockFlowFile response = controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).get(0);
+ MockFlowFile response = controller.getFlowFilesForRelationship(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS).get(0);
response.assertAttributeEquals("gethttp.remote.source","localhost");
String fileName = response.getAttribute(CoreAttributes.FILENAME.key());
assertTrue(fileName.matches("test_\\d\\d\\d\\d/\\d\\d/\\d\\d_\\d\\d:\\d\\d:\\d\\d"));
@@ -334,27 +334,27 @@ public class TestGetHTTP {
HttpErrorServlet servlet = (HttpErrorServlet) handler.getServlets()[0].getServlet();
String destination = server.getUrl();
- this.controller = TestRunners.newTestRunner(GetHTTP.class);
- this.controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
- this.controller.setProperty(GetHTTP.URL, destination+"/test_${literal(1)}.pdf");
- this.controller.setProperty(GetHTTP.FILENAME, "test_${now():format('yyyy/MM/dd_HH:mm:ss')}");
- this.controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
- this.controller.setProperty(GetHTTP.USER_AGENT, "testUserAgent");
+ this.controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
+ this.controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "5 secs");
+ this.controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination+"/test_${literal(1)}.pdf");
+ this.controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "test_${now():format('yyyy/MM/dd_HH:mm:ss')}");
+ this.controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ this.controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.USER_AGENT, "testUserAgent");
// 204 - NO CONTENT
servlet.setErrorToReturn(HttpServletResponse.SC_NO_CONTENT);
this.controller.run();
- this.controller.assertTransferCount(GetHTTP.REL_SUCCESS, 0);
+ this.controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 0);
// 404 - NOT FOUND
servlet.setErrorToReturn(HttpServletResponse.SC_NOT_FOUND);
this.controller.run();
- this.controller.assertTransferCount(GetHTTP.REL_SUCCESS, 0);
+ this.controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 0);
// 500 - INTERNAL SERVER ERROR
servlet.setErrorToReturn(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
this.controller.run();
- this.controller.assertTransferCount(GetHTTP.REL_SUCCESS, 0);
+ this.controller.assertTransferCount(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 0);
} finally {
// shutdown web service
server.shutdownServer();
@@ -379,18 +379,18 @@ public class TestGetHTTP {
final String destination = server.getSecureUrl();
// set up NiFi mock controller
- controller = TestRunners.newTestRunner(GetHTTP.class);
+ controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
// Use context service with only a truststore
useSSLContextService(getTruststoreProperties());
- controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
- controller.setProperty(GetHTTP.URL, destination);
- controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "5 secs");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "testFile");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
controller.run();
- controller.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS, 1);
- final MockFlowFile mff = controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).get(0);
+ controller.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
+ final MockFlowFile mff = controller.getFlowFilesForRelationship(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS).get(0);
mff.assertContentEquals("Hello, World!");
} finally {
server.shutdownServer();
@@ -415,18 +415,18 @@ public class TestGetHTTP {
final String destination = server.getSecureUrl();
// set up NiFi mock controller
- controller = TestRunners.newTestRunner(GetHTTP.class);
+ controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
// Use context service with a keystore and a truststore
useSSLContextService(twoWaySslProperties);
- controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "10 secs");
- controller.setProperty(GetHTTP.URL, destination);
- controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "10 secs");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "testFile");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
controller.run();
- controller.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS, 1);
- final MockFlowFile mff = controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).get(0);
+ controller.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
+ final MockFlowFile mff = controller.getFlowFilesForRelationship(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS).get(0);
mff.assertContentEquals("Hello, World!");
} finally {
server.shutdownServer();
@@ -458,42 +458,42 @@ public class TestGetHTTP {
String destination2 = server2.getUrl();
// set up NiFi mock controller
- controller = TestRunners.newTestRunner(GetHTTP.class);
- controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
- controller.setProperty(GetHTTP.URL, destination1 + "/?redirect=" + URLEncoder.encode(destination2, "UTF-8")
+ controller = TestRunners.newTestRunner(org.apache.nifi.processors.standard.GetHTTP.class);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.CONNECTION_TIMEOUT, "5 secs");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination1 + "/?redirect=" + URLEncoder.encode(destination2, "UTF-8")
+ "&datemode=" + CookieTestingServlet.DATEMODE_COOKIE_DEFAULT);
- controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.setProperty(GetHTTP.FOLLOW_REDIRECTS, "true");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FILENAME, "testFile");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.FOLLOW_REDIRECTS, "true");
controller.run(1);
// verify default cookie data does successful redirect
- controller.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS, 1);
- MockFlowFile ff = controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).get(0);
+ controller.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
+ MockFlowFile ff = controller.getFlowFilesForRelationship(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS).get(0);
ff.assertContentEquals("Hello, World!");
controller.clearTransferState();
// verify NON-standard cookie data fails with default redirect_cookie_policy
- controller.setProperty(GetHTTP.URL, destination1 + "/?redirect=" + URLEncoder.encode(destination2, "UTF-8")
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination1 + "/?redirect=" + URLEncoder.encode(destination2, "UTF-8")
+ "&datemode=" + CookieTestingServlet.DATEMODE_COOKIE_NOT_TYPICAL);
controller.run(1);
- controller.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS, 0);
+ controller.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 0);
controller.clearTransferState();
// change GetHTTP to place it in STANDARD cookie policy mode
- controller.setProperty(GetHTTP.REDIRECT_COOKIE_POLICY, GetHTTP.STANDARD_COOKIE_POLICY_STR);
- controller.setProperty(GetHTTP.URL, destination1 + "/?redirect=" + URLEncoder.encode(destination2, "UTF-8")
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.REDIRECT_COOKIE_POLICY, org.apache.nifi.processors.standard.GetHTTP.STANDARD_COOKIE_POLICY_STR);
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.URL, destination1 + "/?redirect=" + URLEncoder.encode(destination2, "UTF-8")
+ "&datemode=" + CookieTestingServlet.DATEMODE_COOKIE_NOT_TYPICAL);
controller.run(1);
// verify NON-standard cookie data does successful redirect
- controller.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS, 1);
- ff = controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).get(0);
+ controller.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS, 1);
+ ff = controller.getFlowFilesForRelationship(org.apache.nifi.processors.standard.GetHTTP.REL_SUCCESS).get(0);
ff.assertContentEquals("Hello, World!");
} finally {
@@ -529,7 +529,7 @@ public class TestGetHTTP {
Assert.fail("Could not create SSL Context Service");
}
- controller.setProperty(GetHTTP.SSL_CONTEXT_SERVICE, "ssl-service");
+ controller.setProperty(org.apache.nifi.processors.standard.GetHTTP.SSL_CONTEXT_SERVICE, "ssl-service");
}
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
index 3b69179..ff26e38 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
@@ -28,21 +28,21 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.web.util.TestServer;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.ssl.StandardSSLContextService;
import org.apache.nifi.util.FlowFileUnpackagerV3;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
+import org.apache.nifi.web.util.TestServer;
import org.eclipse.jetty.servlet.ServletHandler;
import org.junit.After;
-import org.junit.Test;
import org.junit.Assert;
+import org.junit.Test;
+@SuppressWarnings("deprecation")
public class TestPostHTTP {
private TestServer server;
private TestRunner runner;
@@ -64,7 +64,7 @@ public class TestPostHTTP {
server.startServer();
servlet = (CaptureServlet) handler.getServlets()[0].getServlet();
- runner = TestRunners.newTestRunner(PostHTTP.class);
+ runner = TestRunners.newTestRunner(org.apache.nifi.processors.standard.PostHTTP.class);
}
@After
@@ -91,14 +91,14 @@ public class TestPostHTTP {
runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, JKS_TYPE);
runner.enableControllerService(sslContextService);
- runner.setProperty(PostHTTP.URL, server.getSecureUrl());
- runner.setProperty(PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context");
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getSecureUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false");
runner.enqueue("Hello world".getBytes());
runner.run();
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS, 1);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS, 1);
}
@Test
@@ -123,14 +123,14 @@ public class TestPostHTTP {
runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, JKS_TYPE);
runner.enableControllerService(sslContextService);
- runner.setProperty(PostHTTP.URL, server.getSecureUrl());
- runner.setProperty(PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context");
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getSecureUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false");
runner.enqueue("Hello world".getBytes());
runner.run();
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS, 1);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS, 1);
}
@Test
@@ -152,21 +152,21 @@ public class TestPostHTTP {
runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, JKS_TYPE);
runner.enableControllerService(sslContextService);
- runner.setProperty(PostHTTP.URL, server.getSecureUrl());
- runner.setProperty(PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context");
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getSecureUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false");
runner.enqueue("Hello world".getBytes());
runner.run();
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_FAILURE, 1);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_FAILURE, 1);
}
@Test
public void testSendAsFlowFile() throws Exception {
setup(null);
- runner.setProperty(PostHTTP.URL, server.getUrl());
- runner.setProperty(PostHTTP.SEND_AS_FLOWFILE, "true");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.SEND_AS_FLOWFILE, "true");
final Map<String, String> attrs = new HashMap<>();
attrs.put("abc", "cba");
@@ -177,7 +177,7 @@ public class TestPostHTTP {
runner.enqueue("World".getBytes(), attrs);
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
final byte[] lastPost = servlet.getLastPost();
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -225,9 +225,9 @@ public class TestPostHTTP {
runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, JKS_TYPE);
runner.enableControllerService(sslContextService);
- runner.setProperty(PostHTTP.URL, server.getSecureUrl());
- runner.setProperty(PostHTTP.SEND_AS_FLOWFILE, "true");
- runner.setProperty(PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getSecureUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.SEND_AS_FLOWFILE, "true");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.SSL_CONTEXT_SERVICE, "ssl-context");
final Map<String, String> attrs = new HashMap<>();
attrs.put("abc", "cba");
@@ -238,7 +238,7 @@ public class TestPostHTTP {
runner.enqueue("World".getBytes(), attrs);
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
final byte[] lastPost = servlet.getLastPost();
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -266,38 +266,38 @@ public class TestPostHTTP {
@Test
public void testSendWithMimeType() throws Exception {
setup(null);
- runner.setProperty(PostHTTP.URL, server.getUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl());
final Map<String, String> attrs = new HashMap<>();
final String suppliedMimeType = "text/plain";
attrs.put(CoreAttributes.MIME_TYPE.key(), suppliedMimeType);
runner.enqueue("Camping is great!".getBytes(), attrs);
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false");
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
Map<String, String> lastPostHeaders = servlet.getLastPostHeaders();
- Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(PostHTTP.CONTENT_TYPE_HEADER));
+ Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE_HEADER));
Assert.assertEquals("17",lastPostHeaders.get("Content-Length"));
}
@Test
public void testSendWithEmptyELExpression() throws Exception {
setup(null);
- runner.setProperty(PostHTTP.URL, server.getUrl());
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false");
final Map<String, String> attrs = new HashMap<>();
attrs.put(CoreAttributes.MIME_TYPE.key(), "");
runner.enqueue("The wilderness.".getBytes(), attrs);
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
Map<String, String> lastPostHeaders = servlet.getLastPostHeaders();
- Assert.assertEquals(PostHTTP.DEFAULT_CONTENT_TYPE, lastPostHeaders.get(PostHTTP.CONTENT_TYPE_HEADER));
+ Assert.assertEquals(org.apache.nifi.processors.standard.PostHTTP.DEFAULT_CONTENT_TYPE, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE_HEADER));
}
@Test
@@ -305,19 +305,19 @@ public class TestPostHTTP {
setup(null);
final String suppliedMimeType = "text/plain";
- runner.setProperty(PostHTTP.URL, server.getUrl());
- runner.setProperty(PostHTTP.CONTENT_TYPE, suppliedMimeType);
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE, suppliedMimeType);
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false");
final Map<String, String> attrs = new HashMap<>();
attrs.put(CoreAttributes.MIME_TYPE.key(), "text/csv");
runner.enqueue("Sending with content type property.".getBytes(), attrs);
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
Map<String, String> lastPostHeaders = servlet.getLastPostHeaders();
- Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(PostHTTP.CONTENT_TYPE_HEADER));
+ Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE_HEADER));
}
@Test
@@ -325,9 +325,9 @@ public class TestPostHTTP {
setup(null);
final String suppliedMimeType = "text/plain";
- runner.setProperty(PostHTTP.URL, server.getUrl());
- runner.setProperty(PostHTTP.CONTENT_TYPE, suppliedMimeType);
- runner.setProperty(PostHTTP.COMPRESSION_LEVEL, "9");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE, suppliedMimeType);
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.COMPRESSION_LEVEL, "9");
final Map<String, String> attrs = new HashMap<>();
attrs.put(CoreAttributes.MIME_TYPE.key(), "text/plain");
@@ -335,12 +335,12 @@ public class TestPostHTTP {
runner.enqueue(StringUtils.repeat("Lines of sample text.", 100).getBytes(), attrs);
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
Map<String, String> lastPostHeaders = servlet.getLastPostHeaders();
- Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(PostHTTP.CONTENT_TYPE_HEADER));
+ Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE_HEADER));
// Ensure that a 'Content-Encoding' header was set with a 'gzip' value
- Assert.assertEquals(PostHTTP.CONTENT_ENCODING_GZIP_VALUE, lastPostHeaders.get(PostHTTP.CONTENT_ENCODING_HEADER));
+ Assert.assertEquals(org.apache.nifi.processors.standard.PostHTTP.CONTENT_ENCODING_GZIP_VALUE, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_ENCODING_HEADER));
Assert.assertNull(lastPostHeaders.get("Content-Length"));
}
@@ -349,10 +349,10 @@ public class TestPostHTTP {
setup(null);
final String suppliedMimeType = "text/plain";
- runner.setProperty(PostHTTP.URL, server.getUrl());
- runner.setProperty(PostHTTP.CONTENT_TYPE, suppliedMimeType);
- runner.setProperty(PostHTTP.COMPRESSION_LEVEL, "0");
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE, suppliedMimeType);
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.COMPRESSION_LEVEL, "0");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false");
final Map<String, String> attrs = new HashMap<>();
attrs.put(CoreAttributes.MIME_TYPE.key(), "text/plain");
@@ -360,12 +360,12 @@ public class TestPostHTTP {
runner.enqueue(StringUtils.repeat("Lines of sample text.", 100).getBytes(), attrs);
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
Map<String, String> lastPostHeaders = servlet.getLastPostHeaders();
- Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(PostHTTP.CONTENT_TYPE_HEADER));
+ Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE_HEADER));
// Ensure that the request was not sent with a 'Content-Encoding' header
- Assert.assertNull(lastPostHeaders.get(PostHTTP.CONTENT_ENCODING_HEADER));
+ Assert.assertNull(lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_ENCODING_HEADER));
Assert.assertEquals("2100",lastPostHeaders.get("Content-Length"));
}
@@ -375,9 +375,9 @@ public class TestPostHTTP {
final String suppliedMimeType = "text/plain";
// Specify a property to the URL to have the CaptureServlet specify it doesn't accept gzip
- runner.setProperty(PostHTTP.URL, server.getUrl()+"?acceptGzip=false");
- runner.setProperty(PostHTTP.CONTENT_TYPE, suppliedMimeType);
- runner.setProperty(PostHTTP.COMPRESSION_LEVEL, "9");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl()+"?acceptGzip=false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE, suppliedMimeType);
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.COMPRESSION_LEVEL, "9");
final Map<String, String> attrs = new HashMap<>();
attrs.put(CoreAttributes.MIME_TYPE.key(), "text/plain");
@@ -385,12 +385,12 @@ public class TestPostHTTP {
runner.enqueue(StringUtils.repeat("Lines of sample text.", 100).getBytes(), attrs);
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
Map<String, String> lastPostHeaders = servlet.getLastPostHeaders();
- Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(PostHTTP.CONTENT_TYPE_HEADER));
+ Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE_HEADER));
// Ensure that the request was not sent with a 'Content-Encoding' header
- Assert.assertNull(lastPostHeaders.get(PostHTTP.CONTENT_ENCODING_HEADER));
+ Assert.assertNull(lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_ENCODING_HEADER));
}
@Test
@@ -398,9 +398,9 @@ public class TestPostHTTP {
setup(null);
final String suppliedMimeType = "text/plain";
- runner.setProperty(PostHTTP.URL, server.getUrl());
- runner.setProperty(PostHTTP.CONTENT_TYPE, suppliedMimeType);
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "true");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE, suppliedMimeType);
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "true");
final Map<String, String> attrs = new HashMap<>();
attrs.put(CoreAttributes.MIME_TYPE.key(), "text/plain");
@@ -408,13 +408,13 @@ public class TestPostHTTP {
runner.enqueue(StringUtils.repeat("Lines of sample text.", 100).getBytes(), attrs);
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
byte[] postValue = servlet.getLastPost();
Assert.assertArrayEquals(StringUtils.repeat("Lines of sample text.", 100).getBytes(),postValue);
Map<String, String> lastPostHeaders = servlet.getLastPostHeaders();
- Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(PostHTTP.CONTENT_TYPE_HEADER));
+ Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE_HEADER));
Assert.assertNull(lastPostHeaders.get("Content-Length"));
Assert.assertEquals("chunked",lastPostHeaders.get("Transfer-Encoding"));
}
@@ -424,10 +424,10 @@ public class TestPostHTTP {
setup(null);
final String suppliedMimeType = "text/plain";
- runner.setProperty(PostHTTP.URL, server.getUrl());
- runner.setProperty(PostHTTP.CONTENT_TYPE, suppliedMimeType);
- runner.setProperty(PostHTTP.CHUNKED_ENCODING, "false");
- runner.setProperty(PostHTTP.MAX_DATA_RATE, "10kb");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, server.getUrl());
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE, suppliedMimeType);
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.CHUNKED_ENCODING, "false");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.MAX_DATA_RATE, "10kb");
final Map<String, String> attrs = new HashMap<>();
attrs.put(CoreAttributes.MIME_TYPE.key(), "text/plain");
@@ -436,20 +436,20 @@ public class TestPostHTTP {
boolean stopOnFinish = true;
runner.run(1, stopOnFinish);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
byte[] postValue = servlet.getLastPost();
Assert.assertArrayEquals(StringUtils.repeat("This is a line of sample text. Here is another.", 100).getBytes(),postValue);
Map<String, String> lastPostHeaders = servlet.getLastPostHeaders();
- Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(PostHTTP.CONTENT_TYPE_HEADER));
+ Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(org.apache.nifi.processors.standard.PostHTTP.CONTENT_TYPE_HEADER));
Assert.assertEquals("4700",lastPostHeaders.get("Content-Length"));
}
@Test
public void testDefaultUserAgent() throws Exception {
setup(null);
- Assert.assertTrue(runner.getProcessContext().getProperty(PostHTTP.USER_AGENT).getValue().startsWith("Apache-HttpClient"));
+ Assert.assertTrue(runner.getProcessContext().getProperty(org.apache.nifi.processors.standard.PostHTTP.USER_AGENT).getValue().startsWith("Apache-HttpClient"));
}
@Test
@@ -474,9 +474,9 @@ public class TestPostHTTP {
servletB = (CaptureServlet) handler.getServlets()[0].getServlet();
}
- runner.setProperty(PostHTTP.URL, "${url}"); // use EL for the URL
- runner.setProperty(PostHTTP.SEND_AS_FLOWFILE, "true");
- runner.setProperty(PostHTTP.MAX_BATCH_SIZE, "10 b");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.URL, "${url}"); // use EL for the URL
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.SEND_AS_FLOWFILE, "true");
+ runner.setProperty(org.apache.nifi.processors.standard.PostHTTP.MAX_BATCH_SIZE, "10 b");
Set<String> expectedContentA = new HashSet<>();
Set<String> expectedContentB = new HashSet<>();
@@ -496,8 +496,8 @@ public class TestPostHTTP {
// MAX_BATCH_SIZE is 10 bytes, each file is 2 bytes, so 18 files should produce 4 batches
for (int i = 0; i < 4; i++) {
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS);
- final List<MockFlowFile> successFiles = runner.getFlowFilesForRelationship(PostHTTP.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
+ final List<MockFlowFile> successFiles = runner.getFlowFilesForRelationship(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
assertFalse(successFiles.isEmpty());
MockFlowFile mff = successFiles.get(0);
@@ -517,7 +517,7 @@ public class TestPostHTTP {
// make sure everything transferred, nothing more to do
runner.run(1);
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS, 0);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS, 0);
}
private void enqueueWithURL(String data, String url) {
@@ -531,11 +531,11 @@ public class TestPostHTTP {
Set<String> actualFFContent = new HashSet<>();
Set<String> actualPostContent = new HashSet<>();
- runner.assertAllFlowFilesTransferred(PostHTTP.REL_SUCCESS, expectedCount);
+ runner.assertAllFlowFilesTransferred(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS, expectedCount);
// confirm that all FlowFiles transferred to 'success' have the same URL
// also accumulate content to verify later
- final List<MockFlowFile> successFlowFiles = runner.getFlowFilesForRelationship(PostHTTP.REL_SUCCESS);
+ final List<MockFlowFile> successFlowFiles = runner.getFlowFilesForRelationship(org.apache.nifi.processors.standard.PostHTTP.REL_SUCCESS);
for (int i = 0; i < expectedCount; i++) {
MockFlowFile mff = successFlowFiles.get(i);
mff.assertAttributeEquals("url", server.getUrl());