diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java index 89ab54d554a7..6d04b624fa71 100644 --- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java +++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/StreamUtils.java @@ -120,7 +120,9 @@ public static int fillBuffer(final InputStream source, final byte[] destination, * @throws IllegalArgumentException if the given byte array is smaller than byteCount elements. * @throws EOFException if the InputStream does not have byteCount bytes in the InputStream * @throws IOException if unable to read from the InputStream + * @deprecated Use {@link InputStream#readNBytes(byte[], int, int)} instead. */ + @Deprecated(since = "2.12.0", forRemoval = true) public static void read(final InputStream source, final byte[] destination, final int byteCount) throws IOException { if (destination.length < byteCount) { throw new IllegalArgumentException(); diff --git a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/pcap/SplitPCAP.java b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/pcap/SplitPCAP.java index 89500362ffe4..feeb47a39d98 100644 --- a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/pcap/SplitPCAP.java +++ b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/pcap/SplitPCAP.java @@ -35,7 +35,6 @@ import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processor.io.InputStreamCallback; import org.apache.nifi.processor.util.StandardValidators; -import org.apache.nifi.stream.io.StreamUtils; import java.io.BufferedInputStream; import java.io.IOException; @@ -196,7 +195,7 @@ public PCAPStreamSplitterCallback(ProcessSession session, FlowFile flowFile, int private Packet getNextPacket(final BufferedInputStream bufferedStream, final PCAP templatePcap, final int totalPackets) throws IOException { final byte[] packetHeader = new byte[Packet.PACKET_HEADER_LENGTH]; - StreamUtils.read(bufferedStream, packetHeader, Packet.PACKET_HEADER_LENGTH); + bufferedStream.readNBytes(packetHeader, 0, Packet.PACKET_HEADER_LENGTH); final Packet currentPacket = new Packet(packetHeader, templatePcap); @@ -206,7 +205,7 @@ private Packet getNextPacket(final BufferedInputStream bufferedStream, final PCA final int expectedLength = (int) currentPacket.expectedLength(); final byte[] packetBody = new byte[expectedLength]; - StreamUtils.read(bufferedStream, packetBody, expectedLength); + bufferedStream.readNBytes(packetBody, 0, expectedLength); currentPacket.setBody(packetBody); if (currentPacket.isInvalid()) { @@ -227,7 +226,7 @@ public void process(final InputStream inStream) throws IOException { } final byte[] pcapHeader = new byte[PCAPHeader.PCAP_HEADER_LENGTH]; - StreamUtils.read(bufferedStream, pcapHeader, PCAPHeader.PCAP_HEADER_LENGTH); + bufferedStream.readNBytes(pcapHeader, 0, PCAPHeader.PCAP_HEADER_LENGTH); int currentPcapTotalLength = PCAPHeader.PCAP_HEADER_LENGTH; diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/StandardLoadBalanceProtocol.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/StandardLoadBalanceProtocol.java index ad0592f485f0..43a7a2977bce 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/StandardLoadBalanceProtocol.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/StandardLoadBalanceProtocol.java @@ -452,7 +452,7 @@ private void verifyChecksum(final Checksum checksum, final InputStream in, final private long readChecksum(final InputStream in) throws IOException { final byte[] buffer = getDataBuffer(); - StreamUtils.read(in, buffer, 8); + in.readNBytes(buffer, 0, 8); return ByteBuffer.wrap(buffer, 0, 8).getLong(); }