diff --git a/CHANGELOG.md b/CHANGELOG.md
index 163fe37..eb3b518 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Feature #25901-fix, same as feature 25901 but with minor fixes related to deprecated methods and classes
-## [v1.17.1] - 2023-10-30
+## [v1.18.0-SNAPSHOT] - 2023-10-30
- Implementation of databookstore using rest api of social service client
diff --git a/pom.xml b/pom.xml
index 0d4ab68..678afc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.gcube.portal
social-networking-library
- 1.17.1-SNAPSHOT
+ 1.18.0-SNAPSHOT
gCube Social Networking Library
The gCube Social Networking Library is the 'bridge' between your gCube Applications and the social networking facilities.
@@ -46,7 +46,7 @@
org.gcube.social-networking
social-service-client
- [1.1.0, 2.0.0)
+ [1.3.0-SNAPSHOT, 2.0.0)
com.google
@@ -56,7 +56,6 @@
org.gcube.resources.discovery
ic-client
- 1.0.4
provided
@@ -129,6 +128,24 @@
true
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+ -Xdoclint:none
+ -Xdoclint:none
+
+ 3.1.0
+
+
+ generate-doc
+ install
+
+ jar
+
+
+
+
diff --git a/src/main/java/org/gcube/portal/databook/server/DBCassandraAstyanaxImpl.java b/src/main/java/org/gcube/portal/databook/server/DBCassandraAstyanaxImpl.java
index 2293422..c670bea 100644
--- a/src/main/java/org/gcube/portal/databook/server/DBCassandraAstyanaxImpl.java
+++ b/src/main/java/org/gcube/portal/databook/server/DBCassandraAstyanaxImpl.java
@@ -1,15 +1,45 @@
package org.gcube.portal.databook.server;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
import javax.mail.internet.AddressException;
-import org.gcube.portal.databook.shared.*;
-import org.gcube.portal.databook.shared.ex.*;
-
-import org.gcube.social_networking.social_networking_client_library.*;
-
-
+import org.gcube.portal.databook.shared.Attachment;
+import org.gcube.portal.databook.shared.Comment;
+import org.gcube.portal.databook.shared.Feed;
+import org.gcube.portal.databook.shared.FeedType;
+import org.gcube.portal.databook.shared.Invite;
+import org.gcube.portal.databook.shared.InviteOperationResult;
+import org.gcube.portal.databook.shared.InviteStatus;
+import org.gcube.portal.databook.shared.Like;
+import org.gcube.portal.databook.shared.Notification;
+import org.gcube.portal.databook.shared.NotificationChannelType;
+import org.gcube.portal.databook.shared.NotificationType;
+import org.gcube.portal.databook.shared.Post;
+import org.gcube.portal.databook.shared.PostType;
+import org.gcube.portal.databook.shared.RangeFeeds;
+import org.gcube.portal.databook.shared.RangePosts;
+import org.gcube.portal.databook.shared.ex.ColumnNameNotFoundException;
+import org.gcube.portal.databook.shared.ex.CommentIDNotFoundException;
+import org.gcube.portal.databook.shared.ex.FeedIDNotFoundException;
+import org.gcube.portal.databook.shared.ex.FeedTypeNotFoundException;
+import org.gcube.portal.databook.shared.ex.InviteIDNotFoundException;
+import org.gcube.portal.databook.shared.ex.InviteStatusNotFoundException;
+import org.gcube.portal.databook.shared.ex.LikeIDNotFoundException;
+import org.gcube.portal.databook.shared.ex.NotificationChannelTypeNotFoundException;
+import org.gcube.portal.databook.shared.ex.NotificationIDNotFoundException;
+import org.gcube.portal.databook.shared.ex.NotificationTypeNotFoundException;
+import org.gcube.portal.databook.shared.ex.PrivacyLevelTypeNotFoundException;
+import org.gcube.social_networking.social_networking_client_library.CommentClient;
+import org.gcube.social_networking.social_networking_client_library.HashTagClient;
+import org.gcube.social_networking.social_networking_client_library.InviteClient;
+import org.gcube.social_networking.social_networking_client_library.LikeClient;
+import org.gcube.social_networking.social_networking_client_library.NotificationClient;
+import org.gcube.social_networking.social_networking_client_library.PostClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,21 +62,11 @@ public final class DBCassandraAstyanaxImpl implements DatabookStore {
private static LikeClient likeClient;
- /**
- * connection instance
- */
- private CassandraClusterConnection conn;
-
- protected CassandraClusterConnection getConnection() {
- return conn;
- }
/**
* use this constructor carefully from test classes
* @param dropSchema set true if you want do drop the current and set up new one
*/
protected DBCassandraAstyanaxImpl(boolean dropSchema) {
-
- conn = new CassandraClusterConnection(dropSchema);
try {
postClient = new PostClient();
notificationClient = new NotificationClient();
@@ -63,7 +83,6 @@ public final class DBCassandraAstyanaxImpl implements DatabookStore {
* public constructor, no dropping schema is allowed
*/
public DBCassandraAstyanaxImpl() {
- conn = new CassandraClusterConnection(false);
try {
postClient = new PostClient();
notificationClient = new NotificationClient();
@@ -81,7 +100,6 @@ public final class DBCassandraAstyanaxImpl implements DatabookStore {
* public constructor, no dropping schema is allowed, infrastructureName is given.
*/
public DBCassandraAstyanaxImpl(String infrastructureName) {
- conn = new CassandraClusterConnection(false, infrastructureName);
try {
postClient = new PostClient();
notificationClient = new NotificationClient();
@@ -867,7 +885,6 @@ public final class DBCassandraAstyanaxImpl implements DatabookStore {
*/
@Override
public void closeConnection() {
- conn.closeConnection();
}
@Override
diff --git a/src/main/java/org/gcube/portal/databook/server/RunningCluster.java b/src/main/java/org/gcube/portal/databook/server/RunningCluster.java
index 303357a..f137a9d 100644
--- a/src/main/java/org/gcube/portal/databook/server/RunningCluster.java
+++ b/src/main/java/org/gcube/portal/databook/server/RunningCluster.java
@@ -12,9 +12,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.metadata.Metadata;
-import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
import org.gcube.common.portal.GCubePortalConstants;
import org.gcube.common.portal.PortalContext;
import org.gcube.common.resources.gcore.ServiceEndpoint;