调整代码路径，以后将以此为基准

ExplodingDragon · ExplodingDragon · commit 9c0fb916830c · 2020-07-11T11:26:24.000+08:00
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/ArgsReader.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/ArgsReader.kt
@@ -1,16 +1,14 @@
-package com.github.open_edgn.data.format.utils
+package com.github.open_edgn.data.format
 
-import com.github.open_edgn.data.format.ArgsItem
-import com.github.open_edgn.data.format.Beta
-import com.github.open_edgn.data.format.FormatErrorException
-import com.github.open_edgn.data.format.Ignore
 import org.slf4j.LoggerFactory
-import java.lang.RuntimeException
 import kotlin.reflect.KClass
 import kotlin.reflect.full.createInstance
 import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.full.findAnnotation
-import kotlin.reflect.jvm.*
+import kotlin.reflect.jvm.isAccessible
+import kotlin.reflect.jvm.javaField
+import kotlin.reflect.jvm.jvmErasure
+import kotlin.reflect.jvm.jvmName
 
 /**
  * 解析 main 方法下的 Args 方案
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/BaseDataProperties.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/BaseDataProperties.kt
@@ -1,4 +1,4 @@
-package com.github.open_edgn.data.format.io
+package com.github.open_edgn.data.format
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -43,47 +43,47 @@ abstract class BaseDataProperties : IDataProperties {
     }
 
     override fun putByte(key: String, value: Byte): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 
     override fun putInt(key: String, value: Int): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 
     override fun putFloat(key: String, value: Float): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 
     override fun putLong(key: String, value: Long): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 
     override fun putShort(key: String, value: Short): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 
     override fun putDouble(key: String, value: Double): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 
     override fun putBoolean(key: String, value: Boolean): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 
     override fun putChar(key: String, value: Char): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 
     override fun putString(key: String, value: String): IDataProperties {
-        set(key,value)
+        set(key, value)
         return this
     }
 }
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/DataSerializableFactory.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/DataSerializableFactory.kt
@@ -1,4 +1,4 @@
-package com.github.open_edgn.data.format.io
+package com.github.open_edgn.data.format
 
 import java.io.PrintWriter
 import java.io.Reader
@@ -45,25 +45,13 @@ interface DataSerializableFactory {
         }
 
         override fun output(container: Map<String, String>, writer: Writer): Int {
-            val printWriter = PrintWriter(writer.toString())
+            val printWriter = PrintWriter(writer)
             var len = 0
             container.forEach { (k, v) ->
                 len++
-                printWriter.println("${char2Unicode(k)}=${char2Unicode(v)}")
+                printWriter.println("$k=$v")
             }
             return len
         }
-
-        private fun char2Unicode(k: String): String {
-            val unicode = StringBuffer()
-            for (c in k) {
-                if (c.isLetterOrDigit() || c.isJavaIdentifierStart()) {
-                    unicode.append(c)
-                } else {
-                    unicode.append("\\u").append(c.toLong().toString(16))
-                }
-            }
-            return unicode.toString()
-        }
     }
 }
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/Exceptions.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/Exceptions.kt
@@ -1,16 +1,14 @@
 package com.github.open_edgn.data.format
 
-import java.lang.RuntimeException
-
 
 /**
  *  通用异常：未找到的异常
  * @property message String? 异常消息，必须
  */
-class NotFoundException (override val message: String?): RuntimeException(message)
+class NotFoundException(override val message: String?) : RuntimeException(message)
 
 /**
  *  通用异常：格式化错误异常
  * @property message String? 异常消息，必须
  */
-class FormatErrorException(override val message: String?, e: Throwable? = null): RuntimeException(message,e)
+class FormatErrorException(override val message: String?, e: Throwable? = null) : RuntimeException(message, e)
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/Externals.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/Externals.kt
@@ -1,11 +1,5 @@
 package com.github.open_edgn.data.format
 
