Merge pull request #42 from filip26/release/v0.0.7

Release/v0.0.7
filip26 · Nov 21, 2023 · 0b14f2e · 0b14f2e
2 parents 8c1bfa5 + f6b360e
commit 0b14f2e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 68 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.apicatalog</groupId>
         <artifactId>carbon</artifactId>
-        <version>0.0.7-SNAPSHOT</version>
+        <version>0.0.7</version>
         <relativePath>pom_parent.xml</relativePath>
     </parent>
     <artifactId>carbon-did</artifactId>
@@ -26,14 +26,8 @@
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
         <envSources>src/main/java17</envSources>
-        <multiformats.version>1.1.1</multiformats.version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>com.github.multiformats</groupId>
-            <artifactId>java-multibase</artifactId>
-            <version>${multiformats.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.apicatalog</groupId>
             <artifactId>titanium-json-ld</artifactId>

diff --git a/pom_jre8.xml b/pom_jre8.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.apicatalog</groupId>
 		<artifactId>carbon</artifactId>
-		<version>0.0.7-SNAPSHOT</version>
+		<version>0.0.7</version>
 		<relativePath>pom_parent.xml</relativePath>
 	</parent>
 	<artifactId>carbon-did-jre8</artifactId>
@@ -22,14 +22,8 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<envSources>src/main/java8</envSources>
-		<multiformats.version>v1.1.0</multiformats.version>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>com.github.multiformats</groupId>
-			<artifactId>java-multibase</artifactId>
-			<version>${multiformats.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.apicatalog</groupId>
 			<artifactId>titanium-json-ld-jre8</artifactId>

diff --git a/pom_parent.xml b/pom_parent.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.apicatalog</groupId>
 	<artifactId>carbon</artifactId>
-	<version>0.0.7-SNAPSHOT</version>
+	<version>0.0.7</version>
 	<packaging>pom</packaging>
 
 	<name>Carbon DIDs</name>
@@ -48,7 +48,8 @@
 		<jakarta.json.version>2.0.1</jakarta.json.version>
 
 		<titanium.version>1.3.3</titanium.version>
-		<copper.version>0.0.5</copper.version>
+		<copper.multicodec.version>0.0.6</copper.multicodec.version>
+		<copper.multibase.version>0.0.1</copper.multibase.version>
 
 		<!-- test resources -->
 		<junit.version>5.10.1</junit.version>
@@ -64,7 +65,14 @@
 		<dependency>
 			<groupId>com.apicatalog</groupId>
 			<artifactId>copper-multicodec</artifactId>
-			<version>${copper.version}</version>
+			<version>${copper.multicodec.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.apicatalog</groupId>
+			<artifactId>copper-multibase</artifactId>
+			<version>${copper.multibase.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -85,13 +93,6 @@
 
 	</dependencies>
 
-	<repositories>
-		<repository>
-			<id>scijava.org</id>
-			<url>https://maven.scijava.org/content/repositories/public/</url>
-		</repository>
-	</repositories>
-
 	<build>
 		<plugins>
 			<plugin>

diff --git a/src/main/java/com/apicatalog/did/key/DidKey.java b/src/main/java/com/apicatalog/did/key/DidKey.java
@@ -4,9 +4,10 @@
 
 import com.apicatalog.did.Did;
 import com.apicatalog.multibase.Multibase;
+import com.apicatalog.multibase.MultibaseDecoder;
 import com.apicatalog.multicodec.Multicodec;
 import com.apicatalog.multicodec.Multicodec.Tag;
-import com.apicatalog.multicodec.Multicoder;
+import com.apicatalog.multicodec.MulticodecDecoder;
 
 /**
  * Immutable DID Key
@@ -26,7 +27,8 @@ public class DidKey extends Did {
 
     public static final String METHOD_KEY = "key";
 
-    protected static final Multicoder MULTICODER = Multicoder.getInstance(Tag.Key);
+    protected static final MulticodecDecoder MULTICODEC = MulticodecDecoder.getInstance(Tag.Key);
+    protected static final MultibaseDecoder MULTIBASE = MultibaseDecoder.getInstance(Multibase.BASE_58_BTC);
 
     private final Multicodec codec;
 
@@ -66,13 +68,9 @@ public static final DidKey from(final Did did) {
             throw new IllegalArgumentException("The given DID method [" + did.getMethod() + "] is not 'key'. DID [" + did.toString() + "].");
         }
 
-        if (!Multibase.isAlgorithmSupported(did.getMethodSpecificId())) {
-            throw new IllegalArgumentException();
-        }
-
-        final byte[] decoded = Multibase.decode(did.getMethodSpecificId());
+        final byte[] decoded = MULTIBASE.decode(did.getMethodSpecificId());
 
-        final Multicodec codec = MULTICODER.getCodec(decoded).orElseThrow(() -> new IllegalArgumentException("Cannot detect did:key codec."));
+        final Multicodec codec = MULTICODEC.getCodec(decoded).orElseThrow(() -> new IllegalArgumentException("Cannot detect did:key codec."));
 
         final byte[] rawKey = codec.decode(decoded);
 

diff --git a/src/main/java/com/apicatalog/multibase/Multibase.java b/src/main/java/com/apicatalog/multibase/Multibase.java