NIFI-282: Added send(byte[], Map<String, String>) method to avoid having to create a DataPacket object

nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/Transaction.java

@@ -17,6 +17,7 @@
 package org.apache.nifi.remote;
 
 import java.io.IOException;
+import java.util.Map;
 
 import org.apache.nifi.remote.protocol.DataPacket;
 
@@ -80,6 +81,16 @@ public interface Transaction {
      */
     void send(DataPacket dataPacket) throws IOException;
     
+    /**
+     * Sends the given byte array as the content of a {@link DataPacket} along with the
+     * provided attributes
+     * 
+     * @param content
+     * @param attributes
+     * @throws IOException
+     */
+    void send(byte[] content, Map<String, String> attributes) throws IOException;
+    
     /**
      * Retrieves information from the remote NiFi instance, if any is available. If no data is available, will return
      * {@code null}. It is important to consume all data from the remote NiFi instance before attempting to 

nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/SocketClient.java

@@ -17,6 +17,7 @@
 package org.apache.nifi.remote.client.socket;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.nifi.remote.Communicant;
@@ -185,6 +186,11 @@ public class SocketClient implements SiteToSiteClient {
 				transaction.send(dataPacket);
 			}
 
+			@Override
+			public void send(final byte[] content, final Map<String, String> attributes) throws IOException {
+			    transaction.send(content, attributes);
+			}
+			
 			@Override
 			public DataPacket receive() throws IOException {
 				return transaction.receive();

nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/DataPacket.java

@@ -19,11 +19,27 @@ package org.apache.nifi.remote.protocol;
 import java.io.InputStream;
 import java.util.Map;
 
+
+/**
+ * Represents a piece of data that is to be sent to or that was received from a NiFi instance.
+ */
 public interface DataPacket {
 
+    /**
+     * The key-value attributes that are to be associated with the data
+     * @return
+     */
 	Map<String, String> getAttributes();
 	
+	/**
+	 * An InputStream from which the content can be read
+	 * @return
+	 */
 	InputStream getData();
-	
+
+	/**
+	 * The length of the InputStream.
+	 * @return
+	 */
 	long getSize();
 }

nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/socket/SocketClientTransaction.java

@@ -16,11 +16,13 @@
  */
 package org.apache.nifi.remote.protocol.socket;
 
+import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Map;
 import java.util.zip.CRC32;
 import java.util.zip.CheckedInputStream;
 import java.util.zip.CheckedOutputStream;
@@ -36,6 +38,7 @@ import org.apache.nifi.remote.io.CompressionInputStream;
 import org.apache.nifi.remote.io.CompressionOutputStream;
 import org.apache.nifi.remote.protocol.DataPacket;
 import org.apache.nifi.remote.protocol.RequestType;
+import org.apache.nifi.remote.util.StandardDataPacket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -171,6 +174,11 @@ public class SocketClientTransaction implements Transaction {
 	}
 	
 	
+	@Override
+	public void send(final byte[] content, final Map<String, String> attributes) throws IOException {
+	    send(new StandardDataPacket(attributes, new ByteArrayInputStream(content), content.length));
+	}
+	
 	@Override
 	public void send(final DataPacket dataPacket) throws IOException {
 	    try {