combinatorics: Break out logic to internal

speedment · May 1, 2017 · ab63606 · ab63606
1 parent 1e85e5f
commit ab63606
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/...parent/benchmark/src/main/java/com/speedment/common/benchmark/internal/StopwatchImpl.java b/...parent/benchmark/src/main/java/com/speedment/common/benchmark/internal/StopwatchImpl.java
@@ -14,8 +14,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.core.internal.util.testing;
+package com.speedment.common.benchmark.internal;
 
+import com.speedment.common.benchmark.Stopwatch;
 import java.util.concurrent.TimeUnit;
 
 import static java.util.concurrent.TimeUnit.*;
@@ -29,7 +30,7 @@ public final class StopwatchImpl implements Stopwatch {
     private long start;
     private long stop;
 
-    StopwatchImpl() {
+    public StopwatchImpl() {
         reset();
     }
 

diff --git a/...binatorics/src/main/java/com/speedment/common/combinatorics/internal/CombinationUtil.java b/...binatorics/src/main/java/com/speedment/common/combinatorics/internal/CombinationUtil.java
@@ -14,8 +14,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.core.internal.util.testing;
+package com.speedment.common.combinatorics.internal;
 
+import com.speedment.common.combinatorics.*;
 import java.util.*;
 import java.util.function.Consumer;
 import static java.util.stream.Collectors.toList;
@@ -26,7 +27,7 @@
  *
  * @author Per Minborg
  */
-public final class Combination {
+public final class CombinationUtil {
 
     /**
      * Creates and returns all possible combinations of the given elements.
@@ -70,7 +71,7 @@ public static <T> Stream<List<T>> of(final T... items) {
     @SafeVarargs
     @SuppressWarnings("varargs") // Creating a List from an array is safe
     public static <T> Stream<List<T>> ofDistinct(final T... items) {
-        return of(items).filter(Combination::isDistinctElements);
+        return of(items).filter(CombinationUtil::isDistinctElements);
     }
 
     private static <T> boolean isDistinctElements(List<T> list) {
@@ -89,7 +90,7 @@ private static <T> void generateCombinations(List<T> s, int i, int k, List<T> bu
         }
     }
 
-    private Combination() {
+    private CombinationUtil() {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/...binatorics/src/main/java/com/speedment/common/combinatorics/internal/PermutationUtil.java b/...binatorics/src/main/java/com/speedment/common/combinatorics/internal/PermutationUtil.java
@@ -14,21 +14,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.core.internal.util.testing;
+package com.speedment.common.combinatorics.internal;
 
+import com.speedment.common.combinatorics.*;
 import java.util.*;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 
-import static com.speedment.runtime.core.util.StaticClassUtil.instanceNotAllowed;
-
 /**
  * General Permutation support from
  * http://minborgsjavapot.blogspot.com/2015/07/java-8-master-permutations.html
  *
  * @author Per Minborg
  */
-public class Permutations {
+public final class PermutationUtil {
 
     public static long factorial(final int n) {
         if (n > 20 || n < 0) {
@@ -60,8 +59,8 @@ public static <T> Stream<Stream<T>> of(final T... items) {
             .mapToObj(no -> permutation(no, itemList).stream());
     }
 
-    private Permutations() {
-        instanceNotAllowed(getClass());
+    private PermutationUtil() {
+        throw new UnsupportedOperationException();
     }
 
 }