Merge pull request #30 from cloudoptlab/3.x

3.0.0.0-BETA6

Author: T-baby

cloudopt-next-json/build.gradle

@@ -1,6 +1,10 @@
 dependencies {
-    implementation project(":cloudopt-next-utils")
-    implementation project(":cloudopt-next-logging")
+    api "io.vertx:vertx-core:${rootProject.property('vertx_version')}"
+    api "com.fasterxml.jackson.core:jackson-core:${rootProject.property('jackson_version')}"
+    api "com.fasterxml.jackson.core:jackson-databind:${rootProject.property('jackson_version')}"
+    api "com.fasterxml.jackson.core:jackson-annotations:${rootProject.property('jackson_version')}"
+    api "com.fasterxml.jackson.module:jackson-module-kotlin:${rootProject.property('jackson_version')}"
+    api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.property('jackson_version')}"
 }
 
 description = "Cloudopt Next Json"

cloudopt-next-json/src/main/kotlin/net/cloudopt/next/json/DefaultJSONProvider.kt

@@ -15,75 +15,62 @@
  */
 package net.cloudopt.next.json
 
-import com.alibaba.fastjson.JSON
-import com.alibaba.fastjson.JSONObject
-import com.alibaba.fastjson.parser.ParserConfig
-import net.cloudopt.next.utils.Resourcer
+import com.fasterxml.jackson.databind.MapperFeature
+import io.vertx.core.json.Json
+import io.vertx.core.json.JsonArray
+import io.vertx.core.json.JsonObject
 import kotlin.reflect.KClass
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import io.vertx.core.json.jackson.DatabindCodec
+
 
