From 8a233c23d1da9ea41171f2c0d82f7b2723e58842 Mon Sep 17 00:00:00 2001 From: liaohuqiu Date: Fri, 29 Aug 2014 15:38:14 +0800 Subject: [PATCH] commit for files change --- core/pom.xml | 2 +- core/src/in/srain/binpack/BinPack.java | 4 ++++ tests/pom.xml | 4 ++-- tests/src/Main.java | 10 +++++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 7086369..2e70d24 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -13,7 +13,7 @@ binpack jar BinPack - 1.0.1 + 1.0.2-SNAPSHOT src diff --git a/core/src/in/srain/binpack/BinPack.java b/core/src/in/srain/binpack/BinPack.java index 0e0f745..b77cfaa 100755 --- a/core/src/in/srain/binpack/BinPack.java +++ b/core/src/in/srain/binpack/BinPack.java @@ -81,8 +81,12 @@ public static void pack(OutputStream out, Object obj, String charsetName) throws packFloat(out, ((Float) obj)); } else if (obj instanceof Collection) { packList(out, (Collection) obj, charsetName); + } else if (obj.getClass().isArray()) { + // packList(out, Arrays.asList(obj), charsetName); } else if (obj instanceof Map) { packMap(out, (Map) obj, charsetName); + } else if (obj instanceof Enum) { + packInteger(out, ((Enum) obj).ordinal()); } else { packString(out, "unsupported-type-" + obj.getClass().getName(), "UTF-8"); } diff --git a/tests/pom.xml b/tests/pom.xml index 298471d..3582bfd 100755 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -13,13 +13,13 @@ binpack-test jar BinPack-test - 1.0.1-SNAPSHOT + 1.0.1=-SNAPSHOT in.srain binpack - 1.0.1 + 1.0.2-SNAPSHOT diff --git a/tests/src/Main.java b/tests/src/Main.java index e89111e..b5f90f1 100755 --- a/tests/src/Main.java +++ b/tests/src/Main.java @@ -4,8 +4,16 @@ import java.util.HashMap; import java.util.Map; +enum A { + JAVA, FLASH, +} + public class Main { - public static void main(String[] args) throws IOException { + public static void main(String[] args) throws IOException { + + double[] d = new double[]{1, 2, 3}; + byte[] str = BinPack.encode(d, "UTF-8"); + Object o = BinPack.decode(str, "UTF-8"); String strToBs = "All men are created equal."; Map m = new HashMap();