Merge remote-tracking branch 'origin/master' into composite_products

# Conflicts:
#	src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt
#	src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt

Author: mvgreen

build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
 
 	api("com.google.code.gson:gson:2.10")
 	api("org.apache.httpcomponents:httpclient:4.5.13")
+	api("org.apache.httpcomponents.client5:httpclient5:5.5")
 	api("io.prometheus:prometheus-metrics-core:1.1.0")
 
 	testImplementation(kotlin("test"))
@@ -206,6 +207,8 @@ nexusPublishing {
 			useStaging.set(!project.isSnapshotVersion())
 			packageGroup.set(PublicationSettings.STAGING_PACKAGE_GROUP)
 			stagingProfileId.set(PublicationSettings.STAGING_PROFILE_ID)
+			nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+			snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
 			username.set(settingsProvider.ossrhUsername)
 			password.set(settingsProvider.ossrhPassword)
 		}
@@ -251,12 +254,6 @@ fun printFinalReleaseNote(groupId: String, artifactId: String, sanitizedVersion:
 	println("Discover on Maven Central:")
 	println("	https://repo1.maven.org/maven2/${groupId.replace('.', '/')}/$artifactId/")
 	println()
-	println("Edit or delete artifacts on OSS Nexus Repository Manager:")
-	println("	https://oss.sonatype.org/#nexus-search;gav~$groupId~~~~")
-	println()
-	println("Control staging repositories on OSS Nexus Repository Manager:")
-	println("	https://oss.sonatype.org/#stagingRepositories")
-	println()
 	println("========================================================")
 	println()
 }
