Skip to content

Commit 04b2aa6

Browse files
weden-ecwidweden-ecwid
committed
Renamed DTOs for Storage API
1 parent 8847d7d commit 04b2aa6

9 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ interface ApplicationApiClient {
298298
// Application storage
299299
// https://developers.ecwid.com/api-documentation/app-storage
300300
interface ApplicationStorageApiClient {
301-
fun getStorageEntity(request: StorageEntityRequest): FetchedStorageEntity
301+
fun getStorageEntity(request: StorageEntityRequest): FetchedStorageData
302302
fun getAllStorageEntities(request: StorageEntitiesRequest): StorageEntitiesResult
303303
fun createOrUpdateStorageEntity(request: StorageEntityUpdateRequest): StorageEntityUpdateResult
304304
fun deleteStorageEntity(request: StorageEntityDeleteRequest): StorageEntityDeleteResult

‎src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedStorageEntity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.ecwid.apiclient.v3.converter
22

3-
import com.ecwid.apiclient.v3.dto.storage.request.UpdatedStorageEntity
4-
import com.ecwid.apiclient.v3.dto.storage.result.FetchedStorageEntity
3+
import com.ecwid.apiclient.v3.dto.storage.request.UpdatedStorageData
4+
import com.ecwid.apiclient.v3.dto.storage.result.FetchedStorageData
55

6-
fun FetchedStorageEntity.toUpdated(): UpdatedStorageEntity {
7-
return UpdatedStorageEntity(key = key, value = value)
6+
fun FetchedStorageData.toUpdated(): UpdatedStorageData {
7+
return UpdatedStorageData(key = key, value = value)
88
}

‎src/main/kotlin/com/ecwid/apiclient/v3/dto/storage/request/StorageEntityUpdateRequest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.ecwid.apiclient.v3.impl.MIME_TYPE_APPLICATION_JSON
66
import com.ecwid.apiclient.v3.impl.RequestInfo
77

88
data class StorageEntityUpdateRequest(
9-
private val updatedStorageEntity: UpdatedStorageEntity = UpdatedStorageEntity(),
9+
private val updatedStorageEntity: UpdatedStorageData = UpdatedStorageData(),
1010
) : ApiRequest {
1111

1212
override fun toRequestInfo() = RequestInfo.createPutRequest(

src/main/kotlin/com/ecwid/apiclient/v3/dto/storage/request/UpdatedStorageEntity.kt renamed to src/main/kotlin/com/ecwid/apiclient/v3/dto/storage/request/UpdatedStorageData.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.ecwid.apiclient.v3.dto.storage.request
22

33
import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO
4-
import com.ecwid.apiclient.v3.dto.storage.result.FetchedStorageEntity
4+
import com.ecwid.apiclient.v3.dto.storage.result.FetchedStorageData
55

6-
data class UpdatedStorageEntity(
6+
data class UpdatedStorageData(
77
val key: String = "",
88
val value: String = "",
99
) : ApiUpdatedDTO {
1010

11-
override fun getModifyKind() = ApiUpdatedDTO.ModifyKind.ReadWrite(FetchedStorageEntity::class)
11+
override fun getModifyKind() = ApiUpdatedDTO.ModifyKind.ReadWrite(FetchedStorageData::class)
1212

1313
}

src/main/kotlin/com/ecwid/apiclient/v3/dto/storage/result/FetchedStorageEntity.kt renamed to src/main/kotlin/com/ecwid/apiclient/v3/dto/storage/result/FetchedStorageData.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.ecwid.apiclient.v3.dto.storage.result
22

33
import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO
4-
import com.ecwid.apiclient.v3.dto.storage.request.UpdatedStorageEntity
4+
import com.ecwid.apiclient.v3.dto.storage.request.UpdatedStorageData
55

6-
data class FetchedStorageEntity(
6+
data class FetchedStorageData(
77
val key: String = "",
88
val value: String = "",
99
) : ApiFetchedDTO {
1010

11-
override fun getModifyKind() = ApiFetchedDTO.ModifyKind.ReadWrite(UpdatedStorageEntity::class)
11+
override fun getModifyKind() = ApiFetchedDTO.ModifyKind.ReadWrite(UpdatedStorageData::class)
1212

1313
}

‎src/main/kotlin/com/ecwid/apiclient/v3/dto/storage/result/StorageEntitiesResult.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package com.ecwid.apiclient.v3.dto.storage.result
22

3-
class StorageEntitiesResult : ArrayList<FetchedStorageEntity>()
3+
class StorageEntitiesResult : ArrayList<FetchedStorageData>()

‎src/main/kotlin/com/ecwid/apiclient/v3/impl/ApplicationStorageApiClientImpl.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal class ApplicationStorageApiClientImpl(
1010
) : ApplicationStorageApiClient {
1111

1212
override fun getStorageEntity(request: StorageEntityRequest) =
13-
apiClientHelper.makeObjectResultRequest<FetchedStorageEntity>(request)
13+
apiClientHelper.makeObjectResultRequest<FetchedStorageData>(request)
1414

1515
override fun getAllStorageEntities(request: StorageEntitiesRequest) =
1616
apiClientHelper.makeObjectResultRequest<StorageEntitiesResult>(request)

‎src/test/kotlin/com/ecwid/apiclient/v3/entity/StorageTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class StorageTest : BaseEntityTest() {
2121
val key = "key"
2222
val value = updateData.toJson()
2323

24-
val updatedStorageEntity = UpdatedStorageEntity(key = key, value = value)
24+
val updatedStorageEntity = UpdatedStorageData(key = key, value = value)
2525
val updateRequest = StorageEntityUpdateRequest(updatedStorageEntity)
2626
val updateResult = apiClient.createOrUpdateStorageEntity(updateRequest)
2727
assertEquals(1, updateResult.updateCount)
@@ -41,8 +41,8 @@ class StorageTest : BaseEntityTest() {
4141
@Test
4242
fun testStorageApiMultipleItemsCreation() {
4343
val updatedEntities = listOf(
44-
UpdatedStorageEntity(key = "key1", value = StorageApiData(123, "test1").toJson()),
45-
UpdatedStorageEntity(key = "key2", value = StorageApiData(456, "test2").toJson()),
44+
UpdatedStorageData(key = "key1", value = StorageApiData(123, "test1").toJson()),
45+
UpdatedStorageData(key = "key2", value = StorageApiData(456, "test2").toJson()),
4646
)
4747

4848
updatedEntities.forEach { entity ->

‎src/test/kotlin/com/ecwid/apiclient/v3/rule/NonnullPropertyRules.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.ecwid.apiclient.v3.dto.coupon.request.UpdatedCoupon
55
import com.ecwid.apiclient.v3.dto.customer.request.UpdatedCustomer
66
import com.ecwid.apiclient.v3.dto.customergroup.request.UpdatedCustomerGroup
77
import com.ecwid.apiclient.v3.dto.product.request.UpdatedProduct
8-
import com.ecwid.apiclient.v3.dto.storage.request.UpdatedStorageEntity
8+
import com.ecwid.apiclient.v3.dto.storage.request.UpdatedStorageData
99
import com.ecwid.apiclient.v3.dto.variation.request.UpdatedVariation
1010
import com.ecwid.apiclient.v3.rule.NonnullPropertyRule.AllowNonnull
1111
import com.ecwid.apiclient.v3.rule.NonnullPropertyRule.IgnoreNonnull
@@ -23,8 +23,8 @@ val nonnullPropertyRules: List<NonnullPropertyRule<*, *>> = listOf(
2323
AllowNonnull(UpdatedProduct.ProductOption.TextAreaOption::required),
2424
AllowNonnull(UpdatedProduct.ProductOption.TextFieldOption::required),
2525
AllowNonnull(UpdatedProduct.CustomPriceTier::value),
26-
AllowNonnull(UpdatedStorageEntity::key),
27-
AllowNonnull(UpdatedStorageEntity::value),
26+
AllowNonnull(UpdatedStorageData::key),
27+
AllowNonnull(UpdatedStorageData::value),
2828

2929
IgnoreNonnull(UpdatedCoupon::code),
3030
IgnoreNonnull(UpdatedCoupon::name),

0 commit comments

Comments
 (0)