migrate StringValueResolver from mvc package to util package

greenlaw110 · greenlaw110 · commit 5f2c9a1cf2b5 · 2016-03-08T22:53:55.000+11:00
diff --git a/src/main/java/act/app/conf/AppConfigurator.java b/src/main/java/act/app/conf/AppConfigurator.java
@@ -6,7 +6,7 @@
 import org.osgl.$;
 import org.osgl.http.H;
 import org.osgl.logging.Logger;
-import org.osgl.mvc.util.StringValueResolver;
+import org.osgl.util.StringValueResolver;
 import org.osgl.util.C;
 import org.osgl.util.E;
 import org.osgl.util.FastStr;
diff --git a/src/main/java/act/app/data/StringValueResolverManager.java b/src/main/java/act/app/data/StringValueResolverManager.java
@@ -10,7 +10,7 @@
 import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 import org.joda.time.LocalTime;
-import org.osgl.mvc.util.StringValueResolver;
+import org.osgl.util.StringValueResolver;
 import org.osgl.util.C;
 import org.osgl.util.S;
 
diff --git a/src/main/java/act/data/DateResolver.java b/src/main/java/act/data/DateResolver.java
@@ -3,7 +3,7 @@
 import act.conf.AppConfig;
 import org.osgl.logging.L;
 import org.osgl.logging.Logger;
-import org.osgl.mvc.util.StringValueResolver;
+import org.osgl.util.StringValueResolver;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
diff --git a/src/main/java/act/data/JodaDateTimeCodec.java b/src/main/java/act/data/JodaDateTimeCodec.java
@@ -5,7 +5,7 @@
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-import org.osgl.mvc.util.StringValueResolver;
+import org.osgl.util.StringValueResolver;
 import org.osgl.util.S;
 import org.osgl.util.ValueObject;
 
diff --git a/src/main/java/act/data/JodaLocalDateCodec.java b/src/main/java/act/data/JodaLocalDateCodec.java
@@ -5,7 +5,7 @@
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-import org.osgl.mvc.util.StringValueResolver;
+import org.osgl.util.StringValueResolver;
 import org.osgl.util.ValueObject;
 
 public class JodaLocalDateCodec extends StringValueResolver<LocalDate> implements ValueObject.Codec<LocalDate> {
diff --git a/src/main/java/act/data/JodaLocalDateTimeCodec.java b/src/main/java/act/data/JodaLocalDateTimeCodec.java
@@ -5,7 +5,7 @@
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-import org.osgl.mvc.util.StringValueResolver;
+import org.osgl.util.StringValueResolver;
 import org.osgl.util.ValueObject;
 
 public class JodaLocalDateTimeCodec extends StringValueResolver<LocalDateTime> implements ValueObject.Codec<LocalDateTime> {
diff --git a/src/main/java/act/data/JodaLocalTimeCodec.java b/src/main/java/act/data/JodaLocalTimeCodec.java
@@ -5,7 +5,7 @@
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-import org.osgl.mvc.util.StringValueResolver;
+import org.osgl.util.StringValueResolver;
 import org.osgl.util.ValueObject;
 
 public class JodaLocalTimeCodec extends StringValueResolver<LocalTime> implements ValueObject.Codec<LocalTime> {
diff --git a/src/main/java/act/data/ListCodec.java b/src/main/java/act/data/ListCodec.java
@@ -0,0 +1,37 @@
+package act.data;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import org.osgl.$;
+import org.osgl.util.C;
+import org.osgl.util.ValueObject;
+
+import java.util.List;
+
+public class ListCodec implements ValueObject.Codec<List<Object>> {
+
+    @Override
+    public Class<List<Object>> targetClass() {
+        return $.cast(List.class);
+    }
+
+    @Override
+    public List<Object> parse(String s) {
+        JSONArray array = JSON.parseArray(s);
+        List<Object> list = C.newSizedList(array.size());
+        for (Object o : array) {
+            list.add(ValueObject.of(o));
+        }
+        return list;
+    }
+
+    @Override
+    public String toString(List<Object> o) {
+        return JSON.toJSONString(o);
+    }
+
+    @Override
+    public String toJSONString(List<Object> o) {
+        return toString(o);
+    }
+}
diff --git a/src/main/java/act/data/MapCodec.java b/src/main/java/act/data/MapCodec.java
@@ -0,0 +1,36 @@
+package act.data;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.osgl.$;
+import org.osgl.util.C;
+import org.osgl.util.ValueObject;
+
+import java.util.Map;
+
+public class MapCodec implements ValueObject.Codec<Map<String, Object>> {
+    @Override
+    public Class<Map<String, Object>> targetClass() {
+        return $.cast(Map.class);
+    }
+
+    @Override
+    public Map<String, Object> parse(String s) {
+        JSONObject json = JSON.parseObject(s);
+        Map<String, Object> map = C.newMap();
+        for (Map.Entry<String, Object> entry : json.entrySet()) {
+            map.put(entry.getKey(), ValueObject.of(entry.getValue()));
+        }
+        return map;
+    }
+
+    @Override
+    public String toString(Map<String, Object> o) {
+        return JSON.toJSONString(o);
+    }
+
+    @Override
+    public String toJSONString(Map<String, Object> o) {
+        return toString(o);
+    }
+}
diff --git a/src/main/java/act/data/StringValueResolverPlugin.java b/src/main/java/act/data/StringValueResolverPlugin.java
@@ -1,7 +1,7 @@
 package act.data;
 
 import act.plugin.Plugin;
-import org.osgl.mvc.util.StringValueResolver;
+import org.osgl.util.StringValueResolver;
 
 public abstract class StringValueResolverPlugin<T> extends StringValueResolver<T> implements Plugin {
 
