Merge pull request #3 from OpenEdgn/dev

permission access for travis

Author: ExplodingDragon

core/src/main/kotlin/com/github/open_edgn/data/format/ArgsReader.kt

@@ -75,13 +75,19 @@ class ArgsReader(args: Array<String>, vararg argsBeans: KClass<*>) {
                 throw NullPointerException("无法初始化类型，因为字段${property.name} 为空，但此字段不允许空的数据！")
             }
         }
-        val any = if (bean.isData) {
-            val field = Unsafe::class.java.getDeclaredField("theUnsafe")
-            field.isAccessible = true
-            val unsafe = field.get(null) as Unsafe
-            unsafe.allocateInstance(bean.javaObjectType)
-        } else {
-            bean.createInstance()
+        val any = when {
+            bean.isData -> {
+                val field = Unsafe::class.java.getDeclaredField("theUnsafe")
+                field.isAccessible = true
+                val unsafe = field.get(null) as Unsafe
+                unsafe.allocateInstance(bean.javaObjectType)
+            }
+            bean.objectInstance != null -> {
+                bean.objectInstance!!
+            }
+            else -> {
+                bean.createInstance()
+            }
         }
         for ((index, property) in properties.withIndex()) {
             property.isAccessible = true

core/src/main/kotlin/com/github/open_edgn/data/format/InternalLogger.kt

@@ -18,7 +18,7 @@ internal object InternalLogger {
      * 判断是否开启DEBUG
      */
     private val isDebug: Boolean by lazy {
-        System.getProperty("DateFormat4K.debug", "FALSE").toUpperCase() == "TRUE"
+        System.getProperty("dataFormat4K.debug", "FALSE").toUpperCase() == "TRUE"
     }
     private val dateFormat = SimpleDateFormat("MM/dd HH:mm:ss")
     fun printLogger(clazz: Class<*>, type: Type, message: String, e: Throwable? = null) {
@@ -27,7 +27,7 @@ internal object InternalLogger {
                 System.out.printf("[%s][%s] - %s:[%s]\r\n[%s]\r\n", dateFormat.format(System.currentTimeMillis()),
                         type.name, clazz.simpleName, message, e.readPrintText())
             } else {
-                System.out.printf("[%s][%s] - %s:[%s]\r\n[%s]\r\n", dateFormat.format(System.currentTimeMillis()),
+                System.out.printf("[%s][%s] - %s:[%s]\r\n", dateFormat.format(System.currentTimeMillis()),
                         type.name, clazz.simpleName, message)
             }
         }

core/src/test/kotlin/com/github/open_edgn/data/format/ArgsReaderTest.kt

@@ -1,10 +1,16 @@
 package com.github.open_edgn.data.format
 
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.io.File
 
 internal class ArgsReaderTest {
+    @BeforeEach
+    fun before() {
+        System.setProperty("dataFormat4K.debug", "true")
+    }
+
     @Test
     fun test() {
         val argsReader = ArgsReader(arrayOf("--config", "%{user.home}"), ArgsLoader::class, Data::class)
@@ -90,4 +96,23 @@ internal class ArgsReaderTest {
             @ArgsItem(defaultValue = "false", alias = ["debug", "d"])
             val debug: Boolean
     )
+
+    @Test
+    fun test5() {
+        val argsBean = ArgsReader(
+                arrayOf("-d"),
+                Test5Property::class).getArgsBean(Test5Property::class)
+        assertEquals(argsBean.workDirectory, null)
+    }
+
+    object Test5Property {
+        /**
+         * 工作目录
+         */
+        @ArgsItem(defaultValue = "", nullable = true, alias = ["work-dir"])
+        var workDirectory: File? = null
+
+    }
+
+
 }