More Java-like approach

Author: blootsvoets

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

@@ -209,6 +209,61 @@ public synchronized String refreshAccessToken(User user, int retry) throws IOExc
       throw new NoSuchElementException("User " + user + " is not present in this user repository.");
     }
     String refreshToken = actualUser.apply(u -> u.getOAuth2Credentials().getRefreshToken());
+
+    JsonNode node;
+
+    try {
+      node = requestAccessToken(refreshToken);
+    } catch (IOException ex) {
+      if (retry > 0) {
+        logger.warn("Failed to read OAuth 2.0 response: {}", ex.toString());
+        return refreshAccessToken(user, retry - 1);
+      } else {
+        throw ex;
+      }
+    } catch (NotAuthorizedException ex) {
+      actualUser.accept((u, p) -> {
+        if (!refreshToken.equals(u.getOAuth2Credentials().getRefreshToken())) {
+          // it was updated already by another thread.
+          return;
+        }
+        u.setOauth2Credentials(new OAuth2UserCredentials());
+        store(p, u);
+      });
+      throw ex;
+    }
+
+    JsonNode expiresInNode = node.get("expires_in");
+    Long expiresIn = expiresInNode != null
+        ? expiresInNode.asLong()
+        : null;
+
+    JsonNode accessTokenNode = node.get("access_token");
+    JsonNode refreshTokenNode = node.get("refresh_token");
+    if (accessTokenNode == null || refreshTokenNode == null) {
+      if (retry > 0) {
+        logger.warn("Failed to get access token in successful OAuth 2.0 request:"
+            + " access token or refresh token are missing");
+        return refreshAccessToken(user, retry - 1);
+      } else {
+        throw new NotAuthorizedException("Did not get an access token");
+      }
+    }
+
+    actualUser.accept((u, p) -> {
+      if (!refreshToken.equals(u.getOAuth2Credentials().getRefreshToken())) {
+        // it was updated already by another thread.
+        return;
+      }
+      u.setOauth2Credentials(new OAuth2UserCredentials(
+          refreshTokenNode.asText(), accessTokenNode.asText(), expiresIn));
+      store(p, u);
+    });
+
+    return actualUser.apply(u -> u.getOAuth2Credentials().getAccessToken());
+  }
+
+  private JsonNode requestAccessToken(String refreshToken) throws IOException {
     if (refreshToken == null || refreshToken.isEmpty()) {
       throw new NotAuthorizedException("Refresh token is not set");
     }
@@ -227,13 +282,9 @@ public synchronized String refreshAccessToken(User user, int retry) throws IOExc
       ResponseBody responseBody = response.body();
 
       if (response.isSuccessful() && responseBody != null) {
-        try {
-          node = JSON_READER.readTree(responseBody.charStream());
-        } catch (IOException ex) {
-          exception = ex;
-        }
+        return JSON_READER.readTree(responseBody.charStream());
       } else if (response.code() == 400 || response.code() == 401) {
-        exception = new NotAuthorizedException("Refresh token is no longer valid.");
+        throw new NotAuthorizedException("Refresh token is no longer valid.");
       } else {
         String message = "Failed to request refresh token, with response HTTP status code "
             + response.code();
@@ -243,53 +294,6 @@ public synchronized String refreshAccessToken(User user, int retry) throws IOExc
         throw new IOException(message);
       }
     }
-
-    if (node != null) {
-      JsonNode expiresInNode = node.get("expires_in");
-      Long expiresIn = expiresInNode != null
-          ? expiresInNode.asLong()
-          : null;
-
-      JsonNode accessTokenNode = node.get("access_token");
-      JsonNode refreshTokenNode = node.get("refresh_token");
-      if (accessTokenNode == null || refreshTokenNode == null) {
-        if (retry > 0) {
-          logger.warn("Failed to get access token in successful OAuth 2.0 request:"
-              + " access token or refresh token are missing");
-          return refreshAccessToken(user, retry - 1);
-        } else {
-          throw new NotAuthorizedException("Did not get an access token");
-        }
-      }
-
-      actualUser.accept((u, p) -> {
-        if (!refreshToken.equals(u.getOAuth2Credentials().getRefreshToken())) {
-          // it was updated already by another thread.
-          return;
-        }
-        u.setOauth2Credentials(new OAuth2UserCredentials(
-            refreshTokenNode.asText(), accessTokenNode.asText(), expiresIn));
-        store(p, u);
-      });
-    } else if (exception instanceof IOException) {
-      if (retry > 0) {
-        logger.warn("Failed to read OAuth 2.0 response: {}", exception.toString());
-        return refreshAccessToken(user, retry - 1);
-      }
-      throw (IOException) exception;
-    } else if (exception instanceof NotAuthorizedException) {
-      actualUser.accept((u, p) -> {
-        if (!refreshToken.equals(u.getOAuth2Credentials().getRefreshToken())) {
-          // it was updated already by another thread.
-          return;
-        }
-        u.setOauth2Credentials(new OAuth2UserCredentials());
-        store(p, u);
-      });
-      throw (NotAuthorizedException) exception;
-    }
-
-    return actualUser.apply(u -> u.getOAuth2Credentials().getAccessToken());
   }
 
   /**