From ff90598a2d0fba2b6e6782286bbad179fdc22f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Wed, 8 Mar 2023 16:38:46 +0100 Subject: [PATCH] Rename WebFinger classes to make them consistent --- .../webfinger/GetInstancesViaWebfingerOperation.kt | 14 +++++++------- .../webfinger/responses/WebfingerResponse.kt | 4 ++-- .../webfinger/services/WebfingerService.kt | 6 +++--- .../services/implementation/OCWebfingerService.kt | 12 ++++++------ .../webfinger/responses/WebfingerResponseTest.kt | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/GetInstancesViaWebfingerOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/GetInstancesViaWebfingerOperation.kt index 8439d0d0..2517b14b 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/GetInstancesViaWebfingerOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/GetInstancesViaWebfingerOperation.kt @@ -31,12 +31,12 @@ import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod import com.owncloud.android.lib.common.http.methods.nonwebdav.HttpMethod import com.owncloud.android.lib.common.operations.RemoteOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult -import com.owncloud.android.lib.resources.webfinger.responses.WebfingerJrdResponse +import com.owncloud.android.lib.resources.webfinger.responses.WebFingerResponse import com.squareup.moshi.Moshi import timber.log.Timber import java.net.URL -class GetInstancesViaWebfingerOperation( +class GetInstancesViaWebFingerOperation( private val lockupServerDomain: String, private val rel: String, private val resource: String, @@ -51,9 +51,9 @@ class GetInstancesViaWebfingerOperation( private fun isSuccess(status: Int): Boolean = status == HttpConstants.HTTP_OK - private fun parseResponse(response: String): WebfingerJrdResponse { + private fun parseResponse(response: String): WebFingerResponse { val moshi = Moshi.Builder().build() - val adapter = moshi.adapter(WebfingerJrdResponse::class.java) + val adapter = moshi.adapter(WebFingerResponse::class.java) return adapter.fromJson(response)!! } @@ -62,7 +62,7 @@ class GetInstancesViaWebfingerOperation( response: String?, status: Int ): RemoteOperationResult> { - Timber.e("Failed requesting webfinger info") + Timber.e("Failed requesting WebFinger info") if (response != null) { Timber.e("*** status code: $status; response message: $response") } else { @@ -73,7 +73,7 @@ class GetInstancesViaWebfingerOperation( private fun onRequestSuccessful(rawResponse: String): RemoteOperationResult> { val response = parseResponse(rawResponse) - Timber.d("Successful Webfinger request: $response") + Timber.d("Successful WebFinger request: $response") val operationResult = RemoteOperationResult>(RemoteOperationResult.ResultCode.OK) operationResult.data = response.links.map { it.href } return operationResult @@ -92,7 +92,7 @@ class GetInstancesViaWebfingerOperation( onResultUnsuccessful(getMethod, response, status) } } catch (e: Exception) { - Timber.e(e, "Requesting webfinger info failed") + Timber.e(e, "Requesting WebFinger info failed") RemoteOperationResult>(e) } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt index 45e85a75..d7e5a6bb 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponse.kt @@ -27,13 +27,13 @@ package com.owncloud.android.lib.resources.webfinger.responses import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class WebfingerJrdResponse( +data class WebFingerResponse( val subject: String, val links: List ) @JsonClass(generateAdapter = true) data class LinkItem( + val rel: String, val href: String, - val rel: String ) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/WebfingerService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/WebfingerService.kt index ada5c6d0..f12e87fa 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/WebfingerService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/WebfingerService.kt @@ -20,10 +20,10 @@ package com.owncloud.android.lib.resources.webfinger.services import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.operations.RemoteOperationResult -interface WebfingerService { - fun getInstancesFromWebfinger( +interface WebFingerService { + fun getInstancesFromWebFinger( lookupServer: String, - username: String, + resource: String, rel: String, client: OwnCloudClient, ): RemoteOperationResult> diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/implementation/OCWebfingerService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/implementation/OCWebfingerService.kt index 9ea1147b..3f0ac4d9 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/implementation/OCWebfingerService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/services/implementation/OCWebfingerService.kt @@ -19,16 +19,16 @@ package com.owncloud.android.lib.resources.webfinger.services.implementation import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.operations.RemoteOperationResult -import com.owncloud.android.lib.resources.webfinger.GetInstancesViaWebfingerOperation -import com.owncloud.android.lib.resources.webfinger.services.WebfingerService +import com.owncloud.android.lib.resources.webfinger.GetInstancesViaWebFingerOperation +import com.owncloud.android.lib.resources.webfinger.services.WebFingerService -class OCWebfingerService : WebfingerService { +class OCWebFingerService : WebFingerService { - override fun getInstancesFromWebfinger( + override fun getInstancesFromWebFinger( lookupServer: String, - username: String, + resource: String, rel: String, client: OwnCloudClient, ): RemoteOperationResult> = - GetInstancesViaWebfingerOperation(lookupServer, rel, username).execute(client) + GetInstancesViaWebFingerOperation(lookupServer, rel, resource).execute(client) } diff --git a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt index 2d0c6235..bed95002 100644 --- a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt +++ b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/resources/webfinger/responses/WebfingerResponseTest.kt @@ -8,15 +8,15 @@ import org.junit.Before import org.junit.Test import java.io.File -class WebfingerResponseTest { - lateinit var adapter: JsonAdapter +class WebFingerResponseTest { + lateinit var adapter: JsonAdapter private fun loadResponses(fileName: String) = adapter.fromJson(File(fileName).readText()) @Before fun prepare() { val moshi = Moshi.Builder().build() - adapter = moshi.adapter(WebfingerJrdResponse::class.java) + adapter = moshi.adapter(WebFingerResponse::class.java) } @Test