erik/urlencoder
erik/urlencoder
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed sonar code smells

Browse source
This commit is contained in:
Erik C. Thauvin 2023-06-04 11:39:41 -07:00
parent cb460faf2b
commit 01c46bbdc9
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/src/main/kotlin/net/thauvin/erik/urlencoder/UrlEncoder.kt
View file

@ -65,7 +65,7 @@ object UrlEncoder {
// see https://www.rfc-editor.org/rfc/rfc3986#page-13 // see https://www.rfc-editor.org/rfc/rfc3986#page-13
// and https://url.spec.whatwg.org/#application-x-www-form-urlencoded-percent-encode-set // and https://url.spec.whatwg.org/#application-x-www-form-urlencoded-percent-encode-set
private fun Char.isUnreserved(): Boolean { private fun Char.isUnreserved(): Boolean {
return this <= 'z' && unreservedChars.get(code) return this <= 'z' && unreservedChars[code]
} }
private fun StringBuilder.appendEncodedDigit(digit: Int) { private fun StringBuilder.appendEncodedDigit(digit: Int) {
@ -171,19 +171,22 @@ object UrlEncoder {
out.append(source, 0, i) out.append(source, 0, i)
} }
val cp = source.codePointAt(i) val cp = source.codePointAt(i)
if (cp < 0x80) { when {
cp < 0x80 -> {
if (spaceToPlus && ch == ' ') { if (spaceToPlus && ch == ' ') {
out.append('+') out.append('+')
} else { } else {
out.appendEncodedByte(cp) out.appendEncodedByte(cp)
} }
i++ i++
} else if (Character.isBmpCodePoint(cp)) { }
Character.isBmpCodePoint(cp) -> {
for (b in ch.toString().toByteArray(StandardCharsets.UTF_8)) { for (b in ch.toString().toByteArray(StandardCharsets.UTF_8)) {
out.appendEncodedByte(b.toInt()) out.appendEncodedByte(b.toInt())
} }
i++ i++
} else if (Character.isSupplementaryCodePoint(cp)) { }
Character.isSupplementaryCodePoint(cp) -> {
val high = Character.highSurrogate(cp) val high = Character.highSurrogate(cp)
val low = Character.lowSurrogate(cp) val low = Character.lowSurrogate(cp)
for (b in charArrayOf(high, low).concatToString().toByteArray(StandardCharsets.UTF_8)) { for (b in charArrayOf(high, low).concatToString().toByteArray(StandardCharsets.UTF_8)) {
@ -193,6 +196,7 @@ object UrlEncoder {
} }
} }
} }
}
return out?.toString() ?: source return out?.toString() ?: source
} }