Merge pull request #658 from csmith/times

Switch to new date APIs.

src/com/dmdirc/ChannelEventHandler.java

@@ -60,7 +60,7 @@ import com.dmdirc.parser.interfaces.Parser;
 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 class ChannelEventHandler extends EventHandler {
 
         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())) {

src/com/dmdirc/Topic.java

@@ -26,7 +26,7 @@ import com.dmdirc.interfaces.GroupChatUser;
 
 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);
     }
 }

src/com/dmdirc/logger/ProgramError.java

@@ -29,7 +29,7 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.Throwables;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -52,7 +52,7 @@ public class ProgramError implements Serializable {
     /** Underlying exception. */
     private final Optional<Throwable> exception;
     /** Date/time error first occurred. */
-    private final Date date;
+    private final LocalDateTime date;
     /** The eventbus to post status changes to. */
     private final Optional<DMDircMBassador> eventBus;
     /** Is this an application error? */
@@ -75,7 +75,7 @@ public class ProgramError implements Serializable {
             @Nonnull final ErrorLevel level,
             @Nonnull final String message,
             @Nullable final Throwable exception,
-            @Nonnull final Date date,
+            @Nonnull final LocalDateTime date,
             @Nullable final DMDircMBassador eventBus,
             final boolean appError) {
         checkNotNull(level);
@@ -86,7 +86,7 @@ public class ProgramError implements Serializable {
         this.level = level;
         this.message = message;
         this.exception = Optional.ofNullable(exception);
-        this.date = (Date) date.clone();
+        this.date = date;
         this.reportStatus = ErrorReportStatus.WAITING;
         this.eventBus = Optional.ofNullable(eventBus);
         this.appError = appError;
@@ -123,8 +123,8 @@ public class ProgramError implements Serializable {
      *
      * @return Error time
      */
-    public Date getDate() {
-        return (Date) date.clone();
+    public LocalDateTime getDate() {
+        return date;
     }
 
     /**

src/com/dmdirc/logger/ProgramErrorFactory.java

@@ -24,7 +24,7 @@ package com.dmdirc.logger;
 
 import com.dmdirc.DMDircMBassador;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -43,7 +43,7 @@ public class ProgramErrorFactory {
 
     public ProgramError create(final ErrorLevel level, final String message,
             @Nullable final Throwable exception,
-            final Date date,
+            final LocalDateTime date,
             final boolean appError) {
         return new ProgramError(level, message, exception, date, eventBus, appError);
     }

src/com/dmdirc/logger/ProgramErrorManager.java

@@ -35,11 +35,11 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
 
 import com.google.common.base.Throwables;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -124,7 +124,7 @@ public class ProgramErrorManager {
             final Throwable throwable, final boolean appError) {
 
         final ProgramError error = programErrorFactory.create(level, message, throwable,
-                new Date(), appError);
+                LocalDateTime.now(), appError);
         errors.add(error);
         return error;
     }

src/com/dmdirc/logger/SentryErrorReporter.java

@@ -25,6 +25,8 @@ package com.dmdirc.logger;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.util.ClientInfo;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.Optional;
 
@@ -68,12 +70,12 @@ public class SentryErrorReporter {
     public void sendException(
             final String message,
             final ErrorLevel level,
-            final Date timestamp,
+            final LocalDateTime timestamp,
             final Optional<Throwable> exception) {
         final EventBuilder eventBuilder = newEventBuilder()
                 .withMessage(message)
                 .withLevel(getSentryLevel(level))
-                .withTimestamp(timestamp);
+                .withTimestamp(Date.from(timestamp.toInstant(ZoneOffset.UTC)));
 
         exception.ifPresent(e -> eventBuilder.withSentryInterface(new ExceptionInterface(e)));
 

src/com/dmdirc/ui/core/errors/DisplayableError.java

@@ -28,7 +28,7 @@ import com.dmdirc.logger.ProgramError;
 
 import com.google.common.base.MoreObjects;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 /**
@@ -36,14 +36,14 @@ import java.util.Objects;
  */
 public class DisplayableError {
 
-    private final Date date;
+    private final LocalDateTime date;
     private final String summary;
     private final String details;
     private final ErrorLevel severity;
     private final ProgramError programError;
     private ErrorReportStatus reportStatus;
 
-    public DisplayableError(final Date date, final String summary, final String details,
+    public DisplayableError(final LocalDateTime date, final String summary, final String details,
             final ErrorLevel severity, final ErrorReportStatus reportStatus,
             final ProgramError programError) {
         this.date = date;
@@ -54,8 +54,8 @@ public class DisplayableError {
         this.reportStatus = reportStatus;
     }
 
-    public Date getDate() {
-        return (Date) date.clone();
+    public LocalDateTime getDate() {
+        return date;
     }
 
     public String getSummary() {

test/com/dmdirc/TopicTest.java

@@ -24,7 +24,8 @@ package com.dmdirc;
 
 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 @@ import static org.junit.Assert.assertEquals;
 @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());
     }
 

test/com/dmdirc/logger/ProgramErrorTest.java

@@ -26,7 +26,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ProgramErrorStatusEvent;
 import com.dmdirc.util.ClientInfo;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,7 +51,7 @@ public class ProgramErrorTest {
 
     @Test(expected = NullPointerException.class)
     public void testConstructorNullErrorLevel() {
-        new ProgramError(null, "moo", null, new Date(),eventBus, true);
+        new ProgramError(null, "moo", null, LocalDateTime.now(), eventBus, true);
     }
 
     @Test(expected = NullPointerException.class)
@@ -62,26 +62,26 @@ public class ProgramErrorTest {
     @Test
     public void testConstructorGood() {
         new ProgramError(ErrorLevel.HIGH, "moo", new UnsupportedOperationException(),
-                new Date(), eventBus, true);
+                LocalDateTime.now(), eventBus, true);
     }
 
     @Test
     public void testGetLevel() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
-                new UnsupportedOperationException(), new Date(), eventBus, true);
+                new UnsupportedOperationException(), LocalDateTime.now(), eventBus, true);
         assertEquals(ErrorLevel.HIGH, pe.getLevel());
     }
 
     @Test
     public void testGetMessage() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
-                new UnsupportedOperationException(), new Date(), eventBus, true);
+                new UnsupportedOperationException(), LocalDateTime.now(), eventBus, true);
         assertEquals("moo", pe.getMessage());
     }
 
     @Test
     public void testGetDate() {
-        final Date date = new Date();
+        final LocalDateTime date = LocalDateTime.now();
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
                 new UnsupportedOperationException(), date, eventBus, true);
         assertEquals(date, pe.getDate());
@@ -90,14 +90,14 @@ public class ProgramErrorTest {
     @Test
     public void testIsAppError() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
-                new UnsupportedOperationException(), new Date(), eventBus, true);
+                new UnsupportedOperationException(), LocalDateTime.now(), eventBus, true);
         assertTrue(pe.isAppError());
     }
 
     @Test
     public void testReportStatus() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
-                new UnsupportedOperationException(), new Date(), eventBus, true);
+                new UnsupportedOperationException(), LocalDateTime.now(), eventBus, true);
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
         pe.setReportStatus(null);
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
@@ -114,7 +114,7 @@ public class ProgramErrorTest {
     @Test
     public void testToString() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
-                new UnsupportedOperationException(), new Date(), eventBus, true);
+                new UnsupportedOperationException(), LocalDateTime.now(), eventBus, true);
         assertTrue(pe.toString().contains("moo"));
     }
 
