generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-21 15:10:01 +01:00
Code Issues Projects Releases Wiki Activity

java: fixed a bug within CollectionTemplate.java

Browse Source
This commit is contained in:
Muga Nishizawa 2010-12-12 00:48:31 +09:00
parent 0c07e745f8
commit aff964c58b
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
java/src/main/java/org/msgpack/template/CollectionTemplate.java
View File

@ -18,10 +18,14 @@
package org.msgpack.template; package org.msgpack.template;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import java.util.LinkedList; import java.util.LinkedList;
import java.io.IOException; import java.io.IOException;
import org.msgpack.*;
import org.msgpack.MessagePackObject;
import org.msgpack.MessageTypeException;
import org.msgpack.Packer;
import org.msgpack.Template;
import org.msgpack.Unpacker;
public class CollectionTemplate implements Template { public class CollectionTemplate implements Template {
public static void load() { } public static void load() { }
@ -32,47 +36,53 @@ public class CollectionTemplate implements Template {
this.elementTemplate = elementTemplate; this.elementTemplate = elementTemplate;
} }
@SuppressWarnings("unchecked")
public void pack(Packer pk, Object target) throws IOException { public void pack(Packer pk, Object target) throws IOException {
if(!(target instanceof Collection)) { if (! (target instanceof Collection)) {
throw new MessageTypeException(); if (target == null) {
throw new MessageTypeException(new NullPointerException("target is null."));
}
throw new MessageTypeException("target is not Collection type: " + target.getClass());
} }
Collection<Object> collection = (Collection<Object>)target; Collection<Object> collection = (Collection<Object>) target;
pk.packArray(collection.size()); pk.packArray(collection.size());
for(Object element : collection) { for(Object element : collection) {
elementTemplate.pack(pk, element); elementTemplate.pack(pk, element);
} }
} }
@SuppressWarnings("unchecked")
public Object unpack(Unpacker pac, Object to) throws IOException, MessageTypeException { public Object unpack(Unpacker pac, Object to) throws IOException, MessageTypeException {
int length = pac.unpackArray(); int length = pac.unpackArray();
List<Object> list; Collection<Object> c;
if(to == null) { if(to == null) {
list = new LinkedList<Object>(); c = new LinkedList<Object>();
} else { } else {
// TODO: optimize if list is instanceof ArrayList // TODO: optimize if list is instanceof ArrayList
list = (List<Object>)to; c = (Collection<Object>) to;
list.clear(); c.clear();
} }
for(; length > 0; length--) { for(; length > 0; length--) {
list.add( elementTemplate.unpack(pac, null) ); c.add(elementTemplate.unpack(pac, null));
} }
return list; return c;
} }
@SuppressWarnings("unchecked")
public Object convert(MessagePackObject from, Object to) throws MessageTypeException { public Object convert(MessagePackObject from, Object to) throws MessageTypeException {
MessagePackObject[] array = from.asArray(); MessagePackObject[] array = from.asArray();
List<Object> list; Collection<Object> c;
if(to == null) { if(to == null) {
list = new LinkedList<Object>(); c = new LinkedList<Object>();
} else { } else {
// TODO: optimize if list is instanceof ArrayList // TODO: optimize if list is instanceof ArrayList
list = (List<Object>)to; c = (Collection<Object>) to;
list.clear(); c.clear();
} }
for(MessagePackObject element : array) { for(MessagePackObject element : array) {
list.add( elementTemplate.convert(element, null) ); c.add(elementTemplate.convert(element, null));
} }
return list; return c;
} }
static { static {