Runtime: Refactor parallel package. Fix #246

speedment · Sep 13, 2016 · bdbac18 · bdbac18
1 parent a040ab6
commit bdbac18
Show file tree

Hide file tree

Showing 19 changed files with 78 additions and 32 deletions.
diff --git a/runtime/src/main/java/com/speedment/runtime/db/AsynchronousQueryResult.java b/runtime/src/main/java/com/speedment/runtime/db/AsynchronousQueryResult.java
@@ -17,7 +17,7 @@
 package com.speedment.runtime.db;
 
 import com.speedment.runtime.annotation.Api;
-import com.speedment.runtime.stream.HasParallelStrategy;
+import com.speedment.runtime.stream.parallel.HasParallelStrategy;
 
 import java.sql.ResultSet;
 import java.util.List;

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/db/AsynchronousQueryResultImpl.java b/runtime/src/main/java/com/speedment/runtime/internal/db/AsynchronousQueryResultImpl.java
@@ -26,7 +26,7 @@
 import com.speedment.runtime.db.AsynchronousQueryResult;
 import com.speedment.runtime.exception.SpeedmentException;
 import com.speedment.runtime.internal.stream.StreamUtil;
-import com.speedment.runtime.stream.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ParallelStrategy;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/stream/ComposedStreamDecorator.java b/runtime/src/main/java/com/speedment/runtime/internal/stream/ComposedStreamDecorator.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.runtime.internal.stream;
 
-import com.speedment.runtime.stream.HasParallelStrategy;
+import com.speedment.runtime.stream.parallel.HasParallelStrategy;
 import com.speedment.runtime.stream.Pipeline;
 import com.speedment.runtime.stream.StreamDecorator;
 

diff --git a/runtime/src/main/java/com/speedment/runtime/internal/stream/StreamUtil.java b/runtime/src/main/java/com/speedment/runtime/internal/stream/StreamUtil.java
@@ -22,7 +22,7 @@
 package com.speedment.runtime.internal.stream;
 
 import com.speedment.runtime.exception.SpeedmentException;
-import com.speedment.runtime.stream.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ParallelStrategy;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

diff --git a/...am/parallelstrategy/ArraySpliterator.java → ...nal/stream/parallel/ArraySpliterator.java b/...am/parallelstrategy/ArraySpliterator.java → ...nal/stream/parallel/ArraySpliterator.java
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
 import java.util.Comparator;
 import java.util.Spliterator;

diff --git a/...puteIntensityExtremeParallelStrategy.java → ...puteIntensityExtremeParallelStrategy.java b/...puteIntensityExtremeParallelStrategy.java → ...puteIntensityExtremeParallelStrategy.java
@@ -14,9 +14,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
-import com.speedment.runtime.stream.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ConfigurableIteratorSpliterator;
 
 import java.util.Iterator;
 import java.util.Spliterator;
@@ -31,7 +32,7 @@ public final class ComputeIntensityExtremeParallelStrategy implements ParallelSt
 
     @Override
     public <T> Spliterator<T> spliteratorUnknownSize(Iterator<? extends T> iterator, int characteristics) {
-        return new ConfigurableIteratorSpliterator<>(iterator, characteristics, BATCH_SIZES);
+        return ConfigurableIteratorSpliterator.of(iterator, characteristics, BATCH_SIZES);
     }
 
 }
diff --git a/...ComputeIntensityHighParallelStrategy.java → ...ComputeIntensityHighParallelStrategy.java b/...ComputeIntensityHighParallelStrategy.java → ...ComputeIntensityHighParallelStrategy.java
@@ -14,9 +14,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
-import com.speedment.runtime.stream.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ConfigurableIteratorSpliterator;
 
 import java.util.Iterator;
 import java.util.Spliterator;
@@ -35,7 +36,7 @@ public final class ComputeIntensityHighParallelStrategy implements ParallelStrat
 
     @Override
     public <T> Spliterator<T> spliteratorUnknownSize(Iterator<? extends T> iterator, int characteristics) {
-        return new ConfigurableIteratorSpliterator<>(iterator, characteristics, BATCH_SIZES);
+        return ConfigurableIteratorSpliterator.of(iterator, characteristics, BATCH_SIZES);
     }
 
 }
diff --git a/...mputeIntensityMediumParallelStrategy.java → ...mputeIntensityMediumParallelStrategy.java b/...mputeIntensityMediumParallelStrategy.java → ...mputeIntensityMediumParallelStrategy.java
@@ -14,9 +14,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
-import com.speedment.runtime.stream.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ConfigurableIteratorSpliterator;
 
 import java.util.Iterator;
 import java.util.Spliterator;
