removed storage hub deps

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerSocial@169462 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2018-06-26 15:29:06 +00:00
parent 08b7e7df30
commit 672f88c274
5 changed files with 258 additions and 65 deletions

View File

@ -47,11 +47,6 @@
<artifactId>portal-manager</artifactId> <artifactId>portal-manager</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId> <artifactId>home-library</artifactId>

View File

@ -7,13 +7,13 @@ import java.util.Set;
import java.util.UUID; import java.util.UUID;
import org.gcube.applicationsupportlayer.social.mailing.EmailPlugin; import org.gcube.applicationsupportlayer.social.mailing.EmailPlugin;
import org.gcube.applicationsupportlayer.social.shared.SocialFileItem;
import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingSite; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingSite;
import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingUser; 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.exceptions.InternalErrorException;
import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder;
import org.gcube.common.storagehub.model.items.Item;
import org.gcube.common.storagehub.model.items.SharedFolder;
import org.gcube.portal.databook.shared.Notification; import org.gcube.portal.databook.shared.Notification;
import org.gcube.portal.databook.shared.NotificationChannelType; import org.gcube.portal.databook.shared.NotificationChannelType;
import org.gcube.portal.databook.shared.NotificationType; import org.gcube.portal.databook.shared.NotificationType;
@ -247,14 +247,8 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws InternalErrorException * @throws InternalErrorException
*/ */
@Override @Override
public boolean notifyFolderSharing(String userIdToNotify, SharedFolder sharedFolder) throws InternalErrorException { public boolean notifyFolderSharing(String userIdToNotify, SocialSharedFolder sharedFolder) {
String sharedFolderName = sharedFolder.getTitle(); String sharedFolderName = sharedFolder.isVreFolder()?sharedFolder.getDisplayName():sharedFolder.getTitle();
if (sharedFolder.isShared()) {
SharedFolder sharedWSFolder = (SharedFolder) sharedFolder;
sharedFolderName = sharedWSFolder.isVreFolder()?sharedWSFolder.getDisplayName():sharedFolder.getTitle();
if (sharedWSFolder.isVreFolder())
sharedFolderName = sharedWSFolder.getDisplayName();
}
Notification not = new Notification( Notification not = new Notification(
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
NotificationType.WP_FOLDER_SHARE, NotificationType.WP_FOLDER_SHARE,
@ -319,7 +313,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws Exception * @throws Exception
*/ */
@Override @Override
public boolean notifyAdministratorUpgrade(String userIdToNotify, SharedFolder sharedFolder) throws Exception { public boolean notifyAdministratorUpgrade(String userIdToNotify, SocialSharedFolder sharedFolder) throws Exception {
String sharedFolderName = sharedFolder.getTitle(); String sharedFolderName = sharedFolder.getTitle();
Notification not = new Notification( Notification not = new Notification(
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
@ -364,7 +358,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws Exception * @throws Exception
*/ */
@Override @Override
public boolean notifyAdministratorDowngrade(String userIdToNotify, SharedFolder sharedFolder) throws Exception { public boolean notifyAdministratorDowngrade(String userIdToNotify, SocialSharedFolder sharedFolder) throws Exception {
String sharedFolderName = sharedFolder.getTitle(); String sharedFolderName = sharedFolder.getTitle();
Notification not = new Notification( Notification not = new Notification(
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
@ -436,7 +430,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws UserManagementSystemException * @throws UserManagementSystemException
*/ */
@Override @Override
public boolean notifyFolderAddedUser(String userIdToNotify, SharedFolder sharedFolder, String newAddedUserId) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { public boolean notifyFolderAddedUser(String userIdToNotify, SocialSharedFolder sharedFolder, String newAddedUserId) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException {
UserManager um = new LiferayUserManager(); UserManager um = new LiferayUserManager();
GCubeUser user = um.getUserByUsername(newAddedUserId); GCubeUser user = um.getUserByUsername(newAddedUserId);
Notification not = new Notification( Notification not = new Notification(
@ -496,7 +490,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws UserManagementSystemException * @throws UserManagementSystemException
*/ */
@Override @Override
public boolean notifyFolderAddedUsers(String userIdToNotify, SharedFolder sharedFolder, List<String> newAddedUserIds) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { public boolean notifyFolderAddedUsers(String userIdToNotify, SocialSharedFolder sharedFolder, List<String> newAddedUserIds) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException {
if (newAddedUserIds != null && newAddedUserIds.size() > 0) { if (newAddedUserIds != null && newAddedUserIds.size() > 0) {
if (newAddedUserIds.size() == 1) if (newAddedUserIds.size() == 1)
return notifyFolderAddedUser(userIdToNotify, sharedFolder, newAddedUserIds.get(0)); return notifyFolderAddedUser(userIdToNotify, sharedFolder, newAddedUserIds.get(0));
@ -548,7 +542,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public boolean notifyFolderRemovedUser(String userIdToNotify, SharedFolder sharedFolder) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException { public boolean notifyFolderRemovedUser(String userIdToNotify, SocialSharedFolder sharedFolder) throws InternalErrorException, UserManagementSystemException, UserRetrievalFault, UserManagementPortalException {
Notification not = new Notification( Notification not = new Notification(
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
NotificationType.WP_FOLDER_REMOVEDUSER, NotificationType.WP_FOLDER_REMOVEDUSER,
@ -595,7 +589,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws InternalErrorException * @throws InternalErrorException
*/ */
@Override @Override
public boolean notifyAddedItem(String userIdToNotify, Item item, SharedFolder sharedFolder) throws InternalErrorException { public boolean notifyAddedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws InternalErrorException {
String notifyText = sharedFolder.isVreFolder() ? String notifyText = sharedFolder.isVreFolder() ?
"added "+ item.getTitle() +" to the workspace group folder " + sharedFolder.getDisplayName() : "added "+ item.getTitle() +" to the workspace group folder " + sharedFolder.getDisplayName() :
"added "+ item.getTitle() +" to your workspace shared folder "+ item.getPath().substring(0,item.getPath().lastIndexOf('/')); "added "+ item.getTitle() +" to your workspace shared folder "+ item.getPath().substring(0,item.getPath().lastIndexOf('/'));
@ -606,7 +600,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
userIdToNotify, //user no notify userIdToNotify, //user no notify
item.getId(), //the item.getId(), //the
new Date(), new Date(),
siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+item.getParentId(), siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+item.getParent().getId(),
notifyText, notifyText,
false, false,
currUser.getUsername(), currUser.getUsername(),
@ -644,7 +638,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws InternalErrorException * @throws InternalErrorException
*/ */
@Override @Override
public boolean notifyMovedItem(String userIdToNotify, Item item, SharedFolder sharedFolder) throws InternalErrorException { public boolean notifyMovedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws InternalErrorException {
String notifyText = sharedFolder.isVreFolder() ? "removed item "+ item.getName() +" from the workspace group folder " + sharedFolder.getDisplayName(): 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()+"\""; "removed item "+ item.getName() +" from your workspace shared folder \""+ sharedFolder.getTitle()+"\"";
@ -693,7 +687,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws InternalErrorException * @throws InternalErrorException
*/ */
@Override @Override
public boolean notifyRemovedItem(String userIdToNotify, String itemName, SharedFolder sharedFolder) throws InternalErrorException { public boolean notifyRemovedItem(String userIdToNotify, String itemName, SocialSharedFolder sharedFolder) throws InternalErrorException {
String notifyText = sharedFolder.isVreFolder() ? "deleted item \""+ itemName +"\" from the workspace group folder " + sharedFolder.getDisplayName(): String notifyText = sharedFolder.isVreFolder() ? "deleted item \""+ itemName +"\" from the workspace group folder " + sharedFolder.getDisplayName():
" deleted item \""+ itemName +"\" from your workspace shared folder \""+ sharedFolder.getTitle()+"\""; " deleted item \""+ itemName +"\" from your workspace shared folder \""+ sharedFolder.getTitle()+"\"";
@ -742,7 +736,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws InternalErrorException * @throws InternalErrorException
*/ */
@Override @Override
public boolean notifyUpdatedItem(String userIdToNotify, Item item, SharedFolder sharedFolder) throws InternalErrorException { public boolean notifyUpdatedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws InternalErrorException {
String notifyText = sharedFolder.isVreFolder() ? " updated \""+ item.getName() +"\" from the workspace group folder \"" + sharedFolder.getDisplayName()+"\"": 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('/'))+"\""; " updated \""+ item.getName() +"\" to your workspace shared folder \""+ item.getPath().substring(0,item.getPath().lastIndexOf('/'))+"\"";
@ -752,7 +746,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
userIdToNotify, //user no notify userIdToNotify, //user no notify
item.getId(), //the item.getId(), //the
new Date(), new Date(),
siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+item.getParentId(), siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+item.getParent().getId(),
notifyText, notifyText,
false, false,
currUser.getUsername(), currUser.getUsername(),
@ -791,7 +785,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
* @throws InternalErrorException * @throws InternalErrorException
*/ */
@Override @Override
public boolean notifyItemRenaming(String userIdToNotify, String previousName, Item renamedItem, SharedFolder rootSharedFolder) throws InternalErrorException { public boolean notifyItemRenaming(String userIdToNotify, String previousName, SocialFileItem renamedItem, SocialSharedFolder rootSharedFolder) throws InternalErrorException {
String notifyText = rootSharedFolder.isVreFolder() ? "renamed \""+ previousName +"\" as \"" + renamedItem.getName() +"\" in the workspace group folder " + rootSharedFolder.getDisplayName(): 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('/'))+"\""; "renamed \"" + previousName +"\" as \"" + renamedItem.getName() +"\" in your shared folder \"" + renamedItem.getPath().substring(0, renamedItem.getPath().lastIndexOf('/'))+"\"";
@ -801,7 +795,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
userIdToNotify, //user no notify userIdToNotify, //user no notify
renamedItem.getId(), //the renamedItem.getId(), //the
new Date(), new Date(),
siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+renamedItem.getParentId(), siteLandingPagePath + USER_WORKSPACE_FRIENDLY_URL +"?itemid="+renamedItem.getParent().getId(),
notifyText, notifyText,
false, false,
currUser.getUsername(), currUser.getUsername(),

View File

@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set; 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.WorkspaceFolder;
import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder;
import org.gcube.common.storagehub.model.items.Item;
import org.gcube.common.storagehub.model.items.SharedFolder;
import org.gcube.portal.databook.shared.NotificationType; import org.gcube.portal.databook.shared.NotificationType;
import org.gcube.portal.databook.shared.RunningJob; import org.gcube.portal.databook.shared.RunningJob;
/** /**
@ -23,17 +23,17 @@ public interface NotificationsManager {
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link WorkspaceSharedFolder} * @param sharedFolder the shared {@link WorkspaceSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* @deprecated use {@link SharedFolder} * @deprecated use {@link SocialSharedFolder}
*/ */
boolean notifyFolderSharing(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception; boolean notifyFolderSharing(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception;
/** /**
* use to notify a user he got a workspace folder shared * use to notify a user he got a workspace folder shared
* *
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link SharedFolder} instance * @param sharedFolder the shared {@link SocialSharedFolder} instance
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyFolderSharing(String userIdToNotify, SharedFolder sharedFolder) throws Exception; boolean notifyFolderSharing(String userIdToNotify, SocialSharedFolder sharedFolder) throws Exception;
/** /**
* use to notify a user he got a workspace folder shared * use to notify a user he got a workspace folder shared
* *
@ -49,35 +49,35 @@ public interface NotificationsManager {
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link WorkspaceSharedFolder} * @param sharedFolder the shared {@link WorkspaceSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* @deprecated use {@link SharedFolder} * @deprecated use {@link SocialSharedFolder}
*/ */
boolean notifyAdministratorUpgrade(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception; boolean notifyAdministratorUpgrade(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception;
/** /**
* use to notify a user he got upgraded to Administrator of a folder shared * use to notify a user he got upgraded to Administrator of a folder shared
* *
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link SharedFolder} instance * @param sharedFolder the shared {@link SocialSharedFolder} instance
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* *
*/ */
boolean notifyAdministratorUpgrade(String userIdToNotify, SharedFolder sharedFolder) throws Exception; boolean notifyAdministratorUpgrade(String userIdToNotify, SocialSharedFolder sharedFolder) throws Exception;
/** /**
* use to notify a user he got downgraded from Administrator of a folder shared * use to notify a user he got downgraded from Administrator of a folder shared
* *
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link WorkspaceSharedFolder} * @param sharedFolder the shared {@link WorkspaceSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* @deprecated use {@link SharedFolder} * @deprecated use {@link SocialSharedFolder}
*/ */
boolean notifyAdministratorDowngrade(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception; boolean notifyAdministratorDowngrade(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception;
/** /**
* use to notify a user he got downgraded from Administrator of a folder shared * use to notify a user he got downgraded from Administrator of a folder shared
* *
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link SharedFolder} * @param sharedFolder the shared {@link SocialSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyAdministratorDowngrade(String userIdToNotify, SharedFolder sharedFolder) throws Exception; boolean notifyAdministratorDowngrade(String userIdToNotify, SocialSharedFolder sharedFolder) throws Exception;
/** /**
* use to notify a user he got a workspace folder renamed * use to notify a user he got a workspace folder renamed
* *
@ -95,18 +95,18 @@ public interface NotificationsManager {
* @param sharedFolder the shared {@link WorkspaceSharedFolder} * @param sharedFolder the shared {@link WorkspaceSharedFolder}
* @param newAddedUserId the new user that was added * @param newAddedUserId the new user that was added
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* @deprecated use {@link SharedFolder} * @deprecated use {@link SocialSharedFolder}
*/ */
boolean notifyFolderAddedUser(String userIdToNotify, WorkspaceSharedFolder sharedFolder, String newAddedUserId) throws Exception; 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 * 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 userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link SharedFolder} instance * @param sharedFolder the shared {@link SocialSharedFolder} instance
* @param newAddedUserId the new user that was added * @param newAddedUserId the new user that was added
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyFolderAddedUser(String userIdToNotify, SharedFolder sharedFolder, String newAddedUserId) throws Exception; 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 * use to notify a user that a new user was added in on of his workspace shared folder
* *
@ -114,18 +114,18 @@ public interface NotificationsManager {
* @param sharedFolder the shared {@link WorkspaceSharedFolder} * @param sharedFolder the shared {@link WorkspaceSharedFolder}
* @param newAddedUserIds List of new users that were added * @param newAddedUserIds List of new users that were added
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* @deprecated use {@link SharedFolder} * @deprecated use {@link SocialSharedFolder}
*/ */
boolean notifyFolderAddedUsers(String userIdToNotify, WorkspaceSharedFolder sharedFolder, List<String> newAddedUserIds) throws Exception; boolean notifyFolderAddedUsers(String userIdToNotify, WorkspaceSharedFolder sharedFolder, List<String> newAddedUserIds) throws Exception;
/** /**
* use to notify a user that a new user was added in on of his workspace shared folder * 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 userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link SharedFolder} instance * @param sharedFolder the shared {@link SocialSharedFolder} instance
* @param newAddedUserIds List of new users that were added * @param newAddedUserIds List of new users that were added
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyFolderAddedUsers(String userIdToNotify, SharedFolder sharedFolder, List<String> newAddedUserIds) throws Exception; boolean notifyFolderAddedUsers(String userIdToNotify, SocialSharedFolder sharedFolder, List<String> newAddedUserIds) throws Exception;
/** /**
* use to notify a user that an existing user was removed from one of his workspace shared folder * use to notify a user that an existing user was removed from one of his workspace shared folder
@ -133,51 +133,51 @@ public interface NotificationsManager {
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link WorkspaceSharedFolder} * @param sharedFolder the shared {@link WorkspaceSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* @deprecated use {@link SharedFolder} * @deprecated use {@link SocialSharedFolder}
*/ */
boolean notifyFolderRemovedUser(String userIdToNotify, WorkspaceSharedFolder sharedFolder) throws Exception; 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 * 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 userIdToNotify the user you want to notify
* @param sharedFolder the shared {@link SharedFolder} * @param sharedFolder the shared {@link SocialSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyFolderRemovedUser(String userIdToNotify, SharedFolder sharedFolder) throws Exception; 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 * 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 userIdToNotify the user you want to notify
* @param newItem the new shared {@link WorkspaceItem} * @param newItem the new shared {@link WorkspaceItem}
* @param sharedFolder the shared folder {@link WorkspaceSharedFolder} * @param sharedFolder the shared folder {@link WorkspaceSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* @deprecated use {@link SharedFolder} and {@link Item} * @deprecated use {@link SocialSharedFolder} and {@link SocialFileItem}
*/ */
boolean notifyAddedItem(String userIdToNotify, WorkspaceItem item, WorkspaceSharedFolder sharedFolder) throws Exception; 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 * 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 userIdToNotify the user you want to notify
* @param newItem the new shared {@link Item} instance * @param newItem the new shared {@link SocialFileItem} instance
* @param sharedFolder the shared folder {@link SharedFolder} instance * @param sharedFolder the shared folder {@link SocialSharedFolder} instance
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyAddedItem(String userIdToNotify, Item item, SharedFolder sharedFolder) throws Exception; 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 * 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 userIdToNotify the user you want to notify
* @param removedItem the removed {@link WorkspaceItem} * @param removedItem the removed {@link WorkspaceItem}
* @param sharedFolder the shared folder {@link WorkspaceSharedFolder} * @param sharedFolder the shared folder {@link WorkspaceSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
* @deprecated use {@link SharedFolder} and {@link Item} * @deprecated use {@link SocialSharedFolder} and {@link SocialFileItem}
*/ */
boolean notifyMovedItem(String userIdToNotify, WorkspaceItem item, WorkspaceSharedFolder sharedFolder) throws Exception; 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 * 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 userIdToNotify the user you want to notify
* @param removedItem the removed {@link Item} * @param removedItem the removed item instance of {@link SocialFileItem}
* @param sharedFolder the shared folder {@link haredFolder} * @param sharedFolder the shared folder {@link SocialSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyMovedItem(String userIdToNotify, Item item, SharedFolder sharedFolder) throws Exception; 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 * 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 userIdToNotify the user you want to notify
@ -190,11 +190,11 @@ public interface NotificationsManager {
/** /**
* use to notify a user he got a workspace item deleted from one of his workspace shared folder * 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 userIdToNotify the user you want to notify
* @param removedItem the removed {@link WorkspaceItem} * @param removedItem the removed name
* @param sharedFolder the shared folder {@link WorkspaceSharedFolder} * @param sharedFolder the shared folder {@link SocialSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyRemovedItem(String userIdToNotify, String item, SharedFolder sharedFolder) throws Exception; 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 * 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 userIdToNotify the user you want to notify
@ -207,11 +207,11 @@ public interface NotificationsManager {
/** /**
* use to notify a user he got a workspace item updated from one of his workspace shared folder * 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 userIdToNotify the user you want to notify
* @param updatedItem the updated shared {@link Item} * @param updatedItem the updated shared {@link SocialFileItem}
* @param sharedFolder the shared folder {@link SharedFolder} * @param sharedFolder the shared folder {@link SocialSharedFolder}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyUpdatedItem(String userIdToNotify, Item item, SharedFolder sharedFolder) throws Exception; boolean notifyUpdatedItem(String userIdToNotify, SocialFileItem item, SocialSharedFolder sharedFolder) throws Exception;
/** /**
* use to notify a user he got a workspace item renamed * use to notify a user he got a workspace item renamed
* *
@ -228,11 +228,11 @@ public interface NotificationsManager {
* *
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify
* @param previousName the previous name of the folder * @param previousName the previous name of the folder
* @param renamedItem the renamed {@link Item} * @param renamedItem the renamed {@link SocialFileItem}
* @param rootSharedFolder the root shared {@link SharedFolder} of the {@link Item} * @param rootSharedFolder the root shared {@link SocialSharedFolder} of the {@link SocialFileItem}
* @return true if the notification is correctly delivered, false otherwise * @return true if the notification is correctly delivered, false otherwise
*/ */
boolean notifyItemRenaming(String userIdToNotify, String previousName,Item renamedItem, SharedFolder rootSharedFolder) throws Exception; boolean notifyItemRenaming(String userIdToNotify, String previousName, SocialFileItem renamedItem, SocialSharedFolder rootSharedFolder) throws Exception;
/** /**
* *
* @param userIdToNotify the user you want to notify * @param userIdToNotify the user you want to notify

View File

@ -0,0 +1,89 @@
package org.gcube.applicationsupportlayer.social.shared;
import java.io.Serializable;
@SuppressWarnings("serial")
public class SocialFileItem implements Serializable{
private String id;
private String name;
private String title;
private String path;
private SocialSharedFolder parent;
public SocialFileItem() {
}
public SocialFileItem(String id, String name, String title, String path, SocialSharedFolder parent) {
super();
this.id = id;
this.name = name;
this.title = title;
this.path = path;
this.parent = parent;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
public SocialSharedFolder getParent() {
return parent;
}
public void setParent(SocialSharedFolder parent) {
this.parent = parent;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("SocialFileItem [id=");
builder.append(id);
builder.append(", name=");
builder.append(name);
builder.append(", title=");
builder.append(title);
builder.append(", path=");
builder.append(path);
builder.append(", parent=");
builder.append(parent);
builder.append("]");
return builder.toString();
}
}

View File

@ -0,0 +1,115 @@
package org.gcube.applicationsupportlayer.social.shared;
import java.io.Serializable;
@SuppressWarnings("serial")
public class SocialSharedFolder implements Serializable{
private String id;
private String name;
private String title;
private String displayName;
private String path;
private String parentId;
boolean vreFolder;
public SocialSharedFolder() {
}
public SocialSharedFolder(String id, String name, String title, String displayName, String path, String parentId,
boolean vreFolder) {
super();
this.id = id;
this.name = name;
this.title = title;
this.displayName = displayName;
this.path = path;
this.parentId = parentId;
this.vreFolder = vreFolder;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDisplayName() {
return displayName;
}
public void setDisplayName(String displayName) {
this.displayName = displayName;
}
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public boolean isVreFolder() {
return vreFolder;
}
public void setVreFolder(boolean vreFolder) {
this.vreFolder = vreFolder;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("SocialSharedFolder [id=");
builder.append(id);
builder.append(", name=");
builder.append(name);
builder.append(", displayName=");
builder.append(displayName);
builder.append(", path=");
builder.append(path);
builder.append(", parentId=");
builder.append(parentId);
builder.append(", vreFolder=");
builder.append(vreFolder);
builder.append("]");
return builder.toString();
}
}