Merge pull request #215 from Ecwid/generalize_nested_classes

Move converters to the interface declarations

Author: Alexis2004

src/main/kotlin/com/ecwid/apiclient/v3/dto/common/FetchedAttributeValue.kt

@@ -3,10 +3,13 @@ package com.ecwid.apiclient.v3.dto.common
 import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueLocation
 import com.ecwid.apiclient.v3.dto.producttype.enums.AttributeType
 
-interface FetchedAttributeValue {
+interface FetchedAttributeValue<T : FetchedAttributeValue<T>> {
 	val id: Int?
 	val name: String?
 	val type: AttributeType?
 	val value: String?
 	val show: AttributeValueLocation?
+
+	fun cast(): T
+
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/common/UpdatedAttributeValue.kt

@@ -2,9 +2,12 @@ package com.ecwid.apiclient.v3.dto.common
 
 import com.ecwid.apiclient.v3.dto.product.enums.AttributeValueAlias
 
-interface UpdatedAttributeValue {
+interface UpdatedAttributeValue<T : UpdatedAttributeValue<T>> {
 	val id: Int?
 	val alias: AttributeValueAlias?
 	val name: String?
 	val value: String?
+
+	fun cast(): T
+
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/custom/CustomAppRequest.kt

@@ -282,18 +282,15 @@ data class CustomAppRequest(
 		override val type: AttributeType? = null,
 		override val value: String? = null,
 		override val show: AttributeValueLocation? = null
-	) : FetchedAttributeValue {
+	) : FetchedAttributeValue<AttributeValue> {
 
-		fun FetchedAttributeValue.toOrderAttribute() = AttributeValue(
+		override fun cast() = AttributeValue(
 			id = id,
 			name = name,
 			type = type,
 			value = value,
 			show = show
 		)
-
-		fun Collection<FetchedAttributeValue>.toOrderAttributeList() = this.map { it.toOrderAttribute() }
-
 	}
 
 	data class ProductDimensions(

src/main/kotlin/com/ecwid/apiclient/v3/dto/product/request/UpdatedProduct.kt

@@ -277,17 +277,15 @@ data class UpdatedProduct(
 		override val alias: AttributeValueAlias? = null,
 		override val name: String? = null,
 		override val value: String? = null
-	) : UpdatedAttributeValue {
+	) : UpdatedAttributeValue<AttributeValue> {
 
-		fun UpdatedAttributeValue.toProductAttribute() = AttributeValue(
+		override fun cast() = AttributeValue(
 			id = id,
 			alias = alias,
 			name = name,
 			value = value,
 		)
 
-		fun Collection<UpdatedAttributeValue>.toProductAttributeList() = this.map { it.toProductAttribute() }
-
 		companion object {
 
 			fun createBrandAttributeValue(value: String) = AttributeValue(

src/main/kotlin/com/ecwid/apiclient/v3/dto/product/result/FetchedProduct.kt

@@ -240,18 +240,15 @@ data class FetchedProduct(
 		override val type: AttributeType? = null,
 		override val value: String? = null,
 		override val show: AttributeValueLocation? = null
-	) : FetchedAttributeValue {
+	) : FetchedAttributeValue<AttributeValue> {
 
-		fun FetchedAttributeValue.toProductAttribute() = AttributeValue(
+		override fun cast() = AttributeValue(
 			id = id,
 			name = name,
 			type = type,
 			value = value,
 			show = show
 		)
-
-		fun Collection<FetchedAttributeValue>.toProductAttributeList() = this.map { it.toProductAttribute() }
-
 	}
 
 	data class RelatedProducts(

src/main/kotlin/com/ecwid/apiclient/v3/dto/variation/request/UpdatedVariation.kt

@@ -39,17 +39,14 @@ data class UpdatedVariation(
 		override val alias: AttributeValueAlias? = null,
 		override val name: String? = null,
 		override val value: String? = null
-	) : UpdatedAttributeValue {
+	) : UpdatedAttributeValue<AttributeValue> {
 
-		fun UpdatedAttributeValue.toVariationAttribute() = AttributeValue(
+		override fun cast() = AttributeValue(
 			id = id,
 			alias = alias,
 			name = name,
 			value = value,
 		)
-
-		fun Collection<UpdatedAttributeValue>.toVariationAttributeList() = this.map { it.toVariationAttribute() }
-
 	}
 
 	data class WholesalePrice(

src/main/kotlin/com/ecwid/apiclient/v3/dto/variation/result/FetchedVariation.kt

@@ -55,18 +55,15 @@ data class FetchedVariation(
 		override val type: AttributeType? = null,
 		override val value: String? = null,
 		override val show: AttributeValueLocation? = null
-	) : FetchedAttributeValue {
+	) : FetchedAttributeValue<AttributeValue> {
 
-		fun FetchedAttributeValue.toVariationAttribute() = AttributeValue(
+		override fun cast() = AttributeValue(
 			id = id,
 			name = name,
 			type = type,
 			value = value,
 			show = show
 		)
-
-		fun Collection<FetchedAttributeValue>.toVariationAttributeList() = this.map { it.toVariationAttribute() }
-
 	}
 
 	data class WholesalePrice(