This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new e74557f990 NIFI-10027: Add support for WEBP images to the image viewer
e74557f990 is described below
commit e74557f990ef96bb5f9af9ff827f6ade341f6e48
Author: Matthew Burgess <[email protected]>
AuthorDate: Fri May 20 14:39:51 2022 -0400
NIFI-10027: Add support for WEBP images to the image viewer
This closes #6064
Signed-off-by: David Handermann <[email protected]>
---
.../src/main/java/org/apache/nifi/web/ImageViewerController.java | 3 ++-
.../nifi-image-viewer/src/main/webapp/META-INF/nifi-content-viewer | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer/src/main/java/org/apache/nifi/web/ImageViewerController.java
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer/src/main/java/org/apache/nifi/web/ImageViewerController.java
index 130c934261..eafd0dbc23 100644
---
a/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer/src/main/java/org/apache/nifi/web/ImageViewerController.java
+++
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer/src/main/java/org/apache/nifi/web/ImageViewerController.java
@@ -38,7 +38,8 @@ public class ImageViewerController extends HttpServlet {
final ViewableContent content = (ViewableContent)
request.getAttribute(ViewableContent.CONTENT_REQUEST_ATTRIBUTE);
// handle images
- if ("image/png".equals(content.getContentType()) ||
"image/jpeg".equals(content.getContentType()) ||
"image/gif".equals(content.getContentType())) {
+ if ("image/png".equals(content.getContentType()) ||
"image/jpeg".equals(content.getContentType())
+ || "image/gif".equals(content.getContentType()) ||
"image/webp".equals(content.getContentType())) {
// defer to the jsp
request.getRequestDispatcher("/WEB-INF/jsp/image.jsp").include(request,
response);
} else {
diff --git
a/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer/src/main/webapp/META-INF/nifi-content-viewer
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer/src/main/webapp/META-INF/nifi-content-viewer
index 71cf2a29e7..278d149370 100755
---
a/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer/src/main/webapp/META-INF/nifi-content-viewer
+++
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer/src/main/webapp/META-INF/nifi-content-viewer
@@ -14,4 +14,5 @@
# limitations under the License.
image/png
image/jpeg
-image/gif
\ No newline at end of file
+image/gif
+image/webp
\ No newline at end of file
