Keep up with upstream changes, move to DidJwk instead of DidDht

Author: ALRubinger

site/docs/web5/build/decentralized-identifiers/how-to-create-did.mdx

@@ -9,7 +9,7 @@ import createDidJwk from '!!raw-loader!@site/snippets/testsuite-javascript/__tes
 import requiredDidImports from '!!raw-loader!@site/snippets/testsuite-javascript/__tests__/web5/build/decentralized-identifiers/requiredDidImports.snippet.js';
 import createDidDhtJava from '!!raw-loader!@site/snippets/testsuite-kotlin/src/test/java/website/tbd/developer/site/java/docs/web5/build/decentralizedidentifiers/createDidDhtJava.snippet.java';
 import createDidDhtKt from '!!raw-loader!@site/snippets/testsuite-kotlin/src/test/kotlin/docs/web5/build/decentralizedidentifiers/createDidDhtKt.snippet.kt';
-import createDidJwtJava from '!!raw-loader!@site/snippets/testsuite-kotlin/src/test/java/website/tbd/developer/site/java/docs/web5/build/decentralizedidentifiers/createDidJwtJava.snippet.java';
+import createDidJwkJava from '!!raw-loader!@site/snippets/testsuite-kotlin/src/test/java/website/tbd/developer/site/java/docs/web5/build/decentralizedidentifiers/createDidJwkJava.snippet.java';
 import createDidJwkKt from '!!raw-loader!@site/snippets/testsuite-kotlin/src/test/kotlin/docs/web5/build/decentralizedidentifiers/createDidJwkKt.snippet.kt'
 import requiredDidImportsKt from '!!raw-loader!@site/snippets/testsuite-kotlin/src/test/kotlin/docs/web5/build/decentralizedidentifiers/requiredDidImportsKt.snippet.kt';
 import createADidDependencyGradle from '!!raw-loader!@site/snippets/testsuite-javascript/__tests__/web5/build/decentralized-identifiers/createADidDependencyGradle.snippet.gradle';
@@ -94,7 +94,7 @@ The following DID methods are supported:
   snippets={[
     { snippetContent: createDidJwk, language: 'JavaScript' },
     { snippetContent: createDidJwkKt, language: 'Kotlin' },
-    { snippetContent: createDidKeyJava, language: 'Java' },
+    { snippetContent: createDidJwkJava, language: 'Java' },
   ]}
 />
 

site/testsuites/kotlin-testsuite.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AutoImportedSourceRoots">
+    <option name="directories">
+      <list>
+        <option value="$MODULE_DIR$/testsuite-kotlin/src/main/java" />
+        <option value="$MODULE_DIR$/testsuite-kotlin/src/main/kotlin" />
+        <option value="$MODULE_DIR$/testsuite-kotlin/src/test/java" />
+        <option value="$MODULE_DIR$/testsuite-kotlin/src/test/kotlin" />
+      </list>
+    </option>
+  </component>
+</module>

site/testsuites/testsuite-kotlin/src/test/java/website/tbd/developer/site/java/docs/web5/build/decentralizedidentifiers/HowToCreateDidTest.java

@@ -6,6 +6,7 @@
 import web5.sdk.dids.DidResolutionResult;
 import web5.sdk.dids.methods.dht.CreateDidDhtOptions;
 import web5.sdk.dids.methods.dht.DidDht;
+import web5.sdk.dids.methods.jwk.DidJwk;
 import web5.sdk.dids.methods.key.DidKey;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -34,27 +35,27 @@ void createDidDht(){
 
     assertNotNull(did,"DID should not be null");
     assertTrue(did.startsWith("did:dht"),"Did should start with 'did:dht'");
-    assertEquals(did, didDocument.getId().toString(),"ID od DID Document should match DID");
+    assertEquals(did, didDocument.getId().toString(),"ID of DID Document should match DID");
   }
 
   @Test
-  void createDidKey() {
-    // :snippet-start: createDidKeyJava
-    // Creates a DID using the did:key method
-    final DidKey didKey = DidKey.Companion.create(new InMemoryKeyManager(), null);
+  void createDidJwt() {
+    // :snippet-start: createDidJwkJava
+    // Creates a DID using the did:jwk method
+    final DidJwk didJwk = DidJwk.Companion.create(new InMemoryKeyManager(), null);
 
     // DID and its associated data which can be exported and used in different contexts/apps
-    final DidResolutionResult portableDid = didKey.resolve();
+    final DidResolutionResult portableDid = didJwk.resolve();
 
     // DID String
-    final String did = didKey.getUri();
+    final String did = didJwk.getUri();
 
     // DID Document
     final DIDDocument didDocument = portableDid.getDidDocument();
     // :snippet-end:
 
     assertNotNull(did, "DID should not be null");
-    assertTrue(did.startsWith("did:key"), "DID should start with 'did:key'");
+    assertTrue(did.startsWith("did:jwk"), "DID should start with 'did:jwk'");
     assertNotNull(didDocument, "DID Document should not be null");
     assertEquals(did, didDocument.getId().toString(),"ID od DID Document should match DID");
   }