Skip to content

Commit 0cd3d3d

Browse files
javadevjavadev
authored
Fixed idea warnings
1 parent 1739087 commit 0cd3d3d

File tree

2 files changed

+32
-33
lines changed

2 files changed

+32
-33
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ object Json {
156156
fun writeJson(array: ByteArray?, builder: JsonStringBuilder) {
157157
if (array == null) {
158158
builder.append(NULL)
159-
} else if (array.size == 0) {
159+
} else if (array.isEmpty()) {
160160
builder.append("[]")
161161
} else {
162162
builder.append('[').incIndent().newLine()
@@ -173,7 +173,7 @@ object Json {
173173
fun writeJson(array: ShortArray?, builder: JsonStringBuilder) {
174174
if (array == null) {
175175
builder.append(NULL)
176-
} else if (array.size == 0) {
176+
} else if (array.isEmpty()) {
177177
builder.append("[]")
178178
} else {
179179
builder.append('[').incIndent().newLine()
@@ -190,7 +190,7 @@ object Json {
190190
fun writeJson(array: IntArray?, builder: JsonStringBuilder) {
191191
if (array == null) {
192192
builder.append(NULL)
193-
} else if (array.size == 0) {
193+
} else if (array.isEmpty()) {
194194
builder.append("[]")
195195
} else {
196196
builder.append('[').incIndent().newLine()
@@ -207,7 +207,7 @@ object Json {
207207
fun writeJson(array: LongArray?, builder: JsonStringBuilder) {
208208
if (array == null) {
209209
builder.append(NULL)
210-
} else if (array.size == 0) {
210+
} else if (array.isEmpty()) {
211211
builder.append("[]")
212212
} else {
213213
builder.append('[').incIndent().newLine()
@@ -224,7 +224,7 @@ object Json {
224224
fun writeJson(array: FloatArray?, builder: JsonStringBuilder) {
225225
if (array == null) {
226226
builder.append(NULL)
227-
} else if (array.size == 0) {
227+
} else if (array.isEmpty()) {
228228
builder.append("[]")
229229
} else {
230230
builder.append('[').incIndent().newLine()
@@ -241,7 +241,7 @@ object Json {
241241
fun writeJson(array: DoubleArray?, builder: JsonStringBuilder) {
242242
if (array == null) {
243243
builder.append(NULL)
244-
} else if (array.size == 0) {
244+
} else if (array.isEmpty()) {
245245
builder.append("[]")
246246
} else {
247247
builder.append('[').incIndent().newLine()
@@ -258,7 +258,7 @@ object Json {
258258
fun writeJson(array: BooleanArray?, builder: JsonStringBuilder) {
259259
if (array == null) {
260260
builder.append(NULL)
261-
} else if (array.size == 0) {
261+
} else if (array.isEmpty()) {
262262
builder.append("[]")
263263
} else {
264264
builder.append('[').incIndent().newLine()
@@ -275,7 +275,7 @@ object Json {
275275
fun writeJson(array: CharArray?, builder: JsonStringBuilder) {
276276
if (array == null) {
277277
builder.append(NULL)
278-
} else if (array.size == 0) {
278+
} else if (array.isEmpty()) {
279279
builder.append("[]")
280280
} else {
281281
builder.append('[').incIndent().newLine()
@@ -292,7 +292,7 @@ object Json {
292292
fun writeJson(array: Array<Any?>?, builder: JsonStringBuilder) {
293293
if (array == null) {
294294
builder.append(NULL)
295-
} else if (array.size == 0) {
295+
} else if (array.isEmpty()) {
296296
builder.append("[]")
297297
} else {
298298
builder.append('[').newLine().incIndent().fillSpaces()
@@ -314,7 +314,7 @@ object Json {
314314
}
315315
val iter: Iterator<*> = map.entries.iterator()
316316
builder.append('{').incIndent()
317-
if (!map.isEmpty()) {
317+
if (map.isNotEmpty()) {
318318
builder.newLine()
319319
}
320320
while (iter.hasNext()) {
@@ -366,6 +366,7 @@ object Json {
366366
}
367367
}
368368

369+
@Suppress("UNCHECKED_CAST")
369370
private fun doWriteJson(value: Any, builder: JsonStringBuilder) {
370371
if (value is ByteArray) {
371372
JsonArray.writeJson(value, builder)
@@ -536,7 +537,7 @@ object Json {
536537
readRequiredChar('r')
537538
readRequiredChar('u')
538539
readRequiredChar('e')
539-
return java.lang.Boolean.TRUE
540+
return true
540541
}
541542

542543
private fun readFalse(): Boolean {
@@ -545,7 +546,7 @@ object Json {
545546
readRequiredChar('l')
546547
readRequiredChar('s')
547548
readRequiredChar('e')
548-
return java.lang.Boolean.FALSE
549+
return false
549550
}
550551

551552
private fun readRequiredChar(ch: Char) {
@@ -626,8 +627,7 @@ object Json {
626627
readFraction()
627628
readExponent()
628629
val number = endCapture()
629-
val result: Number
630-
result = if (number.contains(".") || number.contains("e") || number.contains("E")) {
630+
val result: Number = if (number.contains(".") || number.contains("e") || number.contains("E")) {
631631
if (number.length > 9
632632
|| number.contains(".") && number.length - number.lastIndexOf('.') > 2
633633
&& number[number.length - 1] == '0'
@@ -724,7 +724,7 @@ object Json {
724724
private fun endCapture(): String {
725725
val end = if (current == -1) index else index - 1
726726
val captured: String
727-
if (captureBuffer!!.length > 0) {
727+
if (captureBuffer!!.isNotEmpty()) {
728728
captureBuffer!!.append(json, captureStart, end)
729729
captured = captureBuffer.toString()
730730
captureBuffer!!.setLength(0)
@@ -749,12 +749,12 @@ object Json {
749749
}
750750

751751
private val isWhiteSpace: Boolean
752-
private get() = current == ' '.code || current == '\t'.code || current == '\n'.code || current == '\r'.code
752+
get() = current == ' '.code || current == '\t'.code || current == '\n'.code || current == '\r'.code
753753
private val isDigit: Boolean
754-
private get() = current >= '0'.code && current <= '9'.code
754+
get() = current >= '0'.code && current <= '9'.code
755755
private val isHexDigit: Boolean
756-
private get() = isDigit || current >= 'a'.code && current <= 'f'.code || current >= 'A'.code && current <= 'F'.code
756+
get() = isDigit || current >= 'a'.code && current <= 'f'.code || current >= 'A'.code && current <= 'F'.code
757757
private val isEndOfText: Boolean
758-
private get() = current == -1
758+
get() = current == -1
759759
}
760760
}

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ object Xml {
5555
private const val YES = "yes"
5656
private const val TEXT = "#text"
5757
private const val NUMBER = "-number"
58-
private const val ELEMENT = "<" + ELEMENT_TEXT + ">"
59-
private const val CLOSED_ELEMENT = "</" + ELEMENT_TEXT + ">"
58+
private const val ELEMENT = "<$ELEMENT_TEXT>"
59+
private const val CLOSED_ELEMENT = "</$ELEMENT_TEXT>"
6060
private const val EMPTY_ELEMENT = ELEMENT + CLOSED_ELEMENT
61-
private const val NULL_TRUE = " " + NULL + "=\"true\"/>"
61+
private const val NULL_TRUE = " $NULL=\"true\"/>"
6262
private const val NUMBER_TEXT = " number=\"true\""
63-
private const val NUMBER_TRUE = NUMBER_TEXT + ">"
63+
private const val NUMBER_TRUE = "$NUMBER_TEXT>"
6464
private const val ARRAY = "-array"
6565
private const val ARRAY_TRUE = " array=\"true\""
66-
private const val NULL_ELEMENT = "<" + ELEMENT_TEXT + NULL_TRUE
66+
private const val NULL_ELEMENT = "<$ELEMENT_TEXT$NULL_TRUE"
6767
private const val BOOLEAN = "-boolean"
6868
private const val TRUE = "true"
6969
private const val SELF_CLOSING = "-self-closing"
@@ -74,7 +74,7 @@ object Xml {
7474
private const val XML_HEADER = "<?xml "
7575
private const val DOCTYPE_TEXT = "!DOCTYPE"
7676
private const val ROOT = "root"
77-
private const val DOCTYPE_HEADER = "<" + DOCTYPE_TEXT + " "
77+
private const val DOCTYPE_HEADER = "<$DOCTYPE_TEXT "
7878
private val XML_UNESCAPE: MutableMap<String, String> = HashMap()
7979
private val DOCUMENT = Document.createDocument()
8080

@@ -258,13 +258,13 @@ object Xml {
258258
) {
259259
BigDecimal(number)
260260
} else {
261-
java.lang.Double.valueOf(number)
261+
number.toDouble()
262262
}
263263
} else {
264264
if (number.length > 19) {
265265
BigInteger(number)
266266
} else {
267-
java.lang.Long.valueOf(number)
267+
number.toLong()
268268
}
269269
}
270270
return localValue
@@ -355,7 +355,7 @@ object Xml {
355355
if (map.containsKey(BOOLEAN) && TRUE == map[BOOLEAN] && map.containsKey(TEXT)) {
356356
localMap2 = (localMap as LinkedHashMap<String?, Any?>).clone() as MutableMap<String?, Any?>
357357
localMap2.remove(BOOLEAN)
358-
localMap2[TEXT] = java.lang.Boolean.valueOf(localMap[TEXT].toString())
358+
localMap2[TEXT] = localMap[TEXT].toString().toBoolean()
359359
} else {
360360
localMap2 = localMap
361361
}
@@ -483,8 +483,8 @@ object Xml {
483483
@JvmStatic
484484
fun parseAttributes(source: String): Map<String, String> {
485485
val result: MutableMap<String, String> = LinkedHashMap()
486-
val key = java.lang.StringBuilder()
487-
val value = java.lang.StringBuilder()
486+
val key = StringBuilder()
487+
val value = StringBuilder()
488488
var quoteFound = false
489489
var equalFound = false
490490
var index = 0
@@ -768,7 +768,7 @@ object Xml {
768768
}
769769
}
770770

771-
fun fromXmlWithElementMapper(
771+
private fun fromXmlWithElementMapper(
772772
xml: String, elementMapper: BiFunction<Any, Set<String>, String?>
773773
): Any {
774774
return try {
@@ -795,8 +795,7 @@ object Xml {
795795
xml
796796
) { `object`: Any, namespaces: Set<String> ->
797797
val localString = `object`.toString()
798-
val result: String
799-
result = if (localString.startsWith("-")
798+
val result: String = if (localString.startsWith("-")
800799
&& namespaces.contains(
801800
localString.substring(
802801
1, Math.max(1, localString.indexOf(':'))

0 commit comments

Comments
 (0)