(yegor256#1406) Move Callable classes to org.cactoos.callables

andreoss · Sep 5, 2020 · c6af9fd · c6af9fd
1 parent 202c47a
commit c6af9fd
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/...ain/java/org/cactoos/func/CallableOf.java → ...java/org/cactoos/callable/CallableOf.java b/...ain/java/org/cactoos/func/CallableOf.java → ...java/org/cactoos/callable/CallableOf.java
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.func;
+package org.cactoos.callable;
 
 import java.util.concurrent.Callable;
 import org.cactoos.Func;
 import org.cactoos.Proc;
 import org.cactoos.Scalar;
+import org.cactoos.func.FuncOf;
 
 /**
  * Func as {@link Callable}.

diff --git a/...va/org/cactoos/func/RepeatedCallable.java → ...rg/cactoos/callable/RepeatedCallable.java b/...va/org/cactoos/func/RepeatedCallable.java → ...rg/cactoos/callable/RepeatedCallable.java
@@ -21,9 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.func;
+package org.cactoos.callable;
 
 import java.util.concurrent.Callable;
+import org.cactoos.func.FuncOf;
+import org.cactoos.func.Repeated;
 
 /**
  * Callable that runs repeatedly for a number of times.

diff --git a/src/main/java/org/cactoos/experimental/Threads.java b/src/main/java/org/cactoos/experimental/Threads.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.Future;
 import org.cactoos.Func;
 import org.cactoos.Scalar;
-import org.cactoos.func.CallableOf;
+import org.cactoos.callable.CallableOf;
 import org.cactoos.func.UncheckedFunc;
 import org.cactoos.iterable.IterableEnvelope;
 import org.cactoos.iterable.IterableOf;

diff --git a/src/main/java/org/cactoos/experimental/Timed.java b/src/main/java/org/cactoos/experimental/Timed.java
@@ -30,7 +30,7 @@
 import java.util.concurrent.TimeUnit;
 import org.cactoos.Func;
 import org.cactoos.Scalar;
-import org.cactoos.func.CallableOf;
+import org.cactoos.callable.CallableOf;
 import org.cactoos.func.UncheckedFunc;
 import org.cactoos.iterable.IterableEnvelope;
 import org.cactoos.iterable.IterableOf;

diff --git a/src/main/java/org/cactoos/func/BiFuncOf.java b/src/main/java/org/cactoos/func/BiFuncOf.java
@@ -29,6 +29,7 @@
 import org.cactoos.Func;
 import org.cactoos.Proc;
 import org.cactoos.Scalar;
+import org.cactoos.callable.CallableOf;
 
 /**
  * Represents many possible inputs as {@link BiFunc}.

diff --git a/...java/org/cactoos/func/CallableOfTest.java → .../org/cactoos/callable/CallableOfTest.java b/...java/org/cactoos/func/CallableOfTest.java → .../org/cactoos/callable/CallableOfTest.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.func;
+package org.cactoos.callable;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.hamcrest.core.IsEqual;

diff --git a/...rg/cactoos/func/RepeatedCallableTest.java → ...actoos/callable/RepeatedCallableTest.java b/...rg/cactoos/func/RepeatedCallableTest.java → ...actoos/callable/RepeatedCallableTest.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.func;
+package org.cactoos.callable;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/src/test/java/org/cactoos/experimental/TimedTest.java b/src/test/java/org/cactoos/experimental/TimedTest.java
@@ -30,8 +30,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import org.cactoos.func.CallableOf;
-import org.cactoos.func.RepeatedCallable;
+import org.cactoos.callable.CallableOf;
+import org.cactoos.callable.RepeatedCallable;
 import org.cactoos.scalar.ScalarOf;
 import org.hamcrest.core.IsNull;
 import org.junit.Test;