ECWID-153684 - restructured code.

Author: Alexeyyy

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

@@ -15,8 +15,6 @@ import com.ecwid.apiclient.v3.dto.batch.result.CancelBatchGroupResult
 import com.ecwid.apiclient.v3.dto.batch.result.CreateBatchResult
 import com.ecwid.apiclient.v3.dto.batch.result.GetEscapedBatchResult
 import com.ecwid.apiclient.v3.dto.batch.result.GetTypedBatchResult
-import com.ecwid.apiclient.v3.dto.brand.request.BrandsSearchRequest
-import com.ecwid.apiclient.v3.dto.brand.result.BrandsSearchResult
 import com.ecwid.apiclient.v3.dto.cart.request.*
 import com.ecwid.apiclient.v3.dto.cart.result.*
 import com.ecwid.apiclient.v3.dto.common.PartialResult
@@ -318,11 +316,3 @@ interface ProductReviewsApiClient {
 	fun massUpdateProductReview(request: ProductReviewMassUpdateRequest): ProductReviewMassUpdateResult
 	fun getProductReviewsFiltersData(request: ProductReviewFiltersDataRequest): ProductReviewFiltersDataResult
 }
-
-// Brands
-// https://api-docs.ecwid.com/reference/search-product-brands
-interface BrandsApiClient {
-	fun searchBrands(request: BrandsSearchRequest.ByFilters): BrandsSearchResult
-	fun <Result> searchBrands(request: BrandsSearchRequest.ByFilters, resultClass: KClass<Result>): Result
-		where Result : PartialResult<BrandsSearchResult>
-}

src/main/kotlin/com/ecwid/apiclient/v3/BrandsApiClient.kt

@@ -0,0 +1,21 @@
+package com.ecwid.apiclient.v3
+
+import com.ecwid.apiclient.v3.dto.brand.request.BrandsSearchRequest
+import com.ecwid.apiclient.v3.dto.brand.result.BrandsSearchResult
+import com.ecwid.apiclient.v3.dto.common.PartialResult
+import kotlin.reflect.KClass
+
+// Brands
+// https://api-docs.ecwid.com/reference/product-brands
+interface BrandsApiClient {
+	fun searchBrands(request: BrandsSearchRequest): BrandsSearchResult
+	fun <Result> searchBrands(request: BrandsSearchRequest, resultClass: KClass<Result>): Result
+		where Result : PartialResult<BrandsSearchResult>
+}
+
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+inline fun <reified Result: PartialResult<BrandsSearchResult>> BrandsApiClient.searchBrands(
+	request: BrandsSearchRequest
+): Result {
+	return searchBrands(request, resultClass = Result::class)
+}

src/main/kotlin/com/ecwid/apiclient/v3/CategoriesApiClient.kt

@@ -1,7 +1,5 @@
 package com.ecwid.apiclient.v3
 
-import com.ecwid.apiclient.v3.dto.brand.request.BrandsSearchRequest
-import com.ecwid.apiclient.v3.dto.brand.result.BrandsSearchResult
 import com.ecwid.apiclient.v3.dto.category.request.*
 import com.ecwid.apiclient.v3.dto.category.result.*
 import com.ecwid.apiclient.v3.dto.common.PagingResult
@@ -39,8 +37,6 @@ interface CategoriesApiClient {
 	fun deleteCategoryImage(request: CategoryImageDeleteRequest): CategoryImageDeleteResult
 	fun assignProductsToCategory(request: AssignProductsToCategoryRequest): CategoryUpdateResult
 	fun unassignProductsFromCategory(request: UnassignProductsFromCategoryRequest): CategoryDeleteResult
-
-	fun getBrands(request: BrandsSearchRequest): BrandsSearchResult
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")

src/main/kotlin/com/ecwid/apiclient/v3/impl/BrandsApiClientImpl.kt

@@ -11,11 +11,11 @@ internal class BrandsApiClientImpl(
 	private val apiClientHelper: ApiClientHelper,
 ) : BrandsApiClient {
 
-	override fun searchBrands(request: BrandsSearchRequest.ByFilters) =
+	override fun searchBrands(request: BrandsSearchRequest) =
 		apiClientHelper.makeObjectResultRequest<BrandsSearchResult>(request)
 
 	override fun <Result : PartialResult<BrandsSearchResult>> searchBrands(
-		request: BrandsSearchRequest.ByFilters,
+		request: BrandsSearchRequest,
 		resultClass: KClass<Result>
 	): Result {
 		return apiClientHelper.makeObjectPartialResultRequest(

src/main/kotlin/com/ecwid/apiclient/v3/impl/CategoriesApiClientImpl.kt

@@ -2,8 +2,6 @@ package com.ecwid.apiclient.v3.impl
 
 import com.ecwid.apiclient.v3.ApiClientHelper
 import com.ecwid.apiclient.v3.CategoriesApiClient
-import com.ecwid.apiclient.v3.dto.brand.request.BrandsSearchRequest
-import com.ecwid.apiclient.v3.dto.brand.result.BrandsSearchResult
 import com.ecwid.apiclient.v3.dto.category.request.*
 import com.ecwid.apiclient.v3.dto.category.result.*
 import com.ecwid.apiclient.v3.dto.common.PagingResult
@@ -114,7 +112,4 @@ internal class CategoriesApiClientImpl(
 	): Sequence<Item> where Result : PartialResult<CategoriesSearchResult>, Result : PagingResult<Item> {
 		return fetchPagesAsItemSequence(request) { searchCategoriesByPath(it, resultClass) }
 	}
-
-	override fun getBrands(request: BrandsSearchRequest) =
-		apiClientHelper.makeObjectResultRequest<BrandsSearchResult>(request)
 }

src/test/kotlin/com/ecwid/apiclient/v3/entity/BrandsTest.kt

@@ -34,7 +34,7 @@ class BrandsTest : BaseEntityTest() {
 			)
 		}
 
-		val result = apiClient.getBrands(BrandsSearchRequest.ByFilters())
+		val result = apiClient.searchBrands(BrandsSearchRequest.ByFilters())
 		assertEquals(
 			brandedProductsCreateResult.brandNames,
 			result.items.map { it.name }

src/test/resources/test.properties.sample

@@ -1,5 +1,5 @@
 # don't use id of store that contains valuable and useful data! tests can modify or even delete store data
-storeId=
-apiToken=
-apiHost=app.ecwid.com
+storeId=1754
+apiToken=secret_ZVk1LmWMfv8cnFy6bgQrvnyZSpBGjwsz
+apiHost=app.local.ecwid.com
 apiPort=443