Merge pull request #158 from biezhi/dev

Dev

Author: hellokaton

README.md

@@ -60,7 +60,7 @@ Create a basic `Maven` project
 <dependency>
     <groupId>com.bladejava</groupId>
     <artifactId>blade-mvc</artifactId>
-    <version>2.0.5-BETA1</version>
+    <version>2.0.5-BETA2</version>
 </dependency>
 ```
 
@@ -69,7 +69,7 @@ Create a basic `Maven` project
 or `Gradle`:
 
 ```sh
-compile 'com.bladejava:blade-mvc:2.0.5-BETA1'
+compile 'com.bladejava:blade-mvc:2.0.5-BETA2'
 ```
 
 Write `main` method, try `Hello World`：

README_CN.md

@@ -60,7 +60,7 @@
 <dependency>
 	<groupId>com.bladejava</groupId>
 	<artifactId>blade-mvc</artifactId>
-	<version>2.0.5-BETA1</version>
+	<version>2.0.5-BETA2</version>
 </dependency>
 ```
 
@@ -69,7 +69,7 @@
 或者  `Gradle`:
 
 ```sh
-compile 'com.bladejava:blade-mvc:2.0.5-BETA1'
+compile 'com.bladejava:blade-mvc:2.0.5-BETA2'
 ```
 
 编写 `main` 函数写一个 `Hello World`：

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.bladejava</groupId>
     <artifactId>blade-mvc</artifactId>
-    <version>2.0.5-BETA1</version>
+    <version>2.0.5-BETA2</version>
     <packaging>jar</packaging>
 
     <name>blade</name>
@@ -36,7 +36,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.version>4.12</junit.version>
         <slf4j-api.version>1.7.21</slf4j-api.version>
-        <netty.version>4.1.16.Final</netty.version>
+        <netty.version>4.1.18.Final</netty.version>
         <blade-asm.version>0.0.1</blade-asm.version>
         <blade-log.version>0.0.6</blade-log.version>
     </properties>

src/main/java/com/blade/kit/CollectionKit.java

@@ -0,0 +1,130 @@
+package com.blade.kit;
+
+import lombok.NoArgsConstructor;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * Collection kit
+ *
+ * @author biezhi
+ * @date 2017/12/15
+ */
+@NoArgsConstructor
+public final class CollectionKit {
+
+    /**
+     * Determines whether an array is empty
+     *
+     * @param array array object
+     * @param <T>   array type
+     * @return return array is empty
+     */
+    public static <T> boolean isEmpty(T[] array) {
+        return null == array || array.length == 0;
+    }
+
+    /**
+     * Determines whether an array is not empty
+     *
+     * @param array array object
+     * @param <T>   array type
+     * @return return array is not empty
+     */
+    public static <T> boolean isNotEmpty(T[] array) {
+        return null != array && array.length > 0;
+    }
+
+    /**
+     * Determines whether an collection is empty
+     *
+     * @param collection collection object
+     * @param <T>        collection type
+     * @return return collection is empty
+     */
+    public static <T> boolean isEmpty(Collection<T> collection) {
+        return null == collection || collection.size() == 0;
+    }
+
+    /**
+     * Determines whether an collection is not empty
+     *
+     * @param collection collection object
+     * @param <T>        collection type
+     * @return return collection is not empty
+     */
+    public static <T> boolean isNotEmpty(Collection<T> collection) {
+        return null != collection && collection.size() > 0;
+    }
+
+    /**
+     * New HashMap
+     *
+     * @param <K> HashMap Key type
+     * @param <V> HashMap Value type
+     * @return return HashMap
+     */
+    public static <K, V> HashMap<K, V> newMap() {
+        return new HashMap<>();
+    }
+
+    /**
+     * New HashMap and initialCapacity
+     *
+     * @param initialCapacity initialCapacity
+     * @param <K>             HashMap Key type
+     * @param <V>             HashMap Value type
+     * @return return HashMap
+     */
+    public static <K, V> HashMap<K, V> newMap(int initialCapacity) {
+        return new HashMap<>(initialCapacity);
+    }
+
+    /**
+     * New ConcurrentMap
+     *
+     * @param <K> ConcurrentMap Key type
+     * @param <V> ConcurrentMap Value type
+     * @return return ConcurrentMap
+     */
+    public static <K, V> ConcurrentMap<K, V> newConcurrentMap() {
+        return new ConcurrentHashMap<>();
+    }
+
+    /**
+     * New ConcurrentMap and initialCapacity
+     *
+     * @param initialCapacity initialCapacity
+     * @param <K>             ConcurrentMap Key type
+     * @param <V>             ConcurrentMap Value type
+     * @return return ConcurrentMap
+     */
+    public static <K, V> ConcurrentMap<K, V> newConcurrentMap(int initialCapacity) {
+        return new ConcurrentHashMap<>(initialCapacity);
+    }
+
+    /**
+     * New List and add values
+     *
+     * @param values list values
+     * @param <T>    list type
+     * @return return array list
+     */
+    public static <T> List<T> newLists(T... values) {
+        return Arrays.asList(values);
+    }
+
+    /**
+     * New Set and add values
+     *
+     * @param values set values
+     * @param <T>    set type
+     * @return return HashSet
+     */
+    public static <T> Set<T> newSets(T... values) {
+        return new HashSet<>(Arrays.asList(values));
+    }
+
+}

src/main/java/com/blade/kit/JsonKit.java

@@ -1,10 +1,8 @@
 package com.blade.kit;
 
 import com.blade.kit.json.Ason;
-import com.blade.kit.json.BeanSerializer;
-import com.blade.kit.json.JsonSerializer;
-import com.blade.kit.json.SerializeMapping;
-import lombok.NoArgsConstructor;
+import com.blade.kit.json.DefaultJsonSupport;
+import com.blade.kit.json.JsonSupport;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -14,31 +12,26 @@
  * 2017/6/2
  */
 @Slf4j
-@NoArgsConstructor
 public final class JsonKit {
 
-    public static String toString(Object object) {
-        return toString(object, SerializeMapping.defaultMapping());
-    }
+    private static final DefaultJsonSupport defaultJsonSupport = new DefaultJsonSupport();
+
+    private static JsonSupport jsonSupport = new DefaultJsonSupport();
 
-    public static String toString(Object object, SerializeMapping serializeMapping) {
-        try {
-            Object jsonObj = BeanSerializer.serialize(serializeMapping, object);
-            return JsonSerializer.serialize(jsonObj);
-        } catch (Exception e) {
-            log.error("object to json string error", e);
-            return null;
-        }
+    public static void jsonSupprt(JsonSupport jsonSupport) {
+        JsonKit.jsonSupport = jsonSupport;
     }
 
-    public static Ason toAson(String json) {
-        Object jsonObj = JsonSerializer.deserialize(json);
-        return (Ason) jsonObj;
+    public static String toString(Object object) {
+        return jsonSupport.toString(object);
     }
 
     public static <T> T formJson(String json, Class<T> cls) {
-        Object jsonObj = JsonSerializer.deserialize(json);
-        return BeanSerializer.deserialize(cls, jsonObj);
+        return jsonSupport.formJson(json, cls);
+    }
+
+    public static Ason toAson(String value) {
+        return defaultJsonSupport.toAson(value);
     }
 
 }