update bug

Author: Vicent9920

utils/src/main/java/com/haoge/easyandroid/easy/EasyFormatter.kt

@@ -21,7 +21,6 @@ import org.json.JSONObject
 import java.io.StringReader
 import java.io.StringWriter
 import java.lang.reflect.Modifier
-import java.util.*
 import javax.xml.transform.OutputKeys
 import javax.xml.transform.TransformerException
 import javax.xml.transform.TransformerFactory
@@ -38,10 +37,12 @@ class EasyFormatter private constructor(private val builder: Builder) {
     private val indent = "    "
     private val list = mutableListOf<Any>()// 用于临时存放当前已被解析的类。防止出现循环引用导致栈溢出
 
-    fun formatWithArgs(message: String, vararg args:Any):String {
+    fun formatWithArgs(message: String, vararg args: Any): String {
         val array = arrayOfNulls<String>(args.size)
         args.forEachIndexed { index, any -> array[index] = format(any) }
-        return String.format("$message %s", *array)
+        return if (array.filterNotNull().isEmpty()) {
+            message
+        } else String.format("$message %s", *array)
     }
 
     /**
@@ -101,7 +102,7 @@ class EasyFormatter private constructor(private val builder: Builder) {
         return StringBuilder(data)
     }
 
-    private fun formatXML(data:String):StringBuilder {
+    private fun formatXML(data: String): StringBuilder {
         return try {
             val xmlInput = StreamSource(StringReader(data))
             val xmlOutput = StreamResult(StringWriter())
@@ -131,7 +132,7 @@ class EasyFormatter private constructor(private val builder: Builder) {
             val length = array.length()
             val isFlat = isFlat(builder.maxArraySize, length)
 
-            for (index in 0..(length - 1)) {
+            for (index in 0 until length) {
                 val sub = StringBuilder()
                 if (!isFlat) {
                     result.append("\n")
@@ -145,7 +146,7 @@ class EasyFormatter private constructor(private val builder: Builder) {
             if (!isFlat) {
                 result.append("\n")
             }
-        } catch (e:Exception) {
+        } catch (e: Exception) {
             return StringBuilder(data)
         }
         result.append("]")
@@ -178,14 +179,14 @@ class EasyFormatter private constructor(private val builder: Builder) {
             if (!isFlat) {
                 result.append("\n")
             }
-        } catch (e:Exception) {
+        } catch (e: Exception) {
             return StringBuilder(data)
         }
         result.append("}")
         return result
     }
 
-    private fun isFlat(maxSize:Int, length:Int):Boolean {
+    private fun isFlat(maxSize: Int, length: Int): Boolean {
         return when {
             maxSize < 0 -> false
             length <= maxSize -> false
@@ -219,23 +220,22 @@ class EasyFormatter private constructor(private val builder: Builder) {
     }
 
 
+    private fun formatAny(any: Any?): StringBuilder =
+            when (any) {
+                null -> StringBuilder()
+                is Collection<*> -> checkIfFormatted(any) { return@checkIfFormatted formatCollection(any) }
+                is Map<*, *> -> checkIfFormatted(any) { return@checkIfFormatted formatMap(any) }
+                is Array<*> -> checkIfFormatted(any) { return@checkIfFormatted formatCollection(listOf(*any)) }
+                is String -> formatString(any)
+                is Throwable -> formatException(any)
+                is Int, is Boolean, is Short, is Char, is Byte, is Long, is Float, is Double
+                -> StringBuilder(any.toString())
+                else -> checkIfFormatted(any) { return@checkIfFormatted formatOther(any) }
+            }
 
-    private fun formatAny(any:Any?):StringBuilder =
-        when(any) {
-            null -> StringBuilder()
-            is Collection<*> -> checkIfFormatted(any) {return@checkIfFormatted formatCollection(any)}
-            is Map<*, *> -> checkIfFormatted(any) {return@checkIfFormatted formatMap(any)}
-            is Array<*> -> checkIfFormatted(any) {return@checkIfFormatted formatCollection(Arrays.asList(*any))}
-            is String -> formatString(any)
-            is Throwable -> formatException(any)
-            is Int, is Boolean, is Short, is Char, is Byte, is Long, is Float, is Double
-            -> StringBuilder(any.toString())
-            else -> checkIfFormatted(any) {return@checkIfFormatted formatOther(any)}
-        }
-
-    private fun appendIterator(container:StringBuilder, /*数据存储容器*/
-                               iterator:Iterator<*>,
-                               isFlat:Boolean) {
+    private fun appendIterator(container: StringBuilder, /*数据存储容器*/
+                               iterator: Iterator<*>,
+                               isFlat: Boolean) {
         var hasNext = iterator.hasNext()
         while (hasNext) {
             if (!isFlat) {
@@ -305,7 +305,7 @@ class EasyFormatter private constructor(private val builder: Builder) {
         scanFields(any, clazz.superclass, container)
     }
 
-    private fun checkIfFormatted(any:Any, invoke:()-> StringBuilder):StringBuilder {
+    private fun checkIfFormatted(any: Any, invoke: () -> StringBuilder): StringBuilder {
         return if (list.contains(any)) {
             StringBuilder("{(circle ref):${any.javaClass.simpleName}}")
         } else {
@@ -329,15 +329,17 @@ class EasyFormatter private constructor(private val builder: Builder) {
         /**
          * 最大行数，当格式化后的数据行数超过此数量后，将对超出部分数据进行平铺展示
          */
-        var maxLines:Int = -1
+        var maxLines: Int = -1
+
         /**
          * 最大Array尺寸，当Array(包括List/Set/Array/JSONArray)的长度超过此数量限制时：数据以平铺模式展示。
          */
-        var maxArraySize:Int = -1
+        var maxArraySize: Int = -1
+
         /**
          * 最大Map尺寸，当Map(包括Map/JSONObject/Bean)的长度超过此数量限制时：数据以平铺模式展示
          */
-        var maxMapSize:Int = -1
+        var maxMapSize: Int = -1
 
         fun build(): EasyFormatter {
             return EasyFormatter(this)