Merge pull request #188 from Ecwid/http-request-charset

juvirez · web-flow · commit ea6bfafbc853 · 2022-05-19T15:00:35.000+04:00
Added an explicit encoding setting when creating http request in order to correctly transfer the value of the query parameters in POST requests
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/httptransport/impl/ConvertUtils.kt b/src/main/kotlin/com/ecwid/apiclient/v3/httptransport/impl/ConvertUtils.kt
@@ -33,6 +33,7 @@ internal fun HttpRequest.toHttpUriRequest(): HttpUriRequest {
 	}
 	return requestBuilder
 		.apply {
+			charset = Charsets.UTF_8
 			params.map { (name, value) ->
 				BasicNameValuePair(name, value)
 			}.forEach(this::addParameter)
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CustomAppRequestRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CustomAppRequestRules.kt
@@ -187,5 +187,6 @@ val customAppRequestNullablePropertyRules: List<NullablePropertyRule<*, *>> = li
 	AllowNullable(CustomAppRequest.WholesalePriceEntry::quantity),
 	AllowNullable(CustomAppRequest::cart),
 	AllowNullable(CustomAppRequest::merchantAppSettings),
-	AllowNullable(CustomAppRequest::storeId)
+	AllowNullable(CustomAppRequest::storeId),
+	AllowNullable(CustomAppRequest::lang),
 )

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ internal fun HttpRequest.toHttpUriRequest(): HttpUriRequest {`
`33`	`33`	`}`
`34`	`34`	`return requestBuilder`
`35`	`35`	`.apply {`
	`36`	`+ charset = Charsets.UTF_8`
`36`	`37`	`params.map { (name, value) ->`
`37`	`38`	`BasicNameValuePair(name, value)`
`38`	`39`	`}.forEach(this::addParameter)`
Original file line number	Diff line number	Diff line change
`@@ -187,5 +187,6 @@ val customAppRequestNullablePropertyRules: List<NullablePropertyRule<, >> = li`
`187`	`187`	`AllowNullable(CustomAppRequest.WholesalePriceEntry::quantity),`
`188`	`188`	`AllowNullable(CustomAppRequest::cart),`
`189`	`189`	`AllowNullable(CustomAppRequest::merchantAppSettings),`
`190`		`- AllowNullable(CustomAppRequest::storeId)`
	`190`	`+ AllowNullable(CustomAppRequest::storeId),`
	`191`	`+ AllowNullable(CustomAppRequest::lang),`
`191`	`192`	`)`