(yegor256#1396) Fix import order

andreoss · Jun 21, 2020 · 9f688d1 · 9f688d1
1 parent 8e6e999
commit 9f688d1
Show file tree

Hide file tree

Showing 41 changed files with 39 additions and 42 deletions.
diff --git a/src/main/java/org/cactoos/iterable/IterableOf.java b/src/main/java/org/cactoos/iterable/IterableOf.java
@@ -32,13 +32,11 @@
 import org.cactoos.iterator.IteratorOf;
 import org.cactoos.scalar.And;
 import org.cactoos.scalar.FallbackFrom;
-import org.cactoos.scalar.False;
 import org.cactoos.scalar.Folded;
 import org.cactoos.scalar.Or;
 import org.cactoos.scalar.ScalarWithFallback;
 import org.cactoos.scalar.Sticky;
 import org.cactoos.scalar.SumOfInt;
-import org.cactoos.scalar.True;
 import org.cactoos.scalar.Unchecked;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;

diff --git a/src/main/java/org/cactoos/list/Shuffled.java b/src/main/java/org/cactoos/list/Shuffled.java
@@ -24,7 +24,6 @@
 package org.cactoos.list;
 
 import java.util.Collections;
-import java.util.List;
 
 /**
  * Shuffled list.

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

diff --git a/src/test/java/org/cactoos/func/IoCheckedProcTest.java b/src/test/java/org/cactoos/func/IoCheckedProcTest.java
@@ -24,8 +24,8 @@
 package org.cactoos.func;
 
 import java.io.IOException;
-import org.cactoos.Proc;
 import org.cactoos.MatcherAssert;
+import org.cactoos.Proc;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 

diff --git a/src/test/java/org/cactoos/func/ProcOfTest.java b/src/test/java/org/cactoos/func/ProcOfTest.java
@@ -26,8 +26,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
-import org.cactoos.text.FormattedText;
 import org.cactoos.MatcherAssert;
+import org.cactoos.text.FormattedText;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 

diff --git a/src/test/java/org/cactoos/func/RepeatedTest.java b/src/test/java/org/cactoos/func/RepeatedTest.java
@@ -26,8 +26,8 @@
 import java.security.SecureRandom;
 import java.util.Iterator;
 import org.cactoos.Func;
-import org.cactoos.iterator.IteratorOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.iterator.IteratorOf;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 

diff --git a/src/test/java/org/cactoos/func/SolidFuncTest.java b/src/test/java/org/cactoos/func/SolidFuncTest.java
@@ -25,8 +25,8 @@
 
 import java.security.SecureRandom;
 import org.cactoos.Func;
-import org.cactoos.list.ListOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.list.ListOf;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.RunsInThreads;

diff --git a/src/test/java/org/cactoos/func/TimedFuncTest.java b/src/test/java/org/cactoos/func/TimedFuncTest.java
@@ -26,9 +26,9 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
+import org.cactoos.MatcherAssert;
 import org.cactoos.iterable.Endless;
 import org.cactoos.scalar.And;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 

diff --git a/src/test/java/org/cactoos/iterable/CycledTest.java b/src/test/java/org/cactoos/iterable/CycledTest.java
@@ -24,9 +24,9 @@
 package org.cactoos.iterable;
 
 import java.util.Collections;
+import org.cactoos.MatcherAssert;
 import org.cactoos.scalar.ItemAt;
 import org.cactoos.scalar.LengthOf;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/src/test/java/org/cactoos/iterable/FilteredTest.java b/src/test/java/org/cactoos/iterable/FilteredTest.java
@@ -23,9 +23,9 @@
  */
 package org.cactoos.iterable;
 
+import org.cactoos.MatcherAssert;
 import org.cactoos.list.ListOf;
 import org.cactoos.scalar.LengthOf;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.hamcrest.collection.IsEmptyIterable;
 import org.hamcrest.core.IsNot;

diff --git a/src/test/java/org/cactoos/iterable/IterableOfTest.java b/src/test/java/org/cactoos/iterable/IterableOfTest.java
@@ -24,11 +24,11 @@
 package org.cactoos.iterable;
 
 import java.util.Iterator;
+import org.cactoos.MatcherAssert;
 import org.cactoos.iterator.IteratorOf;
 import org.cactoos.scalar.LengthOf;
 import org.cactoos.scalar.Ternary;
 import org.cactoos.text.TextOf;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.hamcrest.collection.IsIterableWithSize;
 import org.hamcrest.core.IsEqual;

diff --git a/src/test/java/org/cactoos/iterable/MappedTest.java b/src/test/java/org/cactoos/iterable/MappedTest.java
@@ -24,11 +24,11 @@
 package org.cactoos.iterable;
 
 import java.util.Collections;
+import org.cactoos.MatcherAssert;
 import org.cactoos.Text;
 import org.cactoos.list.ListOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.Upper;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;

diff --git a/src/test/java/org/cactoos/iterable/MatchedTest.java b/src/test/java/org/cactoos/iterable/MatchedTest.java
@@ -23,8 +23,8 @@
  */
 package org.cactoos.iterable;
 
-import org.cactoos.scalar.LengthOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.scalar.LengthOf;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/src/test/java/org/cactoos/iterable/PartitionedTest.java b/src/test/java/org/cactoos/iterable/PartitionedTest.java
@@ -23,8 +23,8 @@
  */
 package org.cactoos.iterable;
 
-import org.cactoos.scalar.LengthOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.scalar.LengthOf;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 

diff --git a/src/test/java/org/cactoos/iterable/RangeOfTest.java b/src/test/java/org/cactoos/iterable/RangeOfTest.java
@@ -26,8 +26,8 @@
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import org.cactoos.Func;
-import org.cactoos.list.ListOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.list.ListOf;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 

diff --git a/src/test/java/org/cactoos/iterable/RepeatedTest.java b/src/test/java/org/cactoos/iterable/RepeatedTest.java
@@ -23,8 +23,8 @@
  */
 package org.cactoos.iterable;
 
-import org.cactoos.scalar.LengthOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.scalar.LengthOf;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 

diff --git a/src/test/java/org/cactoos/iterable/SolidTest.java b/src/test/java/org/cactoos/iterable/SolidTest.java
@@ -23,8 +23,8 @@
  */
 package org.cactoos.iterable;
 
-import org.cactoos.Scalar;
 import org.cactoos.MatcherAssert;
+import org.cactoos.Scalar;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.RunsInThreads;

diff --git a/src/test/java/org/cactoos/iterable/SortedTest.java b/src/test/java/org/cactoos/iterable/SortedTest.java
@@ -25,8 +25,8 @@
 
 import java.util.Collections;
 import java.util.Comparator;
-import org.cactoos.list.ListOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.list.ListOf;
 import org.hamcrest.Matchers;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;

diff --git a/src/test/java/org/cactoos/iterator/ImmutableTest.java b/src/test/java/org/cactoos/iterator/ImmutableTest.java
@@ -27,9 +27,9 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
+import org.cactoos.MatcherAssert;
 import org.cactoos.text.Randomized;
 import org.cactoos.text.TextOf;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/src/test/java/org/cactoos/iterator/IteratorOfBytesTest.java b/src/test/java/org/cactoos/iterator/IteratorOfBytesTest.java
@@ -25,9 +25,9 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import org.cactoos.MatcherAssert;
 import org.cactoos.list.ListOf;
 import org.cactoos.text.TextOf;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java b/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java
@@ -24,9 +24,9 @@
 package org.cactoos.iterator;
 
 import java.util.NoSuchElementException;
+import org.cactoos.MatcherAssert;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.text.TextOf;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;

diff --git a/src/test/java/org/cactoos/iterator/PartitionedTest.java b/src/test/java/org/cactoos/iterator/PartitionedTest.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.NoSuchElementException;
+import org.cactoos.MatcherAssert;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.list.ListOf;
 import org.cactoos.scalar.LengthOf;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;

diff --git a/src/test/java/org/cactoos/list/ListOfTest.java b/src/test/java/org/cactoos/list/ListOfTest.java
@@ -25,8 +25,8 @@
 
 import java.util.Collections;
 import java.util.List;
-import org.cactoos.iterable.IterableOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.iterable.IterableOf;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.HasSize;

diff --git a/src/test/java/org/cactoos/list/MappedTest.java b/src/test/java/org/cactoos/list/MappedTest.java
@@ -23,11 +23,11 @@
  */
 package org.cactoos.list;
 
+import org.cactoos.MatcherAssert;
 import org.cactoos.Text;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.Upper;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.HasSize;

diff --git a/src/test/java/org/cactoos/map/BehavesAsMap.java b/src/test/java/org/cactoos/map/BehavesAsMap.java
@@ -24,8 +24,8 @@
 package org.cactoos.map;
 
 import java.util.Map;
-import org.hamcrest.Description;
 import org.cactoos.MatcherAssert;
+import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 import org.hamcrest.collection.IsMapContaining;
 import org.hamcrest.core.IsCollectionContaining;

diff --git a/src/test/java/org/cactoos/map/ClearDeletesAllValues.java b/src/test/java/org/cactoos/map/ClearDeletesAllValues.java
@@ -24,8 +24,8 @@
 package org.cactoos.map;
 
 import java.util.Map;
-import org.hamcrest.Description;
 import org.cactoos.MatcherAssert;
+import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 import org.hamcrest.core.IsEqual;
 

diff --git a/src/test/java/org/cactoos/map/GroupedTest.java b/src/test/java/org/cactoos/map/GroupedTest.java
@@ -24,9 +24,9 @@
 package org.cactoos.map;
 
 import java.util.HashSet;
+import org.cactoos.MatcherAssert;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.list.ListOf;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.collection.IsMapContaining;
 import org.hamcrest.core.IsEqual;
 import org.junit.Test;

diff --git a/src/test/java/org/cactoos/map/MapOfTest.java b/src/test/java/org/cactoos/map/MapOfTest.java
@@ -27,11 +27,11 @@
 import java.security.SecureRandom;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.cactoos.MatcherAssert;
 import org.cactoos.Scalar;
 import org.cactoos.func.FuncOf;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterator.Repeated;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.collection.IsMapContaining;
 import org.hamcrest.core.AllOf;
 import org.hamcrest.core.IsAnything;

diff --git a/src/test/java/org/cactoos/map/NoNullsTest.java b/src/test/java/org/cactoos/map/NoNullsTest.java
@@ -24,8 +24,8 @@
 package org.cactoos.map;
 
 import java.util.HashMap;
-import org.cactoos.iterable.IterableOf;
 import org.cactoos.MatcherAssert;
+import org.cactoos.iterable.IterableOf;
 import org.hamcrest.collection.IsMapContaining;
 import org.hamcrest.core.AllOf;
 import org.hamcrest.core.IsEqual;

diff --git a/src/test/java/org/cactoos/map/PutAllUpdatesValues.java b/src/test/java/org/cactoos/map/PutAllUpdatesValues.java
@@ -24,8 +24,8 @@
 package org.cactoos.map;
 
 import java.util.Map;
-import org.hamcrest.Description;
 import org.cactoos.MatcherAssert;
+import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 
 /**

diff --git a/src/test/java/org/cactoos/map/PutUpdatesValues.java b/src/test/java/org/cactoos/map/PutUpdatesValues.java
@@ -24,8 +24,8 @@
 package org.cactoos.map;
 
 import java.util.Map;
-import org.hamcrest.Description;
 import org.cactoos.MatcherAssert;
+import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 
 /**

diff --git a/src/test/java/org/cactoos/map/RemoveDeletesValues.java b/src/test/java/org/cactoos/map/RemoveDeletesValues.java
@@ -24,8 +24,8 @@
 package org.cactoos.map;
 
 import java.util.Map;
-import org.hamcrest.Description;
 import org.cactoos.MatcherAssert;
+import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 import org.hamcrest.collection.IsMapContaining;
 import org.hamcrest.core.IsCollectionContaining;

diff --git a/src/test/java/org/cactoos/map/SolidTest.java b/src/test/java/org/cactoos/map/SolidTest.java
@@ -24,12 +24,12 @@
 package org.cactoos.map;
 
 import java.util.Map;
+import org.cactoos.MatcherAssert;
 import org.cactoos.Scalar;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.text.Sub;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.Upper;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.collection.IsMapContaining;
 import org.hamcrest.core.AllOf;
 import org.hamcrest.core.IsEqual;

diff --git a/src/test/java/org/cactoos/map/StickyTest.java b/src/test/java/org/cactoos/map/StickyTest.java
@@ -27,10 +27,10 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.cactoos.MatcherAssert;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterator.Repeated;
 import org.cactoos.text.FormattedText;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.collection.IsMapContaining;
 import org.hamcrest.core.IsAnything;
 import org.hamcrest.core.IsEqual;

diff --git a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import org.cactoos.MatcherAssert;
 import org.cactoos.Scalar;
 import org.cactoos.func.FuncOf;
 import org.cactoos.func.ProcNoNulls;
@@ -35,7 +36,6 @@
 import org.cactoos.list.ListOf;
 import org.cactoos.list.Synced;
 import org.hamcrest.Matcher;
-import org.cactoos.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.hamcrest.collection.IsIterableContainingInAnyOrder;
 import org.junit.Test;

diff --git a/src/test/java/org/cactoos/scalar/AndTest.java b/src/test/java/org/cactoos/scalar/AndTest.java
@@ -23,9 +23,9 @@
  */
 package org.cactoos.scalar;
 
+import org.cactoos.MatcherAssert;
 import org.cactoos.Scalar;
 import org.cactoos.iterable.IterableOf;
-import org.cactoos.MatcherAssert;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.ScalarHasValue;