From ee5df60850d24cdbc114f1b09c58843f80c5a389 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Thu, 21 Apr 2016 12:14:18 +0000 Subject: [PATCH] removed ASL session dependency git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerSocial@128233 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 5 ---- .../social/ApplicationNewsManager.java | 10 -------- .../ApplicationNotificationsManager.java | 1 + .../social/SocialPortalBridge.java | 24 ------------------- .../social/AppTest.java | 17 ------------- 5 files changed, 1 insertion(+), 56 deletions(-) diff --git a/pom.xml b/pom.xml index abb087e..527066a 100644 --- a/pom.xml +++ b/pom.xml @@ -48,11 +48,6 @@ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided - - org.gcube.applicationsupportlayer - aslcore - provided - org.gcube.common home-library diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNewsManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNewsManager.java index 0ed39d8..d440548 100644 --- a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNewsManager.java +++ b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNewsManager.java @@ -13,7 +13,6 @@ import java.util.UUID; import org.apache.commons.io.IOUtils; import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingUser; import org.gcube.common.encryption.StringEncrypter; import org.gcube.common.portal.PortalContext; @@ -45,15 +44,6 @@ public class ApplicationNewsManager extends SocialPortalBridge implements NewsMa */ private static String RUNTIME_RESOURCE_NAME = "SocialPortalStorage"; private static String CATEGORY_NAME = "FTPServer"; - /** - * deprecated - * @param aslSession the ASLSession instance - * @param portletClassName your portlet class name will be used ad unique identifier for your applicationProfile - */ - @Deprecated - public ApplicationNewsManager(ASLSession session, String portletClassName) { - super(session, portletClassName); - } /** * * @param scope the current scope diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java index e694785..ca33991 100644 --- a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java +++ b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java @@ -54,6 +54,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen setContext(request); _log.warn("Asked for Simple Notification (without redirect to creator)"); } + /** * * Use this constructor if you do need notifications to point back to your applications, diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/SocialPortalBridge.java b/src/main/java/org/gcube/applicationsupportlayer/social/SocialPortalBridge.java index 30e185f..ebf70e0 100644 --- a/src/main/java/org/gcube/applicationsupportlayer/social/SocialPortalBridge.java +++ b/src/main/java/org/gcube/applicationsupportlayer/social/SocialPortalBridge.java @@ -8,7 +8,6 @@ import java.util.List; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.gcube.application.framework.core.session.ASLSession; import org.gcube.applicationsupportlayer.social.ex.ApplicationProfileNotFoundException; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingUser; import org.gcube.common.portal.PortalContext; @@ -43,29 +42,6 @@ public class SocialPortalBridge { protected ApplicationProfile applicationProfile; //unique instance private static DatabookStore store; - - /** - * deprecated: please use SocialPortalBridge(String scope, {@link SocialNetworkingUser} currUser) - * @param session the ASL Session - */ - @Deprecated - protected SocialPortalBridge(ASLSession session) { - this.currScope = session.getScope(); - this.currGroupName = extractGroupNameFromScope(currScope); - this.currUser = new SocialNetworkingUser(session.getUsername(), session.getUserEmailAddress(), session.getUserFullName(), session.getUserAvatarId()); - this.applicationProfile = null; - _log.warn("Using deprecated method of ASLSocial, please consider to upgrade your code. Current scope=" + currScope + " currentGroup name="+currGroupName); - } - /** - * deprecated: please use SocialPortalBridge(String scope, {@link SocialNetworkingUser} currUser, String portletClassName) - * @param session the ASL Session - * @param portletClassName your application unique identifier registered in the infrastructure - */ - @Deprecated - protected SocialPortalBridge(ASLSession session, String portletClassName) { - this(session); - this.applicationProfile = getProfileFromInfrastrucure(portletClassName); - } /** * * @param scope the current scope diff --git a/src/test/java/org/gcube/applicationsupportlayer/social/AppTest.java b/src/test/java/org/gcube/applicationsupportlayer/social/AppTest.java index 8a02727..38e81b8 100644 --- a/src/test/java/org/gcube/applicationsupportlayer/social/AppTest.java +++ b/src/test/java/org/gcube/applicationsupportlayer/social/AppTest.java @@ -4,9 +4,6 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.gcube.application.framework.core.session.ASLSession; -import org.gcube.application.framework.core.session.SessionManager; - /** * Unit test for simple App. */ @@ -32,20 +29,6 @@ extends TestCase } - /** - * the current ASLSession - * @return the session - */ - private ASLSession getTestSession() { - - ASLSession toReturn = SessionManager.getInstance().getASLSession("11", "andrea.rossi"); - toReturn.setScope("/gcube/devsec/devVRE"); - toReturn.setUserFullName("Andrea Rossi"); - toReturn.setUserEmailAddress("m.assante@gmail.com"); - toReturn.setGroupModelInfos("TheGroup", 123L); - - return toReturn; - } /** * @throws Exception *