@@ -122,15 +122,15 @@ public class ProgramErrorTest {
     public void testEquals() {
         final Exception ex = new UnsupportedOperationException();
         final ProgramError pe1 = new ProgramError(ErrorLevel.LOW, "moo",
-                ex, new Date(), eventBus, true);
+                ex, LocalDateTime.now(), eventBus, true);
         final ProgramError pe2 = new ProgramError(ErrorLevel.LOW, "moo",
-                ex, new Date(), eventBus, true);
+                ex, LocalDateTime.now(), eventBus, true);
         final ProgramError pe3 = new ProgramError(ErrorLevel.MEDIUM, "moo",
-                ex, new Date(), eventBus, true);
+                ex, LocalDateTime.now(), eventBus, true);
         final ProgramError pe4 = new ProgramError(ErrorLevel.LOW, "bar",
-                ex, new Date(), eventBus, true);
+                ex, LocalDateTime.now(), eventBus, true);
         final ProgramError pe5 = new ProgramError(ErrorLevel.LOW, "moo",
-                null, new Date(), eventBus, true);
+                null, LocalDateTime.now(), eventBus, true);
 
         assertFalse(pe1.equals(null)); // NOPMD
         assertFalse(pe1.equals("moo"));

test/com/dmdirc/logger/SentryErrorReporterTest.java

@@ -24,7 +24,8 @@ package com.dmdirc.logger;
 
 import com.dmdirc.util.ClientInfo;
 
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Optional;
 
 import org.junit.Before;
