Java8 LocalDateTime

AlexP11223 · AlexP11223 · commit 751f4c1c03b2 · 2015-05-07T15:05:28.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -78,6 +78,12 @@
             <version>2.1.2.RELEASE</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-java8time</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
+
         <!-- servlet -->
 
         <dependency>
diff --git a/src/main/java/alexp/blog/model/Comment.java b/src/main/java/alexp/blog/model/Comment.java
@@ -1,9 +1,11 @@
 package alexp.blog.model;
 
 import alexp.blog.service.MarkdownConverter;
+import alexp.blog.utils.LocalDateTimePersistenceConverter;
 import org.hibernate.validator.constraints.NotBlank;
 
 import javax.persistence.*;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Entity
@@ -19,9 +21,9 @@ public class Comment {
     @NotBlank
     private String commentText;
 
-    @Column(columnDefinition="DATETIME", nullable = false)
-    @Temporal(TemporalType.TIMESTAMP)
-    private Date dateTime;
+    @Column(nullable = false)
+    @Convert(converter = LocalDateTimePersistenceConverter.class)
+    private LocalDateTime dateTime;
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "user_id", nullable = false)
@@ -47,11 +49,11 @@ public String getCommentTextHtml() {
         return MarkdownConverter.toHtml(getCommentText());
     }
 
