Skip to content

Commit bc600a7

Browse files
committed
ktlint fixes
1 parent 6d1dbc3 commit bc600a7

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

core/src/main/java/com/amplitude/core/utilities/EventsFileManager.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@ class EventsFileManager(
195195
return@use jsonArray.toString()
196196
} catch (e: JSONException) {
197197
diagnostics.addMalformedEvent(normalizedContent)
198-
logger.error("Failed to parse events: $normalizedContent, dropping file: $filePath")
198+
logger.error(
199+
"Failed to parse events: $normalizedContent, dropping file: $filePath"
200+
)
199201
this.remove(filePath)
200202
return@use normalizedContent
201203
}
@@ -336,7 +338,9 @@ class EventsFileManager(
336338
finish(it)
337339
}
338340
} catch (e: JSONException) {
339-
logger.error("Failed to parse events: $normalizedContent, dropping file: ${it.path}")
341+
logger.error(
342+
"Failed to parse events: $normalizedContent, dropping file: ${it.path}"
343+
)
340344
this.remove(it.path)
341345
}
342346
}

core/src/main/java/com/amplitude/core/utilities/ExponentialBackoffRetryHandler.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.amplitude.core.utilities
22

3-
import kotlin.math.pow
43
import kotlinx.coroutines.delay
54
import java.util.concurrent.atomic.AtomicInteger
5+
import kotlin.math.pow
66

77
/**
88
* A utility class to handle exponential backoff retry logic.
@@ -32,4 +32,4 @@ class ExponentialBackoffRetryHandler(
3232
companion object {
3333
private const val MAX_RETRY_ATTEMPT = 5
3434
}
35-
}
35+
}

core/src/main/java/com/amplitude/core/utilities/http/AnalyticsResponse.kt

+25-15
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import org.json.JSONObject
88
import java.lang.Exception
99

1010
internal object HttpResponse {
11-
fun createHttpResponse(code: Int, responseBody: String?): AnalyticsResponse {
11+
fun createHttpResponse(
12+
code: Int,
13+
responseBody: String?,
14+
): AnalyticsResponse {
1215
return when (code) {
1316
HttpStatus.SUCCESS.code -> SuccessResponse()
1417

@@ -43,7 +46,10 @@ interface AnalyticsResponse {
4346
val status: HttpStatus
4447

4548
companion object {
46-
fun create(responseCode: Int, responseBody: String?): AnalyticsResponse {
49+
fun create(
50+
responseCode: Int,
51+
responseBody: String?,
52+
): AnalyticsResponse {
4753
return HttpResponse.createHttpResponse(responseCode, responseBody)
4854
}
4955
}
@@ -159,7 +165,11 @@ class FailedResponse(response: JSONObject) : AnalyticsResponse {
159165
* @return true if response was handled or we have successfully recovered, false otherwise
160166
*/
161167
interface ResponseHandler {
162-
fun handle(response: AnalyticsResponse, events: Any, eventsString: String): Boolean {
168+
fun handle(
169+
response: AnalyticsResponse,
170+
events: Any,
171+
eventsString: String,
172+
): Boolean {
163173
return when (response) {
164174
is SuccessResponse ->
165175
handleSuccessResponse(response, events, eventsString)
@@ -187,51 +197,51 @@ interface ResponseHandler {
187197
fun handleSuccessResponse(
188198
successResponse: SuccessResponse,
189199
events: Any,
190-
eventsString: String
191-
) : Boolean
200+
eventsString: String,
201+
): Boolean
192202

193203
/**
194204
* Handle a [HttpStatus.BAD_REQUEST] response.
195205
*/
196206
fun handleBadRequestResponse(
197207
badRequestResponse: BadRequestResponse,
198208
events: Any,
199-
eventsString: String
200-
) : Boolean
209+
eventsString: String,
210+
): Boolean
201211

202212
/**
203213
* Handle a [HttpStatus.PAYLOAD_TOO_LARGE] response.
204214
*/
205215
fun handlePayloadTooLargeResponse(
206216
payloadTooLargeResponse: PayloadTooLargeResponse,
207217
events: Any,
208-
eventsString: String
209-
) : Boolean
218+
eventsString: String,
219+
): Boolean
210220

211221
/**
212222
* Handle a [HttpStatus.TOO_MANY_REQUESTS] response.
213223
*/
214224
fun handleTooManyRequestsResponse(
215225
tooManyRequestsResponse: TooManyRequestsResponse,
216226
events: Any,
217-
eventsString: String
218-
) : Boolean
227+
eventsString: String,
228+
): Boolean
219229

220230
/**
221231
* Handle a [HttpStatus.TIMEOUT] response.
222232
*/
223233
fun handleTimeoutResponse(
224234
timeoutResponse: TimeoutResponse,
225235
events: Any,
226-
eventsString: String
227-
) : Boolean
236+
eventsString: String,
237+
): Boolean
228238

229239
/**
230240
* Handle a [HttpStatus.FAILED] response.
231241
*/
232242
fun handleFailedResponse(
233243
failedResponse: FailedResponse,
234244
events: Any,
235-
eventsString: String
236-
) : Boolean
245+
eventsString: String,
246+
): Boolean
237247
}

core/src/test/kotlin/com/amplitude/core/platform/EventPipelineTest.kt

+1-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ import com.amplitude.core.events.BaseEvent
77
import com.amplitude.core.utilities.ConsoleLoggerProvider
88
import com.amplitude.core.utilities.ExponentialBackoffRetryHandler
99
import com.amplitude.core.utilities.InMemoryStorageProvider
10-
import com.amplitude.core.utilities.http.BadRequestResponse
11-
import com.amplitude.core.utilities.http.FailedResponse
12-
import com.amplitude.core.utilities.http.HttpStatus
13-
import com.amplitude.core.utilities.http.PayloadTooLargeResponse
1410
import com.amplitude.core.utilities.http.ResponseHandler
15-
import com.amplitude.core.utilities.http.SuccessResponse
16-
import com.amplitude.core.utilities.http.TimeoutResponse
17-
import com.amplitude.core.utilities.http.TooManyRequestsResponse
1811
import com.amplitude.id.IMIdentityStorageProvider
1912
import io.mockk.coVerify
2013
import io.mockk.every
@@ -52,7 +45,7 @@ class EventPipelineTest {
5245
storageIODispatcher = testDispatcher,
5346
retryDispatcher = testDispatcher
5447
)
55-
private val fakeResponseHandler: ResponseHandler = mockk(relaxed= true)
48+
private val fakeResponseHandler: ResponseHandler = mockk(relaxed = true)
5649

5750
@Test
5851
fun `should not flush when put and offline`() = runTest(testDispatcher) {

0 commit comments

Comments
 (0)