-/*
- * @author: Cloudopt
- * @Time: 2018/1/9
- * @Description: Default JsonProvider.
- */
 class DefaultJSONProvider : JsonProvider {
 
     init {
-        val cfg = ParserConfig.getGlobalInstance()
-        cfg.addAccept("net.cloudopt.next.")
+        DatabindCodec.mapper().registerModule(JavaTimeModule())
     }
 
     override fun toJsonString(obj: Any): String {
-        return JSON.toJSONString(obj)
+        return Json.encode(obj)
     }
 
     override fun toJsonMap(jsonString: String): MutableMap<String, Any> {
-        return JSON.parseObject(jsonString).toMutableMap()
+        return (Json.decodeValue(jsonString) as JsonObject).map.toMutableMap()
     }
 
     override fun toObject(jsonString: String, clazz: KClass<*>): Any {
-        return JSON.parseObject(jsonString, clazz.java)
+        return Json.decodeValue(jsonString, clazz.java)
     }
 
-    override fun toJsonMapList(s: String): MutableList<MutableMap<String, Any>> {
-        return JSON.parseArray(s).toMutableList() as MutableList<MutableMap<String, Any>>
+    override fun toJsonMapList(jsonString: String): MutableList<MutableMap<String, Any>> {
+        val value = Json.decodeValue(jsonString) as JsonArray
+        val mapList = mutableListOf<MutableMap<String, Any>>()
+        for (it in value.withIndex()) {
+            mapList.add(value.getJsonObject(it.index).map)
+        }
+        return mapList
     }
 
-    override fun toObjectList(jsonString: String, clazz: KClass<*>): MutableList<Any> {
-        return JSON.parseArray(jsonString, clazz.java).toMutableList()
+    override fun <T> toObjectList(jsonString: String, clazz: KClass<*>): MutableList<T> {
+        val value = Json.decodeValue(jsonString) as JsonArray
+        val list = mutableListOf<T>()
+        for (it in value.withIndex()) {
+            list.add(value.getJsonObject(it.index).mapTo(clazz.java) as T)
+        }
+        return list
     }
 
     override fun toList(jsonString: String): MutableList<Any> {
-        return JSON.parseArray(jsonString).toMutableList()
+        return (Json.decodeValue(jsonString) as JsonArray).toMutableList()
     }
 
-    override fun read(filePath: String): MutableMap<String, Any> {
-        var jsonString = Resourcer.inputStreamToString(Resourcer.getFileInputStream(filePath))
-        jsonString = cleanText(jsonString)
-        return toJsonMap(jsonString)
+    override fun toJsonObject(jsonString: String): JsonObject {
+        return Json.decodeValue(jsonString) as JsonObject
     }
 
-    override fun read(filePath: String, prefix: String): MutableMap<String, Any> {
-        var jsonString = Resourcer.inputStreamToString(Resourcer.getFileInputStream(filePath))
-        jsonString = cleanText(jsonString)
-        var jsonObj = JSON.parseObject(jsonString)
-        var list = prefix.split(".")
-        for (key in list) {
-            if (jsonObj.getJSONObject(key) != null) {
-                jsonObj = jsonObj.getJSONObject(key)
-            }
-        }
-        return jsonObj.toMutableMap()
+    override fun toJsonArray(jsonString: String): JsonArray {
+        return Json.decodeValue(jsonString) as JsonArray
     }
 
-    override fun read(filePath: String, prefix: String, clazz: KClass<*>): Any {
-        var jsonObj = read(filePath, prefix)
-        return JSONObject(jsonObj).toJavaObject(clazz.java)!!
-    }
-
-    private fun cleanText(jsonString: String): String {
-        return jsonString.replace("/n", "")
-    }
-
-
 }

cloudopt-next-json/src/main/kotlin/net/cloudopt/next/json/JsonProvider.kt

@@ -15,13 +15,10 @@
  */
 package net.cloudopt.next.json
 
+import io.vertx.core.json.JsonArray
+import io.vertx.core.json.JsonObject
 import kotlin.reflect.KClass
 
-/*
- * @author: Cloudopt
- * @Time: 2018/1/9
- * @Description: JsonProvider Interface.
- */
 interface JsonProvider {
 
     /**
@@ -59,7 +56,7 @@ interface JsonProvider {
      * @param clazz Java class
      * @return MutableList<Any>
      */
-    fun toObjectList(jsonString: String, clazz: KClass<*>): MutableList<Any>
+    fun<T> toObjectList(jsonString: String, clazz: KClass<*>): MutableList<T>
 
     /**
      * Output any list.
@@ -68,30 +65,20 @@ interface JsonProvider {
      */
     fun toList(jsonString: String): MutableList<Any>
 
-
     /**
-     * Read Json file to json string
-     * @param filePath File path
-     * @return MutableMap<String,Any>
+     * Decode a given JSON string to JSON Object.
+     * @see JsonObject
+     * @param jsonString String
+     * @return JsonObject
      */
-    fun read(filePath: String): MutableMap<String, Any>
-
-    /**
-     * Read Json file to Map
-     * @param filePath File path
-     * @param prefix Attribute prefix in json file
-     * @return map
-     */
-    fun read(filePath: String, prefix: String): MutableMap<String, Any>
-
+    fun toJsonObject(jsonString: String):JsonObject
 
     /**
-     * Read Json file into a specific instance of the object
-     * @param filePath File path
-     * @param prefix Attribute prefix in json file
-     * @param clazz Class name
-     * @return Object
+     * Decode a given JSON string to JSON Array.
+     * @see JsonArray
+     * @param jsonString String
+     * @return JsonArray
      */
-    fun read(filePath: String, prefix: String, clazz: KClass<*>): Any
+    fun toJsonArray(jsonString: String):JsonArray
 
 }

cloudopt-next-json/src/main/kotlin/net/cloudopt/next/json/Jsoner.kt

@@ -15,108 +15,81 @@
  */
 package net.cloudopt.next.json
 
-import net.cloudopt.next.utils.Classer
+import io.vertx.core.json.JsonArray
+import io.vertx.core.json.JsonObject
 import kotlin.reflect.KClass
-import kotlin.reflect.full.createInstance
-
-
-/*
- * @author: Cloudopt
- * @Time: 2018/1/9
- * @Description: Json's tool class.
- */
 
 object Jsoner {
 
     @JvmStatic
-    var jsonProvider: JsonProvider = Classer.loadClass("net.cloudopt.next.json.DefaultJSONProvider")
-        .createInstance() as JsonProvider
+    var jsonProvider: JsonProvider = DefaultJSONProvider()
 
     /**
      * Output json string.
-     * @param obj Json Object
      * @return Json string
      */
-    fun toJsonString(obj: Any): String {
-        return jsonProvider.toJsonString(obj)
+    fun Any.toJsonString(): String {
+        return jsonProvider.toJsonString(this)
     }
 
     /**
      * Output MutableMap
-     * @param jsonString Json string
      * @return MutableMap
      */
-    fun toJsonMap(jsonString: String): MutableMap<String, Any> {
-        return jsonProvider.toJsonMap(jsonString)
+    fun String.jsontoMutableMap(): MutableMap<String, Any> {
+        return jsonProvider.toJsonMap(this)
     }
 
     /**
      * Output json object.
-     * @param jsonString Json string
      * @param clazz Java class
      * @return Json object
      */
-    fun toObject(jsonString: String, clazz: KClass<*>): Any {
-        return jsonProvider.toObject(jsonString, clazz)
+    fun String.jsonToObject(clazz: KClass<*>): Any {
+        return jsonProvider.toObject(this, clazz)
     }
 
     /**
      * Output json map list.
-     * @param jsonString Json string
      * @return MutableList<MutableMap<String,Any>>
      */
-    fun toJsonMapList(jsonString: String): MutableList<MutableMap<String, Any>> {
-        return jsonProvider.toJsonMapList(jsonString)
+    fun String.jsontoMutableMapList(): MutableList<MutableMap<String, Any>> {
+        return jsonProvider.toJsonMapList(this)
     }
 
     /**
      * Output obj array.
-     * @param jsonString Json string
      * @param clazz Java class
      * @return MutableList<Any>
      */
-    fun toObjectList(jsonString: String, clazz: KClass<*>): MutableList<Any> {
-        return jsonProvider.toObjectList(jsonString, clazz)
+    fun String.jsonToObjectList(clazz: KClass<*>): MutableList<Any> {
+        return jsonProvider.toObjectList(this, clazz)
     }
 
     /**
      * Output any list.
-     * @param jsonString Json string
      * @return MutableList<Any>
      */
-    fun toList(jsonString: String): MutableList<Any> {
-        return jsonProvider.toList(jsonString)
+    fun String.jsontoObjectList(): MutableList<Any> {
+        return jsonProvider.toList(this)
     }
 
     /**
-     * Read Json file to json string
-     * @param filePath File path
-     * @return MutableMap<String,Any>
+     * Decode a given JSON string to JSON Object.
+     * @see JsonObject
+     * @return JsonObject
      */
-    fun read(filePath: String): MutableMap<String, Any> {
-        return jsonProvider.read(filePath)
+    fun String.toJsonObject(): JsonObject {
+        return jsonProvider.toJsonObject(this)
     }
 
     /**
-     * Read Json file to Map
-     * @param filePath File path
-     * @param prefix Attribute prefix in json file
-     * @return map
+     * Decode a given JSON string to JSON Array.
+     * @see JsonArray
+     * @return JsonArray
      */
-    fun read(filePath: String, prefix: String): MutableMap<String, Any> {
-        return jsonProvider.read(filePath, prefix)
+    fun String.toJsonArray(): JsonArray {
+        return jsonProvider.toJsonArray(this)
     }
 
-    /**
-     * Read Json file into a specific instance of the object
-     * @param filePath File path
-     * @param prefix Attribute prefix in json file
-     * @param clazz Class name
-     * @return Object
-     */
-    fun read(filePath: String, prefix: String, clazz: KClass<*>): Any {
-        return jsonProvider.read(filePath, prefix, clazz)
-    }
-
-
 }