From 9f6b5a09131ff44fc6d31417ff080488e08a70e0 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 6 Jan 2023 18:32:47 -0800
Subject: [PATCH] Minor cleanup

---
 .../net/thauvin/erik/urlencoder/UrlEncoder.kt | 21 ++++++++++---------
 .../thauvin/erik/urlencoder/UrlEncoderTest.kt |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/kotlin/net/thauvin/erik/urlencoder/UrlEncoder.kt b/lib/src/main/kotlin/net/thauvin/erik/urlencoder/UrlEncoder.kt
index 9347936..6503ca0 100644
--- a/lib/src/main/kotlin/net/thauvin/erik/urlencoder/UrlEncoder.kt
+++ b/lib/src/main/kotlin/net/thauvin/erik/urlencoder/UrlEncoder.kt
@@ -84,6 +84,7 @@ object UrlEncoder {
      * encoding.
      */
     @JvmStatic
+    @JvmOverloads
     fun decode(source: String, plusToSpace: Boolean = false): String {
         if (source.isEmpty()) {
             return source
@@ -95,13 +96,13 @@ object UrlEncoder {
         var bytesBuffer: ByteArray? = null
         var bytesPos = 0
         var i = 0
-        var start = false
+        var started = false
         while (i < length) {
             ch = source[i]
             if (ch == '%') {
-                if (!start) {
+                if (!started) {
                     out.append(source, 0, i)
-                    start = true
+                    started = true
                 }
                 if (bytesBuffer == null) {
                     // the remaining characters divided by the length of the encoding format %xx, is the maximum number
@@ -111,7 +112,7 @@ object UrlEncoder {
                 i++
                 require(length >= i + 2) { "Illegal escape sequence" }
                 try {
-                    val v: Int = source.substring(i, i + 2).toInt(16)
+                    val v = source.substring(i, i + 2).toInt(16)
                     require(v in 0..0xFF) { "Illegal escape value" }
                     bytesBuffer[bytesPos++] = v.toByte()
                     i += 2
@@ -121,19 +122,19 @@ object UrlEncoder {
             } else {
                 if (bytesBuffer != null) {
                     out.append(String(bytesBuffer, 0, bytesPos, StandardCharsets.UTF_8))
-                    start = true
+                    started = true
                     bytesBuffer = null
                     bytesPos = 0
                 }
                 if (plusToSpace && ch == '+') {
-                    if (!start) {
+                    if (!started) {
                         out.append(source, 0, i)
                     }
                     out.append(" ")
-                    start = true
-                } else if (start) {
+                    started = true
+                } else if (started) {
                     out.append(ch)
-                    start = true
+                    started = true
                 }
                 i++
             }
@@ -143,7 +144,7 @@ object UrlEncoder {
             out.append(String(bytesBuffer, 0, bytesPos, StandardCharsets.UTF_8))
         }
 
-        return if (!start) source else out.toString()
+        return if (!started) source else out.toString()
     }
 
     /**
diff --git a/lib/src/test/kotlin/net/thauvin/erik/urlencoder/UrlEncoderTest.kt b/lib/src/test/kotlin/net/thauvin/erik/urlencoder/UrlEncoderTest.kt
index 24f1228..8439010 100644
--- a/lib/src/test/kotlin/net/thauvin/erik/urlencoder/UrlEncoderTest.kt
+++ b/lib/src/test/kotlin/net/thauvin/erik/urlencoder/UrlEncoderTest.kt
@@ -79,6 +79,7 @@ class UrlEncoderTest {
         assertEquals("foo bar  foo", decode("foo+bar++foo", true))
         assertEquals("foo  bar  foo", decode("foo+%20bar%20+foo", true))
         assertEquals("foo + bar", decode("foo+%2B+bar", plusToSpace = true))
+        assertEquals("foo+bar", decode("foo%2Bbar", plusToSpace = true))
     }
 
     @ParameterizedTest(name = "encode({0}) should be {1}")