workin on #161

Author: phasenraum2010

README.md

@@ -75,7 +75,7 @@ When creating a new issue, try following [necolas's guidelines][issue-guidelines
 
 ### Support
 
-Let me know if you are using Twitterwall. I may get around to creating a showcase page listing user sites.
+Let me know if you are using Twitterwall. I may get around to creating a showcase pageContent listing user sites.
 
 [Contact me][av-site] if you have questions about Twitterwall, or just like to say something about it.
 If you _really really_ like it and want to support the author, I will be glad to

src/main/java/org/woehlke/twitterwall/frontend/controller/common/GlobalExceptionHandler.java renamed to src/main/java/org/woehlke/twitterwall/frontend/controller/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package org.woehlke.twitterwall.frontend.controller.common;
+package org.woehlke.twitterwall.frontend.controller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,6 +9,8 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.servlet.ModelAndView;
+import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
+import org.woehlke.twitterwall.frontend.controller.common.Symbols;
 
 import javax.servlet.http.HttpServletRequest;
 

src/main/java/org/woehlke/twitterwall/frontend/controller/HashTagController.java

@@ -17,7 +17,7 @@
 import org.woehlke.twitterwall.frontend.controller.common.HashTagsOverviewHelper;
 import org.woehlke.twitterwall.frontend.controller.common.Symbols;
 import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
-import org.woehlke.twitterwall.frontend.model.HashTagOverview;
+import org.woehlke.twitterwall.oodm.entities.transients.HashTagOverview;
 import org.woehlke.twitterwall.oodm.entities.Tweet;
 import org.woehlke.twitterwall.oodm.entities.User;
 import org.woehlke.twitterwall.oodm.entities.HashTag;

src/main/java/org/woehlke/twitterwall/frontend/controller/common/HashTagsOverviewHelper.java

@@ -1,6 +1,6 @@
 package org.woehlke.twitterwall.frontend.controller.common;
 
-import org.woehlke.twitterwall.frontend.model.HashTagOverview;
+import org.woehlke.twitterwall.oodm.entities.transients.HashTagOverview;
 
 public interface HashTagsOverviewHelper {
 

src/main/java/org/woehlke/twitterwall/frontend/controller/common/Symbols.java

@@ -9,18 +9,20 @@ public enum Symbols {
     IMPRINT("<i class=\"fa fa-university\" aria-hidden=\"true\"></i>"),
     PROFILE("<i class=\"fa fa-users\" aria-hidden=\"true\"></i>"),
     HOME("<span class=\"glyphicon glyphicon-home\" aria-hidden=\"true\"></span>"),
-    USER_ALL("<i class=\"fa fa-user\" aria-hidden=\"true\"></i>"),
+    USER_ALL("<i class=\"fa fa-users\" aria-hidden=\"true\"></i>"),
     USER_TWEETS("<i class=\"fa fa-users\" aria-hidden=\"true\"></i>"),
     USER_NOT_YET_FRIENDS("<i class=\"fa fa-plus-square\" aria-hidden=\"true\"></i>"),
-    GET_TEST_DATA("<i class=\"fa fa-cubes\" aria-hidden=\"true\"></i>\n"),
+    GET_TEST_DATA("<i class=\"fa fa-cubes\" aria-hidden=\"true\"></i>"),
     EXCEPTION("<i class=\"fa fa-bolt\" aria-hidden=\"true\"></i>"),
     LEAF("<i class=\"fa fa-leaf\" aria-hidden=\"true\"></i>"),
     DATABASE("<i class=\"fa fa-database\" aria-hidden=\"true\"></i>"),
-    USER_NOT_YET_ON_LIST("<i class=\"fa fa-handshake-o\" aria-hidden=\"true\"></i>\n"),
+    USER_NOT_YET_ON_LIST("<i class=\"fa fa-handshake-o\" aria-hidden=\"true\"></i>"),
     USER_FRIENDS("<i class=\"fa fa-users\" aria-hidden=\"true\"></i>"),
     USER_FOLLOWER("<i class=\"fa fa-users\" aria-hidden=\"true\"></i>"),
     TASK("<i class=\"fa fa-check-square\" aria-hidden=\"true\"></i>"),
-    TASK_HISTORY("<i class=\"fa fa-check-square-o\" aria-hidden=\"true\"></i>");
+    TASK_HISTORY("<i class=\"fa fa-check-square-o\" aria-hidden=\"true\"></i>"),
+    USER_NOTYETFIRENDS("<i class=\"fa fa-plus-square\" aria-hidden=\"true\"></i>"),
+    HASHTAG_USER("<i class=\"fa fa-hashtag\" aria-hidden=\"true\"></i>");
 
     Symbols(String html){
         this.html=html;

src/main/java/org/woehlke/twitterwall/frontend/controller/common/UrlPaths.java

@@ -11,7 +11,7 @@
 import org.woehlke.twitterwall.conf.properties.TwitterProperties;
 import org.woehlke.twitterwall.conf.properties.FrontendProperties;
 import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
-import org.woehlke.twitterwall.frontend.model.Page;
+import org.woehlke.twitterwall.oodm.entities.transients.PageContent;
 
 /**
  * Created by tw on 18.07.17.
@@ -20,42 +20,42 @@
 @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
 public class ControllerHelperImpl implements ControllerHelper {
 
-    private Page setupPage(Page page, String title, String subtitle, String symbol)  {
-        page.setTitle(title);
-        page.setSubtitle(subtitle);
-        page.setSymbol(symbol);
-        page.setMenuAppName(frontendProperties.getMenuAppName());
-        page.setTwitterSearchTerm(twitterProperties.getSearchQuery());
-        page.setInfoWebpage(frontendProperties.getInfoWebpage());
-        page.setTheme(frontendProperties.getTheme());
-        page.setContextTest(frontendProperties.getContextTest());
-        page.setHistoryBack(true);
+    private PageContent setupPage(PageContent pageContent, String title, String subtitle, String symbol)  {
+        pageContent.setTitle(title);
+        pageContent.setSubtitle(subtitle);
+        pageContent.setSymbol(symbol);
+        pageContent.setMenuAppName(frontendProperties.getMenuAppName());
+        pageContent.setTwitterSearchTerm(twitterProperties.getSearchQuery());
+        pageContent.setInfoWebpage(frontendProperties.getInfoWebpage());
+        pageContent.setTheme(frontendProperties.getTheme());
+        pageContent.setContextTest(frontendProperties.getContextTest());
+        pageContent.setHistoryBack(true);
         if(!frontendProperties.getIdGoogleAnalytics().isEmpty()){
             String html = GOOGLE_ANALYTICS_SCRIPT_HTML;
             html = html.replace("###GOOGLE_ANALYTICS_ID###", frontendProperties.getIdGoogleAnalytics());
-            page.setGoogleAnalyticScriptHtml(html);
+            pageContent.setGoogleAnalyticScriptHtml(html);
         } else {
-            page.setGoogleAnalyticScriptHtml("");
+            pageContent.setGoogleAnalyticScriptHtml("");
         }
         log.info("--------------------------------------------------------------------");
-        log.info("setupPage = "+page.toString());
+        log.info("setupPage = "+ pageContent.toString());
         log.info("--------------------------------------------------------------------");
-        return page;
+        return pageContent;
     }
 
     public ModelAndView setupPage(ModelAndView mav, String title, String subtitle, String symbol) {
-        Page page = new Page();
-        page = setupPage(page, title, subtitle, symbol);
-        log.info("page: "+page.toString());
-        mav.addObject("page", page);
+        PageContent pageContent = new PageContent();
+        pageContent = setupPage(pageContent, title, subtitle, symbol);
+        log.info("pageContent: "+ pageContent.toString());
+        mav.addObject("pageContent", pageContent);
         return mav;
     }
 
     public Model setupPage(Model model, String title, String subtitle, String symbol) {
-        Page page = new Page();
-        page = setupPage(page, title, subtitle, symbol);
-        log.info("page: "+page.toString());
-        model.addAttribute("page", page);
+        PageContent pageContent = new PageContent();
+        pageContent = setupPage(pageContent, title, subtitle, symbol);
+        log.info("pageContent: "+ pageContent.toString());
+        model.addAttribute("pageContent", pageContent);
         return model;
     }
 

src/main/java/org/woehlke/twitterwall/frontend/controller/common/impl/ControllerHelperImpl.java

@@ -9,8 +9,8 @@
 import org.springframework.stereotype.Component;
 import org.woehlke.twitterwall.conf.properties.FrontendProperties;
 import org.woehlke.twitterwall.frontend.controller.common.HashTagsOverviewHelper;
-import org.woehlke.twitterwall.frontend.model.HashTagCounted;
-import org.woehlke.twitterwall.frontend.model.HashTagOverview;
+import org.woehlke.twitterwall.oodm.entities.transients.HashTagCounted;
+import org.woehlke.twitterwall.oodm.entities.transients.HashTagOverview;
 import org.woehlke.twitterwall.oodm.entities.HashTag;
 import org.woehlke.twitterwall.oodm.entities.Tweet;
 import org.woehlke.twitterwall.oodm.entities.User;

src/main/java/org/woehlke/twitterwall/frontend/controller/common/impl/HashTagsOverviewHelperImpl.java

@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.woehlke.twitterwall.conf.properties.FrontendProperties;
 import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
-import org.woehlke.twitterwall.frontend.model.TaskResourceModel;
+import org.woehlke.twitterwall.oodm.entities.transients.TaskResourceModel;
 import org.woehlke.twitterwall.oodm.entities.Task;
 import org.woehlke.twitterwall.oodm.entities.TaskHistory;
 import org.woehlke.twitterwall.oodm.service.TaskHistoryService;

src/main/java/org/woehlke/twitterwall/frontend/rest/TaskResource.java

@@ -8,6 +8,9 @@
 import org.woehlke.twitterwall.oodm.entities.parts.HashTagText;
 
 import javax.persistence.*;
+import javax.validation.Valid;
+import javax.validation.constraints.AssertTrue;
+import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -36,6 +39,8 @@ public class HashTag extends AbstractDomainObject<HashTag> implements DomainObje
     @GeneratedValue(strategy = GenerationType.AUTO)
     protected Long id;
 
+    @Valid
+    @NotNull
     @Embedded
     private HashTagText hashTagText;
 
@@ -69,6 +74,8 @@ public void setId(Long id) {
         this.id = id;
     }
 
+    @AssertTrue
+    @Transient
     @Override
     public boolean isValid() {
         if(this.hashTagText == null){