diff --git a/CHANGELOG.md b/CHANGELOG.md index ac7948c..b14ec0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [v2.9.2-SNAPSHOT] - 2023-11-05 + +- Replace Astyanx Java client for Cassandra 2 with Datastax client for Cassandra 4 + ## [v2.9.1] - 2023-09-28 - Fix for Bug #25760 not closing connection to distributed cached diff --git a/pom.xml b/pom.xml index 750d31d..efa6a72 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 @@ -12,7 +12,7 @@ org.gcube.portal social-networking-library-ws war - 2.9.1 + 2.9.2 social-networking-library-ws Rest interface for the social networking library. @@ -66,7 +66,6 @@ javax.servlet javax.servlet-api 3.1.0 - provided @@ -93,13 +92,12 @@ org.gcube.common storagehub-client-library - + com.sun.mail javax.mail 1.5.2 - compile commons-lang @@ -116,78 +114,20 @@ com.google.guava guava - compile 18.0 + compile org.slf4j slf4j-api provided - - com.netflix.astyanax - astyanax - 2.0.2 - compile - - - jersey-client - com.sun.jersey - - - jersey-bundle - com.sun.jersey - - - jersey-apache-client4 - com.sun.jersey.contribs - - - javax.ws.rs - jsr311-api - - - org.mortbay.jetty - servlet-api - - - - - com.netflix.astyanax - astyanax-thrift - 2.0.2 - compile - - - com.netflix.astyanax - astyanax-cassandra - 2.0.2 - compile - - - com.netflix.astyanax - astyanax-core - 2.0.2 - compile - - - org.slf4j - log4j-over-slf4j - - - org.gcube.socialnetworking social-util-library [1.0.1-SNAPSHOT,2.0.0-SNAPSHOT) compile - - org.gcube.portal - social-networking-library - [1.18.0-SNAPSHOT, 2.0.0-SNAPSHOT) - compile - org.gcube.dvos usermanagement-core @@ -245,8 +185,13 @@ com.fasterxml.jackson.dataformat 2.8.6 - - com.ning @@ -257,8 +202,15 @@ org.glassfish.jersey.containers + jersey-container-servlet-core + + org.glassfish.jersey.media jersey-media-json-processing @@ -279,7 +231,6 @@ javax.portlet portlet-api 2.0 - compile @@ -292,7 +243,6 @@ common-smartgears-app compile - org.gcube.portal @@ -312,7 +262,16 @@ 4.3 compile - + + org.mortbay.jetty + jetty-util + 6.1.22 + + + com.googlecode.json-simple + json-simple + 1.1.1 + diff --git a/src/main/java/org/gcube/portal/social/networking/caches/GroupsCache.java b/src/main/java/org/gcube/portal/social/networking/caches/GroupsCache.java index 407ca02..452e1f8 100644 --- a/src/main/java/org/gcube/portal/social/networking/caches/GroupsCache.java +++ b/src/main/java/org/gcube/portal/social/networking/caches/GroupsCache.java @@ -30,7 +30,7 @@ public class GroupsCache { /** * Retrieve an entry - * @param id + * @param groupId * @return user associated to the user */ public GCubeGroup getGroup(long groupId){ @@ -44,7 +44,7 @@ public class GroupsCache { /** * Save an entry into the cache * @param id - * @param user + * @param group */ public void pushEntry(long id, GCubeGroup group){ Ehcache groupsCache = CachesManager.getCache(CachesManager.GROUPS_CACHE); diff --git a/src/main/java/org/gcube/portal/social/networking/caches/UsersCache.java b/src/main/java/org/gcube/portal/social/networking/caches/UsersCache.java index c399965..5f80ad9 100644 --- a/src/main/java/org/gcube/portal/social/networking/caches/UsersCache.java +++ b/src/main/java/org/gcube/portal/social/networking/caches/UsersCache.java @@ -59,7 +59,7 @@ public class UsersCache{ /** * Retrieve an entry - * @param id + * @param userId * @return user associated to the user */ public GCubeUser getUser(long userId){ diff --git a/src/main/java/org/gcube/portal/social/networking/ws/inputs/CommentInputBean.java b/src/main/java/org/gcube/portal/social/networking/ws/inputs/CommentInputBean.java index 5ff7a85..a73865c 100644 --- a/src/main/java/org/gcube/portal/social/networking/ws/inputs/CommentInputBean.java +++ b/src/main/java/org/gcube/portal/social/networking/ws/inputs/CommentInputBean.java @@ -39,8 +39,7 @@ public class CommentInputBean implements Serializable{ /** * @param text * @param postid - * @param params - */ + */ public CommentInputBean(String text, String postid) { super(); this.text = text; diff --git a/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Likes.java b/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Likes.java index 0490a3f..20a0610 100644 --- a/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Likes.java +++ b/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Likes.java @@ -88,7 +88,7 @@ public class Likes { /** * Create a new like to a post in the context of the token - * @param postid The post id to be liked + * @param post The post id to be liked * @return true if everything is OK * @throws ValidationException */ @@ -128,7 +128,7 @@ public class Likes { /** * Unlike to a post in the context of the token - * @param postid The post id to be liked + * @param likeInputBean The post id to be liked * @return true if everything is OK * @throws ValidationException */ diff --git a/src/main/java/org/gcube/portal/social/networking/ws/outputs/ResponseBean.java b/src/main/java/org/gcube/portal/social/networking/ws/outputs/ResponseBean.java index ff52f26..574a61a 100644 --- a/src/main/java/org/gcube/portal/social/networking/ws/outputs/ResponseBean.java +++ b/src/main/java/org/gcube/portal/social/networking/ws/outputs/ResponseBean.java @@ -31,8 +31,7 @@ public class ResponseBean implements Serializable { * @param success * @param message * @param result - * @param help - */ + */ public ResponseBean(boolean success, String message, Object result) { super(); this.success = success; diff --git a/src/main/java/org/gcube/portal/social/networking/ws/utils/Filters.java b/src/main/java/org/gcube/portal/social/networking/ws/utils/Filters.java index e06b272..c5e3af9 100644 --- a/src/main/java/org/gcube/portal/social/networking/ws/utils/Filters.java +++ b/src/main/java/org/gcube/portal/social/networking/ws/utils/Filters.java @@ -89,7 +89,7 @@ public class Filters { * If the initial context is the root: all feeds are returned; * If the initial context is a VO: feeds for vres within the vo are returned; * If the initial context is a vre: feeds of the vre are returned; - * @param retrievedLikedFeeds + * @param feeds * @param context * @throws Exception */ @@ -160,7 +160,7 @@ public class Filters { /** * Depending on the type of object provided (e.g. Feed, Comment etc), some information are removed - * @param comments + * @param toClear * @throws Exception */ public static void hideSensitiveInformation(List toClear, String usernameCaller){ diff --git a/src/main/java/org/gcube/portal/social/networking/ws/utils/SocialUtils.java b/src/main/java/org/gcube/portal/social/networking/ws/utils/SocialUtils.java index 60996f0..98256ac 100644 --- a/src/main/java/org/gcube/portal/social/networking/ws/utils/SocialUtils.java +++ b/src/main/java/org/gcube/portal/social/networking/ws/utils/SocialUtils.java @@ -108,7 +108,7 @@ public class SocialUtils { /** * Method used when an application needs to publish something. - * @param feedText + * @param postText * @param uriParams * @param previewTitle * @param previewDescription