add factory for RemoteShareeMapper

owncloud · Oct 22, 2020 · 3883323 · 3883323
1 parent dae9bb6
commit 3883323
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RemoteDataSourceModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RemoteDataSourceModule.kt
@@ -33,6 +33,7 @@ import com.owncloud.android.data.server.datasources.RemoteServerInfoDataSource
 import com.owncloud.android.data.server.datasources.implementation.OCRemoteServerInfoDataSource
 import com.owncloud.android.data.sharing.sharees.datasources.RemoteShareeDataSource
 import com.owncloud.android.data.sharing.sharees.datasources.implementation.OCRemoteShareeDataSource
+import com.owncloud.android.data.sharing.sharees.datasources.mapper.RemoteShareeMapper
 import com.owncloud.android.data.sharing.shares.datasources.RemoteShareDataSource
 import com.owncloud.android.data.sharing.shares.datasources.implementation.OCRemoteShareDataSource
 import com.owncloud.android.data.sharing.shares.datasources.mapper.RemoteShareMapper
@@ -81,6 +82,7 @@ val remoteDataSourceModule = module {
 
     factory { RemoteCapabilityMapper() }
     factory { RemoteShareMapper() }
+    factory { RemoteShareeMapper() }
     factory { RemoteUserAvatarMapper() }
     factory { RemoteUserInfoMapper() }
     factory { RemoteUserQuotaMapper() }

diff --git a/...cloud/android/data/sharing/sharees/datasources/implementation/OCRemoteShareeDataSource.kt b/...cloud/android/data/sharing/sharees/datasources/implementation/OCRemoteShareeDataSource.kt
@@ -21,16 +21,13 @@ package com.owncloud.android.data.sharing.sharees.datasources.implementation
 
 import com.owncloud.android.data.executeRemoteOperation
 import com.owncloud.android.data.sharing.sharees.datasources.RemoteShareeDataSource
-import com.owncloud.android.data.sharing.sharees.datasources.mapper.RemoteUserShareeMapper
+import com.owncloud.android.data.sharing.sharees.datasources.mapper.RemoteShareeMapper
 import com.owncloud.android.domain.sharing.sharees.model.OCSharee
-import com.owncloud.android.lib.resources.shares.responses.ShareeOcsResponse
 import com.owncloud.android.lib.resources.shares.services.ShareeService
-import org.json.JSONObject
-import java.util.ArrayList
 
 class OCRemoteShareeDataSource(
     private val shareeService: ShareeService,
-    private val shareeMapper: RemoteUserShareeMapper
+    private val shareeMapper: RemoteShareeMapper
 ) : RemoteShareeDataSource {
 
     override fun getSharees(

diff --git a/...n/java/com/owncloud/android/data/sharing/sharees/datasources/mapper/RemoteShareeMapper.kt b/...n/java/com/owncloud/android/data/sharing/sharees/datasources/mapper/RemoteShareeMapper.kt
@@ -6,7 +6,7 @@ import com.owncloud.android.domain.sharing.shares.model.ShareType
 import com.owncloud.android.lib.resources.shares.responses.ShareeItem
 import com.owncloud.android.lib.resources.shares.responses.ShareeOcsResponse
 
-class RemoteUserShareeMapper : RemoteMapper<List<OCSharee>, ShareeOcsResponse> {
+class RemoteShareeMapper : RemoteMapper<List<OCSharee>, ShareeOcsResponse> {
     private fun mapShareeItemToOCShare(item: ShareeItem, isExactMatch: Boolean) =
         OCSharee(
             label = item.label,

diff --git a/...c/test/java/com/owncloud/android/data/shares/datasources/OCRemoteShareesDataSourceTest.kt b/...c/test/java/com/owncloud/android/data/shares/datasources/OCRemoteShareesDataSourceTest.kt
@@ -20,7 +20,7 @@
 package com.owncloud.android.data.shares.datasources
 
 import com.owncloud.android.data.sharing.sharees.datasources.implementation.OCRemoteShareeDataSource
-import com.owncloud.android.data.sharing.sharees.datasources.mapper.RemoteUserShareeMapper
+import com.owncloud.android.data.sharing.sharees.datasources.mapper.RemoteShareeMapper
 import com.owncloud.android.domain.sharing.sharees.model.OCSharee
 import com.owncloud.android.domain.sharing.sharees.model.ShareeType
 import com.owncloud.android.lib.resources.shares.services.implementation.OCShareeService
@@ -48,7 +48,7 @@ class OCRemoteShareesDataSourceTest {
     @Before
     fun init() {
         ocRemoteShareesDataSource =
-            OCRemoteShareeDataSource(ocShareeService, RemoteUserShareeMapper())
+            OCRemoteShareeDataSource(ocShareeService, RemoteShareeMapper())
 
         val getRemoteShareesOperationResult = createRemoteOperationResultMock(
             REMOTE_SHAREES,