removing white spaces and redundant changes on existing classes

Author: daveotengo

sormas-api/src/main/java/de/symeda/sormas/api/user/UserDto.java

@@ -64,7 +64,7 @@ public class UserDto extends EntityDto {
 	public static final String ASSOCIATED_OFFICER = "associatedOfficer";
 	public static final String LABORATORY = "laboratory";
 	public static final String POINT_OF_ENTRY = "pointOfEntry";
-	public static final String LIMITED_DISEASES = "limitedDiseases";
+    public static final String LIMITED_DISEASES = "limitedDiseases";
 	public static final String LANGUAGE = "language";
 	public static final String HAS_CONSENTED_TO_GDPR = "hasConsentedToGdpr";
 	public static final String EXTERNAL_ID = "externalId";

sormas-api/src/main/java/de/symeda/sormas/api/user/UserFacade.java

@@ -42,15 +42,15 @@
 @Remote
 public interface UserFacade {
 
-    UserDto getByUuid(String uuid);
+	UserDto getByUuid(String uuid);
 
-    UserDto saveUser(@Valid UserDto dto, boolean isUserSettingsUpdate);
+	UserDto saveUser(@Valid UserDto dto, boolean isUserSettingsUpdate);
 
-    UserDto saveUserRolesAndRestrictions(UserDto user, Set<UserRoleReferenceDto> userRoles);
+	UserDto saveUserRolesAndRestrictions(UserDto user, Set<UserRoleReferenceDto> userRoles);
 
-    boolean isLoginUnique(String uuid, String userName);
+	boolean isLoginUnique(String uuid, String userName);
 
-    String resetPassword(String uuid);
+	String resetPassword(String uuid);
 
     String updateUserPassword(String uuid, String newPassword, String currentPassword);
 
@@ -62,109 +62,122 @@ public interface UserFacade {
 
     String generatePassword();
 
-    List<UserDto> getAllAfter(Date date);
+	List<UserDto> getAllAfter(Date date);
 
-    UserDto getByUserName(String userName);
+	UserDto getByUserName(String userName);
 
-    /**
-     * @param regionRef      reference of the region to be filtered for. When this region is null, it is not filtered in this regard.
-     *                       NOTE: some users don't have a region (often users with NATIONAL_USER role, for example). They will
-     *                       not be included when a region is specified, but otherwise they will.
-     * @param limitedDisease can be used to remove users from the return value that are limited to diseases other that limitedDisease.
-     * @param userRights     user rights to be filtered for.
-     * @return
-     */
-    List<UserReferenceDto> getUsersByRegionAndRights(RegionReferenceDto regionRef, Disease limitedDisease, UserRight... userRights);
+	/**
+	 *
+	 * @param regionRef
+	 *            reference of the region to be filtered for. When this region is null, it is not filtered in this regard.
+	 *            NOTE: some users don't have a region (often users with NATIONAL_USER role, for example). They will
+	 *            not be included when a region is specified, but otherwise they will.
+	 * @param limitedDisease
+	 *            can be used to remove users from the return value that are limited to diseases other that limitedDisease.
+	 * @param userRights
+	 *            user rights to be filtered for.
+	 * @return
+	 */
+	List<UserReferenceDto> getUsersByRegionAndRights(RegionReferenceDto regionRef, Disease limitedDisease, UserRight... userRights);
 
-    List<UserReferenceDto> getUsersWithSuperiorJurisdiction(UserDto user);
+	List<UserReferenceDto> getUsersWithSuperiorJurisdiction(UserDto user);
 
-    List<UserDto> getIndexList(UserCriteria userCriteria, Integer first, Integer max, List<SortProperty> sortProperties);
+	List<UserDto> getIndexList(UserCriteria userCriteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
-    Page<UserDto> getIndexPage(UserCriteria userCriteria, int offset, int size, List<SortProperty> sortProperties);
+	Page<UserDto> getIndexPage(UserCriteria userCriteria, int offset, int size, List<SortProperty> sortProperties);
 
-    long count(UserCriteria userCriteria);
+	long count(UserCriteria userCriteria);
 
-    /**
-     * @param district       reference of the district to be filtered for. When this district is null, it is not filtered in this regard.
-     *                       NOTE: some users don't have a district (often users with NATIONAL_USER role, for example). They will
-     *                       not be included when a district is specified, but otherwise they will.
-     * @param limitedDisease can be used to remove users from the return value that are limited to diseases other that limitedDisease.
-     * @param userRights     user rights to be filtered for.
-     * @return
-     */
-    List<UserReferenceDto> getUserRefsByDistrict(DistrictReferenceDto district, Disease limitedDisease, UserRight... userRights);
+	/**
+	 *
+	 * @param district
+	 *            reference of the district to be filtered for. When this district is null, it is not filtered in this regard.
+	 *            NOTE: some users don't have a district (often users with NATIONAL_USER role, for example). They will
+	 *            not be included when a district is specified, but otherwise they will.
+	 * @param limitedDisease
+	 *            can be used to remove users from the return value that are limited to diseases other that limitedDisease.
+	 * @param userRights
+	 *            user rights to be filtered for.
+	 * @return
+	 */
+	List<UserReferenceDto> getUserRefsByDistrict(DistrictReferenceDto district, Disease limitedDisease, UserRight... userRights);
 
-    /**
-     * @param district                   reference of the district to be filtered for. When this district is null, it is not filtered in this regard.
-     *                                   NOTE: some users don't have a district (often users with NATIONAL_USER role, for example). They will
-     *                                   * not be included when a district is specified, but otherwise they will.
-     * @param excludeLimitedDiseaseUsers if true, all users limited to diseases are excluded from the return value.
-     * @param userRights                 user rights to be filtered for.
-     * @return
-     */
-    List<UserReferenceDto> getUserRefsByDistrict(DistrictReferenceDto district, boolean excludeLimitedDiseaseUsers, UserRight... userRights);
+	/**
+	 *
+	 * @param district
+	 *            reference of the district to be filtered for. When this district is null, it is not filtered in this regard.
+	 *            NOTE: some users don't have a district (often users with NATIONAL_USER role, for example). They will
+	 *            * not be included when a district is specified, but otherwise they will.
+	 * @param excludeLimitedDiseaseUsers
+	 *            if true, all users limited to diseases are excluded from the return value.
+	 * @param userRights
+	 *            user rights to be filtered for.
+	 * @return
+	 */
+	List<UserReferenceDto> getUserRefsByDistrict(DistrictReferenceDto district, boolean excludeLimitedDiseaseUsers, UserRight... userRights);
 
-    List<UserReferenceDto> getUserRefsByDistricts(List<DistrictReferenceDto> districts, Disease limitedDisease, UserRight... userRights);
+	List<UserReferenceDto> getUserRefsByDistricts(List<DistrictReferenceDto> districts, Disease limitedDisease, UserRight... userRights);
 
-    List<UserReferenceDto> getUserRefsByInfrastructure(
-            InfrastructureDataReferenceDto infrastructure,
-            JurisdictionLevel jurisdictionLevel,
-            JurisdictionLevel allowedJurisdictionLevel,
-            Disease limitedDisease,
-            UserRight... userRights);
+	List<UserReferenceDto> getUserRefsByInfrastructure(
+		InfrastructureDataReferenceDto infrastructure,
+		JurisdictionLevel jurisdictionLevel,
+		JurisdictionLevel allowedJurisdictionLevel,
+		Disease limitedDisease,
+		UserRight... userRights);
 
-    List<UserReferenceDto> getAllUserRefs(boolean includeInactive);
+	List<UserReferenceDto> getAllUserRefs(boolean includeInactive);
 
-    List<UserDto> getUsersByAssociatedOfficer(UserReferenceDto associatedOfficer, UserRight... userRights);
+	List<UserDto> getUsersByAssociatedOfficer(UserReferenceDto associatedOfficer, UserRight... userRights);
 
-    List<String> getAllUuids();
+	List<String> getAllUuids();
 
-    List<UserDto> getByUuids(List<String> uuids);
+	List<UserDto> getByUuids(List<String> uuids);
 
-    UserDto getCurrentUser();
+	UserDto getCurrentUser();
 
-    UserReferenceDto getCurrentUserAsReference();
+	UserReferenceDto getCurrentUserAsReference();
 
-    Set<UserRight> getValidLoginRights(String userName, String password);
+	Set<UserRight> getValidLoginRights(String userName, String password);
 
-    void removeUserAsSurveillanceAndContactOfficer(String userUuid);
+	void removeUserAsSurveillanceAndContactOfficer(String userUuid);
 
-    UserSyncResult syncUser(String userUuid);
+	UserSyncResult syncUser(String userUuid);
 
-    List<UserDto> getUsersWithDefaultPassword();
+	List<UserDto> getUsersWithDefaultPassword();
 
-    List<ProcessedEntity> enableUsers(List<String> userUuids);
+	List<ProcessedEntity> enableUsers(List<String> userUuids);
 
-    List<ProcessedEntity> disableUsers(List<String> userUuids);
+	List<ProcessedEntity> disableUsers(List<String> userUuids);
 
-    List<UserReferenceDto> getUsersHavingCaseInJurisdiction(CaseReferenceDto caseReferenceDto);
+	List<UserReferenceDto> getUsersHavingCaseInJurisdiction(CaseReferenceDto caseReferenceDto);
 
-    List<UserReferenceDto> getUsersHavingContactInJurisdiction(ContactReferenceDto contactReferenceDto);
+	List<UserReferenceDto> getUsersHavingContactInJurisdiction(ContactReferenceDto contactReferenceDto);
 
-    List<UserReferenceDto> getUsersHavingEventInJurisdiction(EventReferenceDto event);
+	List<UserReferenceDto> getUsersHavingEventInJurisdiction(EventReferenceDto event);
 
-    List<UserReferenceDto> getUsersHavingTravelEntryInJurisdiction(TravelEntryReferenceDto travelEntryReferenceDto);
+	List<UserReferenceDto> getUsersHavingTravelEntryInJurisdiction(TravelEntryReferenceDto travelEntryReferenceDto);
 
-    List<UserReferenceDto> getUsersHavingEnvironmentInJurisdiction(EnvironmentReferenceDto environmentReferenceDto);
+	List<UserReferenceDto> getUsersHavingEnvironmentInJurisdiction(EnvironmentReferenceDto environmentReferenceDto);
 
-    List<UserReferenceWithTaskNumbersDto> getAssignableUsersWithTaskNumbers(@NotNull TaskContextIndexCriteria taskContextIndexCriteria);
+	List<UserReferenceWithTaskNumbersDto> getAssignableUsersWithTaskNumbers(@NotNull TaskContextIndexCriteria taskContextIndexCriteria);
 
-    Set<UserRoleDto> getUserRoles(UserDto user);
+	Set<UserRoleDto> getUserRoles(UserDto user);
 
-    long getUserCountHavingRole(UserRoleReferenceDto userRoleRef);
+	long getUserCountHavingRole(UserRoleReferenceDto userRoleRef);
 
-    List<UserReferenceDto> getUsersHavingOnlyRole(UserRoleReferenceDto userRoleRef);
+	List<UserReferenceDto> getUsersHavingOnlyRole(UserRoleReferenceDto userRoleRef);
 
-    /**
-     * Retrieves the user rights of the user specified by the passed UUID, or those of the current user if no UUID is specified.
-     * Requesting the user rights of another user without the rights to view users and user roles results in an AccessDeniedException.
-     *
-     * @param userUuid The UUID of the user to request the user rights for
-     * @return A set containing the user rights associated to all user roles assigned to the user
-     */
-    List<UserRight> getUserRights(String userUuid);
+	/**
+	 * Retrieves the user rights of the user specified by the passed UUID, or those of the current user if no UUID is specified.
+	 * Requesting the user rights of another user without the rights to view users and user roles results in an AccessDeniedException.
+	 *
+	 * @param userUuid
+	 *            The UUID of the user to request the user rights for
+	 * @return A set containing the user rights associated to all user roles assigned to the user
+	 */
+	List<UserRight> getUserRights(String userUuid);
 
-    void syncUsersFromAuthenticationProvider();
+	void syncUsersFromAuthenticationProvider();
 
-    boolean isSyncEnabled();
+	boolean isSyncEnabled();
 }