-import com.github.open_edgn.data.format.io.HashDataProperties
-import com.github.open_edgn.data.format.io.IDataProperties
-import com.github.open_edgn.data.format.utils.ObjectUtils
-import com.github.open_edgn.data.format.utils.StringFillUtils
-import com.github.open_edgn.data.format.utils.StringFormatUtils
-import com.github.open_edgn.data.format.utils.StringUtils
 import java.io.InputStream
 import java.io.Reader
 import java.nio.charset.Charset
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/HashDataProperties.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/HashDataProperties.kt
@@ -1,7 +1,5 @@
-package com.github.open_edgn.data.format.io
+package com.github.open_edgn.data.format
 
-import com.github.open_edgn.data.format.utils.StringFillUtils
-import com.github.open_edgn.data.format.utils.StringFormatUtils
 import java.io.Reader
 import java.io.Writer
 import java.util.*
@@ -26,6 +24,11 @@ class HashDataProperties(private val formatString: Boolean = true) : BaseDataPro
         return container.hashCode()
     }
 
+    override val keys: Set<String>
+        get() = container.keys.toSet()
+
+    override fun get(key: String): Any? = container[key]
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/IDataBackups.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/IDataBackups.kt
@@ -1,4 +1,4 @@
-package com.github.open_edgn.data.format.io
+package com.github.open_edgn.data.format
 
 import java.io.Reader
 import java.io.Writer
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/IDataProperties.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/IDataProperties.kt
@@ -1,14 +1,19 @@
-package com.github.open_edgn.data.format.io
+package com.github.open_edgn.data.format
 
 /**
  *   一个基于 （Key/Value） 关联的数据集合包装类
  */
 interface IDataProperties : IDataBackups, IDataReader, IDataWriter {
 
+    val keys: Set<String>
+
+
     override fun toString(): String
 
     override fun hashCode(): Int
 
     override fun equals(other: Any?): Boolean
 
+    operator fun get(key: String): Any?
+
 }
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/IDataReader.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/IDataReader.kt
@@ -1,8 +1,8 @@
-package com.github.open_edgn.data.format.io
+package com.github.open_edgn.data.format
 
 import java.io.Serializable
 
