Merge remote-tracking branch 'package-url/scratch/refactor-stringutils' into feat/percent-performance

Author: ppkarwasz

src/main/java/com/github/packageurl/PackageURL.java

@@ -23,7 +23,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-import com.github.packageurl.utils.StringUtil;
+import com.github.packageurl.internal.StringUtil;
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URISyntaxException;

…/github/packageurl/utils/StringUtil.java …thub/packageurl/internal/StringUtil.javasrc/main/java/com/github/packageurl/utils/StringUtil.java renamed to src/main/java/com/github/packageurl/internal/StringUtil.java src/main/java/com/github/packageurl/utils/StringUtil.java renamed to src/main/java/com/github/packageurl/internal/StringUtil.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.github.packageurl.utils;
+package com.github.packageurl.internal;
 
 import static java.lang.Byte.toUnsignedInt;
 

src/main/java/com/github/packageurl/internal/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * This package contains utility classes used by the PackageURL library.
+ */
+package com.github.packageurl.internal;

…ackageurl/utils/StringUtilBenchmark.java …ageurl/internal/StringUtilBenchmark.javasrc/test/java/com/github/packageurl/utils/StringUtilBenchmark.java renamed to src/test/java/com/github/packageurl/internal/StringUtilBenchmark.java src/test/java/com/github/packageurl/utils/StringUtilBenchmark.java renamed to src/test/java/com/github/packageurl/internal/StringUtilBenchmark.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.github.packageurl.utils;
+package com.github.packageurl.internal;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
@@ -91,7 +91,7 @@ private String[] createDecodedData() {
 
     private static String[] encodeData(String[] decodedData) {
         String[] encodedData = new String[decodedData.length];
-        for (int i = 0; i < decodedData.length; i++) {
+        for (int i = 0; i < encodedData.length; i++) {
             encodedData[i] = StringUtil.percentEncode(decodedData[i]);
             if (!StringUtil.percentDecode(encodedData[i]).equals(decodedData[i])) {
                 throw new RuntimeException(

…hub/packageurl/utils/StringUtilTest.java …/packageurl/internal/StringUtilTest.javasrc/test/java/com/github/packageurl/utils/StringUtilTest.java renamed to src/test/java/com/github/packageurl/internal/StringUtilTest.java src/test/java/com/github/packageurl/utils/StringUtilTest.java renamed to src/test/java/com/github/packageurl/internal/StringUtilTest.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.github.packageurl.utils;
+package com.github.packageurl.internal;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;