From d0837ef69c00331df387bf7f067364b1dd4ce4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20No=C3=ABl?= Date: Sun, 27 Dec 2020 17:39:33 +0100 Subject: [PATCH] Do not expose constructors taking classes instead of interfaces --- .../java/org/cactoos/iterable/Repeated.java | 12 +----- .../java/org/cactoos/iterator/Repeated.java | 2 +- src/main/java/org/cactoos/text/Split.java | 42 ++++--------------- 3 files changed, 9 insertions(+), 47 deletions(-) diff --git a/src/main/java/org/cactoos/iterable/Repeated.java b/src/main/java/org/cactoos/iterable/Repeated.java index f2e3cea821..3c68a66348 100644 --- a/src/main/java/org/cactoos/iterable/Repeated.java +++ b/src/main/java/org/cactoos/iterable/Repeated.java @@ -24,7 +24,6 @@ package org.cactoos.iterable; import org.cactoos.Scalar; -import org.cactoos.scalar.Unchecked; /** * Repeat an element. @@ -51,18 +50,9 @@ public Repeated(final int total, final T elm) { * @param elm The element to repeat */ public Repeated(final int total, final Scalar elm) { - this(total, new Unchecked(elm)); - } - - /** - * Ctor. - * @param total The total number of repetitions - * @param item The element to repeat - */ - public Repeated(final int total, final Unchecked item) { super( new IterableOf<>( - () -> new org.cactoos.iterator.Repeated<>(total, item) + () -> new org.cactoos.iterator.Repeated<>(total, elm) ) ); } diff --git a/src/main/java/org/cactoos/iterator/Repeated.java b/src/main/java/org/cactoos/iterator/Repeated.java index 85479e712b..eaabd546c6 100644 --- a/src/main/java/org/cactoos/iterator/Repeated.java +++ b/src/main/java/org/cactoos/iterator/Repeated.java @@ -71,7 +71,7 @@ public Repeated(final int max, final Scalar scalar) { * @param max How many times to repeat * @param scalar Scalar to repeat */ - public Repeated(final int max, final Unchecked scalar) { + private Repeated(final int max, final Unchecked scalar) { this.elm = scalar; this.repeat = max; } diff --git a/src/main/java/org/cactoos/text/Split.java b/src/main/java/org/cactoos/text/Split.java index 2d6056fecb..2ed80241ba 100644 --- a/src/main/java/org/cactoos/text/Split.java +++ b/src/main/java/org/cactoos/text/Split.java @@ -45,10 +45,7 @@ public final class Split extends IterableEnvelope { * @see String#split(String) */ public Split(final String text, final String rgx) { - this( - new UncheckedText(new TextOf(text)), - new UncheckedText(new TextOf(rgx)) - ); + this(new TextOf(text), new TextOf(rgx)); } /** @@ -60,11 +57,7 @@ public Split(final String text, final String rgx) { * @see String#split(String, int) */ public Split(final String text, final String rgx, final int lmt) { - this( - new UncheckedText(new TextOf(text)), - new UncheckedText(new TextOf(rgx)), - lmt - ); + this(new TextOf(text), new TextOf(rgx), lmt); } /** @@ -74,7 +67,7 @@ public Split(final String text, final String rgx, final int lmt) { * @see String#split(String) */ public Split(final String text, final Text rgx) { - this(new UncheckedText(text), new UncheckedText(rgx)); + this(new TextOf(text), rgx); } /** @@ -85,7 +78,7 @@ public Split(final String text, final Text rgx) { * @see String#split(String, int) */ public Split(final String text, final Text rgx, final int lmt) { - this(new UncheckedText(text), new UncheckedText(rgx), lmt); + this(new TextOf(text), rgx, lmt); } /** @@ -95,7 +88,7 @@ public Split(final String text, final Text rgx, final int lmt) { * @see String#split(String) */ public Split(final Text text, final String rgx) { - this(new UncheckedText(text), new UncheckedText(rgx)); + this(text, new TextOf(rgx)); } /** @@ -106,7 +99,7 @@ public Split(final Text text, final String rgx) { * @see String#split(String, int) */ public Split(final Text text, final String rgx, final int lmt) { - this(new UncheckedText(text), new UncheckedText(rgx), lmt); + this(text, new TextOf(rgx), lmt); } /** @@ -116,27 +109,6 @@ public Split(final Text text, final String rgx, final int lmt) { * @see String#split(String) */ public Split(final Text text, final Text rgx) { - this(new UncheckedText(text), new UncheckedText(rgx)); - } - - /** - * Ctor. - * @param text The text - * @param rgx The regex - * @param lmt The limit - * @see String#split(String, int) - */ - public Split(final Text text, final Text rgx, final int lmt) { - this(new UncheckedText(text), new UncheckedText(rgx), lmt); - } - - /** - * Ctor. - * @param text The text - * @param rgx The regex - * @see String#split(String) - */ - public Split(final UncheckedText text, final UncheckedText rgx) { this(text, rgx, 0); } @@ -147,7 +119,7 @@ public Split(final UncheckedText text, final UncheckedText rgx) { * @param lmt The limit * @see String#split(String, int) */ - public Split(final UncheckedText text, final UncheckedText rgx, final int lmt) { + public Split(final Text text, final Text rgx, final int lmt) { super( new Mapped<>( TextOf::new,