From d6ef4e36d4f7aae8f8dc722745ce394d7ab46f34 Mon Sep 17 00:00:00 2001 From: vinoyang Date: Thu, 3 Aug 2017 23:24:47 +0800 Subject: [PATCH 1/2] state refactor code --- .../streaming/examples/state/refactor/SumProcessor.scala | 2 +- .../examples/wordcountjava/dsl/refactor/WordCount.java | 4 ++-- .../streaming/examples/wordcount/dsl/refactor/WordCount.scala | 2 +- .../gearpump/streaming/{refactor => }/coder/AtomicCoder.java | 2 +- .../streaming/{refactor => }/coder/BigEndianIntegerCoder.java | 2 +- .../streaming/{refactor => }/coder/BigEndianLongCoder.java | 2 +- .../streaming/{refactor => }/coder/BigIntegerCoder.java | 2 +- .../coder/BufferedElementCountingOutputStream.java | 2 +- .../streaming/{refactor => }/coder/ByteArrayCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/ByteCoder.java | 2 +- .../apache/gearpump/streaming/{refactor => }/coder/Coder.java | 2 +- .../streaming/{refactor => }/coder/CoderException.java | 2 +- .../gearpump/streaming/{refactor => }/coder/CoderUtils.java | 2 +- .../gearpump/streaming/{refactor => }/coder/DoubleCoder.java | 2 +- .../coder/ElementByteSizeObservableIterable.java | 2 +- .../coder/ElementByteSizeObservableIterator.java | 2 +- .../{refactor => }/coder/ElementByteSizeObserver.java | 2 +- .../streaming/{refactor => }/coder/IterableCoder.java | 2 +- .../streaming/{refactor => }/coder/IterableLikeCoder.java | 2 +- .../streaming/{refactor => }/coder/IteratorObserver.java | 2 +- .../gearpump/streaming/{refactor => }/coder/ListCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/MapCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/SetCoder.java | 2 +- .../streaming/{refactor => }/coder/StringUtf8Coder.java | 2 +- .../streaming/{refactor => }/coder/StructuralByteArray.java | 2 +- .../streaming/{refactor => }/coder/StructuredCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/VarInt.java | 2 +- .../gearpump/streaming/{refactor => }/coder/VarIntCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/VarLongCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/VoidCoder.java | 2 +- .../refactor/state/InMemoryGlobalStateInternals.scala | 2 +- .../gearpump/streaming/refactor/state/RuntimeContext.scala | 2 +- .../gearpump/streaming/refactor/state/StateBinder.scala | 2 +- .../apache/gearpump/streaming/refactor/state/StateSpec.scala | 2 +- .../apache/gearpump/streaming/refactor/state/StateSpecs.scala | 2 +- .../apache/gearpump/streaming/refactor/state/StateTags.scala | 2 +- .../gearpump/streaming/refactor/state/StatefulTask.scala | 2 +- .../streaming/refactor/state/heap/HeapStateInternals.scala | 2 +- .../refactor/state/heap/HeapStateInternalsFactory.scala | 2 +- .../refactor/state/heap/HeapStateInternalsProxy.scala | 2 +- .../refactor/state/heap/HeapStateInternalsSpec.scala | 2 +- 41 files changed, 42 insertions(+), 42 deletions(-) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/AtomicCoder.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/BigEndianIntegerCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/BigEndianLongCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/BigIntegerCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/BufferedElementCountingOutputStream.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ByteArrayCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ByteCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/Coder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/CoderException.java (95%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/CoderUtils.java (99%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/DoubleCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ElementByteSizeObservableIterable.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ElementByteSizeObservableIterator.java (95%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ElementByteSizeObserver.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/IterableCoder.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/IterableLikeCoder.java (99%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/IteratorObserver.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ListCoder.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/MapCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/SetCoder.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/StringUtf8Coder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/StructuralByteArray.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/StructuredCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/VarInt.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/VarIntCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/VarLongCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/VoidCoder.java (97%) diff --git a/examples/streaming/state/src/main/scala/org/apache/gearpump/streaming/examples/state/refactor/SumProcessor.scala b/examples/streaming/state/src/main/scala/org/apache/gearpump/streaming/examples/state/refactor/SumProcessor.scala index 438b3376d..557991159 100644 --- a/examples/streaming/state/src/main/scala/org/apache/gearpump/streaming/examples/state/refactor/SumProcessor.scala +++ b/examples/streaming/state/src/main/scala/org/apache/gearpump/streaming/examples/state/refactor/SumProcessor.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.examples.state.refactor import org.apache.gearpump.Message import org.apache.gearpump.cluster.UserConfig -import org.apache.gearpump.streaming.refactor.coder._ +import org.apache.gearpump.streaming.coder._ import org.apache.gearpump.streaming.refactor.state.api.{StateInternals, ValueState} import org.apache.gearpump.streaming.refactor.state.{RuntimeContext, StateNamespaces, StateTags, StatefulTask} import org.apache.gearpump.streaming.task.TaskContext diff --git a/examples/streaming/wordcount-java/src/main/java/org/apache/gearpump/streaming/examples/wordcountjava/dsl/refactor/WordCount.java b/examples/streaming/wordcount-java/src/main/java/org/apache/gearpump/streaming/examples/wordcountjava/dsl/refactor/WordCount.java index 900c35aa9..9f22a86a6 100644 --- a/examples/streaming/wordcount-java/src/main/java/org/apache/gearpump/streaming/examples/wordcountjava/dsl/refactor/WordCount.java +++ b/examples/streaming/wordcount-java/src/main/java/org/apache/gearpump/streaming/examples/wordcountjava/dsl/refactor/WordCount.java @@ -29,8 +29,8 @@ import org.apache.gearpump.streaming.dsl.api.functions.ReduceFunction; import org.apache.gearpump.streaming.hadoop.HadoopCheckpointStoreFactory; import org.apache.gearpump.streaming.hadoop.lib.rotation.FileSizeRotation; -import org.apache.gearpump.streaming.refactor.coder.StringUtf8Coder; -import org.apache.gearpump.streaming.refactor.coder.VarLongCoder; +import org.apache.gearpump.streaming.coder.StringUtf8Coder; +import org.apache.gearpump.streaming.coder.VarLongCoder; import org.apache.gearpump.streaming.refactor.dsl.api.functions.MapWithStateFunction; import org.apache.gearpump.streaming.refactor.dsl.javaapi.JavaStream; import org.apache.gearpump.streaming.dsl.javaapi.functions.GroupByFunction; diff --git a/examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/refactor/WordCount.scala b/examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/refactor/WordCount.scala index a9919e24c..3d442482b 100644 --- a/examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/refactor/WordCount.scala +++ b/examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/refactor/WordCount.scala @@ -19,7 +19,7 @@ package org.apache.gearpump.streaming.examples.wordcount.dsl.refactor import org.apache.commons.logging.{Log, LogFactory} -import org.apache.gearpump.streaming.refactor.coder.{StringUtf8Coder, VarLongCoder} +import org.apache.gearpump.streaming.coder.{StringUtf8Coder, VarLongCoder} import org.apache.gearpump.streaming.refactor.dsl.api.functions.MapWithStateFunction import org.apache.gearpump.streaming.refactor.dsl.scalaapi.StreamApp import org.apache.gearpump.streaming.refactor.dsl.scalaapi.functions.FlatMapWithStateFunction diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/AtomicCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/AtomicCoder.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/AtomicCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/AtomicCoder.java index e152b4827..39e8447e8 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/AtomicCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/AtomicCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.Collections; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianIntegerCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianIntegerCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianIntegerCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianIntegerCoder.java index 27ec53941..86858605e 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianIntegerCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianIntegerCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianLongCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianLongCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianLongCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianLongCoder.java index c788729ec..86c0289e2 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianLongCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianLongCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigIntegerCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigIntegerCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigIntegerCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/BigIntegerCoder.java index 4a65992fb..de5275a82 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigIntegerCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigIntegerCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.InputStream; import java.io.OutputStream; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BufferedElementCountingOutputStream.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BufferedElementCountingOutputStream.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BufferedElementCountingOutputStream.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/BufferedElementCountingOutputStream.java index 119e6ebf7..5cebc2301 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BufferedElementCountingOutputStream.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BufferedElementCountingOutputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.IOException; import java.io.OutputStream; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteArrayCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteArrayCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteArrayCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteArrayCoder.java index 6b1af0570..d0c5316a5 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteArrayCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteArrayCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.io.ByteStreams; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteCoder.java index e3cb7e44a..998416a40 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/Coder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/Coder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/Coder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/Coder.java index edbe9a1c7..0513eea51 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/Coder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/Coder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.base.Joiner; import com.google.common.io.ByteStreams; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderException.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderException.java similarity index 95% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderException.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderException.java index 8213e42c2..44208c661 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderException.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; public class CoderException extends RuntimeException { public CoderException(String message) { diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderUtils.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderUtils.java similarity index 99% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderUtils.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderUtils.java index 2126c4876..9bf3374ca 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderUtils.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.io.BaseEncoding; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/DoubleCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/DoubleCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/DoubleCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/DoubleCoder.java index 981bee234..774fe1621 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/DoubleCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/DoubleCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterable.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterable.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterable.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterable.java index 29b4aa52f..69c26c95a 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterable.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterable.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.ArrayList; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterator.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterator.java similarity index 95% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterator.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterator.java index 946882bad..58b64d77b 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterator.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.Iterator; import java.util.Observable; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObserver.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObserver.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObserver.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObserver.java index 546406774..1df63d9b2 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObserver.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObserver.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.Observable; import java.util.Observer; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableCoder.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableCoder.java index d06906858..8e9bee7b4 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableLikeCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableLikeCoder.java similarity index 99% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableLikeCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableLikeCoder.java index 5bb6c6683..a4b9003a7 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableLikeCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableLikeCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; import java.util.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IteratorObserver.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IteratorObserver.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IteratorObserver.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/IteratorObserver.java index f1be5fb6d..453cbbc7e 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IteratorObserver.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IteratorObserver.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.Observable; import java.util.Observer; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ListCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ListCoder.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ListCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ListCoder.java index 3858ec6fb..b13460838 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ListCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ListCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/MapCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/MapCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/MapCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/MapCoder.java index 66b983cf9..0be1dacd6 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/MapCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/MapCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.collect.Maps; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/SetCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/SetCoder.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/SetCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/SetCoder.java index 4147732ac..07d50c874 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/SetCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/SetCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.HashSet; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StringUtf8Coder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StringUtf8Coder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StringUtf8Coder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/StringUtf8Coder.java index 73ea8ebc5..43e952250 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StringUtf8Coder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StringUtf8Coder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.base.Utf8; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuralByteArray.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuralByteArray.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuralByteArray.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuralByteArray.java index 6a371f687..bb299ed83 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuralByteArray.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuralByteArray.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.io.BaseEncoding; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuredCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuredCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuredCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuredCoder.java index 3e299a6e7..31b0e580c 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuredCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuredCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.ByteArrayOutputStream; import java.util.Collections; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarInt.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarInt.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarInt.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/VarInt.java index bebc1e459..742fb839f 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarInt.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarInt.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.EOFException; import java.io.IOException; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarIntCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarIntCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarIntCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/VarIntCoder.java index 7dac822be..15b886655 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarIntCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarIntCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarLongCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarLongCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarLongCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/VarLongCoder.java index 15af63425..705e81c1c 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarLongCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarLongCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; import java.util.Collections; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VoidCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VoidCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VoidCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/VoidCoder.java index f4d00f18f..699df1caf 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VoidCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VoidCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.InputStream; import java.io.OutputStream; diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/InMemoryGlobalStateInternals.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/InMemoryGlobalStateInternals.scala index 4dbb07f4a..5dee8e75a 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/InMemoryGlobalStateInternals.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/InMemoryGlobalStateInternals.scala @@ -24,7 +24,7 @@ import java.util.{ArrayList, HashSet, List, Set} import java.lang.Iterable import com.google.common.collect.{HashBasedTable, Table} -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.InMemoryGlobalStateInternals.InMemoryStateBinder import org.apache.gearpump.streaming.refactor.state.api._ diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/RuntimeContext.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/RuntimeContext.scala index f5384003d..c5bf40f46 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/RuntimeContext.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/RuntimeContext.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.refactor.state import java.time.Instant -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.api.StateInternals trait RuntimeContext { diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateBinder.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateBinder.scala index db391428e..97d6fda34 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateBinder.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateBinder.scala @@ -18,7 +18,7 @@ package org.apache.gearpump.streaming.refactor.state -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.api.{BagState, MapState, SetState, ValueState} trait StateBinder { diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpec.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpec.scala index 91cdbe5ff..ab83f100f 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpec.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpec.scala @@ -18,7 +18,7 @@ package org.apache.gearpump.streaming.refactor.state -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.api.State trait StateSpec[StateT <: State] extends Serializable { diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpecs.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpecs.scala index f0569158d..3124b31b7 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpecs.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpecs.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.refactor.state import java.util.Objects -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.api.{BagState, MapState, SetState, ValueState} object StateSpecs { diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateTags.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateTags.scala index cbd050afd..57caa08b5 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateTags.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateTags.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.refactor.state import java.util.Objects -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.StateTags.StateKind.StateKind import org.apache.gearpump.streaming.refactor.state.api._ diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StatefulTask.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StatefulTask.scala index 531ff6605..4793b3baa 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StatefulTask.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StatefulTask.scala @@ -25,7 +25,7 @@ import java.util.Map import com.google.common.collect.Table import org.apache.gearpump.cluster.UserConfig -import org.apache.gearpump.streaming.refactor.coder._ +import org.apache.gearpump.streaming.coder._ import org.apache.gearpump.streaming.refactor.state.api.StateInternals import org.apache.gearpump.streaming.refactor.state.heap.HeapStateInternalsFactory import org.apache.gearpump.streaming.state.impl.{CheckpointManager, PersistentStateConfig} diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternals.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternals.scala index 12b6e42e3..33a207eea 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternals.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternals.scala @@ -26,7 +26,7 @@ import java.util._ import java.util.Objects import com.google.common.collect.Table -import org.apache.gearpump.streaming.refactor.coder.{Coder, ListCoder, MapCoder, SetCoder} +import org.apache.gearpump.streaming.coder.{Coder, ListCoder, MapCoder, SetCoder} import org.apache.gearpump.streaming.refactor.state.{StateBinder, StateNamespace, StateSpec, StateTag} import org.apache.gearpump.streaming.refactor.state.api._ import org.apache.gearpump.util.LogUtil diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsFactory.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsFactory.scala index db20d66db..e0897acd1 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsFactory.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsFactory.scala @@ -18,7 +18,7 @@ package org.apache.gearpump.streaming.refactor.state.heap -import org.apache.gearpump.streaming.refactor.coder.{Coder, CoderException, CoderUtils} +import org.apache.gearpump.streaming.coder.{Coder, CoderException, CoderUtils} import org.apache.gearpump.streaming.refactor.state.api.{StateInternals, StateInternalsFactory} import java.util._ diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsProxy.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsProxy.scala index 2f85dd9d9..f42d07d52 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsProxy.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsProxy.scala @@ -18,7 +18,7 @@ package org.apache.gearpump.streaming.refactor.state.heap -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.{StateNamespace, StateTag} import org.apache.gearpump.streaming.refactor.state.api.{State, StateInternals, StateInternalsFactory} diff --git a/streaming/src/test/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsSpec.scala b/streaming/src/test/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsSpec.scala index f11299e24..6db05497a 100644 --- a/streaming/src/test/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsSpec.scala +++ b/streaming/src/test/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsSpec.scala @@ -22,7 +22,7 @@ import java.util import java.util.{Iterator, Map} import com.google.common.collect.Table -import org.apache.gearpump.streaming.refactor.coder.StringUtf8Coder +import org.apache.gearpump.streaming.coder.StringUtf8Coder import org.apache.gearpump.streaming.refactor.state.api.{BagState, SetState, ValueState} import org.apache.gearpump.streaming.refactor.state.{StateNamespaces, StateTags} import org.scalatest.mock.MockitoSugar From 756199b4a148e352c3f737520e16fa84cab2be1e Mon Sep 17 00:00:00 2001 From: vinoyang Date: Thu, 3 Aug 2017 23:24:47 +0800 Subject: [PATCH 2/2] move coders from refactor dir to external dir --- .../streaming/examples/state/refactor/SumProcessor.scala | 2 +- .../examples/wordcountjava/dsl/refactor/WordCount.java | 4 ++-- .../streaming/examples/wordcount/dsl/refactor/WordCount.scala | 2 +- .../gearpump/streaming/{refactor => }/coder/AtomicCoder.java | 2 +- .../streaming/{refactor => }/coder/BigEndianIntegerCoder.java | 2 +- .../streaming/{refactor => }/coder/BigEndianLongCoder.java | 2 +- .../streaming/{refactor => }/coder/BigIntegerCoder.java | 2 +- .../coder/BufferedElementCountingOutputStream.java | 2 +- .../streaming/{refactor => }/coder/ByteArrayCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/ByteCoder.java | 2 +- .../apache/gearpump/streaming/{refactor => }/coder/Coder.java | 2 +- .../streaming/{refactor => }/coder/CoderException.java | 2 +- .../gearpump/streaming/{refactor => }/coder/CoderUtils.java | 2 +- .../gearpump/streaming/{refactor => }/coder/DoubleCoder.java | 2 +- .../coder/ElementByteSizeObservableIterable.java | 2 +- .../coder/ElementByteSizeObservableIterator.java | 2 +- .../{refactor => }/coder/ElementByteSizeObserver.java | 2 +- .../streaming/{refactor => }/coder/IterableCoder.java | 2 +- .../streaming/{refactor => }/coder/IterableLikeCoder.java | 2 +- .../streaming/{refactor => }/coder/IteratorObserver.java | 2 +- .../gearpump/streaming/{refactor => }/coder/ListCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/MapCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/SetCoder.java | 2 +- .../streaming/{refactor => }/coder/StringUtf8Coder.java | 2 +- .../streaming/{refactor => }/coder/StructuralByteArray.java | 2 +- .../streaming/{refactor => }/coder/StructuredCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/VarInt.java | 2 +- .../gearpump/streaming/{refactor => }/coder/VarIntCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/VarLongCoder.java | 2 +- .../gearpump/streaming/{refactor => }/coder/VoidCoder.java | 2 +- .../refactor/state/InMemoryGlobalStateInternals.scala | 2 +- .../gearpump/streaming/refactor/state/RuntimeContext.scala | 2 +- .../gearpump/streaming/refactor/state/StateBinder.scala | 2 +- .../apache/gearpump/streaming/refactor/state/StateSpec.scala | 2 +- .../apache/gearpump/streaming/refactor/state/StateSpecs.scala | 2 +- .../apache/gearpump/streaming/refactor/state/StateTags.scala | 2 +- .../gearpump/streaming/refactor/state/StatefulTask.scala | 2 +- .../streaming/refactor/state/heap/HeapStateInternals.scala | 2 +- .../refactor/state/heap/HeapStateInternalsFactory.scala | 2 +- .../refactor/state/heap/HeapStateInternalsProxy.scala | 2 +- .../refactor/state/heap/HeapStateInternalsSpec.scala | 2 +- 41 files changed, 42 insertions(+), 42 deletions(-) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/AtomicCoder.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/BigEndianIntegerCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/BigEndianLongCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/BigIntegerCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/BufferedElementCountingOutputStream.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ByteArrayCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ByteCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/Coder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/CoderException.java (95%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/CoderUtils.java (99%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/DoubleCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ElementByteSizeObservableIterable.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ElementByteSizeObservableIterator.java (95%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ElementByteSizeObserver.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/IterableCoder.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/IterableLikeCoder.java (99%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/IteratorObserver.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/ListCoder.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/MapCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/SetCoder.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/StringUtf8Coder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/StructuralByteArray.java (96%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/StructuredCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/VarInt.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/VarIntCoder.java (97%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/VarLongCoder.java (98%) rename streaming/src/main/java/org/apache/gearpump/streaming/{refactor => }/coder/VoidCoder.java (97%) diff --git a/examples/streaming/state/src/main/scala/org/apache/gearpump/streaming/examples/state/refactor/SumProcessor.scala b/examples/streaming/state/src/main/scala/org/apache/gearpump/streaming/examples/state/refactor/SumProcessor.scala index 438b3376d..557991159 100644 --- a/examples/streaming/state/src/main/scala/org/apache/gearpump/streaming/examples/state/refactor/SumProcessor.scala +++ b/examples/streaming/state/src/main/scala/org/apache/gearpump/streaming/examples/state/refactor/SumProcessor.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.examples.state.refactor import org.apache.gearpump.Message import org.apache.gearpump.cluster.UserConfig -import org.apache.gearpump.streaming.refactor.coder._ +import org.apache.gearpump.streaming.coder._ import org.apache.gearpump.streaming.refactor.state.api.{StateInternals, ValueState} import org.apache.gearpump.streaming.refactor.state.{RuntimeContext, StateNamespaces, StateTags, StatefulTask} import org.apache.gearpump.streaming.task.TaskContext diff --git a/examples/streaming/wordcount-java/src/main/java/org/apache/gearpump/streaming/examples/wordcountjava/dsl/refactor/WordCount.java b/examples/streaming/wordcount-java/src/main/java/org/apache/gearpump/streaming/examples/wordcountjava/dsl/refactor/WordCount.java index 900c35aa9..9f22a86a6 100644 --- a/examples/streaming/wordcount-java/src/main/java/org/apache/gearpump/streaming/examples/wordcountjava/dsl/refactor/WordCount.java +++ b/examples/streaming/wordcount-java/src/main/java/org/apache/gearpump/streaming/examples/wordcountjava/dsl/refactor/WordCount.java @@ -29,8 +29,8 @@ import org.apache.gearpump.streaming.dsl.api.functions.ReduceFunction; import org.apache.gearpump.streaming.hadoop.HadoopCheckpointStoreFactory; import org.apache.gearpump.streaming.hadoop.lib.rotation.FileSizeRotation; -import org.apache.gearpump.streaming.refactor.coder.StringUtf8Coder; -import org.apache.gearpump.streaming.refactor.coder.VarLongCoder; +import org.apache.gearpump.streaming.coder.StringUtf8Coder; +import org.apache.gearpump.streaming.coder.VarLongCoder; import org.apache.gearpump.streaming.refactor.dsl.api.functions.MapWithStateFunction; import org.apache.gearpump.streaming.refactor.dsl.javaapi.JavaStream; import org.apache.gearpump.streaming.dsl.javaapi.functions.GroupByFunction; diff --git a/examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/refactor/WordCount.scala b/examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/refactor/WordCount.scala index a9919e24c..3d442482b 100644 --- a/examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/refactor/WordCount.scala +++ b/examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/refactor/WordCount.scala @@ -19,7 +19,7 @@ package org.apache.gearpump.streaming.examples.wordcount.dsl.refactor import org.apache.commons.logging.{Log, LogFactory} -import org.apache.gearpump.streaming.refactor.coder.{StringUtf8Coder, VarLongCoder} +import org.apache.gearpump.streaming.coder.{StringUtf8Coder, VarLongCoder} import org.apache.gearpump.streaming.refactor.dsl.api.functions.MapWithStateFunction import org.apache.gearpump.streaming.refactor.dsl.scalaapi.StreamApp import org.apache.gearpump.streaming.refactor.dsl.scalaapi.functions.FlatMapWithStateFunction diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/AtomicCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/AtomicCoder.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/AtomicCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/AtomicCoder.java index e152b4827..39e8447e8 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/AtomicCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/AtomicCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.Collections; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianIntegerCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianIntegerCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianIntegerCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianIntegerCoder.java index 27ec53941..86858605e 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianIntegerCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianIntegerCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianLongCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianLongCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianLongCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianLongCoder.java index c788729ec..86c0289e2 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigEndianLongCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigEndianLongCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigIntegerCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigIntegerCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigIntegerCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/BigIntegerCoder.java index 4a65992fb..de5275a82 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BigIntegerCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BigIntegerCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.InputStream; import java.io.OutputStream; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BufferedElementCountingOutputStream.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BufferedElementCountingOutputStream.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BufferedElementCountingOutputStream.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/BufferedElementCountingOutputStream.java index 119e6ebf7..5cebc2301 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/BufferedElementCountingOutputStream.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/BufferedElementCountingOutputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.IOException; import java.io.OutputStream; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteArrayCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteArrayCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteArrayCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteArrayCoder.java index 6b1af0570..d0c5316a5 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteArrayCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteArrayCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.io.ByteStreams; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteCoder.java index e3cb7e44a..998416a40 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ByteCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ByteCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/Coder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/Coder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/Coder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/Coder.java index edbe9a1c7..0513eea51 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/Coder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/Coder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.base.Joiner; import com.google.common.io.ByteStreams; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderException.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderException.java similarity index 95% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderException.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderException.java index 8213e42c2..44208c661 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderException.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; public class CoderException extends RuntimeException { public CoderException(String message) { diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderUtils.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderUtils.java similarity index 99% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderUtils.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderUtils.java index 2126c4876..9bf3374ca 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/CoderUtils.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/CoderUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.io.BaseEncoding; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/DoubleCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/DoubleCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/DoubleCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/DoubleCoder.java index 981bee234..774fe1621 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/DoubleCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/DoubleCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterable.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterable.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterable.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterable.java index 29b4aa52f..69c26c95a 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterable.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterable.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.ArrayList; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterator.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterator.java similarity index 95% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterator.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterator.java index 946882bad..58b64d77b 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObservableIterator.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObservableIterator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.Iterator; import java.util.Observable; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObserver.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObserver.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObserver.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObserver.java index 546406774..1df63d9b2 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ElementByteSizeObserver.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ElementByteSizeObserver.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.Observable; import java.util.Observer; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableCoder.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableCoder.java index d06906858..8e9bee7b4 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableLikeCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableLikeCoder.java similarity index 99% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableLikeCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableLikeCoder.java index 5bb6c6683..a4b9003a7 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IterableLikeCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IterableLikeCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; import java.util.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IteratorObserver.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IteratorObserver.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IteratorObserver.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/IteratorObserver.java index f1be5fb6d..453cbbc7e 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/IteratorObserver.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/IteratorObserver.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.Observable; import java.util.Observer; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ListCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ListCoder.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ListCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/ListCoder.java index 3858ec6fb..b13460838 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/ListCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/ListCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/MapCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/MapCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/MapCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/MapCoder.java index 66b983cf9..0be1dacd6 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/MapCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/MapCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.collect.Maps; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/SetCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/SetCoder.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/SetCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/SetCoder.java index 4147732ac..07d50c874 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/SetCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/SetCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.util.HashSet; import java.util.List; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StringUtf8Coder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StringUtf8Coder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StringUtf8Coder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/StringUtf8Coder.java index 73ea8ebc5..43e952250 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StringUtf8Coder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StringUtf8Coder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.base.Utf8; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuralByteArray.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuralByteArray.java similarity index 96% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuralByteArray.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuralByteArray.java index 6a371f687..bb299ed83 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuralByteArray.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuralByteArray.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import com.google.common.io.BaseEncoding; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuredCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuredCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuredCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuredCoder.java index 3e299a6e7..31b0e580c 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/StructuredCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/StructuredCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.ByteArrayOutputStream; import java.util.Collections; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarInt.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarInt.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarInt.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/VarInt.java index bebc1e459..742fb839f 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarInt.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarInt.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.EOFException; import java.io.IOException; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarIntCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarIntCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarIntCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/VarIntCoder.java index 7dac822be..15b886655 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarIntCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarIntCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarLongCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarLongCoder.java similarity index 98% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarLongCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/VarLongCoder.java index 15af63425..705e81c1c 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VarLongCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VarLongCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.*; import java.util.Collections; diff --git a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VoidCoder.java b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VoidCoder.java similarity index 97% rename from streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VoidCoder.java rename to streaming/src/main/java/org/apache/gearpump/streaming/coder/VoidCoder.java index f4d00f18f..699df1caf 100644 --- a/streaming/src/main/java/org/apache/gearpump/streaming/refactor/coder/VoidCoder.java +++ b/streaming/src/main/java/org/apache/gearpump/streaming/coder/VoidCoder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.gearpump.streaming.refactor.coder; +package org.apache.gearpump.streaming.coder; import java.io.InputStream; import java.io.OutputStream; diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/InMemoryGlobalStateInternals.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/InMemoryGlobalStateInternals.scala index 4dbb07f4a..5dee8e75a 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/InMemoryGlobalStateInternals.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/InMemoryGlobalStateInternals.scala @@ -24,7 +24,7 @@ import java.util.{ArrayList, HashSet, List, Set} import java.lang.Iterable import com.google.common.collect.{HashBasedTable, Table} -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.InMemoryGlobalStateInternals.InMemoryStateBinder import org.apache.gearpump.streaming.refactor.state.api._ diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/RuntimeContext.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/RuntimeContext.scala index f5384003d..c5bf40f46 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/RuntimeContext.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/RuntimeContext.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.refactor.state import java.time.Instant -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.api.StateInternals trait RuntimeContext { diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateBinder.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateBinder.scala index db391428e..97d6fda34 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateBinder.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateBinder.scala @@ -18,7 +18,7 @@ package org.apache.gearpump.streaming.refactor.state -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.api.{BagState, MapState, SetState, ValueState} trait StateBinder { diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpec.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpec.scala index 91cdbe5ff..ab83f100f 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpec.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpec.scala @@ -18,7 +18,7 @@ package org.apache.gearpump.streaming.refactor.state -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.api.State trait StateSpec[StateT <: State] extends Serializable { diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpecs.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpecs.scala index f0569158d..3124b31b7 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpecs.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateSpecs.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.refactor.state import java.util.Objects -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.api.{BagState, MapState, SetState, ValueState} object StateSpecs { diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateTags.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateTags.scala index cbd050afd..57caa08b5 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateTags.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StateTags.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.refactor.state import java.util.Objects -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.StateTags.StateKind.StateKind import org.apache.gearpump.streaming.refactor.state.api._ diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StatefulTask.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StatefulTask.scala index 531ff6605..4793b3baa 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StatefulTask.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/StatefulTask.scala @@ -25,7 +25,7 @@ import java.util.Map import com.google.common.collect.Table import org.apache.gearpump.cluster.UserConfig -import org.apache.gearpump.streaming.refactor.coder._ +import org.apache.gearpump.streaming.coder._ import org.apache.gearpump.streaming.refactor.state.api.StateInternals import org.apache.gearpump.streaming.refactor.state.heap.HeapStateInternalsFactory import org.apache.gearpump.streaming.state.impl.{CheckpointManager, PersistentStateConfig} diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternals.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternals.scala index 12b6e42e3..33a207eea 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternals.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternals.scala @@ -26,7 +26,7 @@ import java.util._ import java.util.Objects import com.google.common.collect.Table -import org.apache.gearpump.streaming.refactor.coder.{Coder, ListCoder, MapCoder, SetCoder} +import org.apache.gearpump.streaming.coder.{Coder, ListCoder, MapCoder, SetCoder} import org.apache.gearpump.streaming.refactor.state.{StateBinder, StateNamespace, StateSpec, StateTag} import org.apache.gearpump.streaming.refactor.state.api._ import org.apache.gearpump.util.LogUtil diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsFactory.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsFactory.scala index db20d66db..e0897acd1 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsFactory.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsFactory.scala @@ -18,7 +18,7 @@ package org.apache.gearpump.streaming.refactor.state.heap -import org.apache.gearpump.streaming.refactor.coder.{Coder, CoderException, CoderUtils} +import org.apache.gearpump.streaming.coder.{Coder, CoderException, CoderUtils} import org.apache.gearpump.streaming.refactor.state.api.{StateInternals, StateInternalsFactory} import java.util._ diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsProxy.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsProxy.scala index 2f85dd9d9..f42d07d52 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsProxy.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsProxy.scala @@ -18,7 +18,7 @@ package org.apache.gearpump.streaming.refactor.state.heap -import org.apache.gearpump.streaming.refactor.coder.Coder +import org.apache.gearpump.streaming.coder.Coder import org.apache.gearpump.streaming.refactor.state.{StateNamespace, StateTag} import org.apache.gearpump.streaming.refactor.state.api.{State, StateInternals, StateInternalsFactory} diff --git a/streaming/src/test/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsSpec.scala b/streaming/src/test/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsSpec.scala index f11299e24..6db05497a 100644 --- a/streaming/src/test/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsSpec.scala +++ b/streaming/src/test/scala/org/apache/gearpump/streaming/refactor/state/heap/HeapStateInternalsSpec.scala @@ -22,7 +22,7 @@ import java.util import java.util.{Iterator, Map} import com.google.common.collect.Table -import org.apache.gearpump.streaming.refactor.coder.StringUtf8Coder +import org.apache.gearpump.streaming.coder.StringUtf8Coder import org.apache.gearpump.streaming.refactor.state.api.{BagState, SetState, ValueState} import org.apache.gearpump.streaming.refactor.state.{StateNamespaces, StateTags} import org.scalatest.mock.MockitoSugar