(yegor256#1406) Move FallbackFrom to org.cactoos.func

andreoss · Sep 6, 2020 · b79bca9 · b79bca9
1 parent 5899512
commit b79bca9
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/...java/org/cactoos/scalar/FallbackFrom.java → ...n/java/org/cactoos/func/FallbackFrom.java b/...java/org/cactoos/scalar/FallbackFrom.java → ...n/java/org/cactoos/func/FallbackFrom.java
@@ -21,11 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.scalar;
+package org.cactoos.func;
 
 import org.cactoos.Func;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.Mapped;
+import org.cactoos.scalar.InheritanceLevel;
+import org.cactoos.scalar.MinOf;
 
 /**
  * Fallback from exception.

diff --git a/src/main/java/org/cactoos/func/FuncWithFallback.java b/src/main/java/org/cactoos/func/FuncWithFallback.java
@@ -27,7 +27,6 @@
 import java.sql.SQLRecoverableException;
 import org.cactoos.Func;
 import org.cactoos.iterable.IterableOf;
-import org.cactoos.scalar.FallbackFrom;
 import org.cactoos.scalar.InheritanceLevel;
 import org.cactoos.scalar.ScalarWithFallback;
 

diff --git a/src/main/java/org/cactoos/iterable/IterableOf.java b/src/main/java/org/cactoos/iterable/IterableOf.java
@@ -28,10 +28,10 @@
 import java.util.NoSuchElementException;
 import org.cactoos.Func;
 import org.cactoos.Scalar;
+import org.cactoos.func.FallbackFrom;
 import org.cactoos.func.UncheckedFunc;
 import org.cactoos.iterator.IteratorOf;
 import org.cactoos.scalar.And;
-import org.cactoos.scalar.FallbackFrom;
 import org.cactoos.scalar.Folded;
 import org.cactoos.scalar.Or;
 import org.cactoos.scalar.ScalarWithFallback;

diff --git a/src/main/java/org/cactoos/scalar/ScalarWithFallback.java b/src/main/java/org/cactoos/scalar/ScalarWithFallback.java
@@ -27,6 +27,7 @@
 import java.util.Map;
 import org.cactoos.Func;
 import org.cactoos.Scalar;
+import org.cactoos.func.FallbackFrom;
 import org.cactoos.func.FuncWithFallback;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterator.Filtered;

diff --git a/.../org/cactoos/scalar/FallbackFromTest.java → ...va/org/cactoos/func/FallbackFromTest.java b/.../org/cactoos/scalar/FallbackFromTest.java → ...va/org/cactoos/func/FallbackFromTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.scalar;
+package org.cactoos.func;
 
 import java.io.IOException;
 import java.util.IllegalFormatException;

diff --git a/src/test/java/org/cactoos/func/FuncWithFallbackTest.java b/src/test/java/org/cactoos/func/FuncWithFallbackTest.java
@@ -27,7 +27,6 @@
 import java.util.IllegalFormatException;
 import java.util.IllegalFormatWidthException;
 import org.cactoos.iterable.IterableOf;
-import org.cactoos.scalar.FallbackFrom;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.FuncApplies;

diff --git a/src/test/java/org/cactoos/scalar/ScalarWithFallbackTest.java b/src/test/java/org/cactoos/scalar/ScalarWithFallbackTest.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.IllegalFormatException;
 import java.util.IllegalFormatWidthException;
+import org.cactoos.func.FallbackFrom;
 import org.cactoos.iterable.IterableOf;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;