diff --git a/CHANGELOG.md b/CHANGELOG.md
index b00885c..cd7e6c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v2.0.1] - 2022-06-16
- Release for HL portal removal
+ - Removed Social Networking Library dependency #26523
## [v2.0.0] - 2020-07-21
diff --git a/pom.xml b/pom.xml
index 0bea386..9f8d405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,10 +56,16 @@
json-simple
provided
+
- org.gcube.portal
- social-networking-library
- provided
+ org.gcube.social-networking
+ social-service-model
+ [1.2.0-SNAPSHOT, 2.0.0)
+
+
+ org.gcube.social-networking
+ social-service-client
+ [2.0.0-SNAPSHOT, 3.0.0)
org.gcube.dvos
diff --git a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java
index d7d5765..9d7097c 100644
--- a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java
+++ b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java
@@ -25,12 +25,11 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.codec.binary.Base64;
import org.gcube.common.portal.PortalContext;
-import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl;
-import org.gcube.portal.databook.server.DatabookStore;
-import org.gcube.portal.databook.shared.Invite;
-import org.gcube.portal.databook.shared.InviteStatus;
-import org.gcube.portal.databook.shared.ex.InviteIDNotFoundException;
-import org.gcube.portal.databook.shared.ex.InviteStatusNotFoundException;
+import org.gcube.social_networking.social_networking_client_library.LibClient;
+import org.gcube.social_networking.socialnetworking.model.shared.Invite;
+import org.gcube.social_networking.socialnetworking.model.shared.InviteStatus;
+import org.gcube.social_networking.socialnetworking.model.shared.exceptions.InviteIDNotFoundException;
+import org.gcube.social_networking.socialnetworking.model.shared.exceptions.InviteStatusNotFoundException;
import org.gcube.portal.invites.InvitesManager;
import org.gcube.vomanagement.usermanagement.exception.UserManagementSystemException;
import org.gcube.vomanagement.usermanagement.exception.UserRetrievalFault;
@@ -74,17 +73,21 @@ public class PortletViewController {
private static String MODEL_ATTR = "theModel";
- private static DatabookStore store;
+ private static LibClient libClient;
/**
*
* @return the unique instance of the store
*/
- public static synchronized DatabookStore getStore() {
- if (store == null) {
- store = new DBCassandraAstyanaxImpl();
+ public static synchronized LibClient getClient() {
+ if (libClient == null) {
+ try {
+ libClient = new LibClient();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
- return store;
+ return libClient;
}
@RenderMapping
@@ -114,12 +117,7 @@ public class PortletViewController {
Invite invite = null;
- try {
- invite = getStore().readInvite(inviteId);
- } catch (InviteIDNotFoundException | InviteStatusNotFoundException e) {
- e.printStackTrace();
- return PAGE_INVITE_NOTFOUND;
- }
+ invite = getClient().readInviteLib(inviteId);
if (invite.getStatus() == InviteStatus.ACCEPTED)
return PAGE_INVITE_EXPIRED;