Merge pull request eugenp#154 from Doha2012/master

modify reddit schedule

Author: Eugen

spring-security-oauth/src/main/java/org/baeldung/config/MyAuthorizationCodeAccessTokenProvider.java

@@ -23,9 +23,6 @@
 
 public class MyAuthorizationCodeAccessTokenProvider extends AuthorizationCodeAccessTokenProvider implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 3822611002661972274L;
 
     private StateKeyGenerator stateKeyGenerator = new DefaultStateKeyGenerator();

spring-security-oauth/src/main/java/org/baeldung/config/WebConfig.java

@@ -53,18 +53,6 @@ public void configureDefaultServletHandling(DefaultServletHandlerConfigurer conf
         configurer.enable();
     }
 
-    // @Bean
-    // public RedditController redditController(OAuth2RestTemplate redditRestTemplate) {
-    // RedditController controller = new RedditController();
-    // controller.setRedditRestTemplate(redditRestTemplate);
-    // return controller;
-    // }
-    //
-    // @Bean
-    // public RestExceptionHandler restExceptionHandler() {
-    // return new RestExceptionHandler();
-    // }
-    //
     @Bean
     public ScheduledTasks scheduledTasks(OAuth2ProtectedResourceDetails reddit) {
         ScheduledTasks s = new ScheduledTasks();

spring-security-oauth/src/main/java/org/baeldung/persistence/dao/PostRepository.java

@@ -9,7 +9,7 @@
 
 public interface PostRepository extends JpaRepository<Post, Long> {
 
-    public List<Post> findBySubmissionDateBefore(Date date);
+    public List<Post> findBySubmissionDateBeforeAndIsSent(Date date, boolean isSent);
 
     public List<Post> findByUser(User user);
 }

spring-security-oauth/src/main/java/org/baeldung/web/RedditController.java

@@ -102,6 +102,7 @@ public final String schedule(Model model, @RequestParam Map<String, String> form
         post.setSubreddit(formParams.get("sr"));
         post.setUrl(formParams.get("url"));
         post.setSubmissionDate(dateFormat.parse(formParams.get("date")));
+        post.setSubmissionResponse("Not sent yet");
         if (post.getSubmissionDate().before(new Date())) {
             model.addAttribute("msg", "Invalid date");
             return "submissionResponse";

spring-security-oauth/src/main/java/org/baeldung/web/schedule/ScheduledTasks.java

@@ -1,14 +1,14 @@
 package org.baeldung.web.schedule;
 
-import java.io.IOException;
-import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
 import org.baeldung.persistence.dao.PostRepository;
 import org.baeldung.persistence.model.Post;
 import org.baeldung.persistence.model.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -21,24 +21,28 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 
 @EnableScheduling
 public class ScheduledTasks {
 
     private OAuth2RestTemplate redditRestTemplate;
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private PostRepository postReopsitory;
 
-    @Scheduled(fixedRate = 5 * 60 * 1000)
-    public void reportCurrentTime() throws JsonProcessingException, IOException, ParseException {
-        List<Post> posts = postReopsitory.findBySubmissionDateBefore(new Date());
-        System.out.println(posts.size());
+    @Scheduled(fixedRate = 1 * 60 * 1000)
+    public void reportCurrentTime() {
+        List<Post> posts = postReopsitory.findBySubmissionDateBeforeAndIsSent(new Date(), false);
+        logger.info(posts.size() + " Posts in the queue.");
         for (Post post : posts) {
-            if (post.isSent())
-                continue;
+            submitPost(post);
+        }
+    }
+
+    private void submitPost(Post post) {
+        try {
             User user = post.getUser();
             DefaultOAuth2AccessToken token = new DefaultOAuth2AccessToken(user.getAccessToken());
             token.setRefreshToken(new DefaultOAuth2RefreshToken((user.getRefreshToken())));
@@ -59,15 +63,21 @@ public void reportCurrentTime() throws JsonProcessingException, IOException, Par
             param.add("sr", post.getSubreddit());
             param.add("url", post.getUrl());
 
+            logger.info("Submit link with these parameters: " + param.entrySet());
             JsonNode node = redditRestTemplate.postForObject("https://oauth.reddit.com/api/submit", param, JsonNode.class);
             JsonNode errorNode = node.get("json").get("errors").get(0);
             if (errorNode == null) {
                 post.setSent(true);
+                post.setSubmissionResponse("Successfully sent");
                 postReopsitory.save(post);
+                logger.info("Successfully sent");
             } else {
                 post.setSubmissionResponse(errorNode.toString());
                 postReopsitory.save(post);
+                logger.info("Error occurred: " + errorNode.toString());
             }
+        } catch (Exception e) {
+            logger.error("Error occurred", e);
         }
     }
 

spring-security-oauth/src/main/webapp/WEB-INF/jsp/postListView.jsp

@@ -1,4 +1,6 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 
@@ -7,7 +9,7 @@
 
 </head>
 <body>
-<nav class="navbar navbar-inverse">
+<nav class="navbar navbar-default">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
@@ -34,17 +36,17 @@
 <div class="container">
 <h1>My Scheduled Posts</h1>
 <table class="table table-bordered">
-<c:forEach var="post" items="${posts}" >
 <thead>
 <tr>
 <th>Post title</th>
 <th>Submission Date</th>
 <th>Notes</th>
 </tr>
 </thead>
+<c:forEach var="post" items="${posts}" >
     <tr <c:if test="${post.isSent()}"> class="success"</c:if>>
         <td><c:out value="${post.getTitle()}"/></td>
-        <td><c:out value="${post.getSubmissionDate()}"/></td>
+        <td><fmt:formatDate type="both" dateStyle="long" timeStyle="long" value="${post.getSubmissionDate()}" /></td>
         <td><c:out value="${post.getSubmissionResponse()}"/></td>
     </tr>
 </c:forEach>

spring-security-oauth/src/main/webapp/WEB-INF/jsp/reddit.jsp

@@ -7,7 +7,7 @@
 
 </head>
 <body>
-<nav class="navbar navbar-inverse">
+<nav class="navbar navbar-default">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">

spring-security-oauth/src/main/webapp/WEB-INF/jsp/schedulePostForm.jsp

@@ -10,7 +10,7 @@
 
 </head>
 <body>
-<nav class="navbar navbar-inverse">
+<nav class="navbar navbar-default">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">

spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionForm.jsp

@@ -7,7 +7,7 @@
 
 </head>
 <body>
-<nav class="navbar navbar-inverse">
+<nav class="navbar navbar-default">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">

spring-security-oauth/src/main/webapp/WEB-INF/jsp/submissionResponse.jsp

@@ -7,7 +7,7 @@
 
 </head>
 <body>
-<nav class="navbar navbar-inverse">
+<nav class="navbar navbar-default">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">