workin on #161

Author: phasenraum2010

src/main/java/org/woehlke/twitterwall/oodm/entities/Tweet.java

@@ -209,6 +209,7 @@ public Map<String, Object> getParametersForFindByUniqueId() {
         parameters.put("idTwitter",this.idTwitter);
         return parameters;
     }
+
     @Transient
     @Override
     public String getQueryNameForFindByUniqueId() {

src/main/java/org/woehlke/twitterwall/oodm/entities/parts/EntitiesFilter.java

@@ -8,6 +8,8 @@
 import java.util.regex.Pattern;
 
 import static org.woehlke.twitterwall.oodm.entities.parts.HashTagText.HASHTAG_TEXT_PATTERN;
+import static org.woehlke.twitterwall.oodm.entities.parts.HashTagText.HASHTAG_TEXT_PATTERN_TEXT;
+import static org.woehlke.twitterwall.oodm.entities.parts.ScreenName.SCREEN_NAME_PATTERN_TEXT;
 import static org.woehlke.twitterwall.oodm.entities.parts.UrlField.URL_PATTTERN_FOR_USER_HTTP;
 import static org.woehlke.twitterwall.oodm.entities.parts.UrlField.URL_PATTTERN_FOR_USER_HTTPS;
 
@@ -21,8 +23,8 @@ protected Set<Mention> findByUserDescription(String description,Task task) {
         if (description != null) {
 
             String USER_PROFILE_INPUT[] = {
-                "@("+ ScreenName.SCREEN_NAME_PATTERN +")(" + Entities.stopChar + ")",
-                "@("+ ScreenName.SCREEN_NAME_PATTERN +")$"
+                "@("+ SCREEN_NAME_PATTERN_TEXT +")(" + Entities.stopChar + ")",
+                "@("+ SCREEN_NAME_PATTERN_TEXT +")$"
             };
 
             int USER_PROFILE_OUTPUT[] = {
@@ -71,10 +73,10 @@ protected String getFormattedTextForMentions(Set<Mention> mentions, String forma
     protected String getFormattedTextForUserProfiles(String formattedText) {
 
         String USER_PROFILE_INPUT[] = {
-            "(" + stopChar + ")@(\\w{1,15})(" + stopChar + ")",
-            "(" + stopChar + ")@(\\w{1,15})$",
-            "^@(\\w{1,15})(" + stopChar + ")",
-            "^@(\\w{1,15})$"
+            "(" + stopChar + ")@("+SCREEN_NAME_PATTERN_TEXT+")(" + stopChar + ")",
+            "(" + stopChar + ")@("+SCREEN_NAME_PATTERN_TEXT+")$",
+            "^@("+SCREEN_NAME_PATTERN_TEXT+")(" + stopChar + ")",
+            "^@("+SCREEN_NAME_PATTERN_TEXT+")$"
         };
 
         String USER_PROFILE_OUTPUT[] = {
@@ -98,8 +100,8 @@ protected Set<HashTag> getHashTagsForDescription(String description,Task task) {
         if (description != null) {
 
             String USER_PROFILE_INPUT[] = {
-                "#("+HASHTAG_TEXT_PATTERN+")(" + Entities.stopChar + ")",
-                "#("+HASHTAG_TEXT_PATTERN+")$"
+                "#("+HASHTAG_TEXT_PATTERN_TEXT+")(" + Entities.stopChar + ")",
+                "#("+HASHTAG_TEXT_PATTERN_TEXT+")$"
             };
 
             int USER_PROFILE_OUTPUT[] = {
@@ -124,8 +126,8 @@ protected String getFormattedTextForHashTags(Set<HashTag> tags, String formatted
             long tagId = tag.getId();
 
             String USER_PROFILE_INPUT[] = {
-                "#(" + tag.getText() + ")(" + stopChar + ")",
-                "#(" + tag.getText() + ")$"
+                "#(" + tag.getText().getText() + ")(" + stopChar + ")",
+                "#(" + tag.getText().getText() + ")$"
             };
 
             String USER_PROFILE_OUTPUT[] = {
@@ -175,13 +177,13 @@ protected String getFormattedTextForTickerSymbols(Set<TickerSymbol> tickerSymbol
         for(TickerSymbol tickerSymbol:tickerSymbols){
 
             String USER_PROFILE_INPUT[] = {
-                "(" + tickerSymbol.getUrl() + ")(" + stopChar + ")",
-                "(" + tickerSymbol.getUrl() + ")$"
+                "(" + tickerSymbol.getUrl().getUrl() + ")(" + stopChar + ")",
+                "(" + tickerSymbol.getUrl().getUrl() + ")$"
             };
 
             String USER_PROFILE_OUTPUT[] = {
-                "<br/><br/><a class=\"tweet-action tweet-photo1\" href=\"" + tickerSymbol.getUrl() + "\" target=\"_blank\">"+tickerSymbol.getTickerSymbol()+"</a>$2",
-                "<br/><br/><a class=\"tweet-action tweet-photo2\" href=\"" + tickerSymbol.getUrl() + "\" target=\"_blank\">"+tickerSymbol.getTickerSymbol()+"</a> "
+                "<br/><br/><a class=\"tweet-action tweet-photo1\" href=\"" + tickerSymbol.getUrl().getUrl() + "\" target=\"_blank\">"+tickerSymbol.getTickerSymbol()+"</a>$2",
+                "<br/><br/><a class=\"tweet-action tweet-photo2\" href=\"" + tickerSymbol.getUrl().getUrl() + "\" target=\"_blank\">"+tickerSymbol.getTickerSymbol()+"</a> "
             };
 
             for(int i=0;i<2;i++){
@@ -229,8 +231,8 @@ protected String getFormattedTextForMedia(Set<Media> media, String formattedText
             if (medium.getMediaType().compareTo("photo") == 0) {
 
                 String USER_PROFILE_INPUT[] = {
-                    "(" + medium.getUrl() + ")(" + stopChar + ")",
-                    "(" + medium.getUrl() + ")$"
+                    "(" + medium.getUrl().getUrl() + ")(" + stopChar + ")",
+                    "(" + medium.getUrl().getUrl() + ")$"
                 };
 
                 String USER_PROFILE_OUTPUT[] = {

src/main/java/org/woehlke/twitterwall/oodm/entities/parts/ScreenName.java

@@ -16,7 +16,7 @@
 @Embeddable
 public class ScreenName implements DomainObjectEmbededField, Comparable<ScreenName> {
 
-    public final static String SCREEN_NAME_PATTERN_TEXT = "\\w*";
+    public final static String SCREEN_NAME_PATTERN_TEXT = "\\w{1,15}";
 
     public final static Pattern SCREEN_NAME_PATTERN = Pattern.compile("^"+ SCREEN_NAME_PATTERN_TEXT +"$");
 

src/main/java/org/woehlke/twitterwall/oodm/repositories/TweetRepository.java

@@ -7,7 +7,7 @@
 import org.springframework.stereotype.Repository;
 import org.woehlke.twitterwall.oodm.entities.Tweet;
 import org.woehlke.twitterwall.oodm.entities.User;
-import org.woehlke.twitterwall.oodm.entities.transients.*;
+import org.woehlke.twitterwall.oodm.entities.parts.HashTagText;
 import org.woehlke.twitterwall.oodm.repositories.common.DomainRepository;
 import org.woehlke.twitterwall.oodm.repositories.custom.TweetRepositoryCustom;
 
@@ -23,7 +23,7 @@ public interface TweetRepository extends DomainRepository<Tweet>,TweetRepository
         name="Tweet.getTweetsForHashTag",
         countName="Tweet.countTweetsForHashTag"
     )
-    Page<Tweet> findByHashTag(@Param("hashtagText") String hashtagText, Pageable pageRequest);
+    Page<Tweet> findByHashTag(@Param("hashtagText") HashTagText hashtagText, Pageable pageRequest);
 
     Page<Tweet> findByUser(User user, Pageable pageRequest);
 

src/main/java/org/woehlke/twitterwall/oodm/service/impl/TweetServiceImpl.java

@@ -36,7 +36,7 @@ public TweetServiceImpl(TweetRepository tweetRepository, TaskRepository taskRepo
 
     @Override
     public Page<Tweet> findTweetsForHashTag(HashTag hashtag, Pageable pageRequest) {
-        return tweetRepository.findByHashTag(hashtag.getText().getText(),pageRequest);
+        return tweetRepository.findByHashTag(hashtag.getText(),pageRequest);
     }
 
     @Override