More readable oauth client initialziation

Author: blootsvoets

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

@@ -502,12 +502,16 @@ public String getFitbitUserRepositoryClientSecret() {
     return getString(FITBIT_USER_REPOSITORY_CLIENT_SECRET_CONFIG);
   }
 
-  public URL getFitbitUserRepositoryTokenUrl() throws MalformedURLException {
+  public URL getFitbitUserRepositoryTokenUrl() {
     String value = getString(FITBIT_USER_REPOSITORY_TOKEN_URL_CONFIG);
     if (value == null || value.isEmpty()) {
       return null;
     } else {
-      return new URL(getString(FITBIT_USER_REPOSITORY_TOKEN_URL_CONFIG));
+      try {
+        return new URL(getString(FITBIT_USER_REPOSITORY_TOKEN_URL_CONFIG));
+      } catch (MalformedURLException e) {
+        throw new ConfigException("Fitbit user repository token URL is invalid.");
+      }
     }
   }
 }

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

@@ -22,6 +22,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectReader;
+import io.confluent.common.config.ConfigException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -91,30 +92,22 @@ public void initialize(RestSourceConnectorConfig config) {
     this.baseUrl = fitbitConfig.getFitbitUserRepositoryUrl();
     this.containedUsers.addAll(fitbitConfig.getFitbitUsers());
 
-    try {
-      URL tokenUrl = fitbitConfig.getFitbitUserRepositoryTokenUrl();
-      String clientId = fitbitConfig.getFitbitUserRepositoryClientId();
-      String clientSecret = fitbitConfig.getFitbitUserRepositoryClientSecret();
+    URL tokenUrl = fitbitConfig.getFitbitUserRepositoryTokenUrl();
+    String clientId = fitbitConfig.getFitbitUserRepositoryClientId();
+    String clientSecret = fitbitConfig.getFitbitUserRepositoryClientSecret();
 
-      if (tokenUrl != null) {
-        if (clientId.isEmpty()) {
-          throw new ConnectException("Client ID for user repository is not set.");
-        }
-        this.repositoryClient = new OAuth2Client.Builder()
-            .credentials(
-                fitbitConfig
-                    .getString(FitbitRestSourceConnectorConfig.FITBIT_USER_REPOSITORY_CLIENT_ID_CONFIG),
-                fitbitConfig.getString(
-                    FitbitRestSourceConnectorConfig.FITBIT_USER_REPOSITORY_CLIENT_SECRET_CONFIG))
-            .endpoint(tokenUrl)
-            .scopes("SUBJECT.READ")
-            .httpClient(client)
-            .build();
-      } else if (clientId != null) {
-        basicCredentials = Credentials.basic(clientId, clientSecret);
+    if (tokenUrl != null) {
+      if (clientId.isEmpty()) {
+        throw new ConfigException("Client ID for user repository is not set.");
       }
-    } catch (MalformedURLException ex) {
-      throw new ConnectException("OAuth 2.0 server URL is malformed", ex);
+      this.repositoryClient = new OAuth2Client.Builder()
+          .credentials(clientId, clientSecret)
+          .endpoint(tokenUrl)
+          .scopes("SUBJECT.READ")
+          .httpClient(client)
+          .build();
+    } else if (clientId != null) {
+      basicCredentials = Credentials.basic(clientId, clientSecret);
     }
   }