gCubeSystem
/
news-feed
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Massimiliano Assante 2017-01-16 17:28:49 +00:00
parent 3606f4347b
commit 1f72e641b1
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <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> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -39,5 +39,5 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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> </classpath>

9
distro/changelog.xml
View File

@ -1,9 +1,16 @@
<ReleaseNotes> <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" <Changeset component="org.gcube.portlets-user.news-feed.2-2-0"
date="2016-12-02"> date="2016-12-02">
<Change>removed asl session</Change> <Change>removed asl session</Change>
<Change>Increased general performance and bugfixes</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>
<Changeset component="org.gcube.portlets-user.news-feed.2-1-0" <Changeset component="org.gcube.portlets-user.news-feed.2-1-0"
date="2016-10-29"> date="2016-10-29">

2
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>news-feed</artifactId> <artifactId>news-feed</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>2.2.0-SNAPSHOT</version> <version>2.3.0-SNAPSHOT</version>
<name>gCube News Feed Portlet</name> <name>gCube News Feed Portlet</name>
<description> <description>

6
src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
View File

@ -51,8 +51,8 @@ import org.gcube.portlets.user.newsfeed.shared.OperationResult;
import org.gcube.portlets.user.newsfeed.shared.UserSettings; import org.gcube.portlets.user.newsfeed.shared.UserSettings;
import org.gcube.portlets.widgets.pickitem.shared.ItemBean; import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
import org.gcube.social_networking.socialutillibrary.Utils; 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.ElasticSearchClientImpl;
import org.gcube.socialnetworking.social_data_search_client.ElasticSearchClientInterface;
import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.GroupManager;
import org.gcube.vomanagement.usermanagement.UserManager; import org.gcube.vomanagement.usermanagement.UserManager;
import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault; import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault;
@ -100,7 +100,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
/** /**
* Elasticsearch client * Elasticsearch client
*/ */
private ElasticSearchClientInterface escl; private ElasticSearchClient escl;
private final static int MAX_FEEDS_NO = 30; private final static int MAX_FEEDS_NO = 30;
@ -387,7 +387,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
} }
// query elastic search // 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 // retrieve the ids of liked feeds by the user
List<String> likedFeeds = store.getAllLikedFeedIdsByUser(userName); List<String> likedFeeds = store.getAllLikedFeedIdsByUser(userName);

4
src/main/webapp/NewsFeed.css
View File

@ -126,8 +126,8 @@ div#comment-inputContainer textarea.post-comment.comment-dark-color {
.new-feeds-show { .new-feeds-show {
opacity: 1; opacity: 1;
background: #D6E2FC; background: #D6E2FC;
height: 18px; height: 20px;
width: 70%; width: 95%;
} }
.new-feeds-available:hover { .new-feeds-available:hover {