@@ -34,7 +35,7 @@ public final class ComputeIntensityMediumParallelStrategy implements ParallelStr
 
     @Override
     public <T> Spliterator<T> spliteratorUnknownSize(Iterator<? extends T> iterator, int characteristics) {
-        return new ConfigurableIteratorSpliterator<>(iterator, characteristics, BATCH_SIZES);
+        return ConfigurableIteratorSpliterator.of(iterator, characteristics, BATCH_SIZES);
     }
 
 }
diff --git a/...arallelstrategy/ComputeIntensityUtil.java → ...stream/parallel/ComputeIntensityUtil.java b/...arallelstrategy/ComputeIntensityUtil.java → ...stream/parallel/ComputeIntensityUtil.java
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
 import java.util.stream.IntStream;
 

diff --git a/...tegy/ConfigurableIteratorSpliterator.java → .../ConfigurableIteratorSpliteratorImpl.java b/...tegy/ConfigurableIteratorSpliterator.java → .../ConfigurableIteratorSpliteratorImpl.java
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
 import java.util.Arrays;
 import java.util.Comparator;
@@ -29,7 +29,7 @@
  * @author pemi
  * @param <T> type of {@link Spliterator} to implement
  */
-public final class ConfigurableIteratorSpliterator<T> implements Spliterator<T> {
+public final class ConfigurableIteratorSpliteratorImpl<T> implements Spliterator<T> {
 
     static final int MAX_BATCH = 1 << 25;
     private final Iterator<? extends T> iterator;
@@ -48,7 +48,7 @@ public final class ConfigurableIteratorSpliterator<T> implements Spliterator<T>
      * elements.
      * @param batchSizes the batch sizes to use for pseudo parallelism
      */
-    public ConfigurableIteratorSpliterator(Iterator<? extends T> iterator, long size, int characteristics, int[] batchSizes) {
+    public ConfigurableIteratorSpliteratorImpl(Iterator<? extends T> iterator, long size, int characteristics, int[] batchSizes) {
         this.iterator = iterator;
         this.sizeEstimate = size;
         this.characteristics = (characteristics & Spliterator.CONCURRENT) == 0
@@ -66,7 +66,7 @@ public ConfigurableIteratorSpliterator(Iterator<? extends T> iterator, long size
      * elements.
      * @param batchSizes the batch sizes to use for pseudo parallelism
      */
-    public ConfigurableIteratorSpliterator(Iterator<? extends T> iterator, int characteristics, int[] batchSizes) {
+    public ConfigurableIteratorSpliteratorImpl(Iterator<? extends T> iterator, int characteristics, int[] batchSizes) {
         this.iterator = iterator;
         this.sizeEstimate = Long.MAX_VALUE;
         this.characteristics = characteristics & ~(Spliterator.SIZED | Spliterator.SUBSIZED);

diff --git a/...arallelstrategy/SingletonSpliterator.java → ...stream/parallel/SingletonSpliterator.java b/...arallelstrategy/SingletonSpliterator.java → ...stream/parallel/SingletonSpliterator.java
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
 import java.util.Comparator;
 import java.util.Spliterator;

diff --git a/runtime/src/main/java/com/speedment/runtime/stream/StreamDecorator.java b/runtime/src/main/java/com/speedment/runtime/stream/StreamDecorator.java
@@ -16,6 +16,8 @@
  */
 package com.speedment.runtime.stream;
 
+import com.speedment.runtime.stream.parallel.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.HasParallelStrategy;
 import com.speedment.runtime.annotation.Api;
 import com.speedment.runtime.internal.stream.ComposedStreamDecorator;
 import com.speedment.runtime.internal.util.Cast;

diff --git a/.../src/main/java/com/speedment/runtime/stream/parallel/ConfigurableIteratorSpliterator.java b/.../src/main/java/com/speedment/runtime/stream/parallel/ConfigurableIteratorSpliterator.java
@@ -0,0 +1,38 @@
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.speedment.runtime.stream.parallel;
+
+import com.speedment.runtime.internal.stream.parallel.ConfigurableIteratorSpliteratorImpl;
+import java.util.Iterator;
+import java.util.Spliterator;
+
+/**
+ *
+ * @author pemi
+ * @param <T> type of {@link Spliterator} to implement
+ */
+public interface ConfigurableIteratorSpliterator<T> extends Spliterator<T> {
+
+    static <T> Spliterator<T> of(Iterator<? extends T> iterator, long size, int characteristics, int[] batchSizes) {
+        return new ConfigurableIteratorSpliteratorImpl<>(iterator, size, characteristics, batchSizes);
+    }
+
+    static <T> Spliterator<T> of(Iterator<? extends T> iterator, int characteristics, int[] batchSizes) {
+        return new ConfigurableIteratorSpliteratorImpl<>(iterator, characteristics, batchSizes);
+    }
+
+}
diff --git a/...t/runtime/stream/HasParallelStrategy.java → .../stream/parallel/HasParallelStrategy.java b/...t/runtime/stream/HasParallelStrategy.java → .../stream/parallel/HasParallelStrategy.java
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.stream;
+package com.speedment.runtime.stream.parallel;
 
 import com.speedment.runtime.annotation.Api;
 

diff --git a/...ment/runtime/stream/ParallelStrategy.java → ...ime/stream/parallel/ParallelStrategy.java b/...ment/runtime/stream/ParallelStrategy.java → ...ime/stream/parallel/ParallelStrategy.java
@@ -14,13 +14,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.stream;
+package com.speedment.runtime.stream.parallel;
 
 import com.speedment.runtime.annotation.Api;
-import com.speedment.runtime.internal.stream.parallelstrategy.ComputeIntensityExtremeParallelStrategy;
-import com.speedment.runtime.internal.stream.parallelstrategy.ComputeIntensityHighParallelStrategy;
-import com.speedment.runtime.internal.stream.parallelstrategy.ComputeIntensityMediumParallelStrategy;
-import com.speedment.runtime.internal.stream.parallelstrategy.ConfigurableIteratorSpliterator;
+import com.speedment.runtime.internal.stream.parallel.ComputeIntensityExtremeParallelStrategy;
+import com.speedment.runtime.internal.stream.parallel.ComputeIntensityHighParallelStrategy;
+import com.speedment.runtime.internal.stream.parallel.ComputeIntensityMediumParallelStrategy;
+import com.speedment.runtime.internal.stream.parallel.ConfigurableIteratorSpliteratorImpl;
+import com.speedment.runtime.stream.parallel.ConfigurableIteratorSpliterator;
 
 import java.util.Iterator;
 import java.util.Spliterator;
@@ -63,7 +64,7 @@ public static <T> ParallelStrategy of(final int[] batchSizes)  {
         return new ParallelStrategy() {
             @Override
             public <T> Spliterator<T> spliteratorUnknownSize(Iterator<? extends T> iterator, int characteristics) {
-                return new ConfigurableIteratorSpliterator<>(iterator, characteristics, batchSizes);
+                return ConfigurableIteratorSpliterator.of(iterator, characteristics, batchSizes);
             }
         };
     }

diff --git a/...arallelstrategy/ArraySpliteratorTest.java → ...stream/parallel/ArraySpliteratorTest.java b/...arallelstrategy/ArraySpliteratorTest.java → ...stream/parallel/ArraySpliteratorTest.java
@@ -19,8 +19,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
+import com.speedment.runtime.internal.stream.parallel.ArraySpliterator;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;

diff --git a/...parallelstrategy/BaseSpliteratorTest.java → .../stream/parallel/BaseSpliteratorTest.java b/...parallelstrategy/BaseSpliteratorTest.java → .../stream/parallel/BaseSpliteratorTest.java
@@ -19,7 +19,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/...ComputeIntensityParallelStrategyTest.java → ...ComputeIntensityParallelStrategyTest.java b/...ComputeIntensityParallelStrategyTest.java → ...ComputeIntensityParallelStrategyTest.java
@@ -19,9 +19,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
-import com.speedment.runtime.stream.ParallelStrategy;
+import com.speedment.runtime.stream.parallel.ParallelStrategy;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;

diff --git a/...lelstrategy/SingletonSpliteratorTest.java → ...am/parallel/SingletonSpliteratorTest.java b/...lelstrategy/SingletonSpliteratorTest.java → ...am/parallel/SingletonSpliteratorTest.java
@@ -19,8 +19,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.speedment.runtime.internal.stream.parallelstrategy;
+package com.speedment.runtime.internal.stream.parallel;
 
+import com.speedment.runtime.internal.stream.parallel.SingletonSpliterator;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;