Rest.publishBatch: support overloaded method that takes params

Author: SimonWoolf

lib/src/main/java/io/ably/lib/rest/AblyBase.java

@@ -239,15 +239,25 @@ public void requestAsync(String method, String path, Param[] params, HttpCore.Re
      */
     @Experimental
     public PublishResponse[] publishBatch(Message.Batch[] pubSpecs, ChannelOptions channelOptions) throws AblyException {
-        return publishBatchImpl(pubSpecs, channelOptions).sync();
+		return publishBatchImpl(pubSpecs, channelOptions, null).sync();
+	}
+
+	@Experimental
+	public PublishResponse[] publishBatch(Message.Batch[] pubSpecs, ChannelOptions channelOptions, Param[] params) throws AblyException {
+		return publishBatchImpl(pubSpecs, channelOptions, params).sync();
     }
 
     @Experimental
     public void publishBatchAsync(Message.Batch[] pubSpecs, ChannelOptions channelOptions, final Callback<PublishResponse[]> callback) throws AblyException {
-        publishBatchImpl(pubSpecs, channelOptions).async(callback);
+		publishBatchImpl(pubSpecs, channelOptions, null).async(callback);
+	}
+
+	@Experimental
+	public void publishBatchAsync(Message.Batch[] pubSpecs, ChannelOptions channelOptions, Param[] params, final Callback<PublishResponse[]> callback) throws AblyException {
+		publishBatchImpl(pubSpecs, channelOptions, null).async(callback);
     }
 
-    private Http.Request<PublishResponse[]> publishBatchImpl(final Message.Batch[] pubSpecs, ChannelOptions channelOptions) throws AblyException {
+	private Http.Request<PublishResponse[]> publishBatchImpl(final Message.Batch[] pubSpecs, ChannelOptions channelOptions, final Param[] params) throws AblyException {
         boolean hasClientSuppliedId = false;
         for(Message.Batch spec : pubSpecs) {
             for(Message message : spec.messages) {
@@ -270,7 +280,7 @@ private Http.Request<PublishResponse[]> publishBatchImpl(final Message.Batch[] p
             @Override
             public void execute(HttpScheduler http, final Callback<PublishResponse[]> callback) throws AblyException {
                 HttpCore.RequestBody requestBody = options.useBinaryProtocol ? MessageSerializer.asMsgpackRequest(pubSpecs) : MessageSerializer.asJSONRequest(pubSpecs);
-                http.post("/messages", HttpUtils.defaultAcceptHeaders(options.useBinaryProtocol), null, requestBody, new HttpCore.ResponseHandler<PublishResponse[]>() {
+				http.post("/messages", HttpUtils.defaultAcceptHeaders(options.useBinaryProtocol), params, requestBody, new HttpCore.ResponseHandler<PublishResponse[]>() {
                     @Override
                     public PublishResponse[] handleResponse(HttpCore.Response response, ErrorInfo error) throws AblyException {
                         if(error != null && error.code != 40020) {

lib/src/test/java/io/ably/lib/test/rest/RestChannelBulkPublishTest.java

@@ -69,6 +69,51 @@ public void bulk_publish_multiple_channels_simple() {
         }
     }
 
+	/**
+	 * As above but with the param method
+	 */
+	@Test
+	public void bulk_publish_multiple_channels_param() {
+		try {
+			/* setup library instance */
+			ClientOptions opts = createOptions(testVars.keys[0].keyStr);
+			AblyRest ably = new AblyRest(opts);
+
+			/* first, publish some messages */
+			int channelCount = 5;
+			ArrayList<String> channelIds = new ArrayList<String>();
+			for(int i = 0; i < channelCount; i++) {
+				channelIds.add("persisted:" + randomString());
+			}
+
+			Message message = new Message(null, "bulk_publish_multiple_channels_param");
+			String messageId = message.id = randomString();
+			Message.Batch payload = new Message.Batch(channelIds, Collections.singleton(message));
+
+			Param[] params = new Param[] { new Param("quickAck", "true") };
+
+			PublishResponse[] result = ably.publishBatch(new Message.Batch[] { payload }, null, params);
+			for(PublishResponse response : result) {
+				assertEquals("Verify expected response id", response.messageId, messageId);
+				assertTrue("Verify expected channel name", channelIds.contains(response.channelId));
+				assertNull("Verify no publish error", response.error);
+			}
+
+			/* get the history for this channel */
+			for(String channel : channelIds) {
+				PaginatedResult<Message> messages = ably.channels.get(channel).history(null);
+				assertNotNull("Expected non-null messages", messages);
+				assertEquals("Expected 1 message", messages.items().length, 1);
+				/* verify message contents */
+				assertEquals("Expect message data to be expected String", messages.items()[0].data, message.data);
+			}
+		} catch (AblyException e) {
+			e.printStackTrace();
+			fail("bulk_publish_multiple_channels_param: Unexpected exception");
+			return;
+		}
+	}
+
     /**
      * Publish a multiple messages on multiple channels
      *