Refactor package from io.ipfs.multibase to io.multibase

vorburger · vorburger · commit a145310079a7 · 2026-03-08T02:01:34.000+01:00
And Maven from com.github.multiformats:java-multibase to io.multiformats:multibase
diff --git a/pom.xml b/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.github.multiformats</groupId>
-  <artifactId>java-multibase</artifactId>
+  <groupId>io.multiformats</groupId>
+  <artifactId>multibase</artifactId>
   <version>1.3.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
diff --git a/src/main/java/io/multibase/Base16.java b/src/main/java/io/multibase/Base16.java
@@ -1,4 +1,4 @@
-package io.ipfs.multibase;
+package io.multibase;
 
 public class Base16 {
   public static byte[] decode(String hex) {
diff --git a/src/main/java/io/multibase/Base256Emoji.java b/src/main/java/io/multibase/Base256Emoji.java
@@ -1,4 +1,4 @@
-package io.ipfs.multibase;
+package io.multibase;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/main/java/io/multibase/Base36.java b/src/main/java/io/multibase/Base36.java
@@ -1,4 +1,4 @@
-package io.ipfs.multibase;
+package io.multibase;
 
 import java.math.BigInteger;
 
diff --git a/src/main/java/io/multibase/Base58.java b/src/main/java/io/multibase/Base58.java
@@ -1,4 +1,4 @@
-package io.ipfs.multibase;
+package io.multibase;
 
 /*
  * Copyright 2011 Google Inc.
diff --git a/src/main/java/io/multibase/BinaryDecoder.java b/src/main/java/io/multibase/BinaryDecoder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase;
+package io.multibase;
 
 /**
  * Defines common decoding methods for byte array decoders.
diff --git a/src/main/java/io/multibase/BinaryEncoder.java b/src/main/java/io/multibase/BinaryEncoder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase;
+package io.multibase;
 
 /**
  * Defines common encoding methods for byte array encoders.
diff --git a/src/main/java/io/multibase/CharEncoding.java b/src/main/java/io/multibase/CharEncoding.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase;
+package io.multibase;
 
 /**
  * Character encoding names required of every implementation of the Java platform.
diff --git a/src/main/java/io/multibase/Charsets.java b/src/main/java/io/multibase/Charsets.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.ipfs.multibase;
+package io.multibase;
 
 import java.nio.charset.Charset;
 
diff --git a/src/main/java/io/multibase/Decoder.java b/src/main/java/io/multibase/Decoder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase;
+package io.multibase;
 
 /**
  * Provides the highest level of abstraction for Decoders.
diff --git a/src/main/java/io/multibase/DecoderException.java b/src/main/java/io/multibase/DecoderException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase;
+package io.multibase;
 
 /**
  * Thrown when there is a failure condition during the decoding process. This exception is thrown
diff --git a/src/main/java/io/multibase/Encoder.java b/src/main/java/io/multibase/Encoder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase;
+package io.multibase;
 
 /**
  * Provides the highest level of abstraction for Encoders.
diff --git a/src/main/java/io/multibase/EncoderException.java b/src/main/java/io/multibase/EncoderException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase;
+package io.multibase;
 
 /**
  * Thrown when there is a failure condition during the encoding process. This exception is thrown
diff --git a/src/main/java/io/multibase/Multibase.java b/src/main/java/io/multibase/Multibase.java
@@ -1,7 +1,7 @@
-package io.ipfs.multibase;
+package io.multibase;
 
-import io.ipfs.multibase.binary.Base32;
-import io.ipfs.multibase.binary.Base64;
+import io.multibase.binary.Base32;
+import io.multibase.binary.Base64;
 import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
diff --git a/src/main/java/io/multibase/binary/Base32.java b/src/main/java/io/multibase/binary/Base32.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase.binary;
+package io.multibase.binary;
 
 /**
  * Provides Base32 encoding and decoding as defined by <a
@@ -66,15 +66,129 @@ public class Base32 extends BaseNCodec {
    */
   private static final byte[] DECODE_TABLE = {
     //  0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 00-0f
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 10-1f
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 20-2f
-    -1, -1, 26, 27, 28, 29, 30, 31, -1, -1, -1, -1, -1, -1, -1, -1, // 30-3f 2-7
-    -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 40-4f A-O
-    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // 50-5a P-Z
-        -1, -1, -1, -1, -1, // 5b - 5f
-    -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 60 - 6f a-o
-    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // 70 - 7a p-z/**/
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1, // 00-0f
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1, // 10-1f
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1, // 20-2f
+    -1,
+    -1,
+    26,
+    27,
+    28,
+    29,
+    30,
+    31,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1, // 30-3f 2-7
+    -1,
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+    14, // 40-4f A-O
+    15,
+    16,
+    17,
+    18,
+    19,
+    20,
+    21,
+    22,
+    23,
+    24,
+    25, // 50-5a P-Z
+    -1,
+    -1,
+    -1,
+    -1,
+    -1, // 5b - 5f
+    -1,
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    13,
+    14, // 60 - 6f a-o
+    15,
+    16,
+    17,
+    18,
+    19,
+    20,
+    21,
+    22,
+    23,
+    24,
+    25, // 70 - 7a p-z/**/
   };
 
   /**
diff --git a/src/main/java/io/multibase/binary/Base64.java b/src/main/java/io/multibase/binary/Base64.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase.binary;
+package io.multibase.binary;
 
 import java.math.BigInteger;
 
diff --git a/src/main/java/io/multibase/binary/BaseNCodec.java b/src/main/java/io/multibase/binary/BaseNCodec.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase.binary;
+package io.multibase.binary;
 
-import io.ipfs.multibase.BinaryDecoder;
-import io.ipfs.multibase.BinaryEncoder;
-import io.ipfs.multibase.DecoderException;
-import io.ipfs.multibase.EncoderException;
+import io.multibase.BinaryDecoder;
+import io.multibase.BinaryEncoder;
+import io.multibase.DecoderException;
+import io.multibase.EncoderException;
 
 /**
  * Abstract superclass for Base-N encoders and decoders.
diff --git a/src/main/java/io/multibase/binary/StringUtils.java b/src/main/java/io/multibase/binary/StringUtils.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package io.ipfs.multibase.binary;
+package io.multibase.binary;
 
-import io.ipfs.multibase.CharEncoding;
-import io.ipfs.multibase.Charsets;
+import io.multibase.CharEncoding;
+import io.multibase.Charsets;
 import java.nio.charset.Charset;
 
 /**
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -1,4 +1,4 @@
 module io.ipfs.multibase {
-  exports io.ipfs.multibase;
-  exports io.ipfs.multibase.binary;
+  exports io.multibase;
+  exports io.multibase.binary;
 }
diff --git a/src/test/java/io/multibase/MultibaseBadInputsTest.java b/src/test/java/io/multibase/MultibaseBadInputsTest.java
@@ -1,4 +1,4 @@
-package io.ipfs.multibase;
+package io.multibase;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/src/test/java/io/multibase/MultibaseTest.java b/src/test/java/io/multibase/MultibaseTest.java
@@ -1,4 +1,4 @@
-package io.ipfs.multibase;
+package io.multibase;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.ipfs.multibase;`
	`1`	`+package io.multibase;`
`2`	`2`
`3`	`3`	`public class Base16 {`
`4`	`4`	`public static byte[] decode(String hex) {`