Remove unused type parameter from DriverProvider.getDriver method

PiperOrigin-RevId: 348551278
PolymerLabs · Dec 22, 2020 · d31b8c6 · d31b8c6
1 parent b29be67
commit d31b8c6
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 105 deletions.
diff --git a/java/arcs/core/storage/DirectStore.kt b/java/arcs/core/storage/DirectStore.kt
@@ -518,8 +518,7 @@ class DirectStore<Data : CrdtData, Op : CrdtOperation, T> /* internal */ constru
       val driver = CrdtException.requireNotNull(
         driverFactory.getDriver(
           options.storageKey,
-          crdtType.crdtModelDataClass,
-          options.type
+          crdtType.crdtModelDataClass
         ) as? Driver<Data>
       ) { "No driver exists to support storage key ${options.storageKey}" }
 

diff --git a/java/arcs/core/storage/DriverFactory.kt b/java/arcs/core/storage/DriverFactory.kt
@@ -1,6 +1,5 @@
 package arcs.core.storage
 
-import arcs.core.type.Type
 import kotlin.reflect.KClass
 
 interface DriverFactory : ExternalStorageOps {
@@ -9,8 +8,7 @@ interface DriverFactory : ExternalStorageOps {
    */
   suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data>?
 
   /**
@@ -59,6 +57,5 @@ interface DriverFactory : ExternalStorageOps {
  * Fetches a [Driver] of type [Data] given its [storageKey].
  */
 suspend inline fun <reified Data : Any> DriverFactory.getDriver(
-  storageKey: StorageKey,
-  type: Type
-): Driver<Data>? = getDriver(storageKey, Data::class, type)
+  storageKey: StorageKey
+): Driver<Data>? = getDriver(storageKey, Data::class)
diff --git a/java/arcs/core/storage/DriverProvider.kt b/java/arcs/core/storage/DriverProvider.kt
@@ -1,6 +1,5 @@
 package arcs.core.storage
 
-import arcs.core.type.Type
 import kotlin.reflect.KClass
 
 /** Provider of information on the [Driver] and characteristics of the storage behind it. */
@@ -11,8 +10,7 @@ interface DriverProvider {
   /** Gets a [Driver] for the given [storageKey] and type [Data] (declared by [dataClass]). */
   suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data>
 
   /**

diff --git a/java/arcs/core/storage/FixedDriverFactory.kt b/java/arcs/core/storage/FixedDriverFactory.kt
@@ -1,7 +1,6 @@
 package arcs.core.storage
 
 import arcs.core.common.collectExceptions
-import arcs.core.type.Type
 import kotlin.reflect.KClass
 
 /**
@@ -22,11 +21,10 @@ class FixedDriverFactory(
 
   override suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data>? {
     return providerForStorageKey(storageKey)
-      ?.getDriver(storageKey, dataClass, type)
+      ?.getDriver(storageKey, dataClass)
   }
 
   override suspend fun removeAllEntities() {

diff --git a/java/arcs/core/storage/driver/Database.kt b/java/arcs/core/storage/driver/Database.kt
@@ -31,7 +31,6 @@ import arcs.core.storage.database.DatabaseData
 import arcs.core.storage.database.DatabaseManager
 import arcs.core.storage.database.ReferenceWithVersion
 import arcs.core.storage.keys.DatabaseStorageKey
-import arcs.core.type.Type
 import arcs.core.util.Random
 import arcs.core.util.TaggedLog
 import kotlin.reflect.KClass
@@ -64,8 +63,7 @@ object DatabaseDriverProvider : DriverProvider {
 
   override suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data> {
     val databaseKey = requireNotNull(storageKey as? DatabaseStorageKey) {
       "Unsupported StorageKey: $storageKey for DatabaseDriverProvider"

diff --git a/java/arcs/core/storage/driver/RamDiskDriverProvider.kt b/java/arcs/core/storage/driver/RamDiskDriverProvider.kt
@@ -5,7 +5,6 @@ import arcs.core.storage.DriverProvider
 import arcs.core.storage.StorageKey
 import arcs.core.storage.driver.volatiles.VolatileDriverImpl
 import arcs.core.storage.keys.RamDiskStorageKey
-import arcs.core.type.Type
 import kotlin.reflect.KClass
 
 /**
@@ -22,8 +21,7 @@ class RamDiskDriverProvider : DriverProvider {
 
   override suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data> {
     require(willSupport(storageKey)) {
       "This provider does not support StorageKey: $storageKey"

diff --git a/java/arcs/core/storage/driver/VolatileDriverProvider.kt b/java/arcs/core/storage/driver/VolatileDriverProvider.kt
@@ -20,10 +20,8 @@ import arcs.core.storage.driver.volatiles.VolatileDriverImpl
 import arcs.core.storage.driver.volatiles.VolatileMemory
 import arcs.core.storage.driver.volatiles.VolatileMemoryImpl
 import arcs.core.storage.keys.VolatileStorageKey
-import arcs.core.type.Type
 import arcs.core.util.TaggedLog
 import arcs.core.util.guardedBy
-import java.lang.IllegalStateException
 import kotlin.reflect.KClass
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -62,8 +60,7 @@ class VolatileDriverProvider : DriverProvider {
    */
   override suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data> {
     require(storageKey is VolatileStorageKey) {
       "Expected VolatileStorageKey, got ${storageKey::class.simpleName}"

diff --git a/java/arcs/core/storage/driver/testutil/SlowRamDisk.kt b/java/arcs/core/storage/driver/testutil/SlowRamDisk.kt
@@ -8,7 +8,6 @@ import arcs.core.storage.driver.volatiles.VolatileEntry
 import arcs.core.storage.driver.volatiles.VolatileMemory
 import arcs.core.storage.driver.volatiles.VolatileMemoryImpl
 import arcs.core.storage.keys.RamDiskStorageKey
-import arcs.core.type.Type
 import kotlin.reflect.KClass
 
 /**
@@ -27,8 +26,7 @@ class SlowRamDiskDriverProvider(
 
   override suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data> = VolatileDriverImpl.create(storageKey, memory)
 
   override suspend fun removeAllEntities() = Unit

diff --git a/java/arcs/core/storage/testutil/DriverMocks.kt b/java/arcs/core/storage/testutil/DriverMocks.kt
@@ -14,16 +14,14 @@ package arcs.core.storage.testutil
 import arcs.core.storage.Driver
 import arcs.core.storage.DriverProvider
 import arcs.core.storage.StorageKey
-import arcs.core.type.Type
 import kotlin.reflect.KClass
 
 class MockDriverProvider : DriverProvider {
   override fun willSupport(storageKey: StorageKey): Boolean = true
 
   override suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data> = MockDriver(storageKey)
 
   override suspend fun removeAllEntities() = Unit

diff --git a/java/arcs/core/storage/testutil/FakeDriverProvider.kt b/java/arcs/core/storage/testutil/FakeDriverProvider.kt
@@ -3,7 +3,6 @@ package arcs.core.storage.testutil
 import arcs.core.storage.Driver
 import arcs.core.storage.DriverProvider
 import arcs.core.storage.StorageKey
-import arcs.core.type.Type
 import kotlin.reflect.KClass
 
 /**
@@ -30,8 +29,7 @@ class FakeDriverProvider(
   @Suppress("UNCHECKED_CAST")
   override suspend fun <Data : Any> getDriver(
     storageKey: StorageKey,
-    dataClass: KClass<Data>,
-    type: Type
+    dataClass: KClass<Data>
   ): Driver<Data> {
     require(storageKey in storageKeys)
     return drivers[storageKey] as Driver<Data>

diff --git a/javatests/arcs/core/storage/FixedDriverFactoryTest.kt b/javatests/arcs/core/storage/FixedDriverFactoryTest.kt
@@ -6,7 +6,6 @@ import arcs.core.storage.testutil.DummyStorageKey
 import arcs.core.storage.testutil.FakeDriverProvider
 import arcs.core.testutil.CallbackChoreographer
 import arcs.core.testutil.assertSuspendingThrows
-import arcs.core.type.Type
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
 import kotlinx.atomicfu.atomic
@@ -39,7 +38,6 @@ class FixedDriverFactoryTest {
     storageKey3 to mockDriver3
   )
 
-  private val mockType: Type = mock {}
   private val fakeClass = CrdtData::class
 
   @Test
@@ -64,16 +62,16 @@ class FixedDriverFactoryTest {
   fun getDriver_withMatch_returnsFirstMatching() = runBlockingTest {
     val factory = FixedDriverFactory(listOf(provider1, provider2, provider3))
 
-    assertThat(factory.getDriver(storageKey1, fakeClass, mockType)).isEqualTo(mockDriver1)
-    assertThat(factory.getDriver(storageKey2, fakeClass, mockType)).isEqualTo(mockDriver2)
-    assertThat(factory.getDriver(storageKey3, fakeClass, mockType)).isEqualTo(mockDriver3)
+    assertThat(factory.getDriver(storageKey1, fakeClass)).isEqualTo(mockDriver1)
+    assertThat(factory.getDriver(storageKey2, fakeClass)).isEqualTo(mockDriver2)
+    assertThat(factory.getDriver(storageKey3, fakeClass)).isEqualTo(mockDriver3)
   }
 
   @Test
   fun getDriver_withoutMatch_returnsNull() = runBlockingTest {
     val factory = FixedDriverFactory(listOf(provider1))
 
-    assertThat(factory.getDriver(storageKey2, fakeClass, mockType)).isNull()
+    assertThat(factory.getDriver(storageKey2, fakeClass)).isNull()
   }
 
   @Test

diff --git a/javatests/arcs/core/storage/RawEntityDereferencerTest.kt b/javatests/arcs/core/storage/RawEntityDereferencerTest.kt
@@ -15,7 +15,6 @@ import arcs.core.common.Referencable
 import arcs.core.crdt.CrdtEntity
 import arcs.core.crdt.CrdtEntity.Reference.Companion.buildReference
 import arcs.core.crdt.VersionMap
-import arcs.core.data.EntityType
 import arcs.core.data.FieldType
 import arcs.core.data.RawEntity
 import arcs.core.data.Schema
@@ -89,12 +88,10 @@ class RawEntityDereferencerTest {
     )
 
     aliceDriver = DefaultDriverFactory.get().getDriver(
-      backingKey.childKeyWithComponent("aliceId"),
-      EntityType(schema)
+      backingKey.childKeyWithComponent("aliceId")
     )!!
     bobDriver = DefaultDriverFactory.get().getDriver(
-      backingKey.childKeyWithComponent("bobId"),
-      EntityType(schema)
+      backingKey.childKeyWithComponent("bobId")
     )!!
 
     aliceDriver.send(CrdtEntity.Data(VersionMap("alice" to 1), alice, referenceBuilder), 1)

diff --git a/javatests/arcs/core/storage/driver/DatabaseDriverProviderTest.kt b/javatests/arcs/core/storage/driver/DatabaseDriverProviderTest.kt
@@ -15,13 +15,10 @@ import arcs.core.common.ArcId
 import arcs.core.crdt.CrdtEntity
 import arcs.core.crdt.CrdtSet
 import arcs.core.crdt.CrdtSingleton
-import arcs.core.data.CollectionType
-import arcs.core.data.EntityType
 import arcs.core.data.FieldType
 import arcs.core.data.Schema
 import arcs.core.data.SchemaFields
 import arcs.core.data.SchemaName
-import arcs.core.data.SingletonType
 import arcs.core.storage.StorageKey
 import arcs.core.storage.database.DatabaseManager
 import arcs.core.storage.keys.DatabaseStorageKey
@@ -84,7 +81,7 @@ class DatabaseDriverProviderTest {
     val volatile = VolatileStorageKey(ArcId.newForTest("myarc"), "foo")
 
     assertSuspendingThrows(IllegalArgumentException::class) {
-      provider.getDriver(volatile, CrdtEntity.Data::class, DUMMY_ENTITY_TYPE)
+      provider.getDriver(volatile, CrdtEntity.Data::class)
     }
   }
 
@@ -93,7 +90,7 @@ class DatabaseDriverProviderTest {
     val key = DatabaseStorageKey.Persistent("foo", "1234a")
 
     assertSuspendingThrows(IllegalArgumentException::class) {
-      provider.getDriver(key, CrdtEntity.Data::class, DUMMY_ENTITY_TYPE)
+      provider.getDriver(key, CrdtEntity.Data::class)
     }
   }
 
@@ -103,7 +100,7 @@ class DatabaseDriverProviderTest {
     schemaHashLookup["1234a"] = DUMMY_SCHEMA
 
     assertSuspendingThrows(IllegalArgumentException::class) {
-      provider.getDriver(key, Int::class, DUMMY_ENTITY_TYPE)
+      provider.getDriver(key, Int::class)
     }
   }
 
@@ -112,27 +109,15 @@ class DatabaseDriverProviderTest {
     val key = DatabaseStorageKey.Persistent("foo", "1234a")
     schemaHashLookup["1234a"] = DUMMY_SCHEMA
 
-    val entityDriver = provider.getDriver(
-      key,
-      CrdtEntity.Data::class,
-      DUMMY_ENTITY_TYPE
-    )
+    val entityDriver = provider.getDriver(key, CrdtEntity.Data::class)
     assertThat(entityDriver).isInstanceOf(DatabaseDriver::class.java)
     assertThat(entityDriver.storageKey).isEqualTo(key)
 
-    val setDriver = provider.getDriver(
-      key,
-      CrdtSet.DataImpl::class,
-      CollectionType(DUMMY_ENTITY_TYPE)
-    )
+    val setDriver = provider.getDriver(key, CrdtSet.DataImpl::class)
     assertThat(setDriver).isInstanceOf(DatabaseDriver::class.java)
     assertThat(setDriver.storageKey).isEqualTo(key)
 
-    val singletonDriver = provider.getDriver(
-      key,
-      CrdtSingleton.DataImpl::class,
-      SingletonType(DUMMY_ENTITY_TYPE)
-    )
+    val singletonDriver = provider.getDriver(key, CrdtSingleton.DataImpl::class)
     assertThat(singletonDriver).isInstanceOf(DatabaseDriver::class.java)
     assertThat(singletonDriver.storageKey).isEqualTo(key)
   }
@@ -149,6 +134,5 @@ class DatabaseDriverProviderTest {
       ),
       "1234a"
     )
-    private val DUMMY_ENTITY_TYPE = EntityType(DUMMY_SCHEMA)
   }
 }
diff --git a/javatests/arcs/core/storage/driver/RamDiskDriverProviderTest.kt b/javatests/arcs/core/storage/driver/RamDiskDriverProviderTest.kt
@@ -16,8 +16,6 @@ import arcs.core.storage.CapabilitiesResolver
 import arcs.core.storage.StorageKey
 import arcs.core.storage.keys.RamDiskStorageKey
 import arcs.core.storage.keys.VolatileStorageKey
-import arcs.core.type.Tag
-import arcs.core.type.Type
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.runBlocking
 import org.junit.After
@@ -68,7 +66,7 @@ class RamDiskDriverProviderTest {
   fun getDriver_throwsOnInvalidKey() = runBlocking {
     val volatile = VolatileStorageKey(ArcId.newForTest("myarc"), "foo")
 
-    provider.getDriver(volatile, Int::class, DummyType)
+    provider.getDriver(volatile, Int::class)
     Unit
   }
 
@@ -78,9 +76,9 @@ class RamDiskDriverProviderTest {
 
     val key = RamDiskStorageKey("foo")
 
-    val driver1 = provider.getDriver(key, Int::class, DummyType)
-    val driver2 = provider.getDriver(key, Int::class, DummyType)
-    val driver3 = provider2.getDriver(key, Int::class, DummyType)
+    val driver1 = provider.getDriver(key, Int::class)
+    val driver2 = provider.getDriver(key, Int::class)
+    val driver3 = provider2.getDriver(key, Int::class)
 
     var driver2Value: Int? = null
     var driver2Version: Int? = null
@@ -107,7 +105,7 @@ class RamDiskDriverProviderTest {
   @Test
   fun removeAllEntities() = runBlocking {
     val key = RamDiskStorageKey("foo")
-    val driver = provider.getDriver(key, Int::class, DummyType)
+    val driver = provider.getDriver(key, Int::class)
     driver.send(42, 1)
 
     provider.removeAllEntities()
@@ -119,18 +117,12 @@ class RamDiskDriverProviderTest {
   @Test
   fun removeEntitiesBetween() = runBlocking {
     val key = RamDiskStorageKey("foo")
-    val driver = provider.getDriver(key, Int::class, DummyType)
+    val driver = provider.getDriver(key, Int::class)
     driver.send(42, 1)
 
     provider.removeEntitiesCreatedBetween(1, 2)
 
     // Receiver are not updated, so check memory directly.
     assertThat(RamDisk.memory.contains(key)).isFalse()
   }
-
-  companion object {
-    object DummyType : Type {
-      override val tag = Tag.Count
-    }
-  }
 }