@@ -271,10 +268,7 @@ fun printDevSnapshotReleaseNote(groupId: String, artifactId: String, sanitizedVe
 	println("	version: $sanitizedVersion")
 	println()
 	println("Discover on Maven Central:")
-	println("	https://oss.sonatype.org/content/groups/public/${groupId.replace('.', '/')}/$artifactId/")
-	println()
-	println("Edit or delete artifacts on OSS Nexus Repository Manager:")
-	println("	https://oss.sonatype.org/#nexus-search;gav~$groupId~~~~")
+	println("	https://central.sonatype.com/repository/maven-snapshots/${groupId.replace('.', '/')}/$artifactId/$sanitizedVersion/maven-metadata.xml")
 	println()
 	println("========================================================")
 	println()

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

@@ -50,6 +50,7 @@ import com.ecwid.apiclient.v3.dto.variation.result.*
 import com.ecwid.apiclient.v3.httptransport.HttpTransport
 import com.ecwid.apiclient.v3.impl.*
 import com.ecwid.apiclient.v3.jsontransformer.JsonTransformerProvider
+import java.io.Closeable
 import kotlin.reflect.KClass
 
 open class ApiClient private constructor(
@@ -98,7 +99,8 @@ open class ApiClient private constructor(
 	SlugInfoApiClient by slugInfoApiClient,
 	ProductReviewsApiClient by productReviewsApiClient,
 	StoreExtrafieldsApiClient by storeExtrafieldsApiClient,
-	SwatchesApiClient by swatchesApiClient {
+	SwatchesApiClient by swatchesApiClient,
+	Closeable {
 
 	constructor(apiClientHelper: ApiClientHelper) : this(
 		apiClientHelper = apiClientHelper,
@@ -126,6 +128,10 @@ open class ApiClient private constructor(
 		swatchesApiClient = SwatchesApiClientImpl(apiClientHelper),
 	)
 
+	override fun close() {
+		apiClientHelper.httpTransport.close()
+	}
+
 	companion object {
 
 		fun create(

src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt

@@ -175,6 +175,7 @@ fun FetchedOrder.OrderItem.toUpdated(): UpdatedOrder.OrderItem {
 		discounts = discounts?.map(FetchedOrder.OrderItemDiscounts::toUpdated),
 		externalReferenceId = externalReferenceId,
 		isPreorder = isPreorder,
+		taxClassCode = taxClassCode,
 	)
 }
 

src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt

@@ -104,7 +104,8 @@ data class OrderForCalculate(
 		val taxes: List<OrderItemTax>? = null,
 		val files: List<OrderItemProductFile>? = null,
 		val dimensions: ProductDimensions? = null,
-		val discounts: List<OrderItemDiscounts>? = null
+		val discounts: List<OrderItemDiscounts>? = null,
+		val taxClassCode: String? = null
 	)
 
 	data class OrderItemOption(

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt

@@ -180,6 +180,7 @@ data class UpdatedOrder(
 		val discounts: List<OrderItemDiscounts>? = null,
 		val externalReferenceId: String? = null,
 		val isPreorder: Boolean? = null,
+		val taxClassCode: String? = null,
 	)
 
 	data class OrderItemSelectedOption(

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt

@@ -219,6 +219,7 @@ data class FetchedOrder(
 		val externalReferenceId: String? = null,
 		val isPreorder: Boolean? = null,
 		val attributes: List<OrderItemAttributeValue>? = null,
+		val taxClassCode: String? = null,
 		val compositeComponents: List<FetchedProductComponent>? = null,
 	)
 

src/main/kotlin/com/ecwid/apiclient/v3/dto/profile/result/FetchedStoreProfile.kt

@@ -751,6 +751,15 @@ data class FetchedStoreProfile(
 
 		@JsonFieldName("show_signin_link_with_unified_account_page")
 		val showSigninLinkWithUnifiedAccountPage: Boolean? = null,
+
+		@JsonFieldName("swatches_product_option_shape")
+		val swatchesProductOptionShape: String? = null,
+
+		@JsonFieldName("swatches_product_option_size")
+		val swatchesProductOptionSize: String? = null,
+
+		@JsonFieldName("product_details_show_image_alt_text_as_visible_description")
+		val productDetailsShowAltTextAsVisibleAsDescription: Boolean? = null,
 	)
 
 	data class ProductFilterItem(

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ReportType.kt

@@ -46,4 +46,6 @@ enum class ReportType {
 	siteAddressActivity,
 	siteLocationMapActivity,
 	siteContactWidgetActivity,
+	siteSocialActivity,
+	siteAggregatedActivity,
 }

src/main/kotlin/com/ecwid/apiclient/v3/httptransport/HttpTransport.kt

@@ -1,5 +1,7 @@
 package com.ecwid.apiclient.v3.httptransport
 
-interface HttpTransport {
+import java.io.Closeable
+
+interface HttpTransport : Closeable {
 	fun makeHttpRequest(httpRequest: HttpRequest): HttpResponse
 }

src/main/kotlin/com/ecwid/apiclient/v3/httptransport/impl/ApacheCommonsHttpClientTransport.kt

@@ -8,6 +8,7 @@ import org.apache.http.client.HttpClient
 import org.apache.http.client.config.RequestConfig
 import org.apache.http.impl.client.HttpClientBuilder
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager
+import java.io.Closeable
 import java.io.IOException
 
 private const val DEFAULT_CONNECTION_TIMEOUT = 10_000 // 10 sec
@@ -33,6 +34,7 @@ internal const val MAX_RATE_LIMIT_RETRY_INTERVAL_SECONDS = 60L
 val EMPTY_WAITING_REACTION: (Long) -> Unit = { }
 val EMPTY_BEFORE_REQUEST_ACTION: () -> Unit = { }
 
+@Deprecated("Use ApacheCommonsHttpClientTransport from client5 package")
 open class ApacheCommonsHttpClientTransport(
 	private val httpClient: HttpClient = buildHttpClient(),
 	private val rateLimitRetryStrategy: RateLimitRetryStrategy = SleepForRetryAfterRateLimitRetryStrategy(),
@@ -106,6 +108,12 @@ open class ApacheCommonsHttpClientTransport(
 		}
 	}
 
+	override fun close() {
+		if (httpClient is Closeable) {
+			httpClient.close()
+		}
+	}
+
 	companion object {
 
 		private fun buildHttpClient(