comments,
String commentKey,
String ... hashtags) {
String removedMarkup = notification2Save.getDescription().replaceAll("&", "&");
- //notification2Save uri contains the absoulte path to the feed in the correct channel, e.g. /group/ustore_vre?oid=f1637958-34d0-48fc-b5ad-13b1116e389d
+ //notification2Save uri contains the absoulte path to the post in the correct channel, e.g. /group/ustore_vre?oid=f1637958-34d0-48fc-b5ad-13b1116e389d
String pathToVRE = siteLandingPagePath + "?";
if (notification2Save.getUri() != null) {
if (notification2Save.getUri().split("\\?").length > 0) {
@@ -96,7 +96,7 @@ public class SocialMailingUtil {
.append("").append(sender).append(" ").append(removedMarkup) // has done something
.append(getActionLink(notification2Save, portalURL)) //Goto
.append(attachmentsNotice)
- .append(SocialMailingUtil.buildHtmlDiscussion(portalURL, pathToVRE, notification2Save, feed, comments, commentKey)) // the original discussion
+ .append(SocialMailingUtil.buildHtmlDiscussion(portalURL, pathToVRE, notification2Save, post, comments, commentKey)) // the original discussion
.append("
")
.append("
")
.append("")
@@ -126,7 +126,7 @@ public class SocialMailingUtil {
* @param portalURL
* @param siteLandingPagePath
* @param email
- * @param feed
+ * @param post
* @param comments
* @param commentKey
* @param hashtags
@@ -138,7 +138,7 @@ public class SocialMailingUtil {
String portalURL,
String siteLandingPagePath,
String email,
- Feed feed,
+ Post post,
List comments,
String commentKey,
String[] hashtags) {
@@ -177,7 +177,7 @@ public class SocialMailingUtil {
.append("\n").append(sender).append(" ").append(removedMarkup) // has done something
.append("\nsee: ").append(portalURL).append(notification2Save.getUri())
.append(attachmentsNotice)
- .append(SocialMailingUtil.buildPlainTextDiscussion(notification2Save, feed, comments, commentKey))
+ .append(SocialMailingUtil.buildPlainTextDiscussion(notification2Save, post, comments, commentKey))
.append("\n----\n")
.append("This message was sent to ")
.append(email)
@@ -196,7 +196,6 @@ public class SocialMailingUtil {
/**
* construct the subjec of the email
* @param notification2Save
- * @param portalURL
* @param vreName
* @return
*/
@@ -411,14 +410,14 @@ public class SocialMailingUtil {
}
/**
- * Build up a discussion given the feed and its comments.
+ * Build up a discussion given the post and its comments.
* @param notification2Save
* @param post
* @param comments
* @param commentKey if not null, when building the discussion stop at this comment.
* @return an html string representing the discussion
*/
- protected static String buildHtmlDiscussion(String portalURL, String pathToVRE, Notification notification2Save, Feed post, List comments, String commentKey){
+ protected static String buildHtmlDiscussion(String portalURL, String pathToVRE, Notification notification2Save, Post post, List comments, String commentKey){
try{
@@ -501,13 +500,13 @@ public class SocialMailingUtil {
}
/**
- * Build a plain text discussion given a feed and its comments.
- * @param feed
+ * Build a plain text discussion given a post and its comments.
+ * @param post
* @param comments
* @param commentKey if not null, when building the discussion stop at this comment.
* @return a string representing the discussion
*/
- protected static String buildPlainTextDiscussion(Notification notification2Save, Feed feed, List comments, String commentKey){
+ protected static String buildPlainTextDiscussion(Notification notification2Save, Post post, List comments, String commentKey){
try{
@@ -523,15 +522,15 @@ public class SocialMailingUtil {
Format formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm a");
// escape html
- String feedTextNoHtml = convertHTML2Text(feed.getDescription());
+ String postTextNoHtml = convertHTML2Text(post.getDescription());
// build up post + comments
discussion +=
"\n"
- + "[" + formatter.format(feed.getTime()) + "] "
- + feed.getFullName()
+ + "[" + formatter.format(post.getTime()) + "] "
+ + post.getFullName()
+ ": "
- + (feedTextNoHtml.length() > 200 ? feedTextNoHtml.substring(0, 200) + " ..." : feedTextNoHtml)
+ + (postTextNoHtml.length() > 200 ? postTextNoHtml.substring(0, 200) + " ..." : postTextNoHtml)
+ "\n";
diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/storage/FTPManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/storage/FTPManager.java
index 63a0c04..3a0988f 100644
--- a/src/main/java/org/gcube/applicationsupportlayer/social/storage/FTPManager.java
+++ b/src/main/java/org/gcube/applicationsupportlayer/social/storage/FTPManager.java
@@ -18,7 +18,7 @@ import org.gcube.common.encryption.StringEncrypter;
import org.gcube.common.resources.gcore.ServiceEndpoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.portal.databook.shared.ImageType;
+import org.gcube.social_networking.socialnetworking.model.shared.ImageType;
import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/storage/UrlEncoderUtil.java b/src/main/java/org/gcube/applicationsupportlayer/social/storage/UrlEncoderUtil.java
index 8add745..0e21a28 100644
--- a/src/main/java/org/gcube/applicationsupportlayer/social/storage/UrlEncoderUtil.java
+++ b/src/main/java/org/gcube/applicationsupportlayer/social/storage/UrlEncoderUtil.java
@@ -22,7 +22,6 @@ public class UrlEncoderUtil {
public static Logger logger = Logger.getLogger(UrlEncoderUtil.class);
/**
*
- * @param url
* @param parameters
* @return
*/
@@ -46,7 +45,6 @@ public class UrlEncoderUtil {
/**
*
- * @param url
* @param parameters
* @return
*/