Skip to content

WebDAV cache: re-factor using Guava and Hilt #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 19, 2024
Merged

WebDAV cache: re-factor using Guava and Hilt #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
853ee9a
Use per-resource Guava cache with weak keys and values as WebDAV page…
rfc2822 Jul 18, 2024
25f1fe2
Replace ExtendedLruCache by Guava cache
rfc2822 Jul 18, 2024
4b4ae50
Use injected logger in DavDocumentsProvider
rfc2822 Jul 18, 2024
111453b
Use DI for RandomAccessCallback, move Wrapper to outer class
rfc2822 Jul 18, 2024
11437f3
Fix tests
rfc2822 Jul 18, 2024
e5744d3
Use Hilt for more classes
rfc2822 Jul 18, 2024
341d93a
Use Guava LoadingCache as page cache
rfc2822 Jul 18, 2024
f25df7b
Fix tests
rfc2822 Jul 18, 2024
c3d6d5f
Minor code change
rfc2822 Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions app/src/androidTest/kotlin/at/bitfire/davdroid/webdav/DavDocumentsProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import at.bitfire.davdroid.R
import at.bitfire.davdroid.db.AppDatabase
import at.bitfire.davdroid.db.WebDavDocument
import at.bitfire.davdroid.db.WebDavMount
import at.bitfire.davdroid.log.Logger
import at.bitfire.davdroid.network.HttpClient
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.android.testing.HiltAndroidRule
Expand Down Expand Up @@ -42,7 +41,11 @@ class DavDocumentsProviderTest {
@ApplicationContext
lateinit var context: Context

@Inject lateinit var db: AppDatabase
@Inject
lateinit var db: AppDatabase

@Inject
lateinit var logger: java.util.logging.Logger

@Before
fun setUp() {
Expand All @@ -58,7 +61,7 @@ class DavDocumentsProviderTest {
@Before
fun mockServerSetup() {
// Start mock web server
mockServer.dispatcher = TestDispatcher()
mockServer.dispatcher = TestDispatcher(logger)
mockServer.start()

client = HttpClient.Builder(context).build()
Expand All @@ -83,7 +86,7 @@ class DavDocumentsProviderTest {
val cookieStore = mutableMapOf<Long, CookieJar>()

// Query
DavDocumentsProvider.DavDocumentsActor(context, db, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
DavDocumentsProvider.DavDocumentsActor(context, db, logger, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
.queryChildren(parent)

// Assert new children were inserted into db
Expand Down Expand Up @@ -117,7 +120,7 @@ class DavDocumentsProviderTest {
assertEquals("My Books", db.webDavDocumentDao().get(folderId)!!.displayName)

// Query - should update the parent displayname and folder name
DavDocumentsProvider.DavDocumentsActor(context, db, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
DavDocumentsProvider.DavDocumentsActor(context, db, logger, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
.queryChildren(parent)

// Assert parent and children were updated in database
Expand All @@ -142,7 +145,7 @@ class DavDocumentsProviderTest {
assertEquals("deleteme", db.webDavDocumentDao().get(folderId)!!.name)

// Query - discovers serverside deletion
DavDocumentsProvider.DavDocumentsActor(context, db, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
DavDocumentsProvider.DavDocumentsActor(context, db, logger, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
.queryChildren(parent)

// Assert folder got deleted
Expand All @@ -166,9 +169,9 @@ class DavDocumentsProviderTest {
assertEquals("parent2", parent2.name)

// Query - find children of two nodes simultaneously
DavDocumentsProvider.DavDocumentsActor(context, db, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
DavDocumentsProvider.DavDocumentsActor(context, db, logger, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
.queryChildren(parent1)
DavDocumentsProvider.DavDocumentsActor(context, db, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
DavDocumentsProvider.DavDocumentsActor(context, db, logger, cookieStore, CredentialsStore(context), context.getString(R.string.webdav_authority))
.queryChildren(parent2)

// Assert the two folders names have changed
Expand All @@ -179,7 +182,9 @@ class DavDocumentsProviderTest {

// mock server

class TestDispatcher: Dispatcher() {
class TestDispatcher(
private val logger: java.util.logging.Logger
): Dispatcher() {

data class Resource(
val name: String,
Expand Down Expand Up @@ -234,8 +239,8 @@ class DavDocumentsProviderTest {
responses +
"</multistatus>"

Logger.log.info("Query path: $requestPath")
Logger.log.info("Response: $multistatus")
logger.info("Query path: $requestPath")
logger.info("Response: $multistatus")
return MockResponse()
.setResponseCode(207)
.setBody(multistatus)
Expand Down
Loading
Loading