Create LoginData model to replace List<Pair>

src/me/corriekay/pokegoutil/DATA/managers/AccountManager.java

@@ -9,12 +9,11 @@
 import com.pokegoapi.exceptions.RemoteServerException;
 import javafx.scene.control.Alert;
 import javafx.util.Pair;
+import me.corriekay.pokegoutil.DATA.models.LoginData;
 import me.corriekay.pokegoutil.utils.ConfigKey;
 import me.corriekay.pokegoutil.utils.ConfigNew;
 import okhttp3.OkHttpClient;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /*this controller does the login/log off, and different account information (aka player data)
@@ -172,26 +171,25 @@ public static void alertFailedLogin(String message) {
         alert.showAndWait();
     }
 
-    public static List<Pair> getLoginData(LoginType type) {
+    public static LoginData getLoginData(LoginType type) {
+        LoginData loginData = new LoginData();
+
         switch (type) {
             case GOOGLE:
-                String token = config.getString(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN);
-                return (token != null) ? Collections.singletonList(
-                        new Pair<>("token", token)) : null;
+                 loginData.setToken(config.getString(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN));
+                 break;
             case PTC:
-                String username = config.getString(ConfigKey.LOGIN_PTC_USERNAME);
-                String password = config.getString(ConfigKey.LOGIN_PTC_PASSWORD);
-                return (username != null && password != null) ? Arrays.asList(
-                        new Pair<>("username", username), new Pair<>("password", password)) : null;
+                loginData.setUsername(config.getString(ConfigKey.LOGIN_PTC_USERNAME));
+                loginData.setPassword(config.getString(ConfigKey.LOGIN_PTC_PASSWORD));
+                break;
             case BOTH:
-                String token2 = config.getString(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN);
-                String username2 = config.getString(ConfigKey.LOGIN_PTC_USERNAME);
-                String password2 = config.getString(ConfigKey.LOGIN_PTC_PASSWORD);
-                return (username2 != null && password2 != null && token2 != null) ? Arrays.asList(
-                        new Pair<>("username", username2), new Pair<>("password", password2), new Pair<>("token", token2)) : null;
+                loginData.setToken(config.getString(ConfigKey.LOGIN_GOOGLE_AUTH_TOKEN));
+                loginData.setUsername(config.getString(ConfigKey.LOGIN_PTC_USERNAME));
+                loginData.setPassword(config.getString(ConfigKey.LOGIN_PTC_PASSWORD));
+                break;
             default:
-                return null;
-        }
+        }        
+        return loginData;
     }
 
     private static void deleteLoginData(LoginType type) {

src/me/corriekay/pokegoutil/DATA/models/LoginData.java

@@ -0,0 +1,43 @@
+package me.corriekay.pokegoutil.DATA.models;
+
+public class LoginData {
+
+    private String token;
+    private String username;
+    private String password;
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public boolean hasUsername(){
+        return username != null;
+    }
+
+    public boolean hasPassword(){
+        return password != null;
+    }
+    public boolean hasToken(){
+        return token != null;
+    }
+}

src/me/corriekay/pokegoutil/GUI/controller/LoginController.java

@@ -17,6 +17,7 @@
 import me.corriekay.pokegoutil.BlossomsPoGoManager;
 import me.corriekay.pokegoutil.DATA.managers.AccountManager;
 import me.corriekay.pokegoutil.DATA.managers.AccountManager.LoginType;
+import me.corriekay.pokegoutil.DATA.models.LoginData;
 import me.corriekay.pokegoutil.utils.helpers.Browser;
 
 import java.io.IOException;
@@ -76,31 +77,34 @@ public LoginController() {
     @FXML
     private void initialize() {
         AccountManager.initialize();
-        boolean saveCredentials = AccountManager.checkForSavedCredentials();
+
         googleAuthBtn.setOnAction(this::onGoogleAuthBtnClicked);
         ptcLoginBtn.setOnAction(this::onPTCLoginBtnClicked);
-        saveAuthChkbx.setSelected(saveCredentials);
         saveAuthChkbx.setOnAction(this::onAutoRelogChanged);
         getTokenBtn.setOnAction(this::onGetToken);
-        if(saveCredentials){
+
+        boolean saveCredentials = AccountManager.checkForSavedCredentials();
+        saveAuthChkbx.setSelected(saveCredentials);
+
+        if (saveCredentials) {
             LoginType loginType = AccountManager.checkSavedConfig();
-            List<Pair> loginData = AccountManager.getLoginData(loginType);
-            if (loginData != null && !loginData.isEmpty()) {
-                loginData.forEach(pair -> {
-                    switch (pair.getKey().toString()) {
-                        case "username":
-                            usernameField.setText(pair.getValue().toString());
-                            usernameField.setDisable(true);
-                        case "password":
-                            passwordField.setText(pair.getValue().toString());
-                            passwordField.setDisable(true);
-                        case "token":
-                            tokenField.setText("Using Previous Token");
-                            tokenField.setDisable(true);
-                            getTokenBtn.setDisable(true);
-                    }
-                });
+            LoginData loginData = AccountManager.getLoginData(loginType);
+
+            if(loginData.hasUsername()){
+                usernameField.setText(loginData.getUsername());
+                usernameField.setDisable(true);
+            }
+
+            if(loginData.hasPassword()){
+                passwordField.setText(loginData.getPassword());
+                passwordField.setDisable(true);
             }
+
+            if(loginData.hasToken()){
+                tokenField.setText("Using Previous Token");
+                tokenField.setDisable(true);
+                getTokenBtn.setDisable(true);
+            }      
         }
     }
 
@@ -110,23 +114,23 @@ private void onGetToken(ActionEvent actionEvent) {
     }
 
     private void onAutoRelogChanged(ActionEvent actionEvent) {
-        boolean saveCredentials = ((CheckBox)actionEvent.getSource()).isSelected();
+        boolean saveCredentials = ((CheckBox) actionEvent.getSource()).isSelected();
         AccountManager.setSaveLogin(saveCredentials);
         toggleFields(saveCredentials);
     }
 
-    private void toggleFields(boolean save){
-        if(usernameField.getText().isEmpty() || !save)
+    private void toggleFields(boolean save) {
+        if (usernameField.getText().isEmpty() || !save)
             usernameField.setDisable(false);
         else
             usernameField.setDisable(true);
 
-        if(passwordField.getText().isEmpty() || !save)
+        if (passwordField.getText().isEmpty() || !save)
             passwordField.setDisable(false);
         else
             passwordField.setDisable(true);
 
-        if(tokenField.getText().isEmpty() || !save)
+        if (tokenField.getText().isEmpty() || !save)
             tokenField.setDisable(false);
         else
             tokenField.setDisable(true);
@@ -137,7 +141,10 @@ private void toggleFields(boolean save){
     @FXML
     void onGoogleAuthBtnClicked(ActionEvent event) {
         try {
-            AccountManager.login(Collections.singletonList(new Pair<>("token", tokenField.getText())), LoginType.GOOGLE);
+            AccountManager.login(
+                    Collections.singletonList(
+                            new Pair<>("token", tokenField.getText())),
+                    LoginType.GOOGLE);
         } catch (Exception e) {
             AccountManager.alertFailedLogin(e.toString());
         }