Merge pull request #1 from OpenEdgn/dev

Dev

Author: ExplodingDragon

build.gradle.kts

@@ -7,8 +7,8 @@ buildscript {
 
     repositories {
         mavenLocal()
+        maven { url = uri("https://maven.aliyun.com/repository/public/") }
         mavenCentral()
-//        maven { url = uri("https://maven.aliyun.com/repository/public/") }
         jcenter()
         maven { url = uri("https://jitpack.io") }
 
@@ -21,8 +21,8 @@ buildscript {
 allprojects {
     repositories {
         mavenLocal()
+        maven { url = uri("https://maven.aliyun.com/repository/public/") }
         mavenCentral()
-//        maven { url = uri("https://maven.aliyun.com/repository/public/") }
         jcenter()
         maven { url = uri("https://jitpack.io") }
     }

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

@@ -7,13 +7,15 @@ package com.github.open_edgn.data.format
  * 此字段可以忽略，同样会扫描，但会按照默认样式来绑定
  *
  * @property defaultValue String 默认值
+ * @param nullable Boolean 指定此字段是否可以为 null
  * @property alias Array<out String>
  * @constructor
  */
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 annotation class ArgsItem(
         val defaultValue: String = "",
+        val nullable: Boolean = true,
         vararg val alias: String
 )
 

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

@@ -43,27 +43,30 @@ class ArgsReader(args: Array<String>, vararg argsBeans: KClass<*>) {
                 continue
             }
             val argsItem = property.findAnnotation<ArgsItem>()
+            val canNullable = property.returnType.isMarkedNullable
             try {
                 if (argsItem != null) {
                     val alias = argsItem.alias.toMutableList()
                     if (alias.isEmpty()) {
                         alias.add(property.name)
                     }
                     if (argsItem.defaultValue.isNotEmpty()) {
-
-                        logger.debug("字段 {} 指定默认值为 {},在不存在可注入的数据时将使用此默认值.", property.name, argsItem.defaultValue)
+                        logger.debug("字段 {} 指定未找到时的默认值为 {}.", property.name, argsItem.defaultValue)
                     } else {
-                        logger.debug("字段 {} 不存在默认值.", property.name)
+                        logger.debug("字段 {} 不存在默认值." +
+                                if (canNullable && argsItem.nullable)
+                                    "且字段允许为null,如未找到匹配的数据则默认为 null"
+                                else "但字段不允许为null,如果未找到匹配的数据，程序将抛出异常!", property.name)
                     }
-                    injection(result, index, property.returnType.jvmErasure, args, alias, argsItem.defaultValue)
+                    injection(result, index, property.returnType.jvmErasure, args, alias, argsItem.defaultValue, canNullable && argsItem.nullable)
                 } else {
                     logger.debug("字段 {} 不存在默认值.", property.name)
-                    injection(result, index, property.returnType.jvmErasure, args, listOf(property.name), null)
+                    injection(result, index, property.returnType.jvmErasure, args, listOf(property.name), null, canNullable)
                 }
             } catch (e: Exception) {
                 throw FormatErrorException("解析 Arg 时出现错误！[${e.message}]", e)
             }
-            if (property.returnType.isMarkedNullable.not() && result[index] == null) {
+            if (canNullable.not() && result[index] == null) {
                 throw NullPointerException("无法初始化类型，因为字段${property.name} 为空，但此字段不允许空的数据！")
             }
         }
@@ -104,7 +107,8 @@ class ArgsReader(args: Array<String>, vararg argsBeans: KClass<*>) {
                           type: KClass<*>,
                           args: Array<String>,
                           alias: List<String>,
-                          defaultValue: String?) {
+                          defaultValue: String?,
+                          canNullable: Boolean) {
         for (item in alias) {
             val data = when {
                 item.length == 1 -> {
@@ -123,10 +127,12 @@ class ArgsReader(args: Array<String>, vararg argsBeans: KClass<*>) {
             }
         }
 
-        if (defaultValue == null || defaultValue.isEmpty()) {
-            throw FormatErrorException("未发现 Args 下存在可注入的数据且默认值.")
-        } else {
+        if (defaultValue != null && defaultValue.isNotEmpty()) {
             result[index] = StringFormatUtils.parse(defaultValue, type, true)
+        } else {
+            if (!canNullable) {
+                throw FormatErrorException("未发现 Args 下存在可注入的数据且默认值.")
+            }
         }
     }
 

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

@@ -69,4 +69,25 @@ internal class ArgsReaderTest {
             @ArgsItem(defaultValue = "false", alias = ["debug", "d"])
             val debug: Boolean
     )
+
+    @Test
+    fun test4() {
+        val argsBean = ArgsReader(
+                arrayOf("-d"),
+                Test4Property::class).getArgsBean(Test4Property::class)
+        assertEquals(argsBean.workDirectory, null)
+    }
+
+    data class Test4Property(
+            /**
+             * 工作目录
+             */
+            @ArgsItem(defaultValue = "", nullable = true, alias = ["work-dir"])
+            var workDirectory: File?,
+            /**
+             * 开启debug 模式
+             */
+            @ArgsItem(defaultValue = "false", alias = ["debug", "d"])
+            val debug: Boolean
+    )
 }