dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40701
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20686: Reordered user setting methods
------------------------------------------------------------
revno: 20686
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-10-14 09:31:34 +0200
message:
Reordered user setting methods
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java 2015-09-16 14:49:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java 2015-10-14 07:31:34 +0000
@@ -77,6 +77,26 @@
void addOrUpdateUserSetting( UserSetting userSetting );
/**
+ * Saves the name/value pair as a user setting connected to the currently
+ * logged in user.
+ *
+ * @param name the name/handle of the value.
+ * @param value the value to store.
+ * @throws NoCurrentUserException if there is no current user.
+ */
+ void saveUserSetting( String name, Serializable value );
+
+ /**
+ * Saves the name/value pair as a user setting connected to user identified by username
+ *
+ * @param name the name/handle of the value.
+ * @param value the value to store.
+ * @param username the username of user.
+ * @throws NoCurrentUserException if there is no user.
+ */
+ void saveUserSetting( String name, Serializable value, String username );
+
+ /**
* Updates a UserSetting.
*
* @param userSetting the UserSetting to update.
@@ -84,6 +104,28 @@
void updateUserSetting( UserSetting userSetting );
/**
+ * Deletes a UserSetting.
+ *
+ * @param userSetting the UserSetting to delete.
+ */
+ void deleteUserSetting( UserSetting userSetting );
+
+ /**
+ * Removes all user settings associated with the given user.
+ *
+ * @param user the user.
+ */
+ void removeUserSettings( User user );
+
+ /**
+ * Deletes the user setting with the given name.
+ *
+ * @param name the name of the user setting to delete.
+ * @throws NoCurrentUserException if there is no current user.
+ */
+ void deleteUserSetting( String name );
+
+ /**
* Retrieves the UserSetting associated with the given User for the given
* UserSetting name.
*
@@ -122,13 +164,6 @@
List<UserSetting> getUserSettings( String name );
/**
- * Deletes a UserSetting.
- *
- * @param userSetting the UserSetting to delete.
- */
- void deleteUserSetting( UserSetting userSetting );
-
- /**
* Returns a Map with an entry for all UserSettings with the given name where
* the key is the user and the value is the value of the user setting.
*
@@ -139,33 +174,6 @@
Map<User, Serializable> getUserSettings( String name, Serializable defaultValue );
/**
- * Removes all user settings associated with the given user.
- *
- * @param user the user.
- */
- void removeUserSettings( User user );
-
- /**
- * Saves the name/value pair as a user setting connected to the currently
- * logged in user.
- *
- * @param name the name/handle of the value.
- * @param value the value to store.
- * @throws NoCurrentUserException if there is no current user.
- */
- void saveUserSetting( String name, Serializable value );
-
- /**
- * Saves the name/value pair as a user setting connected to user identified by username
- *
- * @param name the name/handle of the value.
- * @param value the value to store.
- * @param username the username of user.
- * @throws NoCurrentUserException if there is no user.
- */
- void saveUserSetting( String name, Serializable value, String username );
-
- /**
* Returns the value of the user setting specified by the given name.
*
* @param name the name of the user setting.
@@ -206,11 +214,4 @@
*/
List<UserSetting> getAllUserSettings();
- /**
- * Deletes the user setting with the given name.
- *
- * @param name the name of the user setting to delete.
- * @throws NoCurrentUserException if there is no current user.
- */
- void deleteUserSetting( String name );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java 2015-10-05 07:55:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java 2015-10-14 07:31:34 +0000
@@ -96,75 +96,6 @@
}
@Override
- public void updateUserSetting( UserSetting userSetting )
- {
- userSettingStore.updateUserSetting( userSetting );
- }
-
- @Override
- public void deleteUserSetting( UserSetting userSetting )
- {
- userSettingStore.deleteUserSetting( userSetting );
- }
-
- @Override
- public List<UserSetting> getAllUserSettings( User user )
- {
- return userSettingStore.getAllUserSettings( user );
- }
-
- @Override
- public List<UserSetting> getUserSettings( String name )
- {
- return userSettingStore.getUserSettings( name );
- }
-
- @Override
- public UserSetting getUserSetting( User user, String name )
- {
- return userSettingStore.getUserSetting( user, name );
- }
-
- @Override
- public Serializable getUserSettingValue( User user, String name, Serializable defaultValue )
- {
- UserSetting setting = getUserSetting( user, name );
-
- return setting != null && setting.getValue() != null ? setting.getValue() : defaultValue;
- }
-
- @Override
- public Map<User, Serializable> getUserSettings( String name, Serializable defaultValue )
- {
- Map<User, Serializable> map = new HashMap<>();
-
- for ( UserSetting setting : userSettingStore.getUserSettings( name ) )
- {
- map.put( setting.getUser(), setting.getValue() != null ? setting.getValue() : defaultValue );
- }
-
- return map;
- }
-
- @Override
- public void removeUserSettings( User user )
- {
- userSettingStore.removeUserSettings( user );
- }
-
- // -------------------------------------------------------------------------
- // UserSettingService implementation
- // -------------------------------------------------------------------------
-
- @Override
- public void saveUserSetting( String name, Serializable value )
- {
- User currentUser = currentUserService.getCurrentUser();
-
- save( name, value, currentUser );
- }
-
- @Override
public void saveUserSetting( String name, Serializable value, String username )
{
UserCredentials credentials = userService.getUserCredentialsByUsername( username );
@@ -175,6 +106,14 @@
}
}
+ @Override
+ public void saveUserSetting( String name, Serializable value )
+ {
+ User currentUser = currentUserService.getCurrentUser();
+
+ save( name, value, currentUser );
+ }
+
private void save( String name, Serializable value, User user )
{
if ( user == null )
@@ -202,6 +141,68 @@
}
@Override
+ public void updateUserSetting( UserSetting userSetting )
+ {
+ userSettingStore.updateUserSetting( userSetting );
+ }
+
+ @Override
+ public void deleteUserSetting( UserSetting userSetting )
+ {
+ userSettingStore.deleteUserSetting( userSetting );
+ }
+
+ @Override
+ public void removeUserSettings( User user )
+ {
+ userSettingStore.removeUserSettings( user );
+ }
+
+
+ @Override
+ public void deleteUserSetting( String name )
+ {
+ User currentUser = currentUserService.getCurrentUser();
+
+ if ( currentUser != null )
+ {
+ deleteUserSetting( getUserSetting( currentUser, name ) );
+ }
+ }
+
+ @Override
+ public List<UserSetting> getUserSettings( String name )
+ {
+ return userSettingStore.getUserSettings( name );
+ }
+
+ @Override
+ public UserSetting getUserSetting( User user, String name )
+ {
+ return userSettingStore.getUserSetting( user, name );
+ }
+
+ @Override
+ public Serializable getUserSetting( String name, Serializable defaultValue )
+ {
+ User currentUser = currentUserService.getCurrentUser();
+
+ if ( currentUser == null )
+ {
+ return defaultValue;
+ }
+
+ UserSetting userSetting = getUserSetting( currentUser, name );
+
+ if ( userSetting != null )
+ {
+ return userSetting.getValue();
+ }
+
+ return defaultValue;
+ }
+
+ @Override
public Serializable getUserSetting( String name )
{
User currentUser = currentUserService.getCurrentUser();
@@ -209,7 +210,6 @@
return getUserSetting( name, currentUser );
}
-
@Override
public Serializable getUserSetting( String name, String username )
{
@@ -236,23 +236,24 @@
}
@Override
- public Serializable getUserSetting( String name, Serializable defaultValue )
- {
- User currentUser = currentUserService.getCurrentUser();
-
- if ( currentUser == null )
- {
- return defaultValue;
- }
-
- UserSetting userSetting = getUserSetting( currentUser, name );
-
- if ( userSetting != null )
- {
- return userSetting.getValue();
- }
-
- return defaultValue;
+ public Serializable getUserSettingValue( User user, String name, Serializable defaultValue )
+ {
+ UserSetting setting = getUserSetting( user, name );
+
+ return setting != null && setting.getValue() != null ? setting.getValue() : defaultValue;
+ }
+
+ @Override
+ public Map<User, Serializable> getUserSettings( String name, Serializable defaultValue )
+ {
+ Map<User, Serializable> map = new HashMap<>();
+
+ for ( UserSetting setting : userSettingStore.getUserSettings( name ) )
+ {
+ map.put( setting.getUser(), setting.getValue() != null ? setting.getValue() : defaultValue );
+ }
+
+ return map;
}
@Override
@@ -267,15 +268,10 @@
return getAllUserSettings( currentUser );
}
-
+
@Override
- public void deleteUserSetting( String name )
+ public List<UserSetting> getAllUserSettings( User user )
{
- User currentUser = currentUserService.getCurrentUser();
-
- if ( currentUser != null )
- {
- deleteUserSetting( getUserSetting( currentUser, name ) );
- }
+ return userSettingStore.getAllUserSettings( user );
}
}
