Merge branch 'api-auth' of https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b into api-auth

1 files changed, 4 insertions, 36 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
index 9b206c8..f17f8f2 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
@@ -58,13 +58,6 @@ public class UserFileDAO implements UserDAO {
         }
     }
 
-    /**
-     * Return the user with the String name name or null otherwise
-     * 
-     * @param username Name of desired user
-     * 
-     * @return Desired user, null otherwise
-     */
     @Override
     public User getUser(String username) {
         synchronized (users) {
@@ -72,14 +65,6 @@ public class UserFileDAO implements UserDAO {
         }
     }
 
-    /**
-     * Create a User user
-     * 
-     * @param user User to create
-     * 
-     * @return Desired created user
-     * @throws IOException If there was an IO issue saving the file
-     */
     @Override
     public User addUser(User user) throws IOException {
         synchronized (users) {
@@ -92,36 +77,19 @@ public class UserFileDAO implements UserDAO {
         }
     }
 
-    /**
-     * Update a user that matches the supplied name
-     * 
-     * @param name    The name of the user
-     * @param newUser New user data
-     * 
-     * @return Desired user, null otherwise
-     * @throws IOException If there was an IO issue saving the file
-     */
     @Override
-    public User updateUser(User newUser, String name) throws IOException {
+    public User updateUser(User user) throws IOException {
         synchronized (users) {
-            if (users.containsKey(name)) {
-                users.put(name, newUser);
+            if (users.containsKey(user.getUsername())) {
+                users.put(user.getUsername(), user);
                 save();
-                return newUser;
+                return user;
             } else {
                 return null;
             }
         }
     }
 
-    /**
-     * Delete a user matching the name
-     * 
-     * @param username The name of the user
-     * 
-     * @return True if deleted, false otherwise
-     * @throws IOException If there was an IO issue saving the file
-     */
     @Override
     public boolean deleteUser(String username) throws IOException {
         synchronized (users) {