#897, all classes implementing Text were refactored to extend TextEnv…

…elope in package org.cactoos.time
yegor256 · Jul 4, 2018 · 4348d7e · 4348d7e
1 parent 84f7c9d
commit 4348d7e
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 85 deletions.
diff --git a/src/main/java/org/cactoos/time/DateAsText.java b/src/main/java/org/cactoos/time/DateAsText.java
@@ -29,19 +29,15 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.Locale;
-import org.cactoos.Text;
+import org.cactoos.Scalar;
+import org.cactoos.text.TextEnvelope;
 
 /**
  * Formatter for {@link Date} instances.
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
-public final class DateAsText implements Text {
-
-    /**
-     * Internal text carrying the formatted date.
-     */
-    private final ZonedDateTimeAsText text;
+public final class DateAsText extends TextEnvelope {
 
     /**
      * Formats current time using the ISO format.
@@ -124,16 +120,13 @@ public DateAsText(final Date date, final String format,
      * @param formatter The formatter to use.
      */
     public DateAsText(final Date date, final DateTimeFormatter formatter) {
-        this.text = new ZonedDateTimeAsText(
-            ZonedDateTime.ofInstant(date.toInstant(), ZoneId.of("UTC")),
+        super((Scalar<String>) () -> new ZonedDateTimeAsText(
+            ZonedDateTime.ofInstant(
+                date.toInstant(),
+                ZoneId.of("UTC")
+            ),
             formatter
-        );
+        ).asString());
     }
-
-    @Override
-    public String asString() {
-        return this.text.asString();
-    }
-
 }
 
diff --git a/src/main/java/org/cactoos/time/LocalDateAsText.java b/src/main/java/org/cactoos/time/LocalDateAsText.java
@@ -29,20 +29,15 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
-import org.cactoos.Text;
-import org.cactoos.scalar.UncheckedScalar;
+import org.cactoos.Scalar;
+import org.cactoos.text.TextEnvelope;
 
 /**
  * Formatter for {@link java.time.LocalDate} instances.
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
-public final class LocalDateAsText implements Text {
-
-    /**
-     * Scalar carrying the formatted date.
-     */
-    private final UncheckedScalar<String> formatted;
+public final class LocalDateAsText extends TextEnvelope {
 
     /**
      * Formats date using ISO date time format.
@@ -80,16 +75,8 @@ public LocalDateAsText(final LocalDate date, final String format,
      */
     public LocalDateAsText(final LocalDate date,
         final DateTimeFormatter formatter) {
-        this.formatted = new UncheckedScalar<>(
-            () -> formatter.format(
-                ZonedDateTime.of(date, LocalTime.MIN, ZoneId.systemDefault())
-            )
-        );
+        super((Scalar<String>) () -> formatter.format(
+            ZonedDateTime.of(date, LocalTime.MIN, ZoneId.systemDefault())
+        ));
     }
-
-    @Override
-    public String asString() {
-        return this.formatted.value();
-    }
-
 }
diff --git a/src/main/java/org/cactoos/time/LocalDateTimeAsText.java b/src/main/java/org/cactoos/time/LocalDateTimeAsText.java
@@ -27,20 +27,15 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
-import org.cactoos.Text;
-import org.cactoos.scalar.UncheckedScalar;
+import org.cactoos.Scalar;
+import org.cactoos.text.TextEnvelope;
 
 /**
  * Formatter for {@link java.time.LocalDateTime} instances.
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
-public final class LocalDateTimeAsText implements Text {
-
-    /**
-     * Scalar carrying the formatted date.
-     */
-    private final UncheckedScalar<String> formatted;
+public final class LocalDateTimeAsText extends TextEnvelope {
 
     /**
      * Formats date using ISO date time format.
@@ -78,14 +73,9 @@ public LocalDateTimeAsText(final LocalDateTime date, final String format,
      */
     public LocalDateTimeAsText(final LocalDateTime date,
         final DateTimeFormatter formatter) {
-        this.formatted = new UncheckedScalar<>(
-            () -> formatter.format(date.atZone(ZoneId.systemDefault()))
+        super((Scalar<String>) () -> formatter.format(
+            date.atZone(ZoneId.systemDefault())
+            )
         );
     }
-
-    @Override
-    public String asString() {
-        return this.formatted.value();
-    }
-
 }
diff --git a/src/main/java/org/cactoos/time/OffsetDateTimeAsText.java b/src/main/java/org/cactoos/time/OffsetDateTimeAsText.java
@@ -26,20 +26,15 @@
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
-import org.cactoos.Text;
-import org.cactoos.scalar.UncheckedScalar;
+import org.cactoos.Scalar;
+import org.cactoos.text.TextEnvelope;
 
 /**
  * Formatter for {@link java.time.OffsetDateTime} instances.
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
-public final class OffsetDateTimeAsText implements Text {
-
-    /**
-     * Scalar carrying the formatted date.
-     */
-    private final UncheckedScalar<String> formatted;
+public final class OffsetDateTimeAsText extends TextEnvelope {
 
     /**
      * Formats date using ISO date time format.
@@ -78,14 +73,6 @@ public OffsetDateTimeAsText(final OffsetDateTime date, final String format,
      */
     public OffsetDateTimeAsText(final OffsetDateTime date,
         final DateTimeFormatter formatter) {
-        this.formatted = new UncheckedScalar<>(
-            () -> formatter.format(date)
-        );
+        super((Scalar<String>) () -> formatter.format(date));
     }
-
-    @Override
-    public String asString() {
-        return this.formatted.value();
-    }
-
 }
diff --git a/src/main/java/org/cactoos/time/ZonedDateTimeAsText.java b/src/main/java/org/cactoos/time/ZonedDateTimeAsText.java
@@ -26,20 +26,15 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
-import org.cactoos.Text;
-import org.cactoos.scalar.UncheckedScalar;
+import org.cactoos.Scalar;
+import org.cactoos.text.TextEnvelope;
 
 /**
  * Formatter for {@link java.time.ZonedDateTime} instances.
  * @since 0.27
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
-public final class ZonedDateTimeAsText implements Text {
-
-    /**
-     * Scalar carrying the formatted date.
-     */
-    private final UncheckedScalar<String> formatted;
+public final class ZonedDateTimeAsText extends TextEnvelope {
 
     /**
      * Formats date using ISO date time format.
@@ -77,14 +72,6 @@ public ZonedDateTimeAsText(final ZonedDateTime date, final String format,
      */
     public ZonedDateTimeAsText(final ZonedDateTime date,
         final DateTimeFormatter formatter) {
-        this.formatted = new UncheckedScalar<>(
-            () -> formatter.format(date)
-        );
+        super((Scalar<String>) () -> formatter.format(date));
     }
-
-    @Override
-    public String asString() {
-        return this.formatted.value();
-    }
-
 }