Optimise getClient()

Author: yatharthranjan

kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/request/FitbitRequestGenerator.java

@@ -23,12 +23,7 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import io.confluent.connect.avro.AvroData;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import okhttp3.OkHttpClient;
@@ -96,15 +91,11 @@ private List<RequestRoute> getRoutes(FitbitRestSourceConnectorConfig config) {
     return localRoutes;
   }
 
-  public OkHttpClient getClient(User user) throws IOException, NoSuchMethodException {
-    for(UserRepository userRepository: userRepositories) {
-      if(userRepository.stream().distinct().anyMatch(u -> u.equals(user))) {
-        return clients.computeIfAbsent(user.getId(), u -> baseClient.newBuilder()
-            .authenticator(new TokenAuthenticator(user, userRepository))
-            .build());
-      }
-    }
-    throw new NoSuchMethodException("User " + user + " is not present in any user repository.");
+  public OkHttpClient getClient(User user, UserRepository userRepository) {
+
+    return clients.computeIfAbsent(user.getId(), u -> baseClient.newBuilder()
+        .authenticator(new TokenAuthenticator(user, userRepository))
+        .build());
   }
 
   public Map<String, Map<String, Object>> getPartitions(String route) {

kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/route/FitbitPollingRoute.java

@@ -31,12 +31,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAmount;
-import java.util.AbstractMap;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -220,15 +215,12 @@ protected FitbitRestRequest newRequest(User user, DateRange dateRange,
           .header("Authorization", "Bearer " + userRepository.getAccessToken(user))
           .build();
       return new FitbitRestRequest(this, request, user, getPartition(user),
-          generator.getClient(user), dateRange,
+          generator.getClient(user, userRepository), dateRange,
           req -> !tooManyRequestsForUser.contains(((FitbitRestRequest)req).getUser()));
     } catch (NotAuthorizedException | IOException ex) {
       logger.warn("User {} does not have a configured access token: {}. Skipping.",
           user, ex.toString());
       return null;
-    } catch (NoSuchMethodException ex) {
-      logger.warn("User not found: {}. Skipping.", ex.toString());
-      return null;
     }
   }