mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-08 06:01:22 +00:00
Remove whitespace at end of lines (again...)
This commit is contained in:
@@ -92,7 +92,7 @@ public class MySQLAuthenticationProvider implements AuthenticationProvider {
|
|||||||
|
|
||||||
// Get user service
|
// Get user service
|
||||||
UserService userService = injector.getInstance(UserService.class);
|
UserService userService = injector.getInstance(UserService.class);
|
||||||
|
|
||||||
// Get user
|
// Get user
|
||||||
MySQLUser authenticatedUser = userService.retrieveUser(credentials);
|
MySQLUser authenticatedUser = userService.retrieveUser(credentials);
|
||||||
if (authenticatedUser != null) {
|
if (authenticatedUser != null) {
|
||||||
|
@@ -660,7 +660,7 @@ public class UserDirectory implements Directory<String, net.sourceforge.guacamol
|
|||||||
// its ID, and that same user will be queried AGAIN later when
|
// its ID, and that same user will be queried AGAIN later when
|
||||||
// deleted, again - to determine its ID. Perhaps we want cascading
|
// deleted, again - to determine its ID. Perhaps we want cascading
|
||||||
// deletes in the schema?
|
// deletes in the schema?
|
||||||
|
|
||||||
// Validate current user has permission to remove the specified user
|
// Validate current user has permission to remove the specified user
|
||||||
permissionCheckService.verifyUserDeleteAccess(this.user_id,
|
permissionCheckService.verifyUserDeleteAccess(this.user_id,
|
||||||
identifier);
|
identifier);
|
||||||
|
@@ -114,12 +114,12 @@ public class UserService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new MySQLUser based on the provided User.
|
* Create a new MySQLUser based on the provided User.
|
||||||
*
|
*
|
||||||
* @param user The User to use when populating the data of the given
|
* @param user The User to use when populating the data of the given
|
||||||
* MySQLUser.
|
* MySQLUser.
|
||||||
* @return A new MySQLUser object, populated with the data of the given
|
* @return A new MySQLUser object, populated with the data of the given
|
||||||
* user.
|
* user.
|
||||||
*
|
*
|
||||||
* @throws GuacamoleException If an error occurs while reading the data
|
* @throws GuacamoleException If an error occurs while reading the data
|
||||||
* of the provided User.
|
* of the provided User.
|
||||||
*/
|
*/
|
||||||
@@ -131,7 +131,7 @@ public class UserService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new MySQLUser based on the provided database record.
|
* Create a new MySQLUser based on the provided database record.
|
||||||
*
|
*
|
||||||
* @param user The database record describing the user.
|
* @param user The database record describing the user.
|
||||||
* @return A new MySQLUser object, populated with the data of the given
|
* @return A new MySQLUser object, populated with the data of the given
|
||||||
* database record.
|
* database record.
|
||||||
@@ -151,12 +151,12 @@ public class UserService {
|
|||||||
|
|
||||||
// Return new user
|
// Return new user
|
||||||
return mySQLUser;
|
return mySQLUser;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the user having the given ID from the database.
|
* Retrieves the user having the given ID from the database.
|
||||||
*
|
*
|
||||||
* @param id The ID of the user to retrieve.
|
* @param id The ID of the user to retrieve.
|
||||||
* @return The existing MySQLUser object if found, null otherwise.
|
* @return The existing MySQLUser object if found, null otherwise.
|
||||||
*/
|
*/
|
||||||
@@ -176,7 +176,7 @@ public class UserService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the users having the given IDs from the database.
|
* Retrieves the users having the given IDs from the database.
|
||||||
*
|
*
|
||||||
* @param ids The IDs of the users to retrieve.
|
* @param ids The IDs of the users to retrieve.
|
||||||
* @return A list of existing MySQLUser objects.
|
* @return A list of existing MySQLUser objects.
|
||||||
*/
|
*/
|
||||||
@@ -185,7 +185,7 @@ public class UserService {
|
|||||||
// If no IDs given, just return empty list
|
// If no IDs given, just return empty list
|
||||||
if (ids.isEmpty())
|
if (ids.isEmpty())
|
||||||
return Collections.EMPTY_LIST;
|
return Collections.EMPTY_LIST;
|
||||||
|
|
||||||
// Query users by ID
|
// Query users by ID
|
||||||
UserExample example = new UserExample();
|
UserExample example = new UserExample();
|
||||||
example.createCriteria().andUser_idIn(ids);
|
example.createCriteria().andUser_idIn(ids);
|
||||||
@@ -203,7 +203,7 @@ public class UserService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the users having the given usernames from the database.
|
* Retrieves the users having the given usernames from the database.
|
||||||
*
|
*
|
||||||
* @param names The usernames of the users to retrieve.
|
* @param names The usernames of the users to retrieve.
|
||||||
* @return A list of existing MySQLUser objects.
|
* @return A list of existing MySQLUser objects.
|
||||||
*/
|
*/
|
||||||
@@ -212,7 +212,7 @@ public class UserService {
|
|||||||
// If no names given, just return empty list
|
// If no names given, just return empty list
|
||||||
if (names.isEmpty())
|
if (names.isEmpty())
|
||||||
return Collections.EMPTY_LIST;
|
return Collections.EMPTY_LIST;
|
||||||
|
|
||||||
// Query users by ID
|
// Query users by ID
|
||||||
UserExample example = new UserExample();
|
UserExample example = new UserExample();
|
||||||
example.createCriteria().andUsernameIn(names);
|
example.createCriteria().andUsernameIn(names);
|
||||||
@@ -230,7 +230,7 @@ public class UserService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the user having the given username from the database.
|
* Retrieves the user having the given username from the database.
|
||||||
*
|
*
|
||||||
* @param name The username of the user to retrieve.
|
* @param name The username of the user to retrieve.
|
||||||
* @return The existing MySQLUser object if found, null otherwise.
|
* @return The existing MySQLUser object if found, null otherwise.
|
||||||
*/
|
*/
|
||||||
@@ -253,7 +253,7 @@ public class UserService {
|
|||||||
/**
|
/**
|
||||||
* Retrieves the user corresponding to the given credentials from the
|
* Retrieves the user corresponding to the given credentials from the
|
||||||
* database.
|
* database.
|
||||||
*
|
*
|
||||||
* @param credentials The credentials to use when locating the user.
|
* @param credentials The credentials to use when locating the user.
|
||||||
* @return The existing MySQLUser object if the credentials given are
|
* @return The existing MySQLUser object if the credentials given are
|
||||||
* valid, null otherwise.
|
* valid, null otherwise.
|
||||||
@@ -291,7 +291,7 @@ public class UserService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new user having the given username and password.
|
* Creates a new user having the given username and password.
|
||||||
*
|
*
|
||||||
* @param username The username to assign to the new user.
|
* @param username The username to assign to the new user.
|
||||||
* @param password The password to assign to the new user.
|
* @param password The password to assign to the new user.
|
||||||
* @return A new MySQLUser containing the data of the newly created
|
* @return A new MySQLUser containing the data of the newly created
|
||||||
@@ -314,9 +314,9 @@ public class UserService {
|
|||||||
// Create user
|
// Create user
|
||||||
userDAO.insert(user);
|
userDAO.insert(user);
|
||||||
return toMySQLUser(user);
|
return toMySQLUser(user);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deletes the user having the given username from the database
|
* Deletes the user having the given username from the database
|
||||||
* @param username The username of the user to delete.
|
* @param username The username of the user to delete.
|
||||||
@@ -355,7 +355,7 @@ public class UserService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates the user in the database corresponding to the given MySQLUser.
|
* Updates the user in the database corresponding to the given MySQLUser.
|
||||||
*
|
*
|
||||||
* @param mySQLUser The MySQLUser to update (save) to the database. This
|
* @param mySQLUser The MySQLUser to update (save) to the database. This
|
||||||
* user must already exist.
|
* user must already exist.
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user