gCubeSystem
/
social-util-library
16
1
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Implementing new Solution refs #13207 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/social-networking/social-util-library@176751 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2019-01-23 15:19:48 +00:00
parent 62e2da9236
commit a4232983ee
7 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
View File

@ -9,10 +9,10 @@ import org.gcube.common.portal.GCubePortalConstants;
import org.gcube.portal.databook.client.GCubeSocialNetworking;
import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
import org.gcube.socialnetworking.token.ReplaceableToken;
import org.gcube.socialnetworking.token.SocialStringTokenizer;
import org.gcube.socialnetworking.token.TagToken;
import org.gcube.socialnetworking.token.Token;
import org.gcube.socialnetworking.token.URLToken;
import org.gcube.socialnetworking.tokenizer.StringTokenizer;
import org.gcube.socialnetworking.tokenizer.Token;
import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
import org.gcube.vomanagement.usermanagement.impl.LiferayRoleManager;
import org.gcube.vomanagement.usermanagement.model.GCubeTeam;
@ -35,7 +35,7 @@ public class MessageParser {
public List<ReplaceableToken> getTokens() {
if(tokens==null){
tokens = new ArrayList<>();
SocialStringTokenizer socialStringTokenizer = new SocialStringTokenizer(originalMessage);
StringTokenizer socialStringTokenizer = new StringTokenizer(originalMessage);
for(Token token : socialStringTokenizer.getTokens()) {
String tokenString = token.getToken();
if(tokenString.startsWith("#")) {

7
src/main/java/org/gcube/socialnetworking/token/ReplaceableToken.java
View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.codec.binary.Base64;
import org.gcube.socialnetworking.tokenizer.Token;
public class ReplaceableToken extends Token {
@ -46,12 +47,12 @@ public class ReplaceableToken extends Token {
public ReplaceableToken(Token token) {
super(token.token, token.delimiter, token.start, token.end);
this.tokenReplacement = token.token;
super(token.getToken(), token.getDelimiter(), token.getStart(), token.getEnd());
this.tokenReplacement = token.getToken();
}
public ReplaceableToken(Token token, String tokenReplacement) {
super(token.token, token.delimiter, token.start, token.end);
this(token);
this.tokenReplacement = tokenReplacement;
}

1
src/main/java/org/gcube/socialnetworking/token/TagToken.java
View File

@ -1,6 +1,7 @@
package org.gcube.socialnetworking.token;
import org.gcube.portal.databook.client.GCubeSocialNetworking;
import org.gcube.socialnetworking.tokenizer.Token;
public class TagToken extends ReplaceableToken {

2
src/main/java/org/gcube/socialnetworking/token/URLToken.java
View File

@ -5,6 +5,8 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import org.gcube.socialnetworking.tokenizer.Token;
public class URLToken extends ReplaceableToken {
private boolean replaced;

6
src/main/java/org/gcube/socialnetworking/token/SocialStringTokenizer.java → src/main/java/org/gcube/socialnetworking/tokenizer/StringTokenizer.java
View File

@ -1,11 +1,11 @@
package org.gcube.socialnetworking.token;
package org.gcube.socialnetworking.tokenizer;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class SocialStringTokenizer {
public class StringTokenizer {
private final String originalString;
@ -14,7 +14,7 @@ public class SocialStringTokenizer {
private List<Token> tokens;
public SocialStringTokenizer(String string) {
public StringTokenizer(String string) {
this.originalString = string;
this.pattern = Pattern.compile("\\s");
this.matcher = pattern.matcher(originalString);

12
src/main/java/org/gcube/socialnetworking/token/Token.java → src/main/java/org/gcube/socialnetworking/tokenizer/Token.java
View File

@ -1,11 +1,11 @@
package org.gcube.socialnetworking.token;
package org.gcube.socialnetworking.tokenizer;
public class Token{
public class Token {
final String token;
final String delimiter;
final int start;
final int end;
final protected String token;
final protected String delimiter;
final protected int start;
final protected int end;
/**
* @param token the Token String

6
src/test/java/org/gcube/social_networking/socialutillibrary/MessageParserTest.java
View File

@ -7,8 +7,8 @@ import java.util.List;
import org.apache.commons.codec.binary.Base64;
import org.gcube.portal.databook.client.GCubeSocialNetworking;
import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
import org.gcube.socialnetworking.token.SocialStringTokenizer;
import org.gcube.socialnetworking.token.Token;
import org.gcube.socialnetworking.tokenizer.StringTokenizer;
import org.gcube.socialnetworking.tokenizer.Token;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
@ -67,7 +67,7 @@ public class MessageParserTest {
public void aux() {
String message = "Prova #Pippo Pollo http://google) :) ";
SocialStringTokenizer socialStringTokenizer = new SocialStringTokenizer(message);
StringTokenizer socialStringTokenizer = new StringTokenizer(message);
List<Token> tokens = socialStringTokenizer.getTokens();
logger.debug("{}", tokens);