Merge pull request #133 from phasenraum2010/master

phasenraum2010 · web-flow · commit 45cbade8bdab · 2017-07-22T01:09:31.000+02:00
bugfixes
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesController.java
@@ -14,7 +14,7 @@
 @RequestMapping(path="/application/countedEntities")
 public class CountedEntitiesController {
 
-    private final static String PATH="/application/countedEntities";
+    private final static String PATH="application/countedEntities";
 
 
     @RequestMapping(path="/tweet/hashtag")
@@ -93,7 +93,7 @@ private void setUpThisPage(String title,Model model){
         String symbol = Symbols.DATABASE.toString();
         model = controllerHelper.setupPage(model,title,subtitle,symbol);
     }
-    
+
 
     @Autowired
     public CountedEntitiesController(ControllerHelper controllerHelper) {
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/DomainController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/DomainController.java
@@ -27,7 +27,7 @@ public String domainCount(Model model) {
         model = controllerHelper.setupPage(model,title,subtitle,symbol);
         CountedEntities countedEntities =this.countedEntitiesService.countAll();
         model.addAttribute("countedEntities", countedEntities);
-        return "/application/domain/count";
+        return "application/domain/count";
     }
 
     private final CountedEntitiesService countedEntitiesService;
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/HashTagController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/HashTagController.java
@@ -49,7 +49,7 @@ public String getAll(@RequestParam(name= "page" ,defaultValue=""+ FIRST_PAGE_NUM
         Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize(), Sort.Direction.ASC,"text");
         Page<HashTag> myPageContent = hashTagService.getAll(pageRequest);
         model.addAttribute("myPageContent",myPageContent);
-        return "/hashtag/all";
+        return "hashtag/all";
     }
 
     @RequestMapping(path="/{text}")
@@ -86,11 +86,11 @@ public String hashTagFromTweetsAndUsers(
             model.addAttribute("users", users);
             //
             log.debug(msg + " READY - DONE");
-            return "/hashtag/hashtagText";
+            return "hashtag/hashtagText";
         } else {
             String msg2 = msg + " parameter ist NOT valid";
             log.warn(msg2);
-            return "/hashtag/hashtagText";
+            return "hashtag/hashtagText";
         }
     }
 
@@ -143,7 +143,7 @@ public String hashTagsOverview(Model model) {
         }
         model.addAttribute("hashTagsTweets", hashTagsTweets);
         model.addAttribute("hashTagsUsers", hashTagsUsers);
-        return "/hashtag/overview";
+        return "hashtag/overview";
     }
 
     private static final Logger log = LoggerFactory.getLogger(HashTagController.class);
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/MediaController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/MediaController.java
@@ -34,7 +34,7 @@ public String getAll(@RequestParam(name= "page" ,defaultValue=""+ ControllerHelp
         Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize(), Sort.Direction.ASC,"url");
         Page<Media> myPageContent = mediaService.getAll(pageRequest);
         model.addAttribute("myPageContent",myPageContent);
-        return "/media/all";
+        return "media/all";
     }
 
     private final MediaService mediaService;
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/MentionController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/MentionController.java
@@ -33,7 +33,7 @@ public String getAll(@RequestParam(name= "page" ,defaultValue=""+ ControllerHelp
         Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize(), Sort.Direction.ASC,"screenName");
         Page<Mention> myPageContent = mentionService.getAll(pageRequest);
         model.addAttribute("myPageContent",myPageContent);
-        return "/mention/all";
+        return "mention/all";
     }
 
     private final TwitterwallFrontendProperties twitterwallFrontendProperties;
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/TaskController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/TaskController.java
@@ -72,7 +72,7 @@ public String  fetchTweetsFromTwitterSearchRequest(Model model) {
         String symbol = Symbols.TASK.toString();
         model = controllerHelper.setupPage(model,title,subtitle,symbol);
         this.fetchTweetsFromTwitterSearch();
-        return "/scheduled/taskStarted";
+        return "scheduled/taskStarted";
     }
 
     @RequestMapping(path="/scheduled/tweets/update")
@@ -84,7 +84,7 @@ public String updateTweetsRequest(Model model) {
         String symbol = Symbols.TASK.toString();
         model = controllerHelper.setupPage(model,title,subtitle,symbol);
         this.updateTweets();
-        return "/scheduled/taskStarted";
+        return "scheduled/taskStarted";
     }
 
     @RequestMapping(path="/scheduled/users/list/fetch")
@@ -96,7 +96,7 @@ public String fetchUsersFromDefinedUserListRequest(Model model){
         String symbol = Symbols.TASK.toString();
         model = controllerHelper.setupPage(model,title,subtitle,symbol);
         this.fetchUsersFromDefinedUserList();
-        return "/scheduled/taskStarted";
+        return "scheduled/taskStarted";
     }
 
     @RequestMapping(path="/scheduled/users/mentions/update")
