1 files changed, 20 insertions, 41 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/storage/Storage.kt b/src/main/kotlin/io/dico/parcels2/storage/Storage.kt
index 6c3d68f..6770d99 100644
--- a/src/main/kotlin/io/dico/parcels2/storage/Storage.kt
+++ b/src/main/kotlin/io/dico/parcels2/storage/Storage.kt
@@ -3,21 +3,16 @@
 package io.dico.parcels2.storage
 
 import io.dico.parcels2.*
-import kotlinx.coroutines.experimental.*
-import kotlinx.coroutines.experimental.channels.ProducerScope
+import kotlinx.coroutines.experimental.Deferred
+import kotlinx.coroutines.experimental.Job
 import kotlinx.coroutines.experimental.channels.ReceiveChannel
-import kotlinx.coroutines.experimental.channels.produce
 import java.util.UUID
-import java.util.concurrent.Executor
-import java.util.concurrent.Executors
 
 typealias DataPair = Pair<ParcelId, ParcelData?>
 typealias AddedDataPair<TAttach> = Pair<TAttach, MutableAddedDataMap>
 
 interface Storage {
     val name: String
-    val syncDispatcher: CoroutineDispatcher
-    val asyncDispatcher: CoroutineDispatcher
     val isConnected: Boolean
 
     fun init(): Job
@@ -54,55 +49,39 @@ interface Storage {
     fun setGlobalAddedStatus(owner: ParcelOwner, player: UUID, status: AddedStatus): Job
 }
 
-class StorageWithCoroutineBacking internal constructor(val backing: Backing) : Storage {
-    override val name get() = backing.name
-    override val syncDispatcher = Executor { it.run() }.asCoroutineDispatcher()
-    val poolSize: Int get() = 4
-    override val asyncDispatcher = Executors.newFixedThreadPool(poolSize) { Thread(it, "Parcels2_StorageThread") }.asCoroutineDispatcher()
-    override val isConnected get() = backing.isConnected
-    val channelCapacity = 16
+class BackedStorage internal constructor(val b: Backing) : Storage {
+    override val name get() = b.name
+    override val isConnected get() = b.isConnected
 
-    private inline fun <T> defer(noinline block: suspend CoroutineScope.() -> T): Deferred<T> {
-        return async(context = asyncDispatcher, start = CoroutineStart.ATOMIC, block = block)
-    }
+    override fun init() = b.launchJob { init() }
 
-    private inline fun job(noinline block: suspend CoroutineScope.() -> Unit): Job {
-        return launch(context = asyncDispatcher, start = CoroutineStart.ATOMIC, block = block)
-    }
+    override fun shutdown() = b.launchJob { shutdown() }
 
-    private inline fun <T> openChannel(noinline block: suspend ProducerScope<T>.() -> Unit): ReceiveChannel<T> {
-        return produce(asyncDispatcher, capacity = channelCapacity, block = block)
-    }
 
-    override fun init() = job { backing.init() }
+    override fun readParcelData(parcel: ParcelId) = b.launchFuture { readParcelData(parcel) }
 
-    override fun shutdown() = job { backing.shutdown() }
+    override fun readParcelData(parcels: Sequence<ParcelId>) = b.openChannel<DataPair> { produceParcelData(it, parcels) }
 
+    override fun readAllParcelData() = b.openChannel<DataPair> { produceAllParcelData(it) }
 
-    override fun readParcelData(parcel: ParcelId) = defer { backing.readParcelData(parcel) }
+    override fun getOwnedParcels(user: ParcelOwner) = b.launchFuture { getOwnedParcels(user) }
 
-    override fun readParcelData(parcels: Sequence<ParcelId>) = openChannel<DataPair> { backing.produceParcelData(channel, parcels) }
+    override fun getNumParcels(user: ParcelOwner) = b.launchFuture { getNumParcels(user) }
 
-    override fun readAllParcelData() = openChannel<DataPair> { backing.produceAllParcelData(channel) }
+    override fun setParcelData(parcel: ParcelId, data: ParcelData?) = b.launchJob { setParcelData(parcel, data) }
 
-    override fun getOwnedParcels(user: ParcelOwner) = defer { backing.getOwnedParcels(user) }
+    override fun setParcelOwner(parcel: ParcelId, owner: ParcelOwner?) = b.launchJob { setParcelOwner(parcel, owner) }
 
-    override fun getNumParcels(user: ParcelOwner) = defer { backing.getNumParcels(user) }
+    override fun setParcelPlayerStatus(parcel: ParcelId, player: UUID, status: AddedStatus) = b.launchJob { setLocalPlayerStatus(parcel, player, status) }
 
-    override fun setParcelData(parcel: ParcelId, data: ParcelData?) = job { backing.setParcelData(parcel, data) }
+    override fun setParcelAllowsInteractInventory(parcel: ParcelId, value: Boolean) = b.launchJob { setParcelAllowsInteractInventory(parcel, value) }
 
-    override fun setParcelOwner(parcel: ParcelId, owner: ParcelOwner?) = job { backing.setParcelOwner(parcel, owner) }
+    override fun setParcelAllowsInteractInputs(parcel: ParcelId, value: Boolean) = b.launchJob { setParcelAllowsInteractInputs(parcel, value) }
 
-    override fun setParcelPlayerStatus(parcel: ParcelId, player: UUID, status: AddedStatus) = job { backing.setLocalPlayerStatus(parcel, player, status) }
 
-    override fun setParcelAllowsInteractInventory(parcel: ParcelId, value: Boolean) = job { backing.setParcelAllowsInteractInventory(parcel, value) }
+    override fun readAllGlobalAddedData(): ReceiveChannel<AddedDataPair<ParcelOwner>> = b.openChannel { produceAllGlobalAddedData(it) }
 
-    override fun setParcelAllowsInteractInputs(parcel: ParcelId, value: Boolean) = job { backing.setParcelAllowsInteractInputs(parcel, value) }
+    override fun readGlobalAddedData(owner: ParcelOwner): Deferred<MutableAddedDataMap?> = b.launchFuture { readGlobalAddedData(owner) }
 
-
-    override fun readAllGlobalAddedData(): ReceiveChannel<AddedDataPair<ParcelOwner>> = openChannel { backing.produceAllGlobalAddedData(channel) }
-
-    override fun readGlobalAddedData(owner: ParcelOwner): Deferred<MutableAddedDataMap?> = defer { backing.readGlobalAddedData(owner) }
-
-    override fun setGlobalAddedStatus(owner: ParcelOwner, player: UUID, status: AddedStatus) = job { backing.setGlobalPlayerStatus(owner, player, status) }
+    override fun setGlobalAddedStatus(owner: ParcelOwner, player: UUID, status: AddedStatus) = b.launchJob { setGlobalPlayerStatus(owner, player, status) }
 }