From ab155a39d9d4587bdf68eb3ce1e0c886bb8f925f Mon Sep 17 00:00:00 2001 From: Pierre Villard Date: Wed, 14 Sep 2016 17:59:17 +0200 Subject: [PATCH] NIFI-1342 Added default User-Agent in PostHttp --- .../java/org/apache/nifi/processors/standard/PostHTTP.java | 2 ++ .../org/apache/nifi/processors/standard/TestPostHTTP.java | 7 +++++++ 2 files changed, 9 insertions(+) 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 37b307e9ed1b..44b79737f0e4 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 @@ -82,6 +82,7 @@ import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpCoreContext; import org.apache.http.util.EntityUtils; +import org.apache.http.util.VersionInfo; import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; import org.apache.nifi.annotation.behavior.SupportsBatching; @@ -194,6 +195,7 @@ public class PostHTTP extends AbstractProcessor { .description("What to report as the User Agent when we connect to the remote server") .required(false) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue(VersionInfo.getUserAgent("Apache-HttpClient", "org.apache.http.client", HttpClientBuilder.class)) .build(); public static final PropertyDescriptor COMPRESSION_LEVEL = new PropertyDescriptor.Builder() .name("Compression Level") 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 edff3b4bb41f..cfda2ef9bfa7 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 @@ -434,4 +434,11 @@ public void testSendWithThrottler() throws Exception { Assert.assertEquals(suppliedMimeType, lastPostHeaders.get(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")); + } + }