You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/03/15 14:16:37 UTC
incubator-nifi git commit: NIFI-353: - Adding support for text/plain.
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-353 c117a5c6f -> 73a54eeb8
NIFI-353:
- Adding support for text/plain.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/73a54eeb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/73a54eeb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/73a54eeb
Branch: refs/heads/NIFI-353
Commit: 73a54eeb859fe9c8822141b59ee79eba8d1e6dff
Parents: c117a5c
Author: Matt Gilman <ma...@gmail.com>
Authored: Sun Mar 15 09:16:24 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Sun Mar 15 09:16:24 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/web/StandardContentViewerController.java | 9 +++++++--
.../src/main/webapp/META-INF/nifi-content-viewer | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/73a54eeb/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
index 8bf61d6..6ce315e 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
@@ -53,7 +53,7 @@ public class StandardContentViewerController extends HttpServlet {
final ViewableContent content = (ViewableContent) request.getAttribute(ViewableContent.CONTENT_REQUEST_ATTRIBUTE);
// handle json/xml
- if ("application/json".equals(content.getContentType()) || "application/xml".equals(content.getContentType())) {
+ if ("application/json".equals(content.getContentType()) || "application/xml".equals(content.getContentType()) || "text/plain".equals(content.getContentType())) {
final String formatted;
// leave the content alone if specified
@@ -61,10 +61,12 @@ public class StandardContentViewerController extends HttpServlet {
formatted = content.getContent();
} else {
if ("application/json".equals(content.getContentType())) {
+ // format json
final ObjectMapper mapper = new ObjectMapper();
final Object objectJson = mapper.readValue(content.getContent(), Object.class);
formatted = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectJson);
- } else {
+ } else if ("application/xml".equals(content.getContentType())) {
+ // format xml
final StringWriter writer = new StringWriter();
try {
@@ -83,6 +85,9 @@ public class StandardContentViewerController extends HttpServlet {
// get the transformed xml
formatted = writer.toString();
+ } else {
+ // leave plain text alone when formatting
+ formatted = content.getContent();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/73a54eeb/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer
index 29fed60..cbf30b7 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer
@@ -1,2 +1,3 @@
application/xml
-application/json
\ No newline at end of file
+application/json
+text/plain
\ No newline at end of file