Make topics use new date APIs.

DMDirc · Feb 21, 2016 · 8e1c213 · 8e1c213
1 parent 0fa22d3
commit 8e1c213
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/com/dmdirc/ChannelEventHandler.java b/src/com/dmdirc/ChannelEventHandler.java
@@ -60,7 +60,7 @@
 import com.google.common.base.Strings;
 
 import java.time.LocalDateTime;
-import java.util.Date;
+import java.time.ZoneOffset;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -139,7 +139,7 @@ public void onChannelTopic(final ChannelTopicEvent event) {
 
         final Topic topic = Topic.create(channel.getTopic(),
                 owner.getUser(getConnection().getUser(channel.getTopicSetter())).orElse(null),
-                new Date(1000 * channel.getTopicTime()));
+                LocalDateTime.ofEpochSecond(channel.getTopicTime(), 0, ZoneOffset.UTC));
 
         if (event.isJoinTopic()) {
             if (Strings.isNullOrEmpty(channel.getTopic())) {

diff --git a/src/com/dmdirc/Topic.java b/src/com/dmdirc/Topic.java
@@ -26,7 +26,7 @@
 
 import com.google.auto.value.AutoValue;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Optional;
 
 /**
@@ -42,11 +42,11 @@ public abstract class Topic {
     /** Topic client. */
     public abstract Optional<GroupChatUser> getClient();
     /** Topic time. */
-    public abstract Date getDate();
+    public abstract LocalDateTime getDate();
 
     public static Topic create(final String topic,
             final GroupChatUser groupChatUser,
-            final Date date) {
+            final LocalDateTime date) {
         return new AutoValue_Topic(topic, Optional.ofNullable(groupChatUser), date);
     }
 }
diff --git a/test/com/dmdirc/TopicTest.java b/test/com/dmdirc/TopicTest.java
@@ -24,7 +24,8 @@
 
 import com.dmdirc.interfaces.GroupChatUser;
 
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Optional;
 
 import org.junit.Test;
@@ -37,25 +38,24 @@
 @RunWith(MockitoJUnitRunner.class)
 public class TopicTest {
 
-    @Mock
-    private GroupChatUser user;
+    @Mock private GroupChatUser user;
 
     @Test
     public void testGetClient() {
-        final Topic test = Topic.create("abc", user, new Date());
+        final Topic test = Topic.create("abc", user, LocalDateTime.now());
         assertEquals(Optional.of(user), test.getClient());
     }
 
     @Test
     public void testGetTime() {
-        final Date date = new Date(123394432);
+        final LocalDateTime date = LocalDateTime.ofEpochSecond(123394432L, 0, ZoneOffset.UTC);
         final Topic test = Topic.create("abc", user, date);
         assertEquals(date, test.getDate());
     }
 
     @Test
     public void testGetTopic() {
-        final Topic test = Topic.create("abc", user, new Date());
+        final Topic test = Topic.create("abc", user, LocalDateTime.now());
         assertEquals("abc", test.getTopic());
     }