agorise/graphenej
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Serializing the memo only when the message bytes is not null

Browse source
This commit is contained in:
Nelson R. Perez 2017-11-27 23:05:42 -05:00
parent de11203ef8
commit 2520099762
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperation.java
View file

@ -121,20 +121,20 @@ public class TransferOperation extends BaseOperation {
jsonObject.addProperty(KEY_FROM, from.getObjectId()); jsonObject.addProperty(KEY_FROM, from.getObjectId());
jsonObject.addProperty(KEY_TO, to.getObjectId()); jsonObject.addProperty(KEY_TO, to.getObjectId());
jsonObject.add(KEY_AMOUNT, amount.toJsonObject()); jsonObject.add(KEY_AMOUNT, amount.toJsonObject());
jsonObject.add(KEY_MEMO, memo.toJsonObject()); if(memo.getByteMessage() != null)
jsonObject.add(KEY_MEMO, memo.toJsonObject());
jsonObject.add(KEY_EXTENSIONS, new JsonArray()); jsonObject.add(KEY_EXTENSIONS, new JsonArray());
array.add(jsonObject); array.add(jsonObject);
return array; return array;
} }
/**
* Serializer used to convert this object into a {@link JsonElement} instance
*/
public static class TransferSerializer implements JsonSerializer<TransferOperation> { public static class TransferSerializer implements JsonSerializer<TransferOperation> {
@Override @Override
public JsonElement serialize(TransferOperation transfer, Type type, JsonSerializationContext jsonSerializationContext) { public JsonElement serialize(TransferOperation transfer, Type type, JsonSerializationContext jsonSerializationContext) {
// JsonArray arrayRep = new JsonArray();
// arrayRep.add(transfer.getId());
// arrayRep.add(transfer.toJsonObject());
// return arrayRep;
return transfer.toJsonObject(); return transfer.toJsonObject();
} }
} }
@ -198,7 +198,6 @@ public class TransferOperation extends BaseOperation {
Memo memo = context.deserialize(jsonObject.get(KEY_MEMO), Memo.class); Memo memo = context.deserialize(jsonObject.get(KEY_MEMO), Memo.class);
transfer.setMemo(memo); transfer.setMemo(memo);
} }
return transfer; return transfer;
} }
} }