Skip to content

Error Message/Exception Handling Refactoring #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimonFedick wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Error Message/Exception Handling Refactoring #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf0914
SQL Exceptions converted to IllegalArgumentExceptions so that communi…
giulianorasper Oct 19, 2020
43b9d6d
Refactored DB_UserManager functions to no longer return boolean value…
SimonFedick Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 22 additions & 35 deletions backend/src/main/java/database/DB_UserManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,17 @@ public TokenResponse checkToken(String token) {
* @return true, iff the db stored the new present value correctly
*/
@Override
public Boolean setPresentValueofUser(String userName, Boolean present) {
public void setPresentValueofUser(String userName, Boolean present) {
Connection connection = this.openConnection();
String sqlstatement = "UPDATE users SET present = ? WHERE username = ?";
try (PreparedStatement stmt = connection.prepareStatement(sqlstatement)) {
stmt.setBoolean(1, present);
stmt.setString(2, userName);
stmt.executeUpdate();
return true;
} catch (SQLException e) {
System.err.println("An exception occurred while updating Present value of a user.");
System.err.println(e.getMessage());
return false;
throw new IllegalArgumentException(e.getMessage());
} finally {
this.closeConnection(connection);
}
Expand Down Expand Up @@ -218,9 +217,9 @@ public int tokenToID(String token) {
* @return True, iff the user was successfully removed.
*/
@Override
public boolean removeUser(int userID) {
public void removeUser(int userID) {
if(!this.userIDAlreadyUsed(userID)) {
return false;
throw new IllegalArgumentException("Attendee does not exist!");
}
Connection connection = this.openConnection();
String sqlstatement = "DELETE FROM users WHERE userID = ?";
Expand All @@ -230,11 +229,10 @@ public boolean removeUser(int userID) {
} catch (SQLException e) {
System.err.println("An exception occurred while removing a user from the database.");
System.err.println(e.getMessage());
return false;
throw new IllegalArgumentException(e.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}


Expand All @@ -247,7 +245,7 @@ public boolean removeUser(int userID) {
* @return True, iff the operation was successful.
*/
@Override
public boolean logoutUser(int userID, String pw, String token) {
public void logoutUser(int userID, String pw, String token) {
Connection connection = this.openConnection();
String sqlstatement = "UPDATE users SET password = ?, token = ?, present = ? WHERE userID = ?";
try (PreparedStatement stmt = connection.prepareStatement(sqlstatement)) {
Expand All @@ -267,11 +265,10 @@ public boolean logoutUser(int userID, String pw, String token) {
} catch (SQLException e) {
System.err.println("An exception occurred while logging out/invalidating a user.");
System.err.println(e.getMessage());
return false;
throw new IllegalArgumentException(e.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}

/**
Expand Down Expand Up @@ -315,7 +312,7 @@ public List<Pair<User, String>> getAllPasswords() {
* @return True, iff the new token was successfully added to the database.
*/
@Override
public boolean storeNewToken(int userID, String token) {
public void storeNewToken(int userID, String token) {
Connection connection = this.openConnection();
String sqlstatement = "UPDATE users SET token = ? WHERE userID = ?";
try (PreparedStatement stmt = connection.prepareStatement(sqlstatement)) {
Expand All @@ -325,11 +322,10 @@ public boolean storeNewToken(int userID, String token) {
} catch (SQLException e) {
System.err.println("An exception occurred while storing a new user token.");
System.err.println(e.getMessage());
return false;
throw new IllegalArgumentException(e.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}

/**
Expand All @@ -341,7 +337,7 @@ public boolean storeNewToken(int userID, String token) {
* @return True, iff the new password was successfully added to the database.
*/
@Override
public boolean storeNewPassword(int userID, String password) {
public void storeNewPassword(int userID, String password) {
Connection connection = this.openConnection();
String sqlstatement = "UPDATE users SET password = ? WHERE userID = ?";
try (PreparedStatement stmt = connection.prepareStatement(sqlstatement)) {
Expand All @@ -351,11 +347,10 @@ public boolean storeNewPassword(int userID, String password) {
} catch (SQLException e) {
System.err.println("An exception occurred while storing a new user password.");
System.err.println(e.getMessage());
return false;
throw new IllegalArgumentException(e.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}

/**
Expand Down Expand Up @@ -394,10 +389,7 @@ public boolean userNameAlreadyUsed(String userName) {
@Override
public boolean userIDAlreadyUsed(int id) {
List<Integer> ids = this.getIDs();
if(ids.contains(id)) {
return true;
}
return false;
return ids.contains(id);
}

/**
Expand Down Expand Up @@ -461,7 +453,7 @@ public List<String> getAllGroupsFromUser() {
* @return True, iff the attendee was added correctly.
*/
@Override
public boolean addAttendee(Attendee a, String password, String token) {
public void addAttendee(Attendee a, String password, String token) {
Connection connection = this.openConnection();
String sqlstatement = "INSERT INTO users(userID, fullname, username, password, "
+ "token, email, groups, function, residence, isAdmin, present)"
Expand All @@ -482,11 +474,10 @@ public boolean addAttendee(Attendee a, String password, String token) {
} catch (SQLException ex) {
System.err.println("An exception occurred while adding a new attendee.");
System.err.println(ex.getMessage());
return false;
throw new IllegalArgumentException(ex.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}

/**
Expand Down Expand Up @@ -565,7 +556,7 @@ public Attendee getAttendeeData(int userID) {
* @return True, iff the Attendee was overwritten properly
*/
@Override
public boolean editAttendee(Attendee a) {
public void editAttendee(Attendee a) {
Connection connection = this.openConnection();
String sqlstatement = "UPDATE users SET fullname = ?, "
+ " email = ?, "
Expand All @@ -586,11 +577,10 @@ public boolean editAttendee(Attendee a) {
} catch (SQLException e) {
System.err.println("An exception occurred while trying to overwrite an attendee.");
System.err.println(e.getMessage());
return false;
throw new IllegalArgumentException(e.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}

/**********************************specialAdminFunctionality********************************************/
Expand All @@ -606,7 +596,7 @@ public boolean editAttendee(Attendee a) {
* @return True, iff the admin was added correctly.
*/
@Override
public boolean addAdmin(Admin a, String password, String token) {
public void addAdmin(Admin a, String password, String token) {
Connection connection = this.openConnection();
String sqlstatement = "INSERT INTO users(userID, fullname, username, password ,"
+ "token, email, groups, function, residence, isAdmin, present)"
Expand All @@ -627,11 +617,10 @@ public boolean addAdmin(Admin a, String password, String token) {
} catch (SQLException ex) {
System.err.println("An exception occurred while adding a new admin.");
System.err.println(ex.getMessage());
return false;
throw new IllegalArgumentException(ex.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}

/**
Expand Down Expand Up @@ -675,7 +664,7 @@ public List<Admin> getAllAdmins() {
* @return True, iff the user was successfully removed.
*/
@Override
public boolean removeAllAdmins() {
public void removeAllAdmins() {
Connection connection = this.openConnection();
String sqlstatement = "DELETE FROM users WHERE isAdmin = ?";
try (PreparedStatement stmt = connection.prepareStatement(sqlstatement)) {
Expand All @@ -684,11 +673,10 @@ public boolean removeAllAdmins() {
} catch (SQLException e) {
System.err.println("An exception occurred while removing all admins from the database.");
System.err.println(e.getMessage());
return false;
throw new IllegalArgumentException(e.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}

/**
Expand Down Expand Up @@ -735,7 +723,7 @@ public Admin getAdminData(int userID) {
* @return True, iff the Admin was overwritten properly
*/
@Override
public boolean editAdmin(Admin a) {
public void editAdmin(Admin a) {
Connection connection = this.openConnection();
String sqlstatement = "UPDATE users SET fullname = ? , "
+ "email = ? ,"
Expand All @@ -755,10 +743,9 @@ public boolean editAdmin(Admin a) {
} catch (SQLException e) {
System.err.println("An exception occurred while trying to overwrite an admin.");
System.err.println(e.getMessage());
return false;
throw new IllegalArgumentException(e.getMessage());
} finally {
this.closeConnection(connection);
}
return true;
}
}
Loading