More optimization to spaceToPlus

.idea/copyright/Apache_License.xml

@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="Copyright 2001-&amp;#36;today.year Geert Bevin (gbevin[remove] at uwyn dot com)&#10;Copyright &amp;#36;today.year Erik C. Thauvin (erik@thauvin.net)&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;   http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="notice" value="Copyright 2001-&amp;#36;today.year Geert Bevin (gbevin[remove] at uwyn dot com)&#10;Copyright 2022-&amp;#36;today.year Erik C. Thauvin (erik@thauvin.net)&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;   http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
     <option name="myName" value="Apache License" />
   </copyright>
 </component>

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

@@ -1,6 +1,6 @@
 /*
  * Copyright 2001-2023 Geert Bevin (gbevin[remove] at uwyn dot com)
- * Copyright 2023 Erik C. Thauvin (erik@thauvin.net)
+ * Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ import kotlin.system.exitProcess
 object UrlEncoder {
     private val hexDigits = "0123456789ABCDEF".toCharArray()
     internal val usage =
-        "Usage : java -jar urlencoder-*all.jar [-ed] <text>" + System.lineSeparator() +
+        "Usage : java -jar urlencoder-*all.jar [-ed] text" + System.lineSeparator() +
                 "Encode and decode URL components defensively." + System.lineSeparator() + "  -e  encode (default) " +
                 System.lineSeparator() + "  -d  decode"
 
@@ -160,27 +160,26 @@ object UrlEncoder {
                     out = StringBuilder(source.length)
                     out.append(source, 0, i)
                 }
-                if (spaceToPlus && ch == ' ') {
+                val cp = source.codePointAt(i)
-                    out.append('+')
+                if (cp < 0x80) {
-                    i++
+                    if (spaceToPlus && ch == ' ') {
-                } else {
+                        out.append('+')
-                    val cp = source.codePointAt(i)
+                    } else {
-                    if (cp < 0x80) {
                         out.appendEncodedByte(cp)
-                        i++
-                    } else if (Character.isBmpCodePoint(cp)) {
-                        for (b in ch.toString().toByteArray(StandardCharsets.UTF_8)) {
-                            out.appendEncodedByte(b.toInt())
-                        }
-                        i++
-                    } else if (Character.isSupplementaryCodePoint(cp)) {
-                        val high = Character.highSurrogate(cp)
-                        val low = Character.lowSurrogate(cp)
-                        for (b in charArrayOf(high, low).concatToString().toByteArray(StandardCharsets.UTF_8)) {
-                            out.appendEncodedByte(b.toInt())
-                        }
-                        i += 2
                     }
+                    i++
+                } else if (Character.isBmpCodePoint(cp)) {
+                    for (b in ch.toString().toByteArray(StandardCharsets.UTF_8)) {
+                        out.appendEncodedByte(b.toInt())
+                    }
+                    i++
+                } else if (Character.isSupplementaryCodePoint(cp)) {
+                    val high = Character.highSurrogate(cp)
+                    val low = Character.lowSurrogate(cp)
+                    for (b in charArrayOf(high, low).concatToString().toByteArray(StandardCharsets.UTF_8)) {
+                        out.appendEncodedByte(b.toInt())
+                    }
+                    i += 2
                 }
             }
         }
@@ -191,7 +190,7 @@ object UrlEncoder {
     /**
      * Encodes and decodes URLs from the command line.
      *
-     * - `java -jar urlencoder-*all.jar <text>`
+     * - `java -jar urlencoder-*all.jar [-ed] text`
      */
     @JvmStatic
     fun main(args: Array<String>) {

lib/src/test/kotlin/net/thauvin/erik/urlencoder/UrlEncoderTest.kt

@@ -1,6 +1,6 @@
 /*
  * Copyright 2001-2023 Geert Bevin (gbevin[remove] at uwyn dot com)
- * Copyright 2023 Erik C. Thauvin (erik@thauvin.net)
+ * Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.