From 1185f6ab17b8eedc5d3b8b3c7d776fca940df875 Mon Sep 17 00:00:00 2001 From: Alex Forcier Date: Mon, 19 Mar 2018 09:59:10 -0400 Subject: [PATCH] Fix Jetpack tunnel ktlint violations --- .../mocked/MockedStack_JetpackTunnelTest.kt | 17 ++--- .../jetpacktunnel/JetpackTunnelGsonRequest.kt | 63 ++++++++++++++----- 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_JetpackTunnelTest.kt b/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_JetpackTunnelTest.kt index ad823f4a19..0f4225f11b 100644 --- a/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_JetpackTunnelTest.kt +++ b/example/src/androidTest/java/org/wordpress/android/fluxc/mocked/MockedStack_JetpackTunnelTest.kt @@ -76,8 +76,8 @@ class MockedStack_JetpackTunnelTest : MockedStack_Base() { }, BaseErrorListener { error -> run { - throw AssertionError("Unexpected BaseNetworkError: " - + (error as WPComGsonNetworkError).apiError + " - " + error.message) + throw AssertionError("Unexpected BaseNetworkError: " + + (error as WPComGsonNetworkError).apiError + " - " + error.message) } }) @@ -105,8 +105,8 @@ class MockedStack_JetpackTunnelTest : MockedStack_Base() { }, BaseErrorListener { error -> run { - throw AssertionError("Unexpected BaseNetworkError: " - + (error as WPComGsonNetworkError).apiError + " - " + error.message) + throw AssertionError("Unexpected BaseNetworkError: " + + (error as WPComGsonNetworkError).apiError + " - " + error.message) } }) @@ -115,9 +115,12 @@ class MockedStack_JetpackTunnelTest : MockedStack_Base() { } @Singleton - class JetpackTunnelClientForTests @Inject constructor(appContext: Context, dispatcher: Dispatcher, - requestQueue: RequestQueue, accessToken: AccessToken, - userAgent: UserAgent + class JetpackTunnelClientForTests @Inject constructor( + appContext: Context, + dispatcher: Dispatcher, + requestQueue: RequestQueue, + accessToken: AccessToken, + userAgent: UserAgent ) : BaseWPComRestClient(appContext, dispatcher, requestQueue, accessToken, userAgent) { /** * Wraps and exposes the protected [add] method so that tests can add requests directly. diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequest.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequest.kt index 6c5679842a..4a8f4e6a78 100644 --- a/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequest.kt +++ b/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpacktunnel/JetpackTunnelGsonRequest.kt @@ -101,8 +101,13 @@ object JetpackTunnelGsonRequest { * * @param T the expected response object from the WP-API endpoint */ - fun buildGetRequest(wpApiEndpoint: String, siteId: Long, params: Map, - type: Type, listener: (T?) -> Unit, errorListener: BaseErrorListener + fun buildGetRequest( + wpApiEndpoint: String, + siteId: Long, + params: Map, + type: Type, + listener: (T?) -> Unit, + errorListener: BaseErrorListener ): WPComGsonRequest>? { val wrappedParams = createTunnelParams(params, wpApiEndpoint) @@ -126,8 +131,13 @@ object JetpackTunnelGsonRequest { * * @param T the expected response object from the WP-API endpoint */ - fun buildPostRequest(wpApiEndpoint: String, siteId: Long, body: Map, - type: Type, listener: (T?) -> Unit, errorListener: BaseErrorListener + fun buildPostRequest( + wpApiEndpoint: String, + siteId: Long, + body: Map, + type: Type, + listener: (T?) -> Unit, + errorListener: BaseErrorListener ): WPComGsonRequest>? { val wrappedBody = createTunnelBody(method = "post", body = body, path = wpApiEndpoint) return buildWrappedPostRequest(siteId, wrappedBody, type, listener, errorListener) @@ -145,8 +155,13 @@ object JetpackTunnelGsonRequest { * * @param T the expected response object from the WP-API endpoint */ - fun buildPatchRequest(wpApiEndpoint: String, siteId: Long, body: Map, - type: Type, listener: (T?) -> Unit, errorListener: BaseErrorListener + fun buildPatchRequest( + wpApiEndpoint: String, + siteId: Long, + body: Map, + type: Type, + listener: (T?) -> Unit, + errorListener: BaseErrorListener ): WPComGsonRequest>? { val wrappedBody = createTunnelBody(method = "patch", body = body, path = wpApiEndpoint) return buildWrappedPostRequest(siteId, wrappedBody, type, listener, errorListener) @@ -164,8 +179,13 @@ object JetpackTunnelGsonRequest { * * @param T the expected response object from the WP-API endpoint */ - fun buildPutRequest(wpApiEndpoint: String, siteId: Long, body: Map, - type: Type, listener: (T?) -> Unit, errorListener: BaseErrorListener + fun buildPutRequest( + wpApiEndpoint: String, + siteId: Long, + body: Map, + type: Type, + listener: (T?) -> Unit, + errorListener: BaseErrorListener ): WPComGsonRequest>? { val wrappedBody = createTunnelBody(method = "put", body = body, path = wpApiEndpoint) return buildWrappedPostRequest(siteId, wrappedBody, type, listener, errorListener) @@ -183,15 +203,24 @@ object JetpackTunnelGsonRequest { * * @param T the expected response object from the WP-API endpoint */ - fun buildDeleteRequest(wpApiEndpoint: String, siteId: Long, params: Map, - type: Type, listener: (T?) -> Unit, errorListener: BaseErrorListener + fun buildDeleteRequest( + wpApiEndpoint: String, + siteId: Long, + params: Map, + type: Type, + listener: (T?) -> Unit, + errorListener: BaseErrorListener ): WPComGsonRequest>? { val wrappedBody = createTunnelBody(method = "delete", params = params, path = wpApiEndpoint) return buildWrappedPostRequest(siteId, wrappedBody, type, listener, errorListener) } - private fun buildWrappedPostRequest(siteId: Long, wrappedBody: Map, type: Type, - listener: (T?) -> Unit, errorListener: BaseErrorListener + private fun buildWrappedPostRequest( + siteId: Long, + wrappedBody: Map, + type: Type, + listener: (T?) -> Unit, + errorListener: BaseErrorListener ): WPComGsonRequest>? { val tunnelRequestUrl = getTunnelApiUrl(siteId) val wrappedType = TypeToken.getParameterized(JetpackTunnelResponse::class.java, type).type @@ -212,8 +241,12 @@ object JetpackTunnelGsonRequest { return finalParams } - private fun createTunnelBody(method: String, body: Map = mapOf(), - params: Map = mapOf(), path: String): MutableMap { + private fun createTunnelBody( + method: String, + body: Map = mapOf(), + params: Map = mapOf(), + path: String + ): MutableMap { val finalBody = mutableMapOf() with(finalBody) { put("path", buildRestApiPath(path, params, method)) @@ -226,7 +259,7 @@ object JetpackTunnelGsonRequest { } private fun buildRestApiPath(path: String, params: Map, method: String): String { - var result = path + "&_method=" + method + var result = "$path&_method=$method" if (params.isNotEmpty()) { for (param in params) { result += "&" + URLEncoder.encode(param.key, "UTF-8") + "=" + URLEncoder.encode(param.value, "UTF-8")