From 4ab4d84ec17f16470bfa9d74ebec319746cfbb02 Mon Sep 17 00:00:00 2001 From: born Date: Wed, 10 Apr 2024 13:02:34 +0400 Subject: [PATCH 1/6] ECWID-134877 - added implementation for getApplicationTokenInfo method to client. --- src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt | 3 +++ .../request/ApplicationTokenInfoRequest.kt | 13 +++++++++++++ .../result/ApplicationTokenInfoResult.kt | 11 +++++++++++ .../apiclient/v3/impl/ApplicationApiClientImpl.kt | 5 +++++ 4 files changed, 32 insertions(+) create mode 100644 src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenInfoRequest.kt create mode 100644 src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt index 63dd13cf2..4585cacc4 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt @@ -4,7 +4,9 @@ import com.ecwid.apiclient.v3.config.ApiServerDomain import com.ecwid.apiclient.v3.config.ApiStoreCredentials import com.ecwid.apiclient.v3.config.LoggingSettings import com.ecwid.apiclient.v3.dto.application.request.ApplicationDeleteRequest +import com.ecwid.apiclient.v3.dto.application.request.ApplicationTokenInfoRequest import com.ecwid.apiclient.v3.dto.application.result.ApplicationDeleteResult +import com.ecwid.apiclient.v3.dto.application.result.ApplicationTokenInfoResult import com.ecwid.apiclient.v3.dto.batch.request.CancelBatchGroupRequest import com.ecwid.apiclient.v3.dto.batch.request.CreateBatchRequest import com.ecwid.apiclient.v3.dto.batch.request.CreateBatchRequestWithIds @@ -252,6 +254,7 @@ interface SalesChannelsApiClient { // https://developers.ecwid.com/api-documentation/application interface ApplicationApiClient { fun deleteApplication(request: ApplicationDeleteRequest): ApplicationDeleteResult + fun getApplicationTokenInfo(request: ApplicationTokenInfoRequest): ApplicationTokenInfoResult } // Application storage diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenInfoRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenInfoRequest.kt new file mode 100644 index 000000000..67fb04742 --- /dev/null +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenInfoRequest.kt @@ -0,0 +1,13 @@ +package com.ecwid.apiclient.v3.dto.application.request + +import com.ecwid.apiclient.v3.dto.ApiRequest +import com.ecwid.apiclient.v3.impl.RequestInfo + +class ApplicationTokenInfoRequest : ApiRequest { + override fun toRequestInfo() = RequestInfo.createGetRequest( + pathSegments = listOf( + "application", + "token", + ) + ) +} diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt new file mode 100644 index 000000000..0b5a6eeeb --- /dev/null +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt @@ -0,0 +1,11 @@ +package com.ecwid.apiclient.v3.dto.application.result + +import com.ecwid.apiclient.v3.dto.common.ApiResultDTO +import java.util.* + +data class ApplicationTokenInfoResult( + val clientId: String? = null, + var permissions: List? = null, + var created: Date? = null, + var expires: Date? = null, +) : ApiResultDTO diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt b/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt index d6745e45e..111a1835a 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt @@ -3,11 +3,16 @@ package com.ecwid.apiclient.v3.impl import com.ecwid.apiclient.v3.ApiClientHelper import com.ecwid.apiclient.v3.ApplicationApiClient import com.ecwid.apiclient.v3.dto.application.request.ApplicationDeleteRequest +import com.ecwid.apiclient.v3.dto.application.request.ApplicationTokenInfoRequest import com.ecwid.apiclient.v3.dto.application.result.ApplicationDeleteResult +import com.ecwid.apiclient.v3.dto.application.result.ApplicationTokenInfoResult class ApplicationApiClientImpl( private val apiClientHelper: ApiClientHelper ) : ApplicationApiClient { override fun deleteApplication(request: ApplicationDeleteRequest) = apiClientHelper.makeObjectResultRequest(request) + + override fun getApplicationTokenInfo(request: ApplicationTokenInfoRequest) = + apiClientHelper.makeObjectResultRequest(request) } From 68101d387d29571ca92e2edb78fe28aa837835b7 Mon Sep 17 00:00:00 2001 From: born Date: Wed, 10 Apr 2024 13:56:43 +0400 Subject: [PATCH 2/6] ECWID-134877 - changed from var to val to pass unit tests. --- .../v3/dto/application/result/ApplicationTokenInfoResult.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt index 0b5a6eeeb..c1c9a1b9b 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt @@ -5,7 +5,7 @@ import java.util.* data class ApplicationTokenInfoResult( val clientId: String? = null, - var permissions: List? = null, - var created: Date? = null, - var expires: Date? = null, + val permissions: List? = null, + val created: Date? = null, + val expires: Date? = null, ) : ApiResultDTO From dfc6e7773ebfd92cfae2a508b6ea7c62dce3c900 Mon Sep 17 00:00:00 2001 From: born Date: Wed, 10 Apr 2024 14:22:18 +0400 Subject: [PATCH 3/6] ECWID-134877 - fixed tests adding default values. --- .../dto/application/result/ApplicationTokenInfoResult.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt index c1c9a1b9b..24950b54a 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt @@ -4,8 +4,8 @@ import com.ecwid.apiclient.v3.dto.common.ApiResultDTO import java.util.* data class ApplicationTokenInfoResult( - val clientId: String? = null, - val permissions: List? = null, - val created: Date? = null, - val expires: Date? = null, + val clientId: String = "", + val permissions: List = emptyList(), + val created: Date = Date(), + val expires: Date = Date(), ) : ApiResultDTO From 3e16860e97117687523c77f609a9671a26409957 Mon Sep 17 00:00:00 2001 From: born Date: Wed, 10 Apr 2024 15:50:13 +0400 Subject: [PATCH 4/6] ECWID-134877 - removed clientid param. --- .../v3/dto/application/result/ApplicationTokenInfoResult.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt index 24950b54a..963893529 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt @@ -4,7 +4,6 @@ import com.ecwid.apiclient.v3.dto.common.ApiResultDTO import java.util.* data class ApplicationTokenInfoResult( - val clientId: String = "", val permissions: List = emptyList(), val created: Date = Date(), val expires: Date = Date(), From 2dd5f0d2c76f4e733d0153c117a8ebe21070b29e Mon Sep 17 00:00:00 2001 From: born Date: Thu, 11 Apr 2024 16:40:11 +0400 Subject: [PATCH 5/6] ECWID-134877 - changed ApplicationTokenInfoResult to ApplicationTokenResult. --- src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt | 4 ++-- ...pplicationTokenInfoResult.kt => ApplicationTokenResult.kt} | 2 +- .../com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/{ApplicationTokenInfoResult.kt => ApplicationTokenResult.kt} (86%) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt index 4585cacc4..36fc16482 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt @@ -6,7 +6,7 @@ import com.ecwid.apiclient.v3.config.LoggingSettings import com.ecwid.apiclient.v3.dto.application.request.ApplicationDeleteRequest import com.ecwid.apiclient.v3.dto.application.request.ApplicationTokenInfoRequest import com.ecwid.apiclient.v3.dto.application.result.ApplicationDeleteResult -import com.ecwid.apiclient.v3.dto.application.result.ApplicationTokenInfoResult +import com.ecwid.apiclient.v3.dto.application.result.ApplicationTokenResult import com.ecwid.apiclient.v3.dto.batch.request.CancelBatchGroupRequest import com.ecwid.apiclient.v3.dto.batch.request.CreateBatchRequest import com.ecwid.apiclient.v3.dto.batch.request.CreateBatchRequestWithIds @@ -254,7 +254,7 @@ interface SalesChannelsApiClient { // https://developers.ecwid.com/api-documentation/application interface ApplicationApiClient { fun deleteApplication(request: ApplicationDeleteRequest): ApplicationDeleteResult - fun getApplicationTokenInfo(request: ApplicationTokenInfoRequest): ApplicationTokenInfoResult + fun getApplicationTokenInfo(request: ApplicationTokenInfoRequest): ApplicationTokenResult } // Application storage diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenResult.kt similarity index 86% rename from src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt rename to src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenResult.kt index 963893529..c7a9ae8f8 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenInfoResult.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/result/ApplicationTokenResult.kt @@ -3,7 +3,7 @@ package com.ecwid.apiclient.v3.dto.application.result import com.ecwid.apiclient.v3.dto.common.ApiResultDTO import java.util.* -data class ApplicationTokenInfoResult( +data class ApplicationTokenResult( val permissions: List = emptyList(), val created: Date = Date(), val expires: Date = Date(), diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt b/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt index 111a1835a..c871dd4b7 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt @@ -5,7 +5,7 @@ import com.ecwid.apiclient.v3.ApplicationApiClient import com.ecwid.apiclient.v3.dto.application.request.ApplicationDeleteRequest import com.ecwid.apiclient.v3.dto.application.request.ApplicationTokenInfoRequest import com.ecwid.apiclient.v3.dto.application.result.ApplicationDeleteResult -import com.ecwid.apiclient.v3.dto.application.result.ApplicationTokenInfoResult +import com.ecwid.apiclient.v3.dto.application.result.ApplicationTokenResult class ApplicationApiClientImpl( private val apiClientHelper: ApiClientHelper @@ -14,5 +14,5 @@ class ApplicationApiClientImpl( apiClientHelper.makeObjectResultRequest(request) override fun getApplicationTokenInfo(request: ApplicationTokenInfoRequest) = - apiClientHelper.makeObjectResultRequest(request) + apiClientHelper.makeObjectResultRequest(request) } From 27686066bd9343c4c932fcd964e41d87739a25c8 Mon Sep 17 00:00:00 2001 From: born Date: Thu, 11 Apr 2024 16:42:56 +0400 Subject: [PATCH 6/6] ECWID-134877 - removed info elsewhere. --- src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt | 4 ++-- ...licationTokenInfoRequest.kt => ApplicationTokenRequest.kt} | 2 +- .../com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/{ApplicationTokenInfoRequest.kt => ApplicationTokenRequest.kt} (84%) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt index 36fc16482..efaf413e6 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt @@ -4,7 +4,7 @@ import com.ecwid.apiclient.v3.config.ApiServerDomain import com.ecwid.apiclient.v3.config.ApiStoreCredentials import com.ecwid.apiclient.v3.config.LoggingSettings import com.ecwid.apiclient.v3.dto.application.request.ApplicationDeleteRequest -import com.ecwid.apiclient.v3.dto.application.request.ApplicationTokenInfoRequest +import com.ecwid.apiclient.v3.dto.application.request.ApplicationTokenRequest import com.ecwid.apiclient.v3.dto.application.result.ApplicationDeleteResult import com.ecwid.apiclient.v3.dto.application.result.ApplicationTokenResult import com.ecwid.apiclient.v3.dto.batch.request.CancelBatchGroupRequest @@ -254,7 +254,7 @@ interface SalesChannelsApiClient { // https://developers.ecwid.com/api-documentation/application interface ApplicationApiClient { fun deleteApplication(request: ApplicationDeleteRequest): ApplicationDeleteResult - fun getApplicationTokenInfo(request: ApplicationTokenInfoRequest): ApplicationTokenResult + fun getApplicationToken(request: ApplicationTokenRequest): ApplicationTokenResult } // Application storage diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenInfoRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenRequest.kt similarity index 84% rename from src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenInfoRequest.kt rename to src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenRequest.kt index 67fb04742..ac4e16810 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenInfoRequest.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/application/request/ApplicationTokenRequest.kt @@ -3,7 +3,7 @@ package com.ecwid.apiclient.v3.dto.application.request import com.ecwid.apiclient.v3.dto.ApiRequest import com.ecwid.apiclient.v3.impl.RequestInfo -class ApplicationTokenInfoRequest : ApiRequest { +class ApplicationTokenRequest : ApiRequest { override fun toRequestInfo() = RequestInfo.createGetRequest( pathSegments = listOf( "application", diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt b/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt index c871dd4b7..9efc39fe3 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationApiClientImpl.kt @@ -3,7 +3,7 @@ package com.ecwid.apiclient.v3.impl import com.ecwid.apiclient.v3.ApiClientHelper import com.ecwid.apiclient.v3.ApplicationApiClient import com.ecwid.apiclient.v3.dto.application.request.ApplicationDeleteRequest -import com.ecwid.apiclient.v3.dto.application.request.ApplicationTokenInfoRequest +import com.ecwid.apiclient.v3.dto.application.request.ApplicationTokenRequest import com.ecwid.apiclient.v3.dto.application.result.ApplicationDeleteResult import com.ecwid.apiclient.v3.dto.application.result.ApplicationTokenResult @@ -13,6 +13,6 @@ class ApplicationApiClientImpl( override fun deleteApplication(request: ApplicationDeleteRequest) = apiClientHelper.makeObjectResultRequest(request) - override fun getApplicationTokenInfo(request: ApplicationTokenInfoRequest) = + override fun getApplicationToken(request: ApplicationTokenRequest) = apiClientHelper.makeObjectResultRequest(request) }