nifi git commit: NIFI-5884 Bumping hbase-client version from 1.1.2 to 1.1.13
Repository: nifi
Updated Branches:
refs/heads/master e76c54234 -> 60064a9f6
NIFI-5884 Bumping hbase-client version from 1.1.2 to 1.1.13
This closes #3211.
Signed-off-by: Koji Kawamura
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/60064a9f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/60064a9f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/60064a9f
Branch: refs/heads/master
Commit: 60064a9f6874f56bc946dfd71c2568528040de0c
Parents: e76c542
Author: Bryan Bende
Authored: Fri Dec 7 10:50:43 2018 -0500
Committer: Koji Kawamura
Committed: Mon Dec 10 11:00:08 2018 +0900
--
.../nifi-hbase_1_1_2-client-service/pom.xml | 2 +-
.../java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/60064a9f/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
--
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
index 4d7744d..6b1d5ba 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
@@ -25,7 +25,7 @@
nifi-hbase_1_1_2-client-service
jar
-1.1.2
+1.1.13
http://git-wip-us.apache.org/repos/asf/nifi/blob/60064a9f/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
--
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
index 050c8d0..9425846 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
@@ -79,8 +79,9 @@ import java.util.concurrent.atomic.AtomicReference;
@RequiresInstanceClassLoading
@Tags({ "hbase", "client"})
-@CapabilityDescription("Implementation of HBaseClientService for HBase 1.1.2.
This service can be configured by providing " +
-"a comma-separated list of configuration files, or by specifying
values for the other properties. If configuration files " +
+@CapabilityDescription("Implementation of HBaseClientService using the HBase
1.1.x client. Although this service was originally built with the 1.1.2 " +
+"client and has 1_1_2 in it's name, the client library has since been
upgraded to 1.1.13 to leverage bug fixes. This service can be configured " +
+"by providing a comma-separated list of configuration files, or by
specifying values for the other properties. If configuration files " +
"are provided, they will be loaded first, and the values of the
additional properties will override the values from " +
"the configuration files. In addition, any user defined properties on
the processor will also be passed to the HBase " +
"configuration.")
nifi git commit: NIFI-5881: Enable to export the template for non-ascii name
Repository: nifi
Updated Branches:
refs/heads/master ecbed6a78 -> e76c54234
NIFI-5881: Enable to export the template for non-ascii name
This closes #3210.
Signed-off-by: Koji Kawamura
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e76c5423
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e76c5423
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e76c5423
Branch: refs/heads/master
Commit: e76c54234dc8997e22aa0227f969b5808eccacbf
Parents: ecbed6a
Author: Kemix Koo
Authored: Fri Dec 7 16:31:36 2018 +0800
Committer: Koji Kawamura
Committed: Mon Dec 10 09:51:46 2018 +0900
--
.../org/apache/nifi/web/api/TemplateResource.java | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/e76c5423/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java
index 4a3de4f..cd3605c 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java
@@ -43,9 +43,13 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
import java.util.Set;
/**
@@ -142,14 +146,22 @@ public class TemplateResource extends ApplicationResource
{
attachmentName = attachmentName.replaceAll("\\s", "_");
}
+final Charset utf8 = StandardCharsets.UTF_8;
+try {
+attachmentName = URLEncoder.encode(attachmentName, utf8.name());
+} catch (UnsupportedEncodingException e) {
+//
+}
+
// generate the response
/*
* Here instead of relying on default JAXB marshalling we are simply
* serializing template to String (formatted, indented etc) and sending
* it as part of the response.
*/
-String serializedTemplate = new
String(TemplateSerializer.serialize(template), StandardCharsets.UTF_8);
-return
generateOkResponse(serializedTemplate).header("Content-Disposition",
String.format("attachment; filename=\"%s.xml\"", attachmentName)).build();
+String serializedTemplate = new
String(TemplateSerializer.serialize(template), utf8);
+String filename = attachmentName + ".xml";
+return
generateOkResponse(serializedTemplate).encoding(utf8.name()).header(HttpHeaders.CONTENT_DISPOSITION,
"attachment; filename* = " + utf8.name() + "''" + filename).build();
}
/**
