From 1f72e641b1fcb4b151ece44c7516a0c8302ebdab Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 16 Jan 2017 17:28:49 +0000
Subject: [PATCH] Refactored to the new version of elastic search client's
 compliancy

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@141595 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                               | 6 +++---
 distro/changelog.xml                                     | 9 ++++++++-
 pom.xml                                                  | 2 +-
 .../portlets/user/newsfeed/server/NewsServiceImpl.java   | 6 +++---
 src/main/webapp/NewsFeed.css                             | 4 ++--
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.classpath b/.classpath
index 4bc4d8b..43f88e6 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/news-feed-2.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/news-feed-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/news-feed-2.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/news-feed-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -39,5 +39,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/news-feed-2.2.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/news-feed-2.3.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 82fb39a..298c6c1 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,9 +1,16 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.news-feed.2-3-0"
+		date="2017-01-16">
+		<Change>Minor css fix </Change>
+		<Change>Refactored to the new version of elastic search client's
+			compliancy</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.news-feed.2-2-0"
 		date="2016-12-02">
 		<Change>removed asl session</Change>
 		<Change>Increased general performance and bugfixes</Change>
-		<Change>fetching of users list to mention in comments loaded on demand</Change>
+		<Change>fetching of users list to mention in comments loaded on demand
+		</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.news-feed.2-1-0"
 		date="2016-10-29">
diff --git a/pom.xml b/pom.xml
index 7753a55..a490998 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>news-feed</artifactId>
 	<packaging>war</packaging>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.3.0-SNAPSHOT</version>
 
 	<name>gCube News Feed Portlet</name>
 	<description>
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
index d58b44f..b9623c7 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
@@ -51,8 +51,8 @@ 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.socialutillibrary.Utils;
+import org.gcube.socialnetworking.social_data_search_client.ElasticSearchClient;
 import org.gcube.socialnetworking.social_data_search_client.ElasticSearchClientImpl;
-import org.gcube.socialnetworking.social_data_search_client.ElasticSearchClientInterface;
 import org.gcube.vomanagement.usermanagement.GroupManager;
 import org.gcube.vomanagement.usermanagement.UserManager;
 import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault;
@@ -100,7 +100,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	/**
 	 * Elasticsearch client
 	 */
-	private ElasticSearchClientInterface escl;
+	private ElasticSearchClient escl;
 
 	private final static int MAX_FEEDS_NO = 30;
 
@@ -387,7 +387,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 			}			
 
 			// query elastic search
-			List<EnhancedFeed> enhancedFeeds = escl.searchInEnhancedFeeds(query, vres, from, quantity);
+			List<EnhancedFeed> enhancedFeeds = escl.search(query, vres, from, quantity);
 
 			// retrieve the ids of liked feeds by the user
 			List<String> likedFeeds = store.getAllLikedFeedIdsByUser(userName);
diff --git a/src/main/webapp/NewsFeed.css b/src/main/webapp/NewsFeed.css
index a03379b..6651f24 100644
--- a/src/main/webapp/NewsFeed.css
+++ b/src/main/webapp/NewsFeed.css
@@ -126,8 +126,8 @@ div#comment-inputContainer textarea.post-comment.comment-dark-color {
 .new-feeds-show {
 	opacity: 1;
 	background: #D6E2FC;
-	height: 18px;
-	width: 70%;
+	height: 20px;
+	width: 95%;
 }
 
 .new-feeds-available:hover {