Move MapStream to API (Fixes #38)

speedment · Oct 12, 2015 · f9d4334 · f9d4334
1 parent f47471f
commit f9d4334
Show file tree

Hide file tree

Showing 3 changed files with 597 additions and 596 deletions.
diff --git a/src/main/java/com/speedment/internal/core/manager/AbstractCrudManager.java b/src/main/java/com/speedment/internal/core/manager/AbstractCrudManager.java
@@ -30,7 +30,7 @@
 import com.speedment.internal.core.db.crud.ReadImpl;
 import com.speedment.internal.core.db.crud.SelectorImpl;
 import com.speedment.internal.core.db.crud.UpdateImpl;
-import com.speedment.internal.core.stream.MapStream;
+import com.speedment.stream.MapStream;
 
 import java.util.Map;
 import java.util.function.Consumer;

diff --git a/src/main/java/com/speedment/internal/core/stream/CollectorUtil.java b/src/main/java/com/speedment/internal/core/stream/CollectorUtil.java
@@ -16,11 +16,11 @@
  */
 package com.speedment.internal.core.stream;
 
+import com.speedment.stream.MapStream;
 import com.speedment.internal.logging.Logger;
 import com.speedment.internal.logging.LoggerManager;
 import com.speedment.internal.core.field.encoder.JsonEncoder;
-import static com.speedment.internal.util.NullUtil.requireNonNulls;
-import static com.speedment.internal.util.StaticClassUtil.instanceNotAllowed;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -38,12 +38,12 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collector;
-import static java.util.stream.Collector.Characteristics.CONCURRENT;
 import java.util.stream.Stream;
-import static java.util.Objects.requireNonNull;
 import java.util.Optional;
 import java.util.StringJoiner;
-import static java.util.stream.Collectors.joining;
+
+import static java.util.stream.Collector.Characteristics.CONCURRENT;
+import static com.speedment.internal.util.StaticClassUtil.instanceNotAllowed;
 import static com.speedment.internal.util.NullUtil.requireNonNulls;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;