From e86cc290febd2dbe3572b9361fca7360931b90ab Mon Sep 17 00:00:00 2001 From: DOHA Date: Wed, 4 Mar 2015 18:09:01 +0200 Subject: [PATCH] minor changes --- .../org/baeldung/web/RedditController.java | 12 ++++++--- .../main/webapp/WEB-INF/jsp/postListView.jsp | 10 +++++--- .../src/main/webapp/WEB-INF/jsp/reddit.jsp | 25 ++++++++----------- .../webapp/WEB-INF/jsp/schedulePostForm.jsp | 10 +++++--- .../webapp/WEB-INF/jsp/submissionForm.jsp | 10 +++++--- .../webapp/WEB-INF/jsp/submissionResponse.jsp | 8 +++--- 6 files changed, 42 insertions(+), 33 deletions(-) diff --git a/spring-security-oauth/src/main/java/org/baeldung/web/RedditController.java b/spring-security-oauth/src/main/java/org/baeldung/web/RedditController.java index 5fb746551b..a8f48684cf 100644 --- a/spring-security-oauth/src/main/java/org/baeldung/web/RedditController.java +++ b/spring-security-oauth/src/main/java/org/baeldung/web/RedditController.java @@ -7,6 +7,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpSession; + import org.baeldung.persistence.dao.PostRepository; import org.baeldung.persistence.dao.UserRepository; import org.baeldung.persistence.model.Post; @@ -22,6 +24,7 @@ import org.springframework.ui.Model; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import com.fasterxml.jackson.databind.JsonNode; @@ -43,15 +46,15 @@ public class RedditController { private PostRepository postReopsitory; @RequestMapping("/info") - public final String getInfo(final Model model) { + public final String getInfo(HttpSession session) { final JsonNode node = redditRestTemplate.getForObject("https://oauth.reddit.com/api/v1/me", JsonNode.class); final String name = node.get("name").asText(); addUser(name, redditRestTemplate.getAccessToken()); - model.addAttribute("info", name); + session.setAttribute("username", name); return "reddit"; } - @RequestMapping("/submit") + @RequestMapping(value = "/submit", method = RequestMethod.POST) public final String submit(final Model model, @RequestParam final Map formParams) { final MultiValueMap param1 = constructParams(formParams); @@ -83,7 +86,7 @@ public class RedditController { return "schedulePostForm"; } - @RequestMapping("/schedule") + @RequestMapping(value = "/schedule", method = RequestMethod.POST) public final String schedule(final Model model, @RequestParam final Map formParams) throws ParseException { logger.info("User scheduling Post with these parameters: " + formParams.entrySet()); final User user = userReopsitory.findByAccessToken(redditRestTemplate.getAccessToken().getValue()); @@ -182,6 +185,7 @@ public class RedditController { user.setTokenExpiration(token.getExpiration()); userReopsitory.save(user); } + } } diff --git a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/postListView.jsp b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/postListView.jsp index 5c750cbda4..dc32612c8e 100755 --- a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/postListView.jsp +++ b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/postListView.jsp @@ -19,15 +19,17 @@ - Spring Security OAuth + Schedule to Reddit + +

Logged in as    

diff --git a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/reddit.jsp b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/reddit.jsp index d8c9809fd8..1da8e5a580 100755 --- a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/reddit.jsp +++ b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/reddit.jsp @@ -17,32 +17,29 @@ - Spring Security OAuth + Schedule to Reddit + +

Logged in as    

- - -

Welcome, ${info}

- Submit to Reddit - - - Sorry, error occurred -

-
${error}
- - +

Welcome,

+
+ My Scheduled Posts + Post to Reddit + Schedule Post to Reddit +
\ No newline at end of file diff --git a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/schedulePostForm.jsp b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/schedulePostForm.jsp index 9f808012b1..976354976c 100755 --- a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/schedulePostForm.jsp +++ b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/schedulePostForm.jsp @@ -20,22 +20,24 @@ - Spring Security OAuth + Schedule to Reddit + +

Logged in as    

-

Schedule Post

+

Schedule Post to Reddit

diff --git a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionForm.jsp b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionForm.jsp index 9944a6893e..17d8c3680c 100755 --- a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionForm.jsp +++ b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionForm.jsp @@ -17,22 +17,24 @@ - Spring Security OAuth + Schedule to Reddit
+ +

Logged in as    

-

Submit to Reddit

+

Post to Reddit

diff --git a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionResponse.jsp b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionResponse.jsp index 2b6337e2a0..3f35c396d2 100755 --- a/spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionResponse.jsp +++ b/spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionResponse.jsp @@ -17,15 +17,17 @@ - Spring Security OAuth + Schedule to Reddit
+ +

Logged in as