NabuAdapter: alias import + Optional handling

1 files changed, 6 insertions, 4 deletions

diff --git a/modules/orgflow-content-store/src/jvmMain/kotlin/jp/orgflow/contentstore/jvm/NabuBlockStoreAdapter.kt b/modules/orgflow-content-store/src/jvmMain/kotlin/jp/orgflow/contentstore/jvm/NabuBlockStoreAdapter.kt
index 2b9bdb5..ad04e42 100644
--- a/modules/orgflow-content-store/src/jvmMain/kotlin/jp/orgflow/contentstore/jvm/NabuBlockStoreAdapter.kt
+++ b/modules/orgflow-content-store/src/jvmMain/kotlin/jp/orgflow/contentstore/jvm/NabuBlockStoreAdapter.kt
@@ -3,6 +3,7 @@ package jp.orgflow.contentstore.jvm
 import io.ipfs.multihash.Multihash
 import jp.orgflow.contentstore.BlockStore
 import jp.orgflow.contentstore.ContentBlock
+import org.ipfs.cid.Cid as NabuCid
 import org.peergos.blockstore.RamBlockstore
 import java.util.concurrent.TimeUnit
 
@@ -16,16 +17,17 @@ class NabuBlockStoreAdapter(
     private fun nabuMultihash(hex: String): Multihash =
         Multihash(Multihash.Type.sha2_256, hexToBytes(hex))
 
-    private fun nabuCid(hex: String): org.ipfs.cid.Cid =
-        org.ipfs.cid.Cid.build(1, org.ipfs.cid.Cid.Codec.Raw, nabuMultihash(hex))
+    private fun nabuCid(hex: String): NabuCid =
+        NabuCid.build(1, NabuCid.Codec.Raw, nabuMultihash(hex))
 
     override suspend fun put(block: ContentBlock) {
-        val stored = backing.put(block.bytes, org.ipfs.cid.Cid.Codec.Raw).get(30, TimeUnit.SECONDS)
+        val stored = backing.put(block.bytes, NabuCid.Codec.Raw).get(30, TimeUnit.SECONDS)
         check(stored.bareMultihash() == nabuMultihash(block.cid.hashHex)) { "cid mismatch after put" }
     }
 
     override suspend fun get(cid: jp.orgflow.contentstore.Cid): ContentBlock? {
-        val bytes = backing.get(nabuCid(cid.hashHex)).get(30, TimeUnit.SECONDS) ?: return null
+        val bytes = backing.get(nabuCid(cid.hashHex)).get(30, TimeUnit.SECONDS).orElse(null)
+            ?: return null
         return ContentBlock(cid, bytes)
     }
 }