NIFI-14615 - Moved parquet processors and cv under a single nar. Removed unnecessary code.

Author: Freedom9339

nifi-assembly/pom.xml

@@ -954,12 +954,6 @@ language governing permissions and limitations under the License. -->
                     <version>2.6.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
-                <dependency>
-                    <groupId>org.apache.nifi</groupId>
-                    <artifactId>nifi-parquet-content-viewer-nar</artifactId>
-                    <version>2.5.0-SNAPSHOT</version>
-                    <type>nar</type>
-                </dependency>
             </dependencies>
         </profile>
         <profile>

nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-content-viewer-nar/pom.xml

@@ -45,10 +45,14 @@
 
 public class ParquetContentViewerController extends HttpServlet {
     private static final Logger logger = LoggerFactory.getLogger(ParquetContentViewerController.class);
-    private static final long maxBytes = 1024 * 1024 * 2; //10MB
-    private static final int bufferSize = 8 * 1024; // 8KB
+    private static final long MAX_CONTENT_SIZE = 1024 * 1024 * 2; // 10MB
+    private static final int BUFFER_SIZE = 8 * 1024; // 8KB
     private static final ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);
 
+    static {
+        objectMapper.getFactory().configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false);
+    }
+
     @Override
     public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException {
         final ContentRequestContext requestContext = new HttpServletContentRequestContext(request);
@@ -75,30 +79,12 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
 
         response.setStatus(HttpServletResponse.SC_OK);
 
-        final boolean formatted = Boolean.parseBoolean(request.getParameter("formatted"));
-        if (!formatted) {
-            final InputStream contentStream = downloadableContent.getContent();
-            contentStream.transferTo(response.getOutputStream());
-            return;
-        }
-
-        // allow the user to drive the data type but fall back to the content type if necessary
-        String displayName = request.getParameter("mimeTypeDisplayName");
-        if (displayName == null) {
-            displayName = downloadableContent.getType();
-        }
-
-        if (displayName == null || !(displayName.equals("parquet") || displayName.equals("application/vnd.apache.parquet"))) {
-            response.sendError(HttpURLConnection.HTTP_BAD_REQUEST, "Unknown content type");
-            return;
-        }
-
         try {
             //Convert InputStream to a seekable InputStream
             byte[] data = getInputStreamBytes(downloadableContent.getContent());
 
             if (data.length == 0) {
-                response.getOutputStream().write("Content size is too large to display.".getBytes());
+                response.sendError(HttpURLConnection.HTTP_INTERNAL_ERROR, "Content size is too large to display.");
                 return;
             }
 
@@ -114,8 +100,8 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
 
             //Format and write out each record
             GenericRecord record;
-            objectMapper.getFactory().configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false);
             boolean firstRecord = true;
+            response.getOutputStream().write("[\n".getBytes());
             while ((record = reader.read()) != null) {
                 if (firstRecord) {
                     firstRecord = false;
@@ -125,6 +111,7 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
 
                 objectMapper.writerWithDefaultPrettyPrinter().writeValue(response.getOutputStream(), objectMapper.readTree(record.toString()));
             }
+            response.getOutputStream().write("\n]".getBytes());
         } catch (final Throwable t) {
             logger.warn("Unable to format FlowFile content", t);
             response.sendError(HttpURLConnection.HTTP_INTERNAL_ERROR, "Unable to format FlowFile content");
@@ -133,11 +120,11 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
 
     private byte[] getInputStreamBytes(final InputStream inputStream) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        byte[] buffer = new byte[bufferSize];
+        byte[] buffer = new byte[BUFFER_SIZE];
         long totalRead = 0;
 
-        while (totalRead < maxBytes) {
-            int bytesRead = inputStream.read(buffer, 0, bufferSize);
+        while (totalRead < MAX_CONTENT_SIZE) {
+            int bytesRead = inputStream.read(buffer, 0, BUFFER_SIZE);
             if (bytesRead == -1) {
                 break;
             }
@@ -146,7 +133,7 @@ private byte[] getInputStreamBytes(final InputStream inputStream) throws IOExcep
         }
 
         // Return empty array if inputStream has more data beyond maxBytes
-        if (totalRead >= maxBytes && inputStream.read() != -1) {
+        if (totalRead >= MAX_CONTENT_SIZE && inputStream.read() != -1) {
             return new byte[0];
         }
 

nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-content-viewer-nar/src/main/resources/META-INF/LICENSE

@@ -1,5 +1,5 @@
 nifi-web-docs
-Copyright 2014-2024 The Apache Software Foundation
+Copyright 2014-2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -24,4 +24,19 @@ The following binary components are provided under the Apache Software License v
       Copyright 2014 The Apache Software Foundation
 
       This product includes software developed at
-      The Apache Software Foundation (http://www.apache.org/).
+      The Apache Software Foundation (http://www.apache.org/).
+
+  (ASLv2) Apache Commons IO
+      The following NOTICE information applies:
+        Apache Commons IO
+        Copyright 2002-2016 The Apache Software Foundation
+
+Other open source components:
+
+  (CDDL 1.1) (GPL2 w/ CPE) Jakarta Servlet API
+  (CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:3.1.10 - https://jersey.github.io/)
+
+  ## FastDoubleParser
+      jackson-core bundles a shaded copy of FastDoubleParser <https://github.com/wrandelshofer/FastDoubleParser>.
+      That code is available under an MIT license <https://github.com/wrandelshofer/FastDoubleParser/blob/main/LICENSE>
+      under the following copyright.

nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-content-viewer-nar/src/main/resources/META-INF/NOTICE

@@ -37,5 +37,11 @@
             <version>2.6.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-parquet-content-viewer</artifactId>
+            <version>2.6.0-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
     </dependencies>
 </project>

nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-content-viewer/src/main/java/org/apache/parquet/web/controller/ParquetContentViewerController.java

@@ -26,10 +26,9 @@
 
     <modules>
         <module>nifi-parquet-processors</module>
-        <module>nifi-parquet-nar</module>
         <module>nifi-parquet-content-viewer</module>
-        <module>nifi-parquet-content-viewer-nar</module>
         <module>nifi-parquet-shared</module>
+        <module>nifi-parquet-nar</module>
     </modules>
     <properties>
         <parquet.version>1.15.2</parquet.version>