AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Make it possible to use MessageNano.mergeFrom without casting.

Browse Source 
You can now do:

  MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes);

without having to cast the message returned from mergeFrom.

Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9
This commit is contained in:
Brian Duff 2013-06-28 17:23:51 -07:00
parent 499f47ffdb
commit a9c4e082e0
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/main/java/com/google/protobuf/nano/MessageNano.java
View File

@ -101,7 +101,7 @@ public abstract class MessageNano {
* Parse {@code data} as a message of this type and merge it with the
* message being built.
*/
public static final MessageNano mergeFrom(MessageNano msg, final byte[] data)
public static final <T extends MessageNano> T mergeFrom(T msg, final byte[] data)
throws InvalidProtocolBufferNanoException {
return mergeFrom(msg, data, 0, data.length);
}
@ -110,8 +110,8 @@ public abstract class MessageNano {
* Parse {@code data} as a message of this type and merge it with the
* message being built.
*/
public static final MessageNano mergeFrom(MessageNano msg, final byte[] data, final int off,
final int len) throws InvalidProtocolBufferNanoException {
public static final <T extends MessageNano> T mergeFrom(T msg, final byte[] data,
final int off, final int len) throws InvalidProtocolBufferNanoException {
try {
final CodedInputByteBufferNano input =
CodedInputByteBufferNano.newInstance(data, off, len);

9
java/src/test/java/com/google/protobuf/NanoTest.java
View File

@ -2241,6 +2241,15 @@ public class NanoTest extends TestCase {
assertEquals(0, MessageNano.toByteArray(deserialized).length);
}
public void testMergeFrom() throws Exception {
SimpleMessageNano message = new SimpleMessageNano();
message.d = 123;
byte[] bytes = MessageNano.toByteArray(message);
SimpleMessageNano newMessage = MessageNano.mergeFrom(new SimpleMessageNano(), bytes);
assertEquals(message.d, newMessage.d);
}
private <T> List<T> list(T first, T... remaining) {
List<T> list = new ArrayList<T>();
list.add(first);

2
src/google/protobuf/compiler/javanano/javanano_message.cc
View File

@ -362,7 +362,7 @@ GenerateParseFromMethods(io::Printer* printer) {
printer->Print(
"public $static$ $classname$ parseFrom(byte[] data)\n"
" throws com.google.protobuf.nano.InvalidProtocolBufferNanoException {\n"
" return ($classname$) com.google.protobuf.nano.MessageNano.mergeFrom(new $classname$(), data);\n"
" return com.google.protobuf.nano.MessageNano.mergeFrom(new $classname$(), data);\n"
"}\n"
"\n"
"public $static$ $classname$ parseFrom(\n"