Added Implementation of deprecated methods.

.settings/org.eclipse.wst.common.component

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-            
-    
+        
     <wb-module deploy-name="social-library">
-                         
-        
+                 
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
-                    
-    
+        <wb-resource deploy-path="/" source-path="/src/test/java"/>
+            
     </wb-module>
-        
-
+    
 </project-modules>

CHANGELOG.md

@@ -4,13 +4,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v2.0.1] - 2023-12-04
+## [v2.0.0] - 2023-11-15
 
- - Bug 27218 - Null pointer exception getting notifications preferences fixed
+ - Feature #25901-fix, same as feature 25901 but with minor fixes related to deprecated methods and classes
 
-## [v2.0.0] - 2023-12-04
+## [v1.18.0-SNAPSHOT] - 2023-10-30
 
- - Support for Cassandra 4.1.3 using DataStax java driver
+- Implementation of databookstore using rest api of social service client
 
 ## [v1.17.0] - 2022-05-13
 

README.md

@@ -24,14 +24,10 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/social-util-library/r
 
 * **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante)
 
-* **Ahmed Ibrahim** ([ORCID](https://orcid.org/0009-0001-3009-5755)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/en/about/people-detail/976/Ahmed_Salah_Tawfik_Ibrahim)
-
 ## Maintainers
 
 * **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante)
 
-* **Ahmed Ibrahim** ([ORCID](https://orcid.org/0009-0001-3009-5755)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/en/about/people-detail/976/Ahmed_Salah_Tawfik_Ibrahim)
-
 ## License
 
 This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details.
@@ -43,4 +39,4 @@ open-source software toolkit used for building and operating Hybrid Data
 Infrastructures enabling the dynamic deployment of Virtual Research Environments
 by favouring the realisation of reuse oriented policies.
  
-The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)
+The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>social-networking-library</artifactId>
-	<version>2.0.1</version>
+	<version>1.18.0-SNAPSHOT</version>
 	<name>gCube Social Networking Library</name>
 	<description>
 		The gCube Social Networking Library is the 'bridge' between your gCube Applications and the social networking facilities.
@@ -36,7 +36,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.7.0</version>
+				<version>3.6.4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -44,27 +44,18 @@
 	</dependencyManagement>
 	<dependencies>
 		<dependency>
-			<groupId>com.datastax.oss</groupId>
-			<artifactId>java-driver-query-builder</artifactId>
-			<version>${cassandra.driver.oss.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.datastax.oss</groupId>
-			<artifactId>java-driver-mapper-runtime</artifactId>
-			<version>${cassandra.driver.oss.version}</version>
-			<scope>provided</scope>
+			<groupId>org.gcube.social-networking</groupId>
+			<artifactId>social-service-client</artifactId>
+			<version>[1.3.0-SNAPSHOT, 2.0.0)</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google</groupId>
 			<artifactId>gwt-jsonmaker</artifactId>
 			<version>1.2.1</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
 			<artifactId>ic-client</artifactId>
-			<version>1.0.4</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -91,18 +82,15 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 			<version>2.6</version>
-			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 	<build>
@@ -140,6 +128,24 @@
 					<skipTests>true</skipTests>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<additionalparam>-Xdoclint:none</additionalparam>
+					<additionalJOption>-Xdoclint:none</additionalJOption>
+				</configuration>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>generate-doc</id>
+						<phase>install</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

src/main/java/org/gcube/portal/databook/server/CassandraClusterConnection.java

@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * @author Massimiliano Assante ISTI-CNR
- * @author Ahmed Ibrahim ISTI-CNR
+ * @author Ahmed Salah Tawfik Ibrahim ISTI-CNR
  *
  */
 public class CassandraClusterConnection {
@@ -41,7 +41,7 @@ public class CassandraClusterConnection {
 	 * @param dropSchema set true if you want do drop the current and set up new one
 	 *  the connection to cassandra cluster
 	 */
-	protected CassandraClusterConnection(boolean dropSchema) throws Exception {
+	protected CassandraClusterConnection(boolean dropSchema)	{
 		if (hosts == null || datacenterName == null || keyspaceName == null) {
 			RunningCluster cluster = RunningCluster.getInstance(null);
 
@@ -62,7 +62,7 @@ public class CassandraClusterConnection {
 	 * @param dropSchema set true if you want to drop the current and set up new one
 	 * the connection to cassandra cluster
 	 */
-	protected CassandraClusterConnection(boolean dropSchema, String infrastructureName) throws Exception {
+	protected CassandraClusterConnection(boolean dropSchema, String infrastructureName)	{
 		if (hosts == null || datacenterName == null || keyspaceName == null) {
 			RunningCluster cluster = RunningCluster.getInstance(infrastructureName);
 			//host = cluster.getHost();
@@ -145,7 +145,7 @@ public class CassandraClusterConnection {
 		CqlSession cqlSession = configBuilder(CqlSession.builder())
 				.addContactPoints(hosts)
 				.withKeyspace(KEYSPACE_NAME)
-				.withLocalDatacenter(datacenterName)
+				.withLocalDatacenter("1")
 				.build();
 		_log.info("[OK] Connected to Keyspace {} ", KEYSPACE_NAME);
 		return cqlSession;
@@ -180,7 +180,7 @@ public class CassandraClusterConnection {
 	private static void createKeyspace(String keyspaceName, int replicationFactor) {
 		try (CqlSession cqlSession = configBuilder(CqlSession.builder())
 				.addContactPoints(hosts)
-				.withLocalDatacenter(datacenterName)
+				.withLocalDatacenter("1")
 				.build()) {
 			cqlSession.execute(SchemaBuilder.createKeyspace(keyspaceName)
 					.ifNotExists()
@@ -196,7 +196,7 @@ public class CassandraClusterConnection {
 		ResultSet toreturn;
 		try (CqlSession cqlSession = configBuilder(CqlSession.builder())
 				.addContactPoints(hosts)
-				.withLocalDatacenter(datacenterName)
+				.withLocalDatacenter("1")
 				.build()) {
 			toreturn = cqlSession.execute(SchemaBuilder.dropKeyspace(keyspaceName).ifExists().build());
 			_log.info("Keyspace {} dropped.", keyspaceName);
@@ -207,7 +207,7 @@ public class CassandraClusterConnection {
 	private void createTables(){
 		try (CqlSession cqlSession = configBuilder(CqlSession.builder())
 				.addContactPoints(hosts)
-				.withLocalDatacenter(datacenterName)
+				.withLocalDatacenter("1")
 				.withKeyspace(keyspaceName)
 				.build()) {
 

src/main/java/org/gcube/portal/databook/server/DatabookStore.java

@@ -654,11 +654,6 @@ public interface DatabookStore {
 	 */
 	List<Attachment> getAttachmentsByFeedId(String feedId) throws FeedIDNotFoundException;
 
-	/**
-	 * save an attachment
-	 */
-	boolean saveAttachmentEntry(String feedId, Attachment toSave);
-
 	/**
 	 * Retrieve all the ids of the vre
 	 * @return the set of ids of the vre available or empty list in case of errors.

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;
@@ -27,7 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 /**
  * @author Massimiliano Assante ISTI-CNR
- * @author Ahmed Ibrahim ISTI-CNR
+ * @author Ahmed Salah Tawfik Ibrahim ISTI-CNR
  *
  * @version 2.0.0 October 2023
  *
@@ -49,7 +46,7 @@ public class RunningCluster implements Serializable {
 	/**
 	 * other constants
 	 */
-	private final static String RUNTIME_RESOURCE_NAME = "SocialDB";
+	private final static String RUNTIME_RESOURCE_NAME = "SocialPortalDataStore";
 	private final static String PLATFORM_NAME = "Cassandra";
 
 	private static final String DEFAULT_CONFIGURATION = "/org/gcube/portal/databook/server/resources/databook.properties";
@@ -72,7 +69,7 @@ public class RunningCluster implements Serializable {
 	 * @param infrastructureName could be null
 	 * @return an instance of the RunningCluster
 	 */
-	public static synchronized RunningCluster getInstance(String infrastructureName){
+	public static synchronized RunningCluster getInstance(String infrastructureName) {
 		if (singleton == null) {
 			singleton = new RunningCluster(infrastructureName);
 		}
@@ -81,10 +78,9 @@ public class RunningCluster implements Serializable {
 	/**
 	 * private constructor
 	 */
-	private RunningCluster(String infrastructureName){
+	private RunningCluster(String infrastructureName) {
 		//Query the IS (for the future)
-		try{
-			List<ServiceEndpoint> resources = getConfigurationFromIS(infrastructureName);
+			/*List<ServiceEndpoint> resources = getConfigurationFromIS(infrastructureName);
 			if (resources.size() > 1) {
 				_log.error("Too many Runtime Resource having name " + RUNTIME_RESOURCE_NAME +" in this scope ");
 				throw new TooManyRunningClustersException("There exist more than 1 Runtime Resource in this scope having name " 
@@ -98,17 +94,17 @@ public class RunningCluster implements Serializable {
 				for (ServiceEndpoint res : resources) {
 					AccessPoint found = res.profile().accessPoints().iterator().next();
 					host = found.address();
-					datacenterName = found.description();
+					clusterName = found.description();
 					keyspaceName = found.name();
 				}
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		}
+		}*/
 
-		/*host = "10.1.28.55:9042, 10.1.30.142:9042, 10.1.28.100:9042";
+		host = "10.1.28.55:9042, 10.1.30.142:9042, 10.1.28.100:9042";
 		datacenterName = "1";
-		keyspaceName = "dev_mig_consistent";*/
+		keyspaceName = "dev_mig_new_schema_test";
 	}
 
 	/**
@@ -116,7 +112,7 @@ public class RunningCluster implements Serializable {
 	 * @return the
 	 * @throws Exception
 	 */
-	private List<ServiceEndpoint> getConfigurationFromIS(String infrastructureName) {
+	private List<ServiceEndpoint> getConfigurationFromIS(String infrastructureName) throws Exception  {
 		_log.debug("getConfigurationFromIS infrastructureName="+infrastructureName );
 		String scope = "/";
 		if(infrastructureName != null && !infrastructureName.isEmpty())

src/main/java/org/gcube/portal/databook/server/Schema.java

@@ -1,13 +1,5 @@
 package org.gcube.portal.databook.server;
 
-/**
- * @author Massimiliano Assante ISTI-CNR
- * @author Ahmed Ibrahim ISTI-CNR
- *
- * @version 2.0.0 October 2023
- *
- */
-
 public class Schema {
     //Tables
     public static final String NOTIFICATIONS = "Notifications";

src/main/java/org/gcube/portal/databook/server/Tester.java

@@ -7,13 +7,6 @@ import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
-/**
- * @author Massimiliano Assante ISTI-CNR
- * @author Ahmed Ibrahim ISTI-CNR
- *
- * @version 2.0.0 October 2023
- *
- */
 public class Tester {
     private static DBCassandraAstyanaxImpl store;
     private static Logger LOGGER = LoggerFactory.getLogger(Tester.class);

src/main/java/org/gcube/portal/databook/shared/PostWithAttachment.java

@@ -1,56 +0,0 @@
-package org.gcube.portal.databook.shared;
-
-import java.io.Serializable;
-import java.util.List;
-
-@SuppressWarnings("serial")
-public class PostWithAttachment implements Serializable {
-    private Post post;
-    private List<Attachment> attachments;
-
-    public PostWithAttachment(Post post, List<Attachment> attachments){
-        super();
-        this.post = post;
-        this.attachments = attachments;
-    }
-
-    public void setAttachments(List<Attachment> attachments) {
-        this.attachments = attachments;
-    }
-    public void setPost(Post post) {
-        this.post = post;
-    }
-
-
-    public List<Attachment> getAttachments() {
-        return attachments;
-    }
-
-    public Post getPost() {
-        return post;
-    }
-
-    public String toString() {
-        String postInfo = "Post [key=" + post.getKey() + ", type=" + post.getType() + ", entityId=" + post.getEntityId()
-                + ", time=" + post.getTime() + ", vreid=" + post.getVreid() + ", uri=" + post.getUri()
-                + ", uriThumbnail=" + post.getUriThumbnail() + ", description="
-                + post.getDescription() + ", privacy=" + post.getPrivacy() + ", fullName="
-                + post.getFullName() + ", email=" + post.getEmail() + ", thumbnailURL="
-                + post.getThumbnailURL() + ", commentsNo=" + post.getCommentsNo() + ", likesNo="
-                + post.getLikesNo() + ", linkTitle=" + post.getLinkTitle() + ", linkDescription="
-                + post.getLinkDescription() + ", linkHost=" + post.getLinkHost()
-                + ", applicationFeed=" + post.isApplicationFeed()
-                + ", multiFileUpload=" + post.isMultiFileUpload() + "]";
-        String attachmentInfo = "[Attachments: ";
-        for (Attachment attachment: attachments){
-            attachmentInfo += "[Attachment [key=" + attachment.getId() + ", uri=" + attachment.getUri() + ", name=" + attachment.getName() + ", description="
-                    + attachment.getDescription() + ", thumbnailURL=" + attachment.getThumbnailURL()
-                    + ", mimeType=" + attachment.getMimeType() + "]],";
-        }
-        attachmentInfo = attachmentInfo.substring(0, attachmentInfo.length()-1);
-        attachmentInfo += "]";
-        ;
-
-        return "[" + postInfo + ", " + attachmentInfo + "]" ;
-    }
-}