NIFI-16186 Deprecate FlowFile Package Versions 1 and 2 for Removal

nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java

@@ -26,6 +26,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
+@Deprecated(since = "2.12.0", forRemoval = true)
 public class FlowFilePackagerV1 implements FlowFilePackager {
 
     public static final String FILENAME_ATTRIBUTES = "flowfile.attributes";

nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV2.java

@@ -83,6 +83,7 @@
  * 64 21
  * </pre>
  */
+@Deprecated(since = "2.12.0", forRemoval = true)
 public class FlowFilePackagerV2 implements FlowFilePackager {
 
     private static final int MAX_VALUE_2_BYTES = 65535;

nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV1.java

@@ -26,6 +26,7 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
+@Deprecated(since = "2.12.0", forRemoval = true)
 public class FlowFileUnpackagerV1 implements FlowFileUnpackager {
 
     private int flowFilesRead = 0;
@@ -40,17 +41,17 @@
         }
 
         final Map<String, String> attributes;
         if (attribEntry.getName().equals(FlowFilePackagerV1.FILENAME_ATTRIBUTES)) {
             attributes = getAttributes(tarIn);
         } else {
             throw new IOException("Expected two tar entries: "
                     + FlowFilePackagerV1.FILENAME_CONTENT + " and "
                     + FlowFilePackagerV1.FILENAME_ATTRIBUTES);
         }
 
         final TarArchiveEntry contentEntry = tarIn.getNextEntry();
 
         if (contentEntry != null && contentEntry.getName().equals(FlowFilePackagerV1.FILENAME_CONTENT)) {
             final byte[] buffer = new byte[512 << 10]; //512KB
             int bytesRead = 0;
             while ((bytesRead = tarIn.read(buffer)) != -1) { //still more data to read
@@ -61,8 +62,8 @@
             out.flush();
         } else {
             throw new IOException("Expected two tar entries: "
                     + FlowFilePackagerV1.FILENAME_CONTENT + " and "
                     + FlowFilePackagerV1.FILENAME_ATTRIBUTES);
         }
 
         return attributes;

nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFileUnpackagerV2.java

@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+@Deprecated(since = "2.12.0", forRemoval = true)
 public class FlowFileUnpackagerV2 implements FlowFileUnpackager {
 
     private final byte[] readBuffer = new byte[8192];

nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml

@@ -568,6 +568,12 @@
             <version>42.7.13</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-deprecation-log</artifactId>
+            <version>2.12.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java

@@ -468,6 +468,7 @@ protected void setUpBinManager(final BinManager binManager, final ProcessContext
     protected BinProcessingResult processBin(final Bin bin, final ProcessContext context) throws ProcessException {
         final BinProcessingResult binProcessingResult = new BinProcessingResult(true);
 
+        @SuppressWarnings("removal")
         MergeBin merger = switch (context.getProperty(MERGE_FORMAT).asAllowableValue(MergeFormat.class)) {
             case TAR -> new TarMerge();
             case ZIP -> new ZipMerge(context.getProperty(COMPRESSION_LEVEL).asInteger());

nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java

@@ -40,6 +40,8 @@
 import org.apache.nifi.annotation.lifecycle.OnStopped;
 import org.apache.nifi.components.DescribedValue;
 import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.deprecation.log.DeprecationLogger;
+import org.apache.nifi.deprecation.log.DeprecationLoggerFactory;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.flowfile.attributes.CoreAttributes;
 import org.apache.nifi.flowfile.attributes.FragmentAttributes;
@@ -227,6 +229,8 @@ public class UnpackContent extends AbstractProcessor {
             REL_ORIGINAL
     );
 
+    private static final DeprecationLogger deprecationLogger = DeprecationLoggerFactory.getLogger(UnpackContent.class);
+
     private Pattern fileFilter;
 
     private Unpacker tarUnpacker;
@@ -249,9 +253,14 @@ public void onStopped() {
 
     @OnScheduled
     public void onScheduled(ProcessContext context) throws ProcessException {
-        if (fileFilter == null) {
-            final PackageFormat packageFormat = context.getProperty(PACKAGING_FORMAT).asAllowableValue(PackageFormat.class);
+        final PackageFormat packageFormat = context.getProperty(PACKAGING_FORMAT).asAllowableValue(PackageFormat.class);
+        if (PackageFormat.FLOWFILE_STREAM_FORMAT_V2 == packageFormat) {
+            deprecationLogger.warn("FlowFile Stream V2 is deprecated for removal");
+        } else if (PackageFormat.FLOWFILE_TAR_FORMAT == packageFormat) {
+            deprecationLogger.warn("FlowFile TAR V1 is deprecated for removal");
+        }
 
+        if (fileFilter == null) {
             fileFilter = Pattern.compile(context.getProperty(FILE_FILTER).getValue());
 
             tarUnpacker = switch (packageFormat) {
@@ -311,6 +320,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
             }
         }
 
+        @SuppressWarnings("removal")
         final Unpacker unpacker = switch (packagingFormat) {
             case TAR_FORMAT -> tarUnpacker;
             case ZIP_FORMAT -> zipUnpacker;
@@ -743,8 +753,8 @@ protected enum PackageFormat implements DescribedValue {
         TAR_FORMAT(TAR_FORMAT_NAME, null, "application/x-tar"),
         ZIP_FORMAT(ZIP_FORMAT_NAME, null, "application/zip"),
         FLOWFILE_STREAM_FORMAT_V3(FLOWFILE_STREAM_FORMAT_V3_NAME, null, StandardFlowFileMediaType.VERSION_3.getMediaType()),
-        FLOWFILE_STREAM_FORMAT_V2(FLOWFILE_STREAM_FORMAT_V2_NAME, null, StandardFlowFileMediaType.VERSION_2.getMediaType()),
-        FLOWFILE_TAR_FORMAT(FLOWFILE_TAR_FORMAT_NAME, null, StandardFlowFileMediaType.VERSION_1.getMediaType());
+        FLOWFILE_STREAM_FORMAT_V2(FLOWFILE_STREAM_FORMAT_V2_NAME, "FlowFile Stream V2 is deprecated", StandardFlowFileMediaType.VERSION_2.getMediaType()),
+        FLOWFILE_TAR_FORMAT(FLOWFILE_TAR_FORMAT_NAME, "FlowFile TAR V1 is deprecated", StandardFlowFileMediaType.VERSION_1.getMediaType());
 
         private final String value;
         private final String description;

nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java

@@ -449,6 +449,7 @@ private void processRecord(InputStream in, FlowFile flowFile, OutputStream out)
         }
     }
 
+    @SuppressWarnings("removal")
     private FlowFileUnpackager getFlowFileUnpackager(String contentType) {
         final FlowFileUnpackager unpackager;
         if (StandardFlowFileMediaType.VERSION_3.getMediaType().equals(contentType)) {