Skip to content

Commit

Permalink
(yegor256#1088) Remove ctors which accept milliseconds
Browse files Browse the repository at this point in the history
  • Loading branch information
Umbrah committed May 2, 2019
1 parent 9b4c2e4 commit 748e590
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 95 deletions.
44 changes: 0 additions & 44 deletions src/main/java/org/cactoos/text/TextOf.java
Expand Up @@ -32,7 +32,6 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
Expand Down Expand Up @@ -453,49 +452,6 @@ public TextOf(
this(date, DateTimeFormatter.ofPattern(format, locale));
}

/**
* Formats the milliseconds using the ISO format.
* @param milliseconds Milliseconds to format.
* @todo #1046:30min Add a class that will create a date from millis
* Create a class which will accept epoch millis and create a Date from it.
* Update ctors in TextOf that accept milliseconds to use this class.
*/
public TextOf(final Long milliseconds) {
this(
Date.from(Instant.ofEpochMilli(milliseconds)),
new Iso().value()
);
}

/**
* Formats the milliseconds using the format and the default locale.
* @param milliseconds Milliseconds to format.
* @param format The format to use.
*/
public TextOf(final long milliseconds, final String format) {
this(
Date.from(Instant.ofEpochMilli(milliseconds)), format,
Locale.getDefault(Locale.Category.FORMAT)
);
}

/**
* Formats the milliseconds as date using the format and the locale.
* @param milliseconds Milliseconds to format as date.
* @param format The format to use.
* @param locale The locale to use for the format.
*/
public TextOf(
final long milliseconds,
final String format,
final Locale locale
) {
this(
Date.from(Instant.ofEpochMilli(milliseconds)),
DateTimeFormatter.ofPattern(format, locale)
);
}

/**
* Formats the date with ISO format using the system zone.
* @param date The date to format.
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/org/cactoos/time/package-info.java
Expand Up @@ -26,10 +26,5 @@
* Time.
*
* @since 1.0
* @todo #1006:30min Classes from package {@link org.cactoos.time} which are
* ending with `AsText` are extending TextEnvelope. It means that they are
* instances of {@link org.cactoos.Text}. They should be merged with
* {@link org.cactoos.text.TextOf} as ctor(s).
* Tests should be moved to TextOfTest.
*/
package org.cactoos.time;
46 changes: 0 additions & 46 deletions src/test/java/org/cactoos/text/TextOfTest.java
Expand Up @@ -472,52 +472,6 @@ public void dateFormattedUsingCustomFormatDifferentLocale() {
).affirm();
}

@Test
public void millisFormattedUsingIsoFormatter() {
final Calendar calendar =
Calendar.getInstance(TimeZone.getDefault());
calendar.set(2017, Calendar.DECEMBER, 13, 14, 15, 16);
calendar.set(Calendar.MILLISECOND, 17);
final ZoneOffset offset = calendar.getTimeZone().toZoneId()
.getRules().getOffset(calendar.toInstant());
new Assertion<>(
"Can't format a java.util.Date with ISO format.",
() -> new TextOf(calendar.getTime().getTime()),
new TextIs("2017-12-13T14:15:16.017" + offset)
).affirm();
}

@Test
public void millisFormattedUsingCustomFormat() {
final Calendar calendar =
Calendar.getInstance(TimeZone.getDefault());
calendar.set(2017, Calendar.DECEMBER, 13, 14, 15, 16);
new Assertion<>(
"Can't format a java.util.Date with custom format.",
() -> new TextOf(
calendar.getTime().getTime(),
"yyyy MM dd hh:mm:ss"
),
new TextIs("2017 12 13 02:15:16")
).affirm();
}

@Test
public void millisFormattedUsingCustomFormatDifferentLocale() {
final Calendar calendar =
Calendar.getInstance(TimeZone.getDefault());
calendar.set(2017, Calendar.DECEMBER, 13, 14, 15, 16);
new Assertion<>(
"Can't format a java.util.Date with custom format.",
() -> new TextOf(
calendar.getTime().getTime(),
"yyyy MMMM dd hh:mm:ss",
Locale.US
),
new TextIs("2017 December 13 02:15:16")
).affirm();
}

@Test
public void offsetDateTimeFormattedAsIsoDateTime() {
final OffsetDateTime date = OffsetDateTime.of(
Expand Down

0 comments on commit 748e590

Please sign in to comment.