Merge pull request #165 from RADAR-base/fix/user-repository

Add UserRepository fixes

Author: this-Aditya

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 @Suppress("ConstPropertyName", "MemberVisibilityCanBePrivate")
 object Versions {
-    const val project = "0.6.1"
+    const val project = "0.6.2"
 
     const val java = 17
     const val kotlin = "1.9.22"

kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.kt

@@ -61,6 +61,7 @@ import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
 import java.util.stream.Stream
 import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration
@@ -234,7 +235,7 @@ class ServiceUserRepository : UserRepository {
         }
 
     override fun hasPendingUpdates(): Boolean = runBlocking(Dispatchers.Default) {
-        userCache.isStale()
+        userCache.isStale(1.hours)
     }
 
     @Throws(IOException::class)

kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepositoryLegacy.java

@@ -44,7 +44,7 @@
 import org.apache.kafka.common.config.ConfigException;
 import org.apache.kafka.connect.errors.ConnectException;
 import org.radarbase.connect.rest.oura.user.OuraUserRepository;
-import org.radarbase.connect.rest.oura.user.OuraServiceUserRepositoryLegacy;
+import org.radarbase.connect.rest.oura.user.OuraServiceUserRepository;
 
 public class OuraRestSourceConnectorConfig extends AbstractConfig {
   public static final Pattern COLON_PATTERN = Pattern.compile(":");
@@ -193,7 +193,7 @@ public String toString() {
 
         .define(OURA_USER_REPOSITORY_CONFIG,
             Type.CLASS,
-            OuraServiceUserRepositoryLegacy.class,
+            OuraServiceUserRepository.class,
             Importance.MEDIUM,
             OURA_USER_REPOSITORY_DOC,
             group,

kafka-connect-oura-source/src/main/java/org/radarbase/connect/rest/oura/OuraRestSourceConnectorConfig.java

@@ -235,7 +235,7 @@ class OuraServiceUserRepository : OuraUserRepository() {
 
     override fun hasPendingUpdates(): Boolean =
         runBlocking(Dispatchers.Default) {
-            userCache.isStale()
+            userCache.isStale(1.hours)
         }
 
     @Throws(IOException::class)