@@ -77,50 +78,56 @@ public class SentryErrorReporterTest {
 
     @Test
     public void testSendsMessage() {
-        sentryErrorReporter.sendException("message 123", ErrorLevel.MEDIUM, new Date(), throwable);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.MEDIUM, LocalDateTime.now(),
+                throwable);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals("message 123", eventCaptor.getValue().getMessage());
     }
 
     @Test
     public void testSendsTimestamp() {
-        final Date date = new Date(561859200000l);
+        final LocalDateTime date = LocalDateTime.ofEpochSecond(56185920L, 0, ZoneOffset.UTC);
         sentryErrorReporter.sendException("message 123", ErrorLevel.MEDIUM, date, throwable);
         verify(raven).sendEvent(eventCaptor.capture());
-        assertEquals(date, eventCaptor.getValue().getTimestamp());
+        assertEquals(56185920000L, eventCaptor.getValue().getTimestamp().getTime());
     }
 
     @Test
     public void testSendsLowLevelAsInfo() {
-        sentryErrorReporter.sendException("message 123", ErrorLevel.LOW, new Date(), throwable);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.LOW, LocalDateTime.now(),
+                throwable);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.INFO, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testSendsMediumLevelAsWarning() {
-        sentryErrorReporter.sendException("message 123", ErrorLevel.MEDIUM, new Date(), throwable);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.MEDIUM, LocalDateTime.now(),
+                throwable);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.WARNING, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testSendsHighLevelAsError() {
-        sentryErrorReporter.sendException("message 123", ErrorLevel.HIGH, new Date(), throwable);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.HIGH, LocalDateTime.now(),
+                throwable);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.ERROR, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testSendsFatalLevelAsFatal() {
-        sentryErrorReporter.sendException("message 123", ErrorLevel.FATAL, new Date(), throwable);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.FATAL, LocalDateTime.now(),
+                throwable);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.FATAL, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testSendsUnknownLevelAsInfo() {
-        sentryErrorReporter.sendException("message 123", ErrorLevel.UNKNOWN, new Date(), throwable);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.UNKNOWN, LocalDateTime.now(),
+                throwable);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.INFO, eventCaptor.getValue().getLevel());
     }
@@ -128,7 +135,7 @@ public class SentryErrorReporterTest {
     @Test
     public void testAddsExceptionInterface() {
         final Exception exception = new IndexOutOfBoundsException("Message blah");
-        sentryErrorReporter.sendException("message 123", ErrorLevel.UNKNOWN, new Date(),
+        sentryErrorReporter.sendException("message 123", ErrorLevel.UNKNOWN, LocalDateTime.now(),
                 Optional.of(exception));
         verify(raven).sendEvent(eventCaptor.capture());
         final SentryInterface iface = eventCaptor.getValue().getSentryInterfaces()

test/com/dmdirc/logger/SentryLoggingErrorManagerTest.java

@@ -29,13 +29,12 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.util.concurrent.MoreExecutors;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Optional;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
@@ -79,14 +78,14 @@ public class SentryLoggingErrorManagerTest {
     public void testHandleErrorEvent() throws Exception {
         instance.handleErrorEvent(appErrorEvent);
         verify(sentryErrorReporter).sendException(anyString(), any(ErrorLevel.class),
-                any(Date.class), Matchers.<Optional<Throwable>>any());
+                any(LocalDateTime.class), any());
     }
 
     @Test
     public void testHandledErrorEvent_UserError() throws Exception {
         instance.handleErrorEvent(userErrorEvent);
         verify(sentryErrorReporter, never()).sendException(anyString(), any(ErrorLevel.class),
-                any(Date.class), Matchers.<Optional<Throwable>>any());
+                any(LocalDateTime.class), any());
     }
 
     @Test
@@ -95,7 +94,7 @@ public class SentryLoggingErrorManagerTest {
         when(appError.getThrowable()).thenReturn(Optional.of(throwable));
         instance.handleErrorEvent(appErrorEvent);
         verify(sentryErrorReporter, never()).sendException(anyString(), any(ErrorLevel.class),
-                any(Date.class), eq(Optional.of(throwable)));
+                any(LocalDateTime.class), eq(Optional.of(throwable)));
     }
 
     @Test
@@ -104,7 +103,7 @@ public class SentryLoggingErrorManagerTest {
         instance.handleNoErrorReporting(false);
         instance.handleErrorEvent(appErrorEvent);
         verify(sentryErrorReporter, never()).sendException(anyString(), any(ErrorLevel.class),
-                any(Date.class), Matchers.<Optional<Throwable>>any());
+                any(LocalDateTime.class), any());
     }
 
     @Test
@@ -113,7 +112,7 @@ public class SentryLoggingErrorManagerTest {
         instance.handleNoErrorReporting(true);
         instance.handleErrorEvent(appErrorEvent);
         verify(sentryErrorReporter, never()).sendException(anyString(), any(ErrorLevel.class),
-                any(Date.class), Matchers.<Optional<Throwable>>any());
+                any(LocalDateTime.class), any());
     }
 
     @Test
@@ -122,7 +121,7 @@ public class SentryLoggingErrorManagerTest {
         instance.handleNoErrorReporting(false);
         instance.handleErrorEvent(appErrorEvent);
         verify(sentryErrorReporter).sendException(anyString(), any(ErrorLevel.class),
-                any(Date.class), Matchers.<Optional<Throwable>>any());
+                any(LocalDateTime.class), any());
     }
 
     @Test
@@ -131,6 +130,6 @@ public class SentryLoggingErrorManagerTest {
         instance.handleNoErrorReporting(true);
         instance.handleErrorEvent(appErrorEvent);
         verify(sentryErrorReporter, never()).sendException(anyString(), any(ErrorLevel.class),
-                any(Date.class), Matchers.<Optional<Throwable>>any());
+                any(LocalDateTime.class), any());
     }
 }