-interface IDataReader: Serializable {
+interface IDataReader : Serializable {
     /**
      * 根据键值获取 Byte 类型的数据
      *
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/IDataWriter.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/IDataWriter.kt
@@ -1,4 +1,4 @@
-package com.github.open_edgn.data.format.io
+package com.github.open_edgn.data.format
 
 import java.io.Serializable
 
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/IObjectFormat.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/IObjectFormat.kt
@@ -1,8 +1,6 @@
-package com.github.open_edgn.data.format.utils
+package com.github.open_edgn.data.format
 
-import kotlin.reflect.KClass
-
-interface IObjectFormat <T:Any>{
+interface IObjectFormat<T : Any> {
     /**
      * 注册可解析的类
      */
@@ -14,13 +12,13 @@ interface IObjectFormat <T:Any>{
      * @param data String 原始字符串
      * @return T 需要的类型
      */
-    fun parse(data: String):T
+    fun parse(data: String): T
 
     /**
      * 将原始数据解析成对应的字符串
      *
      * @param data Any  原始数据
      * @return String 对应的字符串
      */
-    fun format(data: Any):String
+    fun format(data: Any): String
 }
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/ObjectFormats.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/ObjectFormats.kt
@@ -1,6 +1,5 @@
-package com.github.open_edgn.data.format.utils
+package com.github.open_edgn.data.format
 
-import com.github.open_edgn.data.format.FormatErrorException
 import java.io.File
 
 class ByteObjectFormat : IObjectFormat<Byte> {
@@ -134,7 +133,8 @@ class FileObjectFormat : IObjectFormat<File> {
 
     override fun format(data: Any): String {
         if (data is File) {
-            return data.absolutePath
+            // 替换掉 Windows 下的反斜杠
+            return data.absolutePath.replace("\\", "/")
         } else {
             throw FormatErrorException("data#${data::class.java.simpleName} 不是 File 类型.")
         }
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/ObjectUtils.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/ObjectUtils.kt
@@ -1,4 +1,4 @@
-package com.github.open_edgn.data.format.utils
+package com.github.open_edgn.data.format
 
 /**
  * 关于对象的工具方法
@@ -9,7 +9,7 @@ object ObjectUtils {
      * @param data T? 对象
      * @return Boolean 是否为 NULL
      */
-    inline fun <reified T> isNull(data: T?) = data == null
+    fun isNull(data: Any?) = data == null
+
 
-    
 }
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/StringFillUtils.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/StringFillUtils.kt
@@ -1,4 +1,4 @@
-package com.github.open_edgn.data.format.utils
+package com.github.open_edgn.data.format
 
 import java.util.regex.Pattern
 
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/StringFormatUtils.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/StringFormatUtils.kt
@@ -1,7 +1,5 @@
-package com.github.open_edgn.data.format.utils
+package com.github.open_edgn.data.format
 
-import com.github.open_edgn.data.format.FormatErrorException
-import com.github.open_edgn.data.format.NotFoundException
 import kotlin.reflect.KClass
 
 
@@ -49,8 +47,8 @@ object StringFormatUtils {
     /**
      * 扩展方法，具体查看 `#parse(String,Class)`
      */
-    fun <T : Any> parse(source: String, clazz: KClass<T>,fillSystemProp:Boolean = false): T {
-        return parse(source, clazz.javaObjectType,fillSystemProp)
+    fun <T : Any> parse(source: String, clazz: KClass<T>, fillSystemProp: Boolean = false): T {
+        return parse(source, clazz.javaObjectType, fillSystemProp)
     }
 
     /**
@@ -64,10 +62,10 @@ object StringFormatUtils {
      */
     @Suppress("UNCHECKED_CAST")
     @Throws(FormatErrorException::class, NotFoundException::class)
-    fun <T : Any> parse(source: String, clazz: Class<T>, fillSystemProp:Boolean = false): T {
-        val sourceData = if (fillSystemProp){
+    fun <T : Any> parse(source: String, clazz: Class<T>, fillSystemProp: Boolean = false): T {
+        val sourceData = if (fillSystemProp) {
             StringFillUtils.fillFromSystemProp(source)
-        }else{
+        } else {
             source
         }
         var parse = formatMap[clazz]
@@ -96,6 +94,7 @@ object StringFormatUtils {
     fun <T : Any> format(source: T, clazz: KClass<out T>): String {
         return format(source, clazz.javaObjectType)
     }
+
     /**
      *  扩展方法，具体查看 `#format(T,Class)`
      */
diff --git a/core/src/main/kotlin/com/github/open_edgn/data/format/StringUtils.kt b/core/src/main/kotlin/com/github/open_edgn/data/format/StringUtils.kt
@@ -1,4 +1,4 @@
-package com.github.open_edgn.data.format.utils
+package com.github.open_edgn.data.format
 
 import java.io.*
 import java.nio.charset.Charset
@@ -35,7 +35,9 @@ object StringUtils {
      * @return String 读取到的全部字符串
      */
     fun readText(reader: Reader): String {
-        return reader.readText()
+        val stringWriter = StringWriter()
+        reader.copyTo(stringWriter)
+        return stringWriter.toString()
     }
 
 
diff --git a/core/src/test/kotlin/com/github/open_edgn/data/format/ArgsReaderTest.kt b/core/src/test/kotlin/com/github/open_edgn/data/format/ArgsReaderTest.kt
@@ -1,6 +1,5 @@
-package com.github.open_edgn.data.format.utils
+package com.github.open_edgn.data.format
 
-import com.github.open_edgn.data.format.ArgsItem
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import java.io.File
@@ -34,7 +33,7 @@ internal class ArgsReaderTest {
     @Test
     fun testSecond() {
         val test2 = ArgsReader(
-                arrayOf("--work-dir","data/app", "-d", "--skip-args"),
+                arrayOf("--work-dir", "data/app", "-d", "--skip-args"),
                 Test2::class
 
         ).getArgsBean(Test2::class)
diff --git a/core/src/test/kotlin/com/github/open_edgn/data/format/HashDataPropertiesTest.kt b/core/src/test/kotlin/com/github/open_edgn/data/format/HashDataPropertiesTest.kt
@@ -1,8 +1,7 @@
-package com.github.open_edgn.data.format.io
-
-import org.junit.jupiter.api.Test
+package com.github.open_edgn.data.format
 
 import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
 
 internal class HashDataPropertiesTest {
     private fun getEmptyHashDataProperties(): HashDataProperties {
@@ -203,7 +202,4 @@ internal class HashDataPropertiesTest {
         assertFalse(prop.replace("long4",2121L))
         assertEquals(prop.getLong("long3"),2343L)
     }
-
-
-
 }
diff --git a/core/src/test/kotlin/com/github/open_edgn/data/format/ObjectUtilsTest.kt b/core/src/test/kotlin/com/github/open_edgn/data/format/ObjectUtilsTest.kt
@@ -0,0 +1,14 @@
+package com.github.open_edgn.data.format
+
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+
+internal class ObjectUtilsTest {
+
+    @Test
+    fun isNull() {
+        assertFalse(ObjectUtils.isNull(Any()))
+        assertTrue(ObjectUtils.isNull(null))
+    }
+}
diff --git a/core/src/test/kotlin/com/github/open_edgn/data/format/StringFillUtilsTest.kt b/core/src/test/kotlin/com/github/open_edgn/data/format/StringFillUtilsTest.kt
diff --git a/core/src/test/kotlin/com/github/open_edgn/data/format/StringFormatUtilsTest.kt b/core/src/test/kotlin/com/github/open_edgn/data/format/StringFormatUtilsTest.kt
diff --git a/core/src/test/kotlin/com/github/open_edgn/data/format/StringUtilsTest.kt b/core/src/test/kotlin/com/github/open_edgn/data/format/StringUtilsTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.open_edgn.data.format.io`
	`1`	`+package com.github.open_edgn.data.format`
`2`	`2`
`3`	`3`	`import org.slf4j.Logger`
`4`	`4`	`import org.slf4j.LoggerFactory`
`@@ -43,47 +43,47 @@ abstract class BaseDataProperties : IDataProperties {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`override fun putByte(key: String, value: Byte): IDataProperties {`
`46`		`- set(key,value)`
	`46`	`+ set(key, value)`
`47`	`47`	`return this`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`override fun putInt(key: String, value: Int): IDataProperties {`
`51`		`- set(key,value)`
	`51`	`+ set(key, value)`
`52`	`52`	`return this`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`override fun putFloat(key: String, value: Float): IDataProperties {`
`56`		`- set(key,value)`
	`56`	`+ set(key, value)`
`57`	`57`	`return this`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`override fun putLong(key: String, value: Long): IDataProperties {`
`61`		`- set(key,value)`
	`61`	`+ set(key, value)`
`62`	`62`	`return this`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`override fun putShort(key: String, value: Short): IDataProperties {`
`66`		`- set(key,value)`
	`66`	`+ set(key, value)`
`67`	`67`	`return this`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`override fun putDouble(key: String, value: Double): IDataProperties {`
`71`		`- set(key,value)`
	`71`	`+ set(key, value)`
`72`	`72`	`return this`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`override fun putBoolean(key: String, value: Boolean): IDataProperties {`
`76`		`- set(key,value)`
	`76`	`+ set(key, value)`
`77`	`77`	`return this`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`override fun putChar(key: String, value: Char): IDataProperties {`
`81`		`- set(key,value)`
	`81`	`+ set(key, value)`
`82`	`82`	`return this`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`override fun putString(key: String, value: String): IDataProperties {`
`86`		`- set(key,value)`
	`86`	`+ set(key, value)`
`87`	`87`	`return this`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-package com.github.open_edgn.data.format.io`
	`1`	`+package com.github.open_edgn.data.format`
`2`	`2`
`3`	`3`	`import java.io.Serializable`
`4`	`4`
`5`		`-interface IDataReader: Serializable {`
	`5`	`+interface IDataReader : Serializable {`
`6`	`6`	`/**`
`7`	`7`	`* 根据键值获取 Byte 类型的数据`
`8`	`8`	`*`