From 847533830244127fc683d3aee73ac7915ca505bc Mon Sep 17 00:00:00 2001 From: yatharthranjan Date: Thu, 24 Jun 2021 19:50:53 +0100 Subject: [PATCH] Bump version and context http client --- build.gradle.kts | 2 +- .../push/integration/garmin/service/BackfillService.kt | 6 ++---- .../integration/garmin/user/GarminServiceUserRepository.kt | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c22cbee..7ef34e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ description = "RADAR Push API Gateway to handle secured data flow to backend." allprojects { group = "org.radarbase" - version = "0.1.2" + version = "0.2.0" repositories { mavenCentral() diff --git a/src/main/kotlin/org/radarbase/push/integration/garmin/service/BackfillService.kt b/src/main/kotlin/org/radarbase/push/integration/garmin/service/BackfillService.kt index 7a17b95..083cee0 100644 --- a/src/main/kotlin/org/radarbase/push/integration/garmin/service/BackfillService.kt +++ b/src/main/kotlin/org/radarbase/push/integration/garmin/service/BackfillService.kt @@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit */ class BackfillService( @Context private val config: Config, + @Context private val httpClient: OkHttpClient, @Named(GARMIN_QUALIFIER) private val userRepository: GarminUserRepository ) : ApplicationEventListener { @@ -44,10 +45,7 @@ class BackfillService( redisHolder, config.pushIntegration.garmin.backfill.redis.lockPrefix ) - private val httpClient = OkHttpClient.Builder() - .connectTimeout(30, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) - .build() + private val requestsPerUserPerIteration: Int get() = 40 diff --git a/src/main/kotlin/org/radarbase/push/integration/garmin/user/GarminServiceUserRepository.kt b/src/main/kotlin/org/radarbase/push/integration/garmin/user/GarminServiceUserRepository.kt index e670eb2..8d4fac9 100644 --- a/src/main/kotlin/org/radarbase/push/integration/garmin/user/GarminServiceUserRepository.kt +++ b/src/main/kotlin/org/radarbase/push/integration/garmin/user/GarminServiceUserRepository.kt @@ -29,10 +29,10 @@ import java.util.concurrent.ConcurrentHashMap @Suppress("UNCHECKED_CAST") class GarminServiceUserRepository( @Context private val config: Config, + @Context private val client: OkHttpClient, @Context private val objectReaderFactory: ObjectReaderFactory, ) : GarminUserRepository(config) { private val garminConfig: GarminConfig = config.pushIntegration.garmin - private val client: OkHttpClient = OkHttpClient() private val cachedCredentials: ConcurrentHashMap = ConcurrentHashMap() private var nextFetch = MIN_INSTANT