You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2017/08/18 17:31:55 UTC
nifi git commit: NIFI-1835 - added text/xml to content viewer
Repository: nifi
Updated Branches:
refs/heads/master 0bcb19771 -> 41984bed1
NIFI-1835 - added text/xml to content viewer
Signed-off-by: Scott Aslan <sc...@gmail.com>
This closes #2098
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/41984bed
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/41984bed
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/41984bed
Branch: refs/heads/master
Commit: 41984bed1302f5c8bd898c9d1772357f67363194
Parents: 0bcb197
Author: Pierre Villard <pi...@gmail.com>
Authored: Wed Aug 16 18:30:20 2017 +0200
Committer: Scott Aslan <sc...@gmail.com>
Committed: Fri Aug 18 12:48:49 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/nifi/web/StandardContentViewerController.java | 3 ++-
.../src/main/webapp/META-INF/nifi-content-viewer | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/41984bed/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
index cf532c3..405b11c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
@@ -53,6 +53,7 @@ public class StandardContentViewerController extends HttpServlet {
static {
supportedMimeTypes.add("application/json");
supportedMimeTypes.add("application/xml");
+ supportedMimeTypes.add("text/xml");
supportedMimeTypes.add("text/plain");
supportedMimeTypes.add("text/csv");
supportedMimeTypes.add("application/avro-binary");
@@ -85,7 +86,7 @@ public class StandardContentViewerController extends HttpServlet {
final ObjectMapper mapper = new ObjectMapper();
final Object objectJson = mapper.readValue(content.getContentStream(), Object.class);
formatted = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectJson);
- } else if ("application/xml".equals(contentType)) {
+ } else if ("application/xml".equals(contentType) || "text/xml".equals(contentType)) {
// format xml
final StringWriter writer = new StringWriter();
http://git-wip-us.apache.org/repos/asf/nifi/blob/41984bed/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer
index e5e25f0..f105ca2 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/webapp/META-INF/nifi-content-viewer
@@ -14,6 +14,7 @@
# limitations under the License.
application/xml
application/json
+text/xml
text/plain
text/csv
avro/binary