Skip to content

Commit f23650b

Browse files
committed
Fix lint errors
1 parent 5a4ff75 commit f23650b

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

oura-library/src/main/kotlin/org/radarbase/oura/request/OuraRequestGenerator.kt

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,11 @@ constructor(
8080
"Skip {} for {}: user in backoff until {}",
8181
route,
8282
user.versionedId,
83-
userNextRequest[user.versionedId]
83+
userNextRequest[user.versionedId],
8484
)
8585
emptySequence()
8686
}
8787
}
88-
8988
}
9089

9190
override fun requests(
@@ -131,19 +130,23 @@ constructor(
131130
// and we've reached or surpassed it (startOffset >= endDate),
132131
// permanently disable future requests for this user+route.
133132
val userEnd = user.endDate
134-
if (userEnd != null && endDate == userEnd && Duration.between(userEnd, Instant.now()) > Duration.ofDays(30)) {
133+
if (userEnd != null && endDate == userEnd &&
134+
Duration.between(userEnd, Instant.now()) > Duration.ofDays(30)
135+
) {
135136
val key = routeKey(route, user)
136137
routeNextRequest[key] = Instant.MAX
137138
logger.info(
138-
"Disable future requests for {}: user={}, endDate={} (>30d ago), startOffset={}",
139+
"Disable future requests for {}: user={}, " +
140+
"endDate={} (>30d ago), startOffset={}",
139141
route,
140142
user.versionedId,
141143
userEnd,
142144
startOffset,
143145
)
144146
}
145147
logger.info(
146-
"Skip {} for {}: interval empty (startOffset={} >= endDate={}), persistedOffset={}, userStartDate={}",
148+
"Skip {} for {}: interval empty (startOffset={} >= endDate={}), " +
149+
"persistedOffset={}, userStartDate={}",
147150
route,
148151
user.versionedId,
149152
startOffset,
@@ -200,7 +203,9 @@ constructor(
200203
val nextRequestTime = Instant.now().plus(SUCCESS_BACK_OFF_TIME)
201204
val key = routeKey(request.route, request.user)
202205
routeNextRequest[key] =
203-
routeNextRequest[key]?.let { if (it > nextRequestTime) it else nextRequestTime } ?: nextRequestTime
206+
routeNextRequest[key]?.let {
207+
if (it > nextRequestTime) it else nextRequestTime
208+
} ?: nextRequestTime
204209
} else {
205210
if (request.startDate.plus(TIME_AFTER_REQUEST).isBefore(Instant.now())) {
206211
logger.info("No records found, updating offsets to end date..")
@@ -258,7 +263,8 @@ constructor(
258263
400 -> {
259264
logger.warn("Client exception..")
260265
nextRequestTime = Instant.now() + BACK_OFF_TIME
261-
routeNextRequest[routeKey(request.route, request.user)] = Instant.now().plus(BACK_OFF_TIME)
266+
routeNextRequest[routeKey(request.route, request.user)] =
267+
Instant.now().plus(BACK_OFF_TIME)
262268
OuraClientException(
263269
"Client unsupported or unauthorized..",
264270
IOException("Invalid client"),
@@ -267,7 +273,8 @@ constructor(
267273
}
268274
422 -> {
269275
logger.warn("Request Failed: {}, {}", request, response)
270-
routeNextRequest[routeKey(request.route, request.user)] = Instant.now().plus(BACK_OFF_TIME)
276+
routeNextRequest[routeKey(request.route, request.user)] =
277+
Instant.now().plus(BACK_OFF_TIME)
271278
OuraValidationError(
272279
response.body!!.string(),
273280
IOException("Validation error"),
@@ -276,7 +283,8 @@ constructor(
276283
}
277284
404 -> {
278285
logger.warn("Not found..")
279-
routeNextRequest[routeKey(request.route, request.user)] = Instant.now().plus(BACK_OFF_TIME)
286+
routeNextRequest[routeKey(request.route, request.user)] =
287+
Instant.now().plus(BACK_OFF_TIME)
280288
OuraNotFoundError(
281289
response.body!!.string(),
282290
IOException("Data not found"),
@@ -285,7 +293,8 @@ constructor(
285293
}
286294
else -> {
287295
logger.warn("Request Failed: {}, {}", request, response)
288-
routeNextRequest[routeKey(request.route, request.user)] = Instant.now().plus(BACK_OFF_TIME)
296+
routeNextRequest[routeKey(request.route, request.user)] =
297+
Instant.now().plus(BACK_OFF_TIME)
289298
OuraGenericError(response.body!!.string(), IOException("Unknown error"), "500")
290299
}
291300
}
@@ -304,7 +313,7 @@ constructor(
304313
return routeNextRequest[key]?.let { Instant.now() > it } ?: true
305314
}
306315

307-
private fun routeKey(route: Route, user: User): String = "${user.versionedId}#${route}"
316+
private fun routeKey(route: Route, user: User): String = user.versionedId + "#" + route
308317

309318
companion object {
310319
private val logger = LoggerFactory.getLogger(OuraRequestGenerator::class.java)

oura-library/src/main/kotlin/org/radarbase/oura/route/OuraHeartRateRoute.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
package org.radarbase.oura.route
22

33
import org.radarbase.oura.converter.OuraHeartRateConverter
4+
import org.radarbase.oura.request.RestRequest
45
import org.radarbase.oura.user.User
56
import org.radarbase.oura.user.UserRepository
6-
import org.radarcns.connector.oura.OuraHeartRate
7-
import org.radarcns.connector.oura.OuraHeartRateSource
8-
import org.slf4j.LoggerFactory
97
import java.time.Duration
108
import java.time.Instant
11-
import java.time.LocalDateTime
12-
import org.radarbase.oura.request.RestRequest
139

1410
class OuraHeartRateRoute(
1511
private val userRepository: UserRepository,

0 commit comments

Comments
 (0)