(yegor256#1116) Extends TextEnvelope when possible

victornoel · May 30, 2019 · 4a301a9 · 4a301a9
1 parent 74a9a55
commit 4a301a9
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 83 deletions.
diff --git a/src/main/java/org/cactoos/text/FormattedText.java b/src/main/java/org/cactoos/text/FormattedText.java
@@ -24,9 +24,9 @@
 package org.cactoos.text;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Formatter;
 import java.util.Locale;
+import org.cactoos.Scalar;
 import org.cactoos.Text;
 import org.cactoos.list.ListOf;
 
@@ -36,27 +36,8 @@
  * <p>There is no thread-safety guarantee.
  *
  * @since 0.1
- * @todo #1063:30min All classes implementing Text need to be refactored
- *  to extend TextEnvelope - asString() should be removed and implementation
- *  from TextEnvelope should be used. This to-do should be moved to another
- *  class which need to be refactored.
  */
-public final class FormattedText implements Text {
-
-    /**
-     * Pattern.
-     */
-    private final Text pattern;
-
-    /**
-     * Arguments.
-     */
-    private final Collection<Object> args;
-
-    /**
-     * Format locale.
-     */
-    private final Locale locale;
+public final class FormattedText extends TextEnvelope {
 
     /**
      * New formatted string with default locale.
@@ -148,27 +129,25 @@ public FormattedText(
      *
      * @param ptn Pattern
      * @param locale Format locale
-     * @param arguments Arguments
+     * @param args Arguments
      */
     public FormattedText(
         final Text ptn,
         final Locale locale,
-        final Collection<Object> arguments
+        final Collection<Object> args
     ) {
-        this.pattern = ptn;
-        this.locale = locale;
-        this.args = Collections.unmodifiableCollection(arguments);
-    }
-
-    @Override
-    public String asString() throws Exception {
-        final StringBuilder out = new StringBuilder(0);
-        try (final Formatter fmt = new Formatter(out, this.locale)) {
-            fmt.format(
-                this.pattern.asString(),
-                this.args.toArray(new Object[0])
-            );
-        }
-        return out.toString();
+        super(new Scalar<String>() {
+            @Override
+            public String value() throws Exception {
+                final StringBuilder out = new StringBuilder(0);
+                try (final Formatter fmt = new Formatter(out, locale)) {
+                    fmt.format(
+                        ptn.asString(),
+                        args.toArray()
+                    );
+                }
+                return out.toString();
+            }
+        });
     }
 }
diff --git a/src/main/java/org/cactoos/text/NoNulls.java b/src/main/java/org/cactoos/text/NoNulls.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.text;
 
+import org.cactoos.Scalar;
 import org.cactoos.Text;
 
 /**
@@ -32,33 +33,28 @@
  *
  * @since 0.11
  */
-public final class NoNulls implements Text {
-    /**
-     * The origin text.
-     */
-    private final Text origin;
-
+public final class NoNulls extends TextEnvelope {
     /**
      * Ctor.
      * @param text The text
      */
     public NoNulls(final Text text) {
-        this.origin = text;
-    }
-
-    @Override
-    public String asString() throws Exception {
-        if (this.origin == null) {
-            throw new IllegalArgumentException(
-                "NULL instead of a valid text"
-            );
-        }
-        final String string = this.origin.asString();
-        if (string == null) {
-            throw new IllegalStateException(
-                "NULL instead of a valid result string"
-            );
-        }
-        return string;
+        super(new Scalar<String>() {
+            @Override
+            public String value() throws Exception {
+                if (text == null) {
+                    throw new IllegalArgumentException(
+                        "NULL instead of a valid text"
+                    );
+                }
+                final String string = text.asString();
+                if (string == null) {
+                    throw new IllegalStateException(
+                        "NULL instead of a valid result string"
+                    );
+                }
+                return string;
+            }
+        });
     }
 }
diff --git a/src/main/java/org/cactoos/text/Randomized.java b/src/main/java/org/cactoos/text/Randomized.java
@@ -37,6 +37,10 @@
  * <p>There is no thread-safety guarantee.
  *
  * @since 0.32
+ * @todo #1116:30min All classes implementing Text need to be refactored
+ *  to extend TextEnvelope - asString() should be removed and implementation
+ *  from TextEnvelope should be used. This to-do should be moved to another
+ *  class which need to be refactored.
  */
 public final class Randomized implements Text {
 

diff --git a/src/main/java/org/cactoos/text/Synced.java b/src/main/java/org/cactoos/text/Synced.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.text;
 
+import org.cactoos.Scalar;
 import org.cactoos.Text;
 
 /**
@@ -32,18 +33,7 @@
  *
  * @since 0.18
  */
-public final class Synced implements Text {
-
-    /**
-     * The text.
-     */
-    private final Text origin;
-
-    /**
-     * The lock.
-     */
-    private final Object lock;
-
+public final class Synced extends TextEnvelope {
     /**
      * Ctor.
      * @param text The text
@@ -58,15 +48,13 @@ public Synced(final Text text) {
      * @param lck The lock
      */
     public Synced(final Text text, final Object lck) {
-        this.origin = text;
-        this.lock = lck;
+        super(new Scalar<String>() {
+            @Override
+            public String value() throws Exception {
+                synchronized (lck) {
+                    return text.asString();
+                }
+            }
+        });
     }
-
-    @Override
-    public String asString() throws Exception {
-        synchronized (this.lock) {
-            return this.origin.asString();
-        }
-    }
-
 }