ready to release

fixed pom
2023-12-11 15:19:51 +01:00 · 2023-12-11 15:14:42 +01:00 · 2023-12-11 14:48:41 +01:00 · 2023-12-11 14:38:46 +01:00 · 2023-12-11 14:34:12 +01:00 · 2023-12-07 11:33:02 +01:00
6 changed files with 121 additions and 159 deletions
--- a/.classpath
+++ b/.classpath
@ -13,15 +13,15 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
@ -36,8 +36,9 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@ -1,24 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-      
-    <wb-module deploy-name="news-feed">
-                
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-            
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-            
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="social-util-library-1.7.3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/social-util-library/social-util-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-            
-        <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
-                
-        <property name="context-root" value="news-feed"/>
-          
-    </wb-module>
+                  
    
+    
+    
+    <wb-module deploy-name="news-feed">
+                                        
+        
+        
+        
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+                                    
+        
+        
+        
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+                                    
+        
+        
+        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+                                        
+        
+        
+        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
+                                        
+        
+        
+        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+                                    
+        
+        
+        
+        <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
+                                        
+        
+        
+        
+        <property name="context-root" value="news-feed"/>
+                                  
+    
+    
+    
+    </wb-module>
+                
+
+
+
 </project-modules>
--- a/.tern-project
+++ b/.tern-project
@ -1,17 +0,0 @@
-{
-  "plugins": {
-    "aui": {
-      
-    },
-    "liferay": {
-      
-    },
-    "yui": {
-      
-    }
-  },
-  "libs": [
-    "ecma5",
-    "browser"
-  ]
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +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).

+
+
+
+## [v3.0.0] - 2023-12-15
+
+- Feature #26194: News Feed portlet: remove elastic search client 
+
 ## [v2.8.4] - 2022-05-15

 - fixed changelog and README
--- a/pom.xml
+++ b/pom.xml
@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>news-feed</artifactId>
 	<packaging>war</packaging>
-	<version>2.8.4</version>
+	<version>3.0.0</version>

 	<name>gCube News Feed Portlet</name>
 	<description>
@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.4</version>
+				<version>3.7.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@ -86,6 +86,57 @@
 			<artifactId>xml-apis</artifactId>
 			<version>1.4.01</version>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>social-library-stubs</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0)</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.social-networking</groupId>
+			<artifactId>social-service-client</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.gcube.portal</groupId>
+					<artifactId>social-networking-library</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.socialnetworking</groupId>
+			<artifactId>social-util-library</artifactId>
+			<version>[1.7.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.2</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>pickitem-widget</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>image-previewer-widget</artifactId>
+			<version>[1.1.0-SNAPSHOT, 1.3.0-SNAPSHOT)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>notifications-common-library</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>user-selection-dialog</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
@ -129,110 +180,16 @@
 			<groupId>com.google</groupId>
 			<artifactId>gwt-jsonmaker</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>common-authorization</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.portal</groupId>
-			<artifactId>social-networking-library</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.astyanax</groupId>
-			<artifactId>astyanax-core</artifactId>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>log4j-over-slf4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.astyanax</groupId>
-			<artifactId>astyanax-thrift</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.astyanax</groupId>
-			<artifactId>astyanax-cassandra</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cassandra</groupId>
-			<artifactId>cassandra-all</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cassandra</groupId>
-			<artifactId>cassandra-thrift</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-logging</artifactId>
-					<groupId>commons-logging</groupId>
-				</exclusion>
-			</exclusions>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.socialnetworking</groupId>
-			<artifactId>social-util-library</artifactId>
-			<version>[1.7.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.socialnetworking</groupId>
-			<artifactId>social-data-search-client</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>pickitem-widget</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>image-previewer-widget</artifactId>
-			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portal</groupId>
-			<artifactId>notifications-common-library</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>user-selection-dialog</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<!-- Please note that the elasticsearch client needs a compress-lzf version 
-			>= 1.0.2 -->
-		<dependency>
-			<groupId>com.ning</groupId>
-			<artifactId>compress-lzf</artifactId>
-			<version>1.0.3</version>
-			<scope>compile</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>commons-validator</groupId>
 			<artifactId>commons-validator</artifactId>
--- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
@ -52,9 +52,8 @@ import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
 import org.gcube.portlets.user.newsfeed.shared.OperationResult;
 import org.gcube.portlets.user.newsfeed.shared.UserSettings;
 import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
+import org.gcube.social_networking.social_networking_client_library.FullTextSearchClient;
 import org.gcube.social_networking.socialutillibrary.Utils;
-import org.gcube.socialnetworking.social_data_search_client.ElasticSearchClient;
-import org.gcube.socialnetworking.social_data_search_client.ElasticSearchClientImpl;
 import org.gcube.socialnetworking.socialtoken.SocialMessageParser;
 import org.gcube.vomanagement.usermanagement.GroupManager;
 import org.gcube.vomanagement.usermanagement.RoleManager;
@ -101,23 +100,12 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	 */
 	private DatabookStore store;

-	/**
-	 * Elasticsearch client
-	 */
-	private ElasticSearchClient escl;
+

 	private final static int MAX_POSTS_NO = 30;

 	public void init() {
 		store = new DBCassandraAstyanaxImpl();
-		try {
-			escl = new ElasticSearchClientImpl(null);
-			_log.info("Elasticsearch connection created");
-		} catch (Exception e) {
-			escl = null;
-			_log.error("Unable to create elasticsearch client connection!!!", e);
-		}
-
 		APP_ID = this.getClass().getName();
 	}

@ -345,12 +333,8 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	@Override
 	public ArrayList<EnhancedFeed> getPostsByQuery(String query, int from, int quantity) {

-		// TODO : check this error better
-		if(escl == null){
-			_log.warn("There is no connection to elasticsearch, sorry.");
-			return null;
-		}
-
+		_log.debug("\n\n IN getPostsByQuery ");
+		
 		PortalContext pContext = PortalContext.getConfiguration();
 		String userName = pContext.getCurrentUser(getThreadLocalRequest()).getUsername();
 		String currentScope = pContext.getCurrentScope(getThreadLocalRequest());
@ -384,11 +368,14 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 				vres.add(currentScope);
 			}			

+			FullTextSearchClient sClient = new FullTextSearchClient();
+			List<EnhancedFeed> enhancedFeeds = sClient.search(query, from, quantity);
+			
 			// query elastic search
-			List<EnhancedFeed> enhancedFeeds = escl.search(query, vres, from, quantity);
+			//escl.search(query, vres, from, quantity);

 			// retrieve the ids of liked posts by the user
-			List<String> likedPosts = store.getAllLikedFeedIdsByUser(userName);
+			List<String> likedPosts = store.getAllLikedPostIdsByUser(userName);

 			// update fields "liked" and "isuser"
 			for (EnhancedFeed enhancedFeed : enhancedFeeds) {
Author	SHA1	Message	Date
Massimiliano Assante	1ef4a03b19	ready to release	2023-12-11 15:19:51 +01:00
Massimiliano Assante	ab1b38b118	fixed pom	2023-12-11 15:14:42 +01:00
Massimiliano Assante	72dd25f37d	fixed pom	2023-12-11 14:48:41 +01:00
Massimiliano Assante	e4550200a4	added lombok for jdk11	2023-12-11 14:38:46 +01:00
Massimiliano Assante	e1b6646647	excluded snl	2023-12-11 14:34:12 +01:00
Massimiliano Assante	6e2592004b	Feature #26194 : News Feed portlet: remove elastic search client	2023-12-07 11:33:02 +01:00