Changeset 17720 in josm

Timestamp:

2021-04-09T00:55:40+02:00 (3 years ago)

Author:

simon04

Message:

see #14176 - Migrate ChangesetDiscussionComment to Instant

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/OsmChangesetParser.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetDiscussionCommentTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import java.util.Date;
-
-import org.openstreetmap.josm.tools.date.DateUtils;
+import java.time.Instant;
 
 /**
@@ -13 +11 @@
 
     /** date this comment was posted at */
-    private final Date date;
+    private final Instant date;
     /** the user who posted the comment */
     private final User user;
@@ -24 +22 @@
      * @param user the user who posted the comment
      */
-    public ChangesetDiscussionComment(Date date, User user) {
-        this.date = DateUtils.cloneDate(date);
+    public ChangesetDiscussionComment(Instant date, User user) {
+        this.date = date;
         this.user = user;
     }
@@ -49 +47 @@
      * @return date this comment was posted at
      */
-    public final Date getDate() {
-        return DateUtils.cloneDate(date);
+    public final Instant getDate() {
+        return date;
     }
 

trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

@@ -9 +9 @@
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
-import java.util.Date;
+import java.time.Instant;
 import java.util.LinkedList;
 import java.util.List;
@@ -172 +172 @@
             // -- date
             String value = atts.getValue("date");
-            Date date = null;
-            if (value != null) {
-                date = DateUtils.fromString(value);
-            }
-
+            Instant date = value != null ? DateUtils.parseInstant(value) : null;
             comment = new ChangesetDiscussionComment(date, createUser(atts));
         }

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetDiscussionCommentTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.Date;
+import java.time.Instant;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -29 +29 @@
     @Test
     void testChangesetDiscussionComment() {
-        Date d = new Date(1000);
+        Instant d = Instant.ofEpochMilli(1000);
         User foo = User.createOsmUser(1, "foo");
         ChangesetDiscussionComment cdc = new ChangesetDiscussionComment(d, foo);
         assertEquals(d, cdc.getDate());
         assertEquals(foo, cdc.getUser());
-        assertEquals("ChangesetDiscussionComment [date=Thu Jan 01 00:00:01 UTC 1970, user=id:1 name:foo, text='null']", cdc.toString());
+        assertEquals("ChangesetDiscussionComment [date=1970-01-01T00:00:01Z, user=id:1 name:foo, text='null']", cdc.toString());
     }
 
@@ -42 +42 @@
     @Test
     void testText() {
-        ChangesetDiscussionComment cdc = new ChangesetDiscussionComment(new Date(), null);
+        ChangesetDiscussionComment cdc = new ChangesetDiscussionComment(Instant.now(), null);
         cdc.setText("foo");
         assertEquals("foo", cdc.getText());