Improve hasValidPrefix() [fixes #38]

PS: Humans are still smarter than AI... for now! ;-)

Author: vorburger

src/main/java/io/ipfs/multibase/Multibase.java

@@ -1,6 +1,7 @@
 package io.ipfs.multibase;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.TreeMap;
 
 import io.ipfs.multibase.binary.Base32;
@@ -45,14 +46,21 @@ public enum Base {
                 lookup.put(b.prefix, b);
         }
 
-        public static Base lookup(String data) {
+        private static Optional<Base> lookupOptional(String data) {
+            if (data == null || data.isEmpty())
+                return Optional.empty();
             String p = Character.toString(data.codePointAt(0));
             Base base = lookup.get(p);
             if (base != null)
-                return base;
+                return Optional.of(base);
             if (data.startsWith(Base256Emoji.prefix))
-                return Base256Emoji;
-            throw new IllegalArgumentException("Unknown Multibase type: " + p);
+                return Optional.of(Base256Emoji);
+            return Optional.empty();
+        }
+
+        public static Base lookup(String data) {
+            return lookupOptional(data)
+                    .orElseThrow(() -> new IllegalArgumentException("Unknown Multibase type: " + data));
         }
     }
 
@@ -155,12 +163,21 @@ private static String safeSubstringFromIndexOne(String data) {
         return data.substring(charIndex);
     }
 
-    public static boolean isValid(String data) {
-        try {
-            decode(data);
-            return true;
-        } catch (IllegalArgumentException | UnsupportedOperationException e) {
-            return false;
-        }
+    /**
+     * Check if the given data has a valid multibase prefix.
+     *
+     * <p>
+     * Please note that "having a valid prefix" is NOT the same as "being an
+     * entirely valid multibase string"; even if <tt>true</tt>, it's still entirely
+     * possible for {@link #decode(String)} to throw an
+     * <tt>IllegalArgumentException</tt>, if prefix is valid, but the following
+     * data is not.
+     *
+     * @param data Multibase string to check.
+     * @return true if the data has a valid multibase prefix, false otherwise; but
+     *         see above.
+     */
+    public static boolean hasValidPrefix(String data) {
+        return Base.lookupOptional(data).isPresent();
     }
 }

src/test/java/io/ipfs/multibase/MultibaseBadInputsTest.java

@@ -1,5 +1,6 @@
 package io.ipfs.multibase;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Arrays;
@@ -29,4 +30,17 @@ public void badInputTest(String input) {
         });
     }
 
+    public static Collection<String> invalidPrefix() {
+        return Arrays.asList(
+                "2", // '2' is not a valid encoding marker
+                "", // Empty string is not a valid multibase
+                "🫕🚀" // This not a valid Emoji Multibase (note how it's inverted)
+        );
+    }
+
+    @MethodSource("invalidPrefix")
+    @ParameterizedTest(name = "{index}: \"{0}\"")
+    public void invalidPrefix(String input) {
+        assertFalse(Multibase.hasValidPrefix(input));
+    }
 }

src/test/java/io/ipfs/multibase/MultibaseTest.java

@@ -9,7 +9,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class MultibaseTest {
 
@@ -71,25 +70,8 @@ public void testDecode(Multibase.Base base, byte[] raw, String encoded) {
 
     @MethodSource("data")
     @ParameterizedTest(name = "{index}: {0}, {2}")
-    public void testIsValid(Multibase.Base base, byte[] raw, String encoded) {
-        assertTrue(Multibase.isValid(encoded));
-    }
-
-    public static Collection<String> invalidData() {
-        return Arrays.asList(
-                "f012", // Hex string of odd length, not allowed in Base16
-                "f0g", // 'g' char is not allowed in Base16
-                "zt1Zv2yaI", // 'I' char is not allowed in Base58
-                "2", // '2' is not a valid encoding marker
-                "", // Empty string is not a valid multibase
-                "🚀🫕" // This Emoji (Swiss Fondue) is not part of the Base256Emoji table
-        );
-    }
-
-    @MethodSource("invalidData")
-    @ParameterizedTest(name = "{index}: \"{0}\"")
-    public void testIsInvalid(String input) {
-        assertFalse(Multibase.isValid(input));
+    public void testHasValidPrefix(Multibase.Base base, byte[] raw, String encoded) {
+        assertTrue(Multibase.hasValidPrefix(encoded));
     }
 
     //Copied from https://stackoverflow.com/a/140861