消除警告

Author: houko

async/pom.xml

@@ -23,6 +23,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>1.5.8.RELEASE</version>
                 <executions>
                     <execution>
                         <goals>

core/src/main/java/info/xiaomo/core/untils/CastUtil.kt

@@ -20,23 +20,23 @@ import java.util.*
 
 class CastUtil {
     companion object {
-        protected val OUT = ByteArrayOutputStream()
-        protected var oos: ObjectOutputStream? = null
+        private val OUT = ByteArrayOutputStream()
+        private var oos: ObjectOutputStream? = null
 
         fun toInteger(str: Any?): Int {
             return if (str == null) 0 else (str as? Number)?.toInt() ?: toInteger(str.toString())
         }
 
         fun toDouble(number: Any?): Double {
-            if (number == null) {
-                return 0.0
+            return if (number == null) {
+                0.0
             } else if (number is Number) {
-                return number.toDouble()
+                number.toDouble()
             } else if (number is String) {
                 val str = number as String?
-                return if (isNumeric(str) > 0) java.lang.Double.valueOf(str!!) else 0.0
+                if (isNumeric(str) > 0) java.lang.Double.valueOf(str!!) else 0.0
             } else {
-                return 0.0
+                0.0
             }
         }
 
@@ -55,16 +55,16 @@ class CastUtil {
         }
 
         fun toInteger(str: String?): Int {
-            var str = str
-            if (str == null) {
-                return 0
+            var intStr = str
+            return if (intStr == null) {
+                0
             } else {
-                str = str.trim { it <= ' ' }
-                if (str.length == 0) {
-                    return 0
+                intStr = intStr.trim { it <= ' ' }
+                if (intStr.isEmpty()) {
+                    0
                 } else {
-                    val i = isNumeric(str)
-                    return if (i == 1) Integer.parseInt(str) else if (i == 2) java.lang.Double.valueOf(str).toInt() else 0
+                    val i = isNumeric(intStr)
+                    if (i == 1) Integer.parseInt(intStr) else if (i == 2) java.lang.Double.valueOf(intStr).toInt() else 0
                 }
             }
         }
@@ -118,7 +118,7 @@ class CastUtil {
             val newmap = HashMap<Any, Any>(10)
 
             for (key in map.keys) {
-                newmap.put(key, map.get(key)!!)
+                newmap.put(key, map[key]!!)
             }
 
             return newmap
@@ -221,7 +221,6 @@ class CastUtil {
 
         fun stringToBytes(str: String): ByteArray {
             val sb = StringBuffer(str)
-            val c = sb[0]
             val buffer = ByteBuffer.allocate(sb.length * 2)
             var index = 0
 

core/src/main/java/info/xiaomo/core/untils/CharUtil.kt

@@ -74,33 +74,33 @@ object CharUtil {
      * Utf8URL解码
      */
     fun utf8urldecode(text: String?): String {
-        var text = text
+        var str = text
         var result = ""
         var p: Int
-        if (text != null && text.length > 0) {
-            text = text.toLowerCase()
-            p = text.indexOf("%e")
+        if (str != null && str.isNotEmpty()) {
+            str = str.toLowerCase()
+            p = str.indexOf("%e")
             if (p == -1) {
-                return text
+                return str
             }
             while (p != -1) {
-                result += text!!.substring(0, p)
-                text = text.substring(p, text.length)
-                if (text == "" || text.length < 9) {
+                result += str!!.substring(0, p)
+                str = str.substring(p, str.length)
+                if (str == "" || str.length < 9) {
                     return result
                 }
-                result += codetoword(text.substring(0, 9))
-                text = text.substring(9, text.length)
-                p = text.indexOf("%e")
+                result += codeToWord(str.substring(0, 9))
+                str = str.substring(9, str.length)
+                p = str.indexOf("%e")
             }
         }
-        return result + text!!
+        return result + str!!
     }
 
     /**
      * utf8URL编码转字符
      */
-    private fun codetoword(text: String): String? {
+    private fun codeToWord(text: String): String? {
         var result: String?
         if (utf8codecheck(text)) {
             val code = ByteArray(3)
@@ -142,14 +142,14 @@ object CharUtil {
      * 判断是否Utf8Url编码
      */
     fun isUtf8Url(text: String): Boolean {
-        var text = text
-        text = text.toLowerCase()
-        val p = text.indexOf("%")
+        var textStr = text
+        textStr = textStr.toLowerCase()
+        val p = textStr.indexOf("%")
         val nine = 9
-        if (p != -1 && text.length - p > nine) {
-            text = text.substring(p, p + nine)
+        if (p != -1 && textStr.length - p > nine) {
+            textStr = textStr.substring(p, p + nine)
         }
-        return utf8codecheck(text)
+        return utf8codecheck(textStr)
     }
 
     /**
@@ -158,19 +158,19 @@ object CharUtil {
      * @return char
      */
     fun regularize(input: Char): Char {
-        var input = input
-        if (input.toInt() == 12288) {
-            input = 32.toChar()
-        } else if (input.toInt() > 65280 && input.toInt() < 65375) {
-            input = (input.toInt() - 65248).toChar()
+        var char = input
+        if (char.toInt() == 12288) {
+            char = 32.toChar()
+        } else if (char.toInt() in 65281..65374) {
+            char = (char.toInt() - 65248).toChar()
         } else {
             val a = 'A'
             val z = 'Z'
-            if (input >= a && input <= z) {
-                input += 32.toChar().toInt()
+            if (char in a..z) {
+                char += 32.toChar().toInt()
             }
         }
-        return input
+        return char
     }
 
     @JvmStatic

core/src/main/java/info/xiaomo/core/untils/FileUtil.kt

@@ -201,7 +201,6 @@ object FileUtil {
         }
 
         val entries = dir.listFiles()
-        val sz = entries?.size ?: 0
 
         for (entry in entries ?: arrayOfNulls(0)) {
             if (entry.isDirectory) {
@@ -528,10 +527,10 @@ object FileUtil {
      */
     @Throws(IOException::class)
     fun genModuleTpl(path: String, modulecontent: String): Boolean {
-        var path = path
+        var str = path
 
-        path = getUNIXfilePath(path)
-        val patharray = path.split("\\/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        str = getUNIXfilePath(str)
+        val patharray = str.split("\\/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
         var modulepath = ""
         for (i in 0 until patharray.size - 1) {
             modulepath += "/" + patharray[i]
@@ -543,7 +542,7 @@ object FileUtil {
             }
         }
         //建立FileWriter对象，并实例化fw
-        val fw = FileWriter(path)
+        val fw = FileWriter(str)
         //将字符串写入文件
         fw.write(modulecontent)
         fw.close()
@@ -558,23 +557,23 @@ object FileUtil {
      * @since 1.0
      */
     fun getPicExtendName(picPath: String): String {
-        var picPath = picPath
-        picPath = getUNIXfilePath(picPath)
+        var pic = picPath
+        pic = getUNIXfilePath(pic)
         var picExtend = ""
         val gif = ".gif"
-        if (isFileExist(picPath + gif)) {
+        if (isFileExist(pic + gif)) {
             picExtend = gif
         }
         val jpeg = ".jpeg"
-        if (isFileExist(picPath + jpeg)) {
+        if (isFileExist(pic + jpeg)) {
             picExtend = jpeg
         }
         val jpg = ".jpg"
-        if (isFileExist(picPath + jpg)) {
+        if (isFileExist(pic + jpg)) {
             picExtend = jpg
         }
         val png = ".png"
-        if (isFileExist(picPath + png)) {
+        if (isFileExist(pic + png)) {
             picExtend = png
         }
         //返回图片扩展名
@@ -672,15 +671,14 @@ object FileUtil {
             // 重新定义图片名字
             filename = FileUtil.getNewFileName(fileName, email)
             //上传服务器上 新文件路径
-            val os = System.getProperty("os.name").toLowerCase()
             try {
                 // 判断服务器上 文件夹是否存在
                 val newFile = File(savePath)
                 if (!newFile.exists()) {
                     val result = newFile.mkdirs()
                     println(result)
                 }
-                savePath = savePath + filename
+                savePath += filename
                 val out = FileOutputStream(savePath)
                 // 写入文件
                 out.write(file.bytes)
@@ -716,7 +714,6 @@ object FileUtil {
         var bytes: ByteArray? = ByteArray(len)
         val r = bufferedInputStream.read(bytes!!)
         if (len != r) {
-            bytes = null
             throw IOException("读取文件不正确")
         }
         bufferedInputStream.close()
@@ -731,7 +728,6 @@ object FileUtil {
         var bytes: ByteArray? = ByteArray(len)
         val r = bufferedInputStream.read(bytes!!)
         if (len != r) {
-            bytes = null
             throw IOException("读取文件不正确")
         }
         bufferedInputStream.close()
@@ -746,10 +742,9 @@ object FileUtil {
      * @return
      */
     private fun getData(`in`: InputStream): String {
-        val result = ""
         val sb = StringBuilder()
         val br = BufferedReader(InputStreamReader(`in`))
-        var line = ""
+        val line = ""
         try {
             while ((br.readLine()) != null) {
                 // result = result + line;

core/src/main/java/info/xiaomo/core/untils/HtmlUtil.kt

@@ -125,13 +125,13 @@ object HtmlUtil {
      * @since 1.0
      */
     fun htmlDecode(strSrc: String?): String? {
-        var strSrc: String? = strSrc ?: return ""
-        strSrc = strSrc!!.replace("&lt;".toRegex(), "<")
-        strSrc = strSrc.replace("&gt;".toRegex(), ">")
-        strSrc = strSrc.replace("&quot;".toRegex(), "\"")
-        strSrc = strSrc.replace("&#039;".toRegex(), "'")
-        strSrc = strSrc.replace("&amp;".toRegex(), "&")
-        return strSrc
+        var str: String? = strSrc ?: return ""
+        str = str!!.replace("&lt;".toRegex(), "<")
+        str = str.replace("&gt;".toRegex(), ">")
+        str = str.replace("&quot;".toRegex(), "\"")
+        str = str.replace("&#039;".toRegex(), "'")
+        str = str.replace("&amp;".toRegex(), "&")
+        return str
     }
 
     /**
@@ -141,7 +141,7 @@ object HtmlUtil {
      * @return string
      */
     fun delHTMLTag(htmlStr: String): String {
-        var htmlStr = htmlStr
+        var text = htmlStr
         //定义script的正则表达式
         val regexScript = "<script[^>]*?>[\\s\\S]*?<\\/script>"
         //定义style的正则表达式
@@ -150,21 +150,21 @@ object HtmlUtil {
         val regexHtml = "<[^>]+>"
 
         val pScript = Pattern.compile(regexScript, Pattern.CASE_INSENSITIVE)
-        val mScript = pScript.matcher(htmlStr)
+        val mScript = pScript.matcher(text)
         //过滤script标签
-        htmlStr = mScript.replaceAll("")
+        text = mScript.replaceAll("")
 
         val pStyle = Pattern.compile(regexStyle, Pattern.CASE_INSENSITIVE)
-        val mStyle = pStyle.matcher(htmlStr)
+        val mStyle = pStyle.matcher(text)
         //过滤style标签
-        htmlStr = mStyle.replaceAll("")
+        text = mStyle.replaceAll("")
 
         val pHtml = Pattern.compile(regexHtml, Pattern.CASE_INSENSITIVE)
-        val mHtml = pHtml.matcher(htmlStr)
+        val mHtml = pHtml.matcher(text)
         //过滤html标签
-        htmlStr = mHtml.replaceAll("")
+        text = mHtml.replaceAll("")
         //返回文本字符串
-        return htmlStr.trim { it <= ' ' }
+        return text.trim { it <= ' ' }
     }
 
 }

core/src/main/java/info/xiaomo/core/untils/HttpUtil.kt

@@ -126,7 +126,7 @@ class HttpUtil {
                 val read = BufferedReader(InputStreamReader(`in`, DEFAULT_CHARSET))
                 val valueString: String? = null
                 bufferRes = StringBuffer()
-                while ((valueString == read.readLine()) != null) {
+                while ((read.readLine()) != null) {
                     bufferRes.append(valueString)
                 }
                 read.close()
@@ -141,13 +141,13 @@ class HttpUtil {
         }
 
         fun post(url: String, params: String?, headers: Map<String, String>?): String? {
-            var bufferRes: StringBuffer? = null
+            var bufferRes: StringBuffer?
             try {
-                var http: HttpURLConnection? = null
-                if (isHttps(url)) {
-                    http = initHttps(url, POST, headers)
+                var http: HttpURLConnection?
+                http = if (isHttps(url)) {
+                    initHttps(url, POST, headers)
                 } else {
-                    http = initHttp(url, POST, headers)
+                    initHttp(url, POST, headers)
                 }
                 val out = http.outputStream
                 out.write(params!!.toByteArray(charset(DEFAULT_CHARSET)))