diff --git a/pom.xml b/pom.xml index 955c9eb..c7ab111 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.applicationsupportlayer aslsocial - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT jar Social Portal ASL Extension @@ -47,11 +47,6 @@ portal-manager provided - - org.gcube.common - home-library - provided - org.gcube.portal social-networking-library diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java index 170be3c..50acb7c 100644 --- a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java +++ b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java @@ -11,9 +11,6 @@ import org.gcube.applicationsupportlayer.social.shared.SocialFileItem; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingSite; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingUser; import org.gcube.applicationsupportlayer.social.shared.SocialSharedFolder; -import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; -import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; -import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder; import org.gcube.portal.databook.shared.Notification; import org.gcube.portal.databook.shared.NotificationChannelType; import org.gcube.portal.databook.shared.NotificationType; @@ -219,34 +216,6 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws InternalErrorException */ @Override - @Deprecated - public boolean notifyFolderSharing(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws InternalErrorException { - String sharedFolderName = sharedFolder.getName(); - if (sharedFolder.isShared()) { - WorkspaceSharedFolder sharedWSFolder = (WorkspaceSharedFolder) sharedFolder; - if (sharedWSFolder.isVreFolder()) - sharedFolderName = sharedWSFolder.getDisplayName(); - } - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_FOLDER_SHARE, - userIdToNotify, //user no notify - sharedFolder.getId(), - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+sharedFolder.getId(), - "shared the workspace folder \""+ sharedFolderName +"\" with you", - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } - /** - * {@inheritDoc} - * @throws InternalErrorException - */ - @Override public boolean notifyFolderSharing(String userIdToNotify, SocialSharedFolder sharedFolder) { String sharedFolderName = sharedFolder.isVreFolder()?sharedFolder.getDisplayName():sharedFolder.getTitle(); Notification not = new Notification( @@ -285,29 +254,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen return saveNotification(not); } - /** - * {@inheritDoc} - * @throws Exception - */ - @Override - @Deprecated - public boolean notifyAdministratorUpgrade(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception { - String sharedFolderName = sharedFolder.getName(); - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_ADMIN_UPGRADE, - userIdToNotify, //user no notify - sharedFolder.getId(), - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+sharedFolder.getId(), - "upgraded you to Administrator of the workspace folder \""+ sharedFolderName+"\"", - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } + /** * {@inheritDoc} * @throws Exception @@ -330,29 +277,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen return saveNotification(not); } - /** - * {@inheritDoc} - * @throws Exception - */ - @Override - @Deprecated - public boolean notifyAdministratorDowngrade(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception { - String sharedFolderName = sharedFolder.getName(); - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_ADMIN_DOWNGRADE, - userIdToNotify, //user no notify - sharedFolder.getId(), - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+sharedFolder.getId(), - "downgraded you from Administrator of the workspace folder \""+ sharedFolderName+"\"", - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - return saveNotification(not); - } /** * {@inheritDoc} * @throws Exception @@ -381,7 +306,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws InternalErrorException */ @Override - public boolean notifyFolderRenaming(String userIdToNotify, String previousName, String newName, String renamedFolderId) throws InternalErrorException { + public boolean notifyFolderRenaming(String userIdToNotify, String previousName, String newName, String renamedFolderId) { Notification not = new Notification( UUID.randomUUID().toString(), NotificationType.WP_FOLDER_RENAMED, @@ -404,33 +329,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws UserManagementSystemException */ @Override - @Deprecated - public boolean notifyFolderAddedUser(String userIdToNotify, WorkspaceSharedFolder sharedFolder, String newAddedUserId) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { - UserManager um = new LiferayUserManager(); - GCubeUser user = um.getUserByUsername(newAddedUserId); - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_FOLDER_ADDEDUSER, - userIdToNotify, //user no notify - sharedFolder.getId(), //the - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+sharedFolder.getId(), - "added "+ user.getFullname() +" to your workspace shared folder \""+ sharedFolder.getName()+"\"", - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } - /** - * {@inheritDoc} - * @throws UserManagementPortalException - * @throws UserRetrievalFault - * @throws UserManagementSystemException - */ - @Override - public boolean notifyFolderAddedUser(String userIdToNotify, SocialSharedFolder sharedFolder, String newAddedUserId) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { + public boolean notifyFolderAddedUser(String userIdToNotify, SocialSharedFolder sharedFolder, String newAddedUserId) throws UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { UserManager um = new LiferayUserManager(); GCubeUser user = um.getUserByUsername(newAddedUserId); Notification not = new Notification( @@ -455,42 +354,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws UserManagementSystemException */ @Override - @Deprecated - public boolean notifyFolderAddedUsers(String userIdToNotify, WorkspaceSharedFolder sharedFolder, List newAddedUserIds) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { - if (newAddedUserIds != null && newAddedUserIds.size() > 0) { - if (newAddedUserIds.size() == 1) - return notifyFolderAddedUser(userIdToNotify, sharedFolder, newAddedUserIds.get(0)); - StringBuilder addedUsersFullNames = new StringBuilder(); - UserManager um = new LiferayUserManager(); - for (String userId : newAddedUserIds) - addedUsersFullNames.append(um.getUserByUsername(userId).getFullname()).append(" "); - - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_FOLDER_ADDEDUSER, - userIdToNotify, //user no notify - sharedFolder.getId(), //the - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+sharedFolder.getId(), - "added "+ addedUsersFullNames +" to your workspace shared folder \""+ sharedFolder.getName()+"\"", - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } - - return false; - } - /** - * {@inheritDoc} - * @throws UserManagementPortalException - * @throws UserRetrievalFault - * @throws UserManagementSystemException - */ - @Override - public boolean notifyFolderAddedUsers(String userIdToNotify, SocialSharedFolder sharedFolder, List newAddedUserIds) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { + public boolean notifyFolderAddedUsers(String userIdToNotify, SocialSharedFolder sharedFolder, List newAddedUserIds) throws UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { if (newAddedUserIds != null && newAddedUserIds.size() > 0) { if (newAddedUserIds.size() == 1) return notifyFolderAddedUser(userIdToNotify, sharedFolder, newAddedUserIds.get(0)); @@ -521,28 +385,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * {@inheritDoc} */ @Override - @Deprecated - public boolean notifyFolderRemovedUser(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_FOLDER_REMOVEDUSER, - userIdToNotify, //user no notify - sharedFolder.getId(), //the - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+sharedFolder.getId(), - "unshared his shared folder \""+ sharedFolder.getName() + "\" from your workspace", - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } - /** - * {@inheritDoc} - */ - @Override - public boolean notifyFolderRemovedUser(String userIdToNotify, SocialSharedFolder sharedFolder) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { + public boolean notifyFolderRemovedUser(String userIdToNotify, SocialSharedFolder sharedFolder) throws UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { Notification not = new Notification( UUID.randomUUID().toString(), NotificationType.WP_FOLDER_REMOVEDUSER, @@ -563,33 +406,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws InternalErrorException */ @Override - @Deprecated - public boolean notifyAddedItem(String userIdToNotify, WorkspaceItem item, WorkspaceSharedFolder sharedFolder) throws InternalErrorException { - String notifyText = sharedFolder.isVreFolder() ? - "added "+ item.getName() +" to the workspace group folder " + sharedFolder.getDisplayName() : - "added "+ item.getName() +" to your workspace shared folder "+ item.getPath().substring(0,item.getPath().lastIndexOf('/')); - - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_ITEM_NEW, - userIdToNotify, //user no notify - item.getId(), //the - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+item.getParent().getId(), - notifyText, - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } - /** - * {@inheritDoc} - * @throws InternalErrorException - */ - @Override - public boolean notifyAddedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws InternalErrorException { + public boolean notifyAddedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) { String notifyText = sharedFolder.isVreFolder() ? "added "+ item.getTitle() +" to the workspace group folder " + sharedFolder.getDisplayName() : "added "+ item.getTitle() +" to your workspace shared folder "+ sharedFolder.getTitle(); @@ -614,31 +431,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws InternalErrorException */ @Override - @Deprecated - public boolean notifyMovedItem(String userIdToNotify, WorkspaceItem item, WorkspaceSharedFolder sharedFolder) throws InternalErrorException { - String notifyText = sharedFolder.isVreFolder() ? "removed item "+ item.getName() +" from the workspace group folder " + sharedFolder.getDisplayName(): - "removed item "+ item.getName() +" from your workspace shared folder \""+ sharedFolder.getName()+"\""; - - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_ITEM_DELETE, - userIdToNotify, //user no notify - item.getId(), //the - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+sharedFolder.getId(), - notifyText, - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - }/** - * {@inheritDoc} - * @throws InternalErrorException - */ - @Override - public boolean notifyMovedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws InternalErrorException { + public boolean notifyMovedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) { String notifyText = sharedFolder.isVreFolder() ? "removed item "+ item.getName() +" from the workspace group folder " + sharedFolder.getDisplayName(): "removed item "+ item.getName() +" from your workspace shared folder \""+ sharedFolder.getTitle()+"\""; @@ -662,32 +455,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws InternalErrorException */ @Override - @Deprecated - public boolean notifyRemovedItem(String userIdToNotify, String itemName, WorkspaceSharedFolder sharedFolder) throws InternalErrorException { - String notifyText = sharedFolder.isVreFolder() ? "deleted item \""+ itemName +"\" from the workspace group folder " + sharedFolder.getDisplayName(): - " deleted item \""+ itemName +"\" from your workspace shared folder \""+ sharedFolder.getName()+"\""; - - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_ITEM_DELETE, - userIdToNotify, //user no notify - sharedFolder.getId(), //the - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+sharedFolder.getId(), - notifyText, - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } - /** - * {@inheritDoc} - * @throws InternalErrorException - */ - @Override - public boolean notifyRemovedItem(String userIdToNotify, String itemName, SocialSharedFolder sharedFolder) throws InternalErrorException { + public boolean notifyRemovedItem(String userIdToNotify, String itemName, SocialSharedFolder sharedFolder) { String notifyText = sharedFolder.isVreFolder() ? "deleted item \""+ itemName +"\" from the workspace group folder " + sharedFolder.getDisplayName(): " deleted item \""+ itemName +"\" from your workspace shared folder \""+ sharedFolder.getTitle()+"\""; @@ -711,32 +479,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws InternalErrorException */ @Override - @Deprecated - public boolean notifyUpdatedItem(String userIdToNotify, WorkspaceItem item, WorkspaceSharedFolder sharedFolder) throws InternalErrorException { - String notifyText = sharedFolder.isVreFolder() ? " updated \""+ item.getName() +"\" from the workspace group folder \"" + sharedFolder.getDisplayName()+"\"": - " updated \""+ item.getName() +"\" to your workspace shared folder \""+ item.getPath().substring(0,item.getPath().lastIndexOf('/'))+"\""; - - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_ITEM_UPDATED, - userIdToNotify, //user no notify - item.getId(), //the - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+item.getParent().getId(), - notifyText, - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } - /** - * {@inheritDoc} - * @throws InternalErrorException - */ - @Override - public boolean notifyUpdatedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws InternalErrorException { + public boolean notifyUpdatedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) { String notifyText = sharedFolder.isVreFolder() ? " updated \""+ item.getName() +"\" from the workspace VRE folder \"" + sharedFolder.getDisplayName()+"\"": " updated \""+ item.getName() +"\" to your workspace shared folder \""+ sharedFolder.getTitle() +"\""; @@ -760,32 +503,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen * @throws InternalErrorException */ @Override - @Deprecated - public boolean notifyItemRenaming(String userIdToNotify, String previousName, WorkspaceItem renamedItem, WorkspaceSharedFolder rootSharedFolder) throws InternalErrorException { - String notifyText = rootSharedFolder.isVreFolder() ? "renamed \""+ previousName +"\" as \"" + renamedItem.getName() +"\" in the workspace group folder " + rootSharedFolder.getDisplayName(): - "renamed \"" + previousName +"\" as \"" + renamedItem.getName() +"\" in your shared folder \"" + renamedItem.getPath().substring(0, renamedItem.getPath().lastIndexOf('/'))+"\""; - - Notification not = new Notification( - UUID.randomUUID().toString(), - NotificationType.WP_ITEM_RENAMED, - userIdToNotify, //user no notify - renamedItem.getId(), //the - new Date(), - siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+renamedItem.getParent().getId(), - notifyText, - false, - currUser.getUsername(), - currUser.getFullname(), - currUser.getUserAvatarId()); - - return saveNotification(not); - } - /** - * {@inheritDoc} - * @throws InternalErrorException - */ - @Override - public boolean notifyItemRenaming(String userIdToNotify, String previousName, SocialFileItem renamedItem, SocialSharedFolder rootSharedFolder) throws InternalErrorException { + public boolean notifyItemRenaming(String userIdToNotify, String previousName, SocialFileItem renamedItem, SocialSharedFolder rootSharedFolder) { String notifyText = rootSharedFolder.isVreFolder() ? "renamed \""+ previousName +"\" as \"" + renamedItem.getName() +"\" in the workspace VRE folder " + rootSharedFolder.getDisplayName(): "renamed \"" + previousName +"\" as \"" + renamedItem.getName() +"\" in your shared folder \"" + rootSharedFolder.getTitle()+"\""; diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/NotificationsManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/NotificationsManager.java index 84a8526..489061e 100644 --- a/src/main/java/org/gcube/applicationsupportlayer/social/NotificationsManager.java +++ b/src/main/java/org/gcube/applicationsupportlayer/social/NotificationsManager.java @@ -6,9 +6,6 @@ import java.util.Set; import org.gcube.applicationsupportlayer.social.shared.SocialFileItem; import org.gcube.applicationsupportlayer.social.shared.SocialSharedFolder; -import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; -import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; -import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder; import org.gcube.portal.databook.shared.NotificationType; import org.gcube.portal.databook.shared.RunningJob; /** @@ -17,15 +14,6 @@ import org.gcube.portal.databook.shared.RunningJob; * */ public interface NotificationsManager { - /** - * use to notify a user he got a workspace folder shared - * - * @param userIdToNotify the user you want to notify - * @param sharedFolder the shared {@link WorkspaceSharedFolder} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SocialSharedFolder} - */ - boolean notifyFolderSharing(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception; /** * use to notify a user he got a workspace folder shared * @@ -43,15 +31,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyFolderUnsharing(String userIdToNotify, String unsharedFolderId, String unsharedFolderName) throws Exception; - /** - * use to notify a user he got upgraded to Administrator of a folder shared - * - * @param userIdToNotify the user you want to notify - * @param sharedFolder the shared {@link WorkspaceSharedFolder} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SocialSharedFolder} - */ - boolean notifyAdministratorUpgrade(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception; /** * use to notify a user he got upgraded to Administrator of a folder shared * @@ -61,15 +40,6 @@ public interface NotificationsManager { * */ boolean notifyAdministratorUpgrade(String userIdToNotify, SocialSharedFolder sharedFolder) throws Exception; - /** - * use to notify a user he got downgraded from Administrator of a folder shared - * - * @param userIdToNotify the user you want to notify - * @param sharedFolder the shared {@link WorkspaceSharedFolder} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SocialSharedFolder} - */ - boolean notifyAdministratorDowngrade(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception; /** * use to notify a user he got downgraded from Administrator of a folder shared * @@ -88,16 +58,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyFolderRenaming(String userIdToNotify, String previousName, String newName, String renamedFolderId) throws Exception; - /** - * use to notify a user that a new user was added in on of his workspace shared folder - * - * @param userIdToNotify the user you want to notify - * @param sharedFolder the shared {@link WorkspaceSharedFolder} - * @param newAddedUserId the new user that was added - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SocialSharedFolder} - */ - boolean notifyFolderAddedUser(String userIdToNotify, WorkspaceSharedFolder sharedFolder, String newAddedUserId) throws Exception; /** * use to notify a user that a new user was added in on of his workspace shared folder * @@ -107,16 +67,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyFolderAddedUser(String userIdToNotify, SocialSharedFolder sharedFolder, String newAddedUserId) throws Exception; - /** - * use to notify a user that a new user was added in on of his workspace shared folder - * - * @param userIdToNotify the user you want to notify - * @param sharedFolder the shared {@link WorkspaceSharedFolder} - * @param newAddedUserIds List of new users that were added - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SocialSharedFolder} - */ - boolean notifyFolderAddedUsers(String userIdToNotify, WorkspaceSharedFolder sharedFolder, List newAddedUserIds) throws Exception; /** * use to notify a user that a new user was added in on of his workspace shared folder * @@ -126,16 +76,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyFolderAddedUsers(String userIdToNotify, SocialSharedFolder sharedFolder, List newAddedUserIds) throws Exception; - - /** - * use to notify a user that an existing user was removed from one of his workspace shared folder - * - * @param userIdToNotify the user you want to notify - * @param sharedFolder the shared {@link WorkspaceSharedFolder} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SocialSharedFolder} - */ - boolean notifyFolderRemovedUser(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception; /** * use to notify a user that an existing user was removed from one of his workspace shared folder * @@ -144,15 +84,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyFolderRemovedUser(String userIdToNotify, SocialSharedFolder sharedFolder) throws Exception; - /** - * use to notify a user he got a workspace item new in some of his workspace shared folder - * @param userIdToNotify the user you want to notify - * @param newItem the new shared {@link WorkspaceItem} - * @param sharedFolder the shared folder {@link WorkspaceSharedFolder} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SocialSharedFolder} and {@link SocialFileItem} - */ - boolean notifyAddedItem(String userIdToNotify, WorkspaceItem item, WorkspaceSharedFolder sharedFolder) throws Exception; /** * use to notify a user he got a workspace item new in some of his workspace shared folder * @param userIdToNotify the user you want to notify @@ -161,15 +92,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyAddedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws Exception; - /** - * use to notify a user he got a workspace item deleted from one of his workspace shared folder - * @param userIdToNotify the user you want to notify - * @param removedItem the removed {@link WorkspaceItem} - * @param sharedFolder the shared folder {@link WorkspaceSharedFolder} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SocialSharedFolder} and {@link SocialFileItem} - */ - boolean notifyMovedItem(String userIdToNotify, WorkspaceItem item, WorkspaceSharedFolder sharedFolder) throws Exception; /** * use to notify a user he got a workspace item deleted from one of his workspace shared folder * @param userIdToNotify the user you want to notify @@ -178,15 +100,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyMovedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws Exception; - /** - * use to notify a user he got a workspace item deleted from one of his workspace shared folder - * @param userIdToNotify the user you want to notify - * @param removedItem the removed {@link WorkspaceItem} - * @param sharedFolder the shared folder {@link WorkspaceSharedFolder} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SharedFolder} - */ - boolean notifyRemovedItem(String userIdToNotify, String item, WorkspaceSharedFolder sharedFolder) throws Exception; /** * use to notify a user he got a workspace item deleted from one of his workspace shared folder * @param userIdToNotify the user you want to notify @@ -195,15 +108,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyRemovedItem(String userIdToNotify, String item, SocialSharedFolder sharedFolder) throws Exception; - /** - * use to notify a user he got a workspace item updated from one of his workspace shared folder - * @param userIdToNotify the user you want to notify - * @param updatedItem the updated shared {@link WorkspaceItem} - * @param sharedFolder the shared folder {@link WorkspaceFolder} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SharedFolder} and {@link Item} - */ - boolean notifyUpdatedItem(String userIdToNotify, WorkspaceItem item, WorkspaceSharedFolder sharedFolder) throws Exception; /** * use to notify a user he got a workspace item updated from one of his workspace shared folder * @param userIdToNotify the user you want to notify @@ -212,17 +116,6 @@ public interface NotificationsManager { * @return true if the notification is correctly delivered, false otherwise */ boolean notifyUpdatedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws Exception; - /** - * use to notify a user he got a workspace item renamed - * - * @param userIdToNotify the user you want to notify - * @param previousName the previous name of the folder - * @param renamedItem the renamed {@link WorkspaceItem} - * @param rootSharedFolder the root shared {@link WorkspaceSharedFolder} of the {@link WorkspaceItem} - * @return true if the notification is correctly delivered, false otherwise - * @deprecated use {@link SharedFolder} and {@link Item} - */ - boolean notifyItemRenaming(String userIdToNotify, String previousName, WorkspaceItem renamedItem, WorkspaceSharedFolder rootSharedFolder) throws Exception; /** * use to notify a user he got a workspace item renamed *