Add PublishFrom

cmoreau004 · cmoreau004 · commit ca4005d3cfd9 · 2017-09-14T16:18:50.000+02:00
diff --git a/src/main/java/multichain/command/StreamCommand.java b/src/main/java/multichain/command/StreamCommand.java
@@ -537,7 +537,58 @@ public String publish(String streamName, String key, String dataHex) throws Mult
 
 		return stringPublish;
 	}
+	
+	/**
+	 * {@link #publish(String, String, String)} with control over the from-address used to
+	 * used to publish
+	 * 
+	 * @param addressFrom
+	 *            (Address) The from-address used to publish
+	 * @param streamName
+	 *            (String) The name of the stream
+	 * @param key
+	 *            (String) The key of the item
+	 * @param dataHex
+	 *            (String) Data in hexadecimal
+	 * @return (String) The transaction id
+	 * @throws MultichainException
+	 */
+	
+	public String publishFrom(Address addressFrom, String streamName, String key, String dataHex) throws MultichainException {
+		String stringPublish = "";
+		Object objectPublish = executePublishFrom(addressFrom.getAddress(), streamName, key, dataHex);
+		if (verifyInstance(objectPublish, String.class)) {
+			stringPublish = (String) objectPublish;
+		}
+		return stringPublish;
+	}
+	
+	/**
+	 * {@link #createFrom(Address, String, String, String)} with address in format string
+	 * 
+	 * @param addressFrom
+	 *            (String) The from-address used to publish
+	 * @param streamName
+	 *            (String) The name of the stream
+	 * @param key
+	 *            (String) The key of the item
+	 * @param dataHex
+	 *            (String) Data in hexadecimal
+	 * @return (String) The transaction id
+	 * @throws MultichainException
+	 */
+	
+	public String publishFrom(String addressFrom, String streamName, String key, String dataHex) throws MultichainException {
+		String stringPublish = "";
 
+		Object objectPublish = executePublishFrom(addressFrom, streamName, key, dataHex);
+		if (verifyInstance(objectPublish, String.class)) {
+			stringPublish = (String) objectPublish;
+		}
+
+		return stringPublish;
+	}
+	
 	/**
 	 * subscribe entity-identifier(s) ( rescan )
 	 * 
diff --git a/src/main/java/multichain/command/builders/QueryBuilderStream.java b/src/main/java/multichain/command/builders/QueryBuilderStream.java
@@ -271,6 +271,30 @@ protected Object executePublish(String streamName, String key, String dataHex) t
 		return execute(CommandEnum.PUBLISH, streamName, key, dataHex);
 	}
 
+	/**
+	 * {@link #executePublish(String, String, String)} with control over the
+	 * from-address used to publish
+	 * 
+	 * @param addressFrom
+	 *            (String) The from-address used to publish
+	 * @param streamName
+	 *            (String) The name of the stream
+	 * @param key
+	 *            (String) The key of the item
+	 * @param dataHex
+	 *            (String) Data in hexadecimal
+	 * @return (String) The transaction id
+	 * @throws MultichainException
+	 */
+	protected Object executePublishFrom(String addressFrom ,String streamName, String key, String dataHex) throws MultichainException {
+		MultichainTestParameter.isNotNullOrEmpty("addressFrom", addressFrom);
+		MultichainTestParameter.isNotNullOrEmpty("streamName", streamName);
+		MultichainTestParameter.isNotNullOrEmpty("key", key);
+		MultichainTestParameter.isNotNullOrEmpty("dataHex", dataHex);
+
+		return execute(CommandEnum.PUBLISHFROM, addressFrom, streamName, key, dataHex);
+	}
+
 	/**
 	 * subscribe entity-identifier(s) ( rescan )
 	 * 
