Skip to content

Commit 22c4c10

Browse files
javadevjavadev
authored
Fixed Idea warnings
1 parent 17ffd96 commit 22c4c10

File tree

3 files changed

+32
-36
lines changed

3 files changed

+32
-36
lines changed

‎src/main/java/com/github/underscore/Base32.kt‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,12 @@ package com.github.underscore
2626
import java.nio.charset.StandardCharsets
2727

2828
class Base32 private constructor() {
29-
private val digits: CharArray
30-
private val mask: Int
31-
private val shift: Int
32-
private val charMap: MutableMap<Char, Int>
29+
private val digits: CharArray = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef".toCharArray()
30+
private val mask: Int = digits.size - 1
31+
private val shift: Int = Integer.numberOfTrailingZeros(digits.size)
32+
private val charMap = HashMap<Char, Int>()
3333

3434
init {
35-
digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef".toCharArray()
36-
mask = digits.size - 1
37-
shift = Integer.numberOfTrailingZeros(digits.size)
38-
charMap = HashMap()
3935
var index = 0
4036
while (index < digits.size) {
4137
charMap[digits[index]] = index
@@ -44,7 +40,7 @@ class Base32 private constructor() {
4440
}
4541

4642
private fun decodeInternal(encoded: String): ByteArray {
47-
if (encoded.length == 0) {
43+
if (encoded.isEmpty()) {
4844
return ByteArray(0)
4945
}
5046
val encodedLength = encoded.length
@@ -69,7 +65,7 @@ class Base32 private constructor() {
6965
}
7066

7167
private fun encodeInternal(data: ByteArray): String {
72-
if (data.size == 0) {
68+
if (data.isEmpty()) {
7369
return ""
7470
}
7571
val outputLength = (data.size * 8 + shift - 1) / shift

‎src/main/java/com/github/underscore/Xml.kt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ object Xml {
675675
fromType
676676
)
677677
if (checkResult(xml, document, result, fromType)) {
678-
((result as Map<*, *>).entries.iterator().next() as Map.Entry<*, *>).value
678+
(result as Map<*, *>).entries.iterator().next().value
679679
} else result
680680
} catch (ex: Exception) {
681681
throw IllegalArgumentException(ex)
@@ -767,7 +767,7 @@ object Xml {
767767
FromType.FOR_CONVERT
768768
)
769769
if (checkResult(xml, document, result, FromType.FOR_CONVERT)) {
770-
((result as Map<*, *>).entries.iterator().next() as Map.Entry<*, *>).value!!
770+
(result as Map<*, *>).entries.iterator().next().value!!
771771
} else result
772772
} catch (ex: Exception) {
773773
throw IllegalArgumentException(ex)
@@ -788,7 +788,7 @@ object Xml {
788788
FromType.FOR_CONVERT
789789
)
790790
if (checkResult(xml, document, result, FromType.FOR_CONVERT)) {
791-
((result as Map<*, *>).entries.iterator().next() as Map.Entry<*, *>).value!!
791+
(result as Map<*, *>).entries.iterator().next().value!!
792792
} else result
793793
} catch (ex: Exception) {
794794
throw IllegalArgumentException(ex)
@@ -804,19 +804,19 @@ object Xml {
804804
val result: String = if (localString.startsWith("-")
805805
&& namespaces.contains(
806806
localString.substring(
807-
1, Math.max(1, localString.indexOf(':'))
807+
1, max(1, localString.indexOf(':'))
808808
)
809809
)
810810
) {
811811
("-"
812812
+ localString.substring(
813-
Math.max(0, localString.indexOf(':') + 1)
813+
max(0, localString.indexOf(':') + 1)
814814
))
815815
} else if (namespaces.contains(
816-
localString.substring(0, Math.max(0, localString.indexOf(':')))
816+
localString.substring(0, max(0, localString.indexOf(':')))
817817
)
818818
) {
819-
localString.substring(Math.max(0, localString.indexOf(':') + 1))
819+
localString.substring(max(0, localString.indexOf(':') + 1))
820820
} else {
821821
`object`.toString()
822822
}
@@ -842,10 +842,10 @@ object Xml {
842842
val result: String? = if (localString.startsWith("-")) {
843843
null
844844
} else if (namespaces.contains(
845-
localString.substring(0, Math.max(0, localString.indexOf(':')))
845+
localString.substring(0, max(0, localString.indexOf(':')))
846846
)
847847
) {
848-
localString.substring(Math.max(0, localString.indexOf(':') + 1))
848+
localString.substring(max(0, localString.indexOf(':') + 1))
849849
} else {
850850
`object`.toString()
851851
}
@@ -917,7 +917,7 @@ object Xml {
917917

918918
fun fillSpaces(): XmlStringBuilder {
919919
builder.append(
920-
(if (identStep == Step.TABS) '\t' else ' ').toString().repeat(Math.max(0, ident))
920+
(if (identStep == Step.TABS) '\t' else ' ').toString().repeat(max(0, ident))
921921
)
922922
return this
923923
}
@@ -1771,10 +1771,10 @@ object Xml {
17711771
}
17721772
result.append(ch)
17731773
} catch (ex: Exception) {
1774-
result.append("__").append(encode(Character.toString(ch))).append("__")
1774+
result.append("__").append(encode(ch.toString())).append("__")
17751775
}
17761776
} else {
1777-
result.append("__").append(encode(Character.toString(ch))).append("__")
1777+
result.append("__").append(encode(ch.toString())).append("__")
17781778
}
17791779
for (i in 1 until length) {
17801780
ch = name[i]
@@ -1788,11 +1788,11 @@ object Xml {
17881788
result.append(ch)
17891789
} catch (ex: Exception) {
17901790
result.append("__")
1791-
.append(encode(Character.toString(ch)))
1791+
.append(encode(ch.toString()))
17921792
.append("__")
17931793
}
17941794
} else {
1795-
result.append("__").append(encode(Character.toString(ch))).append("__")
1795+
result.append("__").append(encode(ch.toString())).append("__")
17961796
}
17971797
}
17981798
return result.toString()
@@ -1886,13 +1886,13 @@ object Xml {
18861886
@JvmStatic
18871887
fun getMapKey(map: Any?): String {
18881888
return if (map is Map<*, *> && map.isNotEmpty())
1889-
(map.entries.iterator().next() as Map.Entry<*, *>).key.toString() else ""
1889+
map.entries.iterator().next().key.toString() else ""
18901890
}
18911891

18921892
@JvmStatic
18931893
fun getMapValue(map: Any?): Any? {
1894-
return if (map is Map<*, *> && map.isNotEmpty()) (map.entries.iterator()
1895-
.next() as Map.Entry<*, *>).value else null
1894+
return if (map is Map<*, *> && map.isNotEmpty()) map.entries.iterator()
1895+
.next().value else null
18961896
}
18971897
}
18981898

‎src/main/java/com/github/underscore/XmlBuilder.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ import com.github.underscore.Xml.toXml
3030
import org.w3c.dom.Document
3131

3232
open class XmlBuilder internal constructor(rootName: String) {
33-
private val data: MutableMap<String?, Any?>
33+
private val data = LinkedHashMap<String?, Any?>()
3434
private var path: String
3535
private var savedPath: String? = null
3636

3737
init {
38-
data = LinkedHashMap()
3938
val value: MutableMap<String, Any> = LinkedHashMap()
4039
value[SELF_CLOSING] = TRUE
4140
data[rootName] = value
4241
path = rootName
4342
}
4443

44+
@Suppress("UNCHECKED_CAST")
4545
fun e(elementName: String): XmlBuilder {
46-
U.remove<Any>(data, path + "." + SELF_CLOSING)
46+
U.remove<Any>(data, "$path.$SELF_CLOSING")
4747
val value: MutableMap<String, Any> = LinkedHashMap()
4848
value[SELF_CLOSING] = TRUE
4949
val `object` = U.get<Any>(data, "$path.$elementName")
@@ -55,7 +55,7 @@ open class XmlBuilder internal constructor(rootName: String) {
5555
path += ".$elementName.1"
5656
savedPath = path
5757
} else if (`object` is List<*>) {
58-
path += "." + elementName + "." + (`object` as List<Any?>).size
58+
path += "." + elementName + "." + `object`.size
5959
savedPath = path
6060
(`object` as MutableList<Any?>).add(value)
6161
} else {
@@ -66,31 +66,31 @@ open class XmlBuilder internal constructor(rootName: String) {
6666
}
6767

6868
fun a(attributeName: String, value: String?): XmlBuilder {
69-
U.remove<Any>(data, path + "." + SELF_CLOSING)
69+
U.remove<Any>(data, "$path.$SELF_CLOSING")
7070
U.set<Any>(data, "$path.-$attributeName", value)
7171
return this
7272
}
7373

7474
fun c(comment: String?): XmlBuilder {
75-
U.remove<Any>(data, path + "." + SELF_CLOSING)
75+
U.remove<Any>(data, "$path.$SELF_CLOSING")
7676
U.update<Any>(data, "$path.#comment", comment)
7777
return this
7878
}
7979

8080
fun i(target: String, value: String?): XmlBuilder {
81-
U.remove<Any>(data, path + "." + SELF_CLOSING)
81+
U.remove<Any>(data, "$path.$SELF_CLOSING")
8282
U.set<Any>(data, "?$target", value)
8383
return this
8484
}
8585

8686
fun d(cdata: String?): XmlBuilder {
87-
U.remove<Any>(data, path + "." + SELF_CLOSING)
87+
U.remove<Any>(data, "$path.$SELF_CLOSING")
8888
U.update<Any>(data, "$path.#cdata-section", cdata)
8989
return this
9090
}
9191

9292
fun t(text: String?): XmlBuilder {
93-
U.remove<Any>(data, path + "." + SELF_CLOSING)
93+
U.remove<Any>(data, "$path.$SELF_CLOSING")
9494
U.update<Any>(data, "$path.#text", text)
9595
return this
9696
}

0 commit comments

Comments
 (0)