Skip to content

Create batch deduplication #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
turchenkoalex merged 5 commits into from
Dec 29, 2022
Merged

Create batch deduplication #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
070cc65
deduplicationKey parameter added for CreateBatchRequest
Dec 28, 2022
315dd53
Added allowParallelMode parameter to CreateBatchRequest constructor
Dec 28, 2022
b201d1f
removed extraParams parameter from CreateBatchRequest
Dec 28, 2022
58a3eed
removed extraParams from CreateBatchRequestWithIds and added allowPar…
Dec 28, 2022
51540c9
fixed wrong default values for constructor agruments in SleepForRetry…
Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/batch/request/CreateBatchRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@ import com.ecwid.apiclient.v3.httptransport.HttpBody
import com.ecwid.apiclient.v3.impl.RequestInfo
import com.ecwid.apiclient.v3.util.buildEndpointPath
import com.ecwid.apiclient.v3.util.buildQueryString
import java.util.UUID

data class CreateBatchRequestWithIds(
val requests: Map<String, ApiRequest> = emptyMap(),
val stopOnFirstFailure: Boolean = true,
val extraParams: Map<String, String> = emptyMap()
val allowParallelMode: Boolean = false,
val deduplicationKey: UUID = UUID.randomUUID(),
) : ApiRequest {

override fun toRequestInfo() = RequestInfo.createPostRequest(
pathSegments = listOf(
"batch"
),
params = extraParams + mapOf(
"stopOnFirstFailure" to stopOnFirstFailure.toString()
params = mapOf(
"stopOnFirstFailure" to stopOnFirstFailure.toString(),
"allowParallelMode" to allowParallelMode.toString(),
"deduplicationKey" to deduplicationKey.toString(),
),
httpBody = HttpBody.JsonBody(
obj = requests.map { (id, request) ->
Expand All @@ -31,15 +35,18 @@ data class CreateBatchRequestWithIds(
data class CreateBatchRequest(
val requests: List<ApiRequest> = emptyList(),
val stopOnFirstFailure: Boolean = true,
val extraParams: Map<String, String> = emptyMap()
val allowParallelMode: Boolean = false,
val deduplicationKey: UUID = UUID.randomUUID(),
) : ApiRequest {

override fun toRequestInfo() = RequestInfo.createPostRequest(
pathSegments = listOf(
"batch"
),
params = extraParams + mapOf(
"stopOnFirstFailure" to stopOnFirstFailure.toString()
params = mapOf(
"stopOnFirstFailure" to stopOnFirstFailure.toString(),
"allowParallelMode" to allowParallelMode.toString(),
"deduplicationKey" to deduplicationKey.toString(),
),
httpBody = HttpBody.JsonBody(
obj = requests.map(SingleBatchRequest.Companion::create)
Expand Down
4 changes: 2 additions & 2 deletions ...lin/com/ecwid/apiclient/v3/httptransport/impl/SleepForRetryAfterRateLimitRetryStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import org.apache.http.client.methods.HttpUriRequest
import java.io.IOException

class SleepForRetryAfterRateLimitRetryStrategy(
private val defaultRateLimitRetryInterval: Long = MAX_RATE_LIMIT_RETRY_INTERVAL_SECONDS,
private val maxRateLimitRetryInterval: Long = DEFAULT_RATE_LIMIT_RETRY_INTERVAL_SECONDS,
private val defaultRateLimitRetryInterval: Long = DEFAULT_RATE_LIMIT_RETRY_INTERVAL_SECONDS,
private val maxRateLimitRetryInterval: Long = MAX_RATE_LIMIT_RETRY_INTERVAL_SECONDS,
private val defaultRateLimitAttempts: Int = DEFAULT_RATE_LIMIT_ATTEMPTS,
private val onEverySecondOfWaiting: (Long) -> Unit = EMPTY_WAITING_REACTION,
private val beforeEachRequestAttempt: () -> Unit = EMPTY_BEFORE_REQUEST_ACTION,
Expand Down