@@ -108,7 +108,7 @@ public String updateUserProfilesFromMentionsRequest(Model model){
         String symbol = Symbols.TASK.toString();
         model = controllerHelper.setupPage(model,title,subtitle,symbol);
         this.updateUserProfilesFromMentions();
-        return "/scheduled/taskStarted";
+        return "scheduled/taskStarted";
     }
 
     @RequestMapping(path="/scheduled/users/update")
@@ -120,7 +120,7 @@ public String updateUserProfilesRequest(Model model) {
         String symbol = Symbols.TASK.toString();
         model = controllerHelper.setupPage(model,title,subtitle,symbol);
         this.updateUserProfiles();
-        return "/scheduled/taskStarted";
+        return "scheduled/taskStarted";
     }
 
     @Async
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/TaskHistoryController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/TaskHistoryController.java
@@ -23,7 +23,7 @@
 @RequestMapping(path="/taskhistory")
 public class TaskHistoryController {
 
-    private final static String PATH="/taskhistory";
+    private final static String PATH="taskhistory";
 
     @RequestMapping(path="/all")
     public String getAll(@RequestParam(name= "page" ,defaultValue=""+ ControllerHelper.FIRST_PAGE_NUMBER) int page, Model model){
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/TestController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/TestController.java
@@ -41,7 +41,7 @@ public String getTestData(Model model) {
             model.addAttribute("latestTweets",null);
             model.addAttribute("users",null);
         }
-        return "/test/getTestData";
+        return "test/getTestData";
     }
 
     @RequestMapping("/user/onlist/renew")
@@ -56,7 +56,7 @@ public String getOnListRenew(@RequestParam(name= "page" ,defaultValue=""+ Contro
         String symbol = Symbols.LEAF.toString();
         String title = "Renew List of Users On List";
         model = controllerHelper.setupPage(model, title, "Users", symbol);
-        return "/test/user/onlist/renew";
+        return "test/user/onlist/renew";
     }
 
     private static final Logger log = LoggerFactory.getLogger(TestController.class);
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/TickerSymbolController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/TickerSymbolController.java
@@ -23,7 +23,7 @@
 @RequestMapping("/tickersymbol")
 public class TickerSymbolController {
 
-    private final static String PATH="/tickersymbol";
+    private final static String PATH="tickersymbol";
 
     @RequestMapping(path="/all")
     public String getAll(@RequestParam(name= "page" ,defaultValue=""+ ControllerHelper.FIRST_PAGE_NUMBER) int page, Model model){
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/UrlCacheController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/UrlCacheController.java
@@ -23,7 +23,7 @@
 @RequestMapping("/urlcache")
 public class UrlCacheController {
 
-    private final static String PATH="/urlcache";
+    private final static String PATH="urlcache";
 
     @RequestMapping(path="/all")
     public String getAll(@RequestParam(name= "page" ,defaultValue=""+ControllerHelper.FIRST_PAGE_NUMBER) int page, Model model){
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/UrlController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/UrlController.java
@@ -23,7 +23,7 @@
 @RequestMapping("/url")
 public class UrlController {
 
-    private final static String PATH="/url";
+    private final static String PATH="url";
 
     @RequestMapping(path="/all")
     public String getAll(@RequestParam(name= "page" ,defaultValue=""+ControllerHelper.FIRST_PAGE_NUMBER) int page, Model model){
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/UserController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/UserController.java
@@ -28,7 +28,7 @@
 @RequestMapping("/user")
 public class UserController {
 
-    private final static String PATH="/user";
+    private final static String PATH="user";
 
     @RequestMapping("/all")
     public String getAll(@RequestParam(name= "page" ,defaultValue=""+ControllerHelper.FIRST_PAGE_NUMBER) int page, Model model) {
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/common/GlobalExceptionHandler.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/common/GlobalExceptionHandler.java
@@ -32,7 +32,7 @@ private ModelAndView getTemplate(HttpServletRequest request, Exception ex) {
         mav = controllerHelper.setupPage(mav, title, subtitle, symbol);
         mav.addObject("exception", ex);
         mav.addObject("url", request.getRequestURL());
-        mav.setViewName("/exceptionhandler/persistentObjectNotFound");
+        mav.setViewName("exceptionhandler/persistentObjectNotFound");
         return mav;
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -43,7 +43,7 @@ spring:
       max-active: 50
       max-wait: 10000
       test-on-borrow: true
-    url: ${JDBC_DATABASE_URL}
+    url: ${DATABASE_URL}
   devtools:
     livereload:
       enabled: false
@@ -117,4 +117,4 @@ twitterwall:
         - 876514968933478400 #wowa_TYPO3
         - 876441863191920641 #dirscherl17
         - 876441015523192832 #Markus306
-        - 876440419416109056 #mattLefaux
+        - 876440419416109056 #mattLefaux
diff --git a/src/main/resources/templates/scheduled/taskStarted.html b/src/main/resources/templates/scheduled/taskStarted.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:spring="http://www.springframework.org/hashTags">
+<head  th:include="layout :: tw-head">
+</head>
+<body id="page-top" class="page-2" style="padding-top:50px; padding-bottom:200px;">
+<header th:include="layout :: tw-header" >
+</header>
+<section>
+    <div class="container">
+        <div class="row">
+            <div class="col-md-12">
+
+                <h2>Backend Task Started.</h2>
+
+                <span th:if="${page.historyBack}">
+                        <a href="javascript:history.back()"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i>&nbsp;&nbsp;zurück</a>
+                </span>
+            </div>
+        </div>
+    </div>
+</section>
+<footer th:include="layout :: footer" >
+
+</footer>
+</body>
+</html>
+

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public String domainCount(Model model) {`
`27`	`27`	`model = controllerHelper.setupPage(model,title,subtitle,symbol);`
`28`	`28`	`CountedEntities countedEntities =this.countedEntitiesService.countAll();`
`29`	`29`	`model.addAttribute("countedEntities", countedEntities);`
`30`		`- return "/application/domain/count";`
	`30`	`+ return "application/domain/count";`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`private final CountedEntitiesService countedEntitiesService;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public String getAll(@RequestParam(name= "page" ,defaultValue=""+ FIRST_PAGE_NUM`
`49`	`49`	`Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize(), Sort.Direction.ASC,"text");`
`50`	`50`	`Page<HashTag> myPageContent = hashTagService.getAll(pageRequest);`
`51`	`51`	`model.addAttribute("myPageContent",myPageContent);`
`52`		`- return "/hashtag/all";`
	`52`	`+ return "hashtag/all";`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@RequestMapping(path="/{text}")`
`@@ -86,11 +86,11 @@ public String hashTagFromTweetsAndUsers(`
`86`	`86`	`model.addAttribute("users", users);`
`87`	`87`	`//`
`88`	`88`	`log.debug(msg + " READY - DONE");`
`89`		`- return "/hashtag/hashtagText";`
	`89`	`+ return "hashtag/hashtagText";`
`90`	`90`	`} else {`
`91`	`91`	`String msg2 = msg + " parameter ist NOT valid";`
`92`	`92`	`log.warn(msg2);`
`93`		`- return "/hashtag/hashtagText";`
	`93`	`+ return "hashtag/hashtagText";`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`@@ -143,7 +143,7 @@ public String hashTagsOverview(Model model) {`
`143`	`143`	`}`
`144`	`144`	`model.addAttribute("hashTagsTweets", hashTagsTweets);`
`145`	`145`	`model.addAttribute("hashTagsUsers", hashTagsUsers);`
`146`		`- return "/hashtag/overview";`
	`146`	`+ return "hashtag/overview";`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`private static final Logger log = LoggerFactory.getLogger(HashTagController.class);`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public String getAll(@RequestParam(name= "page" ,defaultValue=""+ ControllerHelp`
`34`	`34`	`Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize(), Sort.Direction.ASC,"url");`
`35`	`35`	`Page<Media> myPageContent = mediaService.getAll(pageRequest);`
`36`	`36`	`model.addAttribute("myPageContent",myPageContent);`
`37`		`- return "/media/all";`
	`37`	`+ return "media/all";`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private final MediaService mediaService;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public String getAll(@RequestParam(name= "page" ,defaultValue=""+ ControllerHelp`
`33`	`33`	`Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize(), Sort.Direction.ASC,"screenName");`
`34`	`34`	`Page<Mention> myPageContent = mentionService.getAll(pageRequest);`
`35`	`35`	`model.addAttribute("myPageContent",myPageContent);`
`36`		`- return "/mention/all";`
	`36`	`+ return "mention/all";`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private final TwitterwallFrontendProperties twitterwallFrontendProperties;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public String getTestData(Model model) {`
`41`	`41`	`model.addAttribute("latestTweets",null);`
`42`	`42`	`model.addAttribute("users",null);`
`43`	`43`	`}`
`44`		`- return "/test/getTestData";`
	`44`	`+ return "test/getTestData";`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@RequestMapping("/user/onlist/renew")`
`@@ -56,7 +56,7 @@ public String getOnListRenew(@RequestParam(name= "page" ,defaultValue=""+ Contro`
`56`	`56`	`String symbol = Symbols.LEAF.toString();`
`57`	`57`	`String title = "Renew List of Users On List";`
`58`	`58`	`model = controllerHelper.setupPage(model, title, "Users", symbol);`
`59`		`- return "/test/user/onlist/renew";`
	`59`	`+ return "test/user/onlist/renew";`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private static final Logger log = LoggerFactory.getLogger(TestController.class);`