Revert some of the manual JSON deserialisation code I injected as it was causing REST crypto tests for text protocol to fail.

Author: Quintin Willison

lib/src/main/java/io/ably/lib/types/Message.java

@@ -173,8 +173,7 @@ static Message fromMsgpack(MessageUnpacker unpacker) throws IOException {
 	 */
 	public static Message fromEncoded(JsonObject messageJson, ChannelOptions channelOptions) throws MessageDecodeException {
 		try {
-			final Message message = new Message();
-			message.read(messageJson);
+			Message message = Serialisation.gson.fromJson(messageJson, Message.class);
 			message.decode(channelOptions);
 			return message;
 		} catch(Exception e) {

lib/src/main/java/io/ably/lib/types/MessageSerializer.java

@@ -136,15 +136,7 @@ static void writeMsgpackArray(Message.Batch[] pubSpecs, MessagePacker packer) th
 	 ****************************************/
 
 	public static Message[] readMessagesFromJson(byte[] packed) throws MessageDecodeException {
-		final InputStream stream = new ByteArrayInputStream(packed);
-		final Reader reader = new InputStreamReader(stream);
-		final JsonElement root = JsonParser.parseReader(reader);
-
-		if (!(root instanceof JsonArray)) {
-			throw MessageDecodeException.fromDescription("Expected a JSON array but found type \"" + root.getClass() + "\".");
-		}
-
-		return Message.fromEncodedArray((JsonArray)root, null);
+		return Serialisation.gson.fromJson(new String(packed), Message[].class);
 	}
 
 	/****************************************