-    public Date getDateTime() {
+    public LocalDateTime getDateTime() {
         return dateTime;
     }
 
-    public void setDateTime(Date dateTime) {
+    public void setDateTime(LocalDateTime dateTime) {
         this.dateTime = dateTime;
     }
 
diff --git a/src/main/java/alexp/blog/model/Post.java b/src/main/java/alexp/blog/model/Post.java
@@ -1,12 +1,14 @@
 package alexp.blog.model;
 
 import alexp.blog.service.MarkdownConverter;
+import alexp.blog.utils.LocalDateTimePersistenceConverter;
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.util.StringUtils;
 
 import javax.persistence.*;
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -30,9 +32,9 @@ public class Post {
     @Column(nullable = false)
     private String fullPostText;
 
-    @Column(columnDefinition="DATETIME", nullable = false)
-    @Temporal(TemporalType.TIMESTAMP)
-    private Date dateTime;
+    @Column(nullable = false)
+    @Convert(converter = LocalDateTimePersistenceConverter.class)
+    private LocalDateTime dateTime;
 
     @Column(nullable = false)
     private boolean hidden = false;
@@ -104,11 +106,11 @@ public void setTags(Collection<Tag> tags) {
         this.tags = tags;
     }
 
-    public Date getDateTime() {
+    public LocalDateTime getDateTime() {
         return dateTime;
     }
 
-    public void setDateTime(Date dateTime) {
+    public void setDateTime(LocalDateTime dateTime) {
         this.dateTime = dateTime;
     }
 
diff --git a/src/main/java/alexp/blog/model/User.java b/src/main/java/alexp/blog/model/User.java
@@ -1,13 +1,15 @@
 package alexp.blog.model;
 
 import alexp.blog.service.MarkdownConverter;
+import alexp.blog.utils.LocalDateTimePersistenceConverter;
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotBlank;
 import org.springframework.util.StringUtils;
 
 import javax.persistence.*;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -53,7 +55,8 @@ public interface ProfileInfoValidationGroup {}
     private boolean enabled;
 
     @Column(nullable = false)
-    private Date registrationDate;
+    @Convert(converter = LocalDateTimePersistenceConverter.class)
+    private LocalDateTime registrationDate;
 
     @ManyToMany(fetch = FetchType.EAGER)
     @JoinTable(name = "users_roles",
@@ -109,11 +112,11 @@ public boolean isEnabled() {
         return enabled;
     }
 
-    public Date getRegistrationDate() {
+    public LocalDateTime getRegistrationDate() {
         return registrationDate;
     }
 
-    public void setRegistrationDate(Date registrationDate) {
+    public void setRegistrationDate(LocalDateTime registrationDate) {
         this.registrationDate = registrationDate;
     }
 
diff --git a/src/main/java/alexp/blog/service/CommentServiceImpl.java b/src/main/java/alexp/blog/service/CommentServiceImpl.java
@@ -6,6 +6,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +26,7 @@ public List<Comment> getPostComments(Post post) {
 
     @Override
     public void saveNewComment(Comment comment, Post post) {
-        comment.setDateTime(new Date());
+        comment.setDateTime(LocalDateTime.now());
 
         comment.setPost(post);
 
diff --git a/src/main/java/alexp/blog/service/PostServiceImpl.java b/src/main/java/alexp/blog/service/PostServiceImpl.java
@@ -10,6 +10,8 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -58,7 +60,7 @@ public Post saveNewPost(PostEditDto postEditDto) {
 
         fillPost(post, postEditDto);
 
-        post.setDateTime(new Date());
+        post.setDateTime(LocalDateTime.now());
 
         postRepository.saveAndFlush(post);
 
diff --git a/src/main/java/alexp/blog/service/UserServiceImpl.java b/src/main/java/alexp/blog/service/UserServiceImpl.java
@@ -17,6 +17,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -77,7 +78,7 @@ public void register(User user) {
 
         user.setEnabled(true);
 
-        user.setRegistrationDate(new Date());
+        user.setRegistrationDate(LocalDateTime.now());
 
         userRepository.saveAndFlush(user);
     }
diff --git a/src/main/java/alexp/blog/utils/LocalDatePersistenceConverter.java b/src/main/java/alexp/blog/utils/LocalDatePersistenceConverter.java
@@ -0,0 +1,25 @@
+package alexp.blog.utils;
+
+import java.time.LocalDate;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+@Converter
+public class LocalDatePersistenceConverter implements AttributeConverter<LocalDate, java.sql.Date> {
+
+    @Override
+    public java.sql.Date convertToDatabaseColumn(LocalDate entityValue) {
+        if (entityValue != null) {
+            return java.sql.Date.valueOf(entityValue);
+        }
+        return null;
+    }
+
+    @Override
+    public LocalDate convertToEntityAttribute(java.sql.Date databaseValue) {
+        if (databaseValue != null) {
+            return databaseValue.toLocalDate();
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/alexp/blog/utils/LocalDateTimePersistenceConverter.java b/src/main/java/alexp/blog/utils/LocalDateTimePersistenceConverter.java
@@ -0,0 +1,25 @@
+package alexp.blog.utils;
+
+import java.time.LocalDateTime;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+@Converter
+public class LocalDateTimePersistenceConverter implements AttributeConverter<LocalDateTime, java.sql.Timestamp> {
+
+    @Override
+    public java.sql.Timestamp convertToDatabaseColumn(LocalDateTime entityValue) {
+        if (entityValue != null) {
+            return java.sql.Timestamp.valueOf(entityValue);
+        }
+        return null;
+    }
+
+    @Override
+    public LocalDateTime convertToEntityAttribute(java.sql.Timestamp databaseValue) {
+        if (databaseValue != null) {
+            return databaseValue.toLocalDateTime();
+        }
+        return null;
+    }
+}
diff --git a/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
@@ -43,6 +43,7 @@
             <set>
                 <bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
                 <bean class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect"/>
+                <bean class="org.thymeleaf.extras.java8time.dialect.Java8TimeDialect"/>
             </set>
         </property>
     </bean>
diff --git a/src/main/webapp/WEB-INF/templates/fragments/comments.html b/src/main/webapp/WEB-INF/templates/fragments/comments.html
@@ -10,7 +10,7 @@
     <th:block th:fragment="commentList">
         <div class="comment" th:each="comment : ${comments}">
             <a class="comment-title" th:href="@{|/users/${comment.user.username}|}" th:text="${comment.user.username}"></a>
-            <span class="post-date" th:text="${#dates.format(comment.dateTime, 'MMM dd, yyyy HH:mm')}"></span>
+            <span class="post-date" th:text="${#temporals.format(comment.dateTime, 'MMM dd, yyyy HH:mm')}"></span>
 
             <div class="comment-content" th:utext="${comment.getCommentTextHtml()}"></div>
         </div>
diff --git a/src/main/webapp/WEB-INF/templates/post.html b/src/main/webapp/WEB-INF/templates/post.html
@@ -32,7 +32,7 @@
         <div th:attr="data-post-id=${post.id}, data-post-title=${post.title}" class="post">
             <div class="post-content">
                 <h2 class="post-title" th:text="${post.title}"></h2>
-                <p class="post-date" th:text="${#dates.format(post.dateTime, 'MMM dd, yyyy HH:mm:ss')}"></p>
+                <p class="post-date" th:text="${#temporals.format(post.dateTime, 'MMM dd, yyyy HH:mm:ss')}"></p>
 
                 <div class="post-tags">
                     <a class="post-tag" th:each="tag : ${post.getTags()}" th:text="${tag.name}" th:href="@{/tag(name=${tag.name})}"></a>
diff --git a/src/main/webapp/WEB-INF/templates/posts.html b/src/main/webapp/WEB-INF/templates/posts.html
@@ -22,7 +22,7 @@ <h2 th:text="${tag}"></h2>
         <div th:attr="data-post-id=${post.id}, data-post-title=${post.title}" class="post" th:each="post, iterStat : ${postsPage.getContent()}">
             <div class="post-content">
                 <a class="h2 post-title" th:text="${post.title}" th:href="@{|/posts/${post.id}|}"></a>
-                <p class="post-date" th:text="${#dates.format(post.dateTime, 'MMM dd, yyyy HH:mm')}"></p>
+                <p class="post-date" th:text="${#temporals.format(post.dateTime, 'MMM dd, yyyy HH:mm')}"></p>
 
                 <div class="post-tags">
                     <a class="post-tag" th:each="tag : ${post.getTags()}" th:text="${tag.name}" th:href="@{/tag(name=${tag.name})}"></a>
diff --git a/src/main/webapp/WEB-INF/templates/profile.html b/src/main/webapp/WEB-INF/templates/profile.html
@@ -29,7 +29,7 @@ <h3 th:text="${user.username}"></h3>
             </div>
 
             <div class="reg-date">
-                <span th:text="'Registered ' + ${#dates.format(user.registrationDate, 'MMM dd, yyyy')}"></span>
+                <span th:text="'Registered ' + ${#temporals.format(user.registrationDate, 'MMM dd, yyyy')}"></span>
             </div>
         </div>
 
diff --git a/src/test/java/alexp/blog/service/CommentServiceTest.java b/src/test/java/alexp/blog/service/CommentServiceTest.java
@@ -7,6 +7,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.*;
+
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 
@@ -71,6 +73,8 @@ public void shouldAddNewComment() {
 
         assertThat(comment.getUser(), is(equalTo(user)));
 
+        assertThat(comment.getDateTime().toLocalDate().equals(LocalDate.now()), is(equalTo(true)));
+
         verify(commentRepository, times(1)).saveAndFlush(Matchers.any(Comment.class));
     }
 }
diff --git a/src/test/java/alexp/blog/service/PostServiceTest.java b/src/test/java/alexp/blog/service/PostServiceTest.java
@@ -13,6 +13,10 @@
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Month;
 import java.util.*;
 
 import static org.hamcrest.CoreMatchers.*;
@@ -168,14 +172,16 @@ public void shouldAddNewPost() {
 
         assertThat(post.isHidden(), CoreMatchers.is(equalTo(false)));
 
+        assertThat(post.getDateTime().toLocalDate().equals(LocalDate.now()), is(equalTo(true)));
+
         verify(tagRepository, times(2)).findByNameIgnoreCase(Matchers.anyString());
 
         verify(postRepository, times(1)).saveAndFlush(Matchers.any(Post.class));
     }
 
     @Test
     public void shouldEditPost() {
-        Date dt = new GregorianCalendar(2015, Calendar.DECEMBER, 1, 12, 30, 0).getTime();
+        LocalDateTime dt = LocalDateTime.of(2015, Month.JANUARY, 1, 12, 30, 0);
 
         Long postId = 1L;
 
diff --git a/src/test/java/alexp/blog/service/UserServiceTest.java b/src/test/java/alexp/blog/service/UserServiceTest.java
@@ -15,6 +15,7 @@
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -104,6 +105,8 @@ public void shouldAddNewUser() {
         assertThat(user.getRoles().size(), is(equalTo(1)));
         assertThat(user.getRoles().get(0), is(role));
 
+        assertThat(user.getRegistrationDate().toLocalDate().equals(LocalDate.now()), is(equalTo(true)));
+
         verify(userRepository, times(1)).saveAndFlush(user);
 
         verify(roleRepository, times(1)).findByName(Matchers.anyString());
