diff --git a/README.md b/README.md index 822a730c..21fcaf67 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ Then you can use the library in your maven project. ```xml - de.tub.dima.scotty + stream.scotty flink-connector 0.4 diff --git a/beam-connector/pom.xml b/beam-connector/pom.xml index 5648709d..1735ba2d 100644 --- a/beam-connector/pom.xml +++ b/beam-connector/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> parent - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 @@ -36,17 +36,17 @@ 1.2 - de.tub.dima.scotty + stream.scotty core ${scotty.version} - de.tub.dima.scotty + stream.scotty slicing ${scotty.version} - de.tub.dima.scotty + stream.scotty state ${scotty.version} diff --git a/beam-connector/src/main/java/de/tub/dima/scotty/beamconnector/KeyedScottyWindowOperator.java b/beam-connector/src/main/java/stream/scotty/beamconnector/KeyedScottyWindowOperator.java similarity index 88% rename from beam-connector/src/main/java/de/tub/dima/scotty/beamconnector/KeyedScottyWindowOperator.java rename to beam-connector/src/main/java/stream/scotty/beamconnector/KeyedScottyWindowOperator.java index 841812f2..e31e0e57 100644 --- a/beam-connector/src/main/java/de/tub/dima/scotty/beamconnector/KeyedScottyWindowOperator.java +++ b/beam-connector/src/main/java/stream/scotty/beamconnector/KeyedScottyWindowOperator.java @@ -1,12 +1,12 @@ -package de.tub.dima.scotty.beamconnector; +package stream.scotty.beamconnector; -import de.tub.dima.scotty.core.AggregateWindow; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; -import de.tub.dima.scotty.core.windowType.SlidingWindow; -import de.tub.dima.scotty.core.windowType.TumblingWindow; -import de.tub.dima.scotty.core.windowType.Window; -import de.tub.dima.scotty.slicing.SlicingWindowOperator; -import de.tub.dima.scotty.state.memory.MemoryStateFactory; +import stream.scotty.core.AggregateWindow; +import stream.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowType.SlidingWindow; +import stream.scotty.core.windowType.TumblingWindow; +import stream.scotty.core.windowType.Window; +import stream.scotty.slicing.SlicingWindowOperator; +import stream.scotty.state.memory.MemoryStateFactory; import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.values.KV; import org.joda.time.Instant; diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 9f28d47c..beaf480d 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> parent - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 @@ -13,12 +13,12 @@ pom - de.tub.dima.scotty + stream.scotty slicing 0.4 - de.tub.dima.scotty + stream.scotty flink-connector 0.4 diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/AnalyzeTool.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/AnalyzeTool.java similarity index 97% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/AnalyzeTool.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/AnalyzeTool.java index f84d3932..7fc28fa6 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/AnalyzeTool.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/AnalyzeTool.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.flinkBenchmark; +package stream.scotty.flinkBenchmark; import org.apache.commons.math3.stat.descriptive.SummaryStatistics; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkConfig.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkConfig.java similarity index 92% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkConfig.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkConfig.java index f8cf7888..289f44d8 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkConfig.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkConfig.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.flinkBenchmark; +package stream.scotty.flinkBenchmark; import java.util.List; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkJob.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkJob.java similarity index 87% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkJob.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkJob.java index a54273e9..e53187bd 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkJob.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkJob.java @@ -1,8 +1,8 @@ -package de.tub.dima.scotty.flinkBenchmark; +package stream.scotty.flinkBenchmark; -import de.tub.dima.scotty.core.windowType.*; -import de.tub.dima.scotty.flinkBenchmark.aggregations.SumAggregation; -import de.tub.dima.scotty.flinkconnector.*; +import stream.scotty.core.windowType.*; +import stream.scotty.flinkBenchmark.aggregations.SumAggregation; +import stream.scotty.flinkconnector.*; import org.apache.flink.api.java.tuple.*; import org.apache.flink.api.java.utils.ParameterTool; import org.apache.flink.streaming.api.TimeCharacteristic; @@ -47,9 +47,9 @@ public BenchmarkJob(List assigner, StreamExecutionEnvironment env, final DataStream> messageStream = env - .addSource(new de.tub.dima.scotty.flinkBenchmark.LoadGeneratorSource(runtime, throughput, gaps)); + .addSource(new stream.scotty.flinkBenchmark.LoadGeneratorSource(runtime, throughput, gaps)); - messageStream.flatMap(new de.tub.dima.scotty.flinkBenchmark.ThroughputLogger<>(200, throughput)); + messageStream.flatMap(new stream.scotty.flinkBenchmark.ThroughputLogger<>(200, throughput)); diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkRunner.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkRunner.java similarity index 98% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkRunner.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkRunner.java index 4f8b4459..82a1421a 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/BenchmarkRunner.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/BenchmarkRunner.java @@ -1,9 +1,9 @@ -package de.tub.dima.scotty.flinkBenchmark; +package stream.scotty.flinkBenchmark; import com.google.gson.*; -import de.tub.dima.scotty.core.*; -import de.tub.dima.scotty.core.windowType.*; -import de.tub.dima.scotty.core.*; +import stream.scotty.core.*; +import stream.scotty.core.windowType.*; +import stream.scotty.core.*; import org.apache.flink.api.java.tuple.*; import org.apache.flink.configuration.*; import org.apache.flink.streaming.api.environment.*; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/FlinkBenchmarkJob.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/FlinkBenchmarkJob.java similarity index 95% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/FlinkBenchmarkJob.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/FlinkBenchmarkJob.java index 1e785317..9fd16481 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/FlinkBenchmarkJob.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/FlinkBenchmarkJob.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.flinkBenchmark; +package stream.scotty.flinkBenchmark; -import de.tub.dima.scotty.core.windowType.*; -import de.tub.dima.scotty.core.windowType.Window; +import stream.scotty.core.windowType.*; +import stream.scotty.core.windowType.Window; import org.apache.flink.api.java.tuple.*; import org.apache.flink.api.java.utils.*; import org.apache.flink.streaming.api.*; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/LoadGeneratorSource.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/LoadGeneratorSource.java similarity index 98% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/LoadGeneratorSource.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/LoadGeneratorSource.java index 33e452c0..47223aab 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/LoadGeneratorSource.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/LoadGeneratorSource.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.flinkBenchmark; +package stream.scotty.flinkBenchmark; import org.apache.flink.api.java.tuple.*; import org.apache.flink.streaming.api.functions.source.*; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/ThroughputLogger.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/ThroughputLogger.java similarity index 97% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/ThroughputLogger.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/ThroughputLogger.java index 6e39f879..8af84ea1 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/ThroughputLogger.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/ThroughputLogger.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.flinkBenchmark; +package stream.scotty.flinkBenchmark; import org.apache.flink.api.common.functions.FlatMapFunction; import org.apache.flink.util.Collector; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/ThroughputStatistics.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/ThroughputStatistics.java similarity index 94% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/ThroughputStatistics.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/ThroughputStatistics.java index 011d5461..c413e2c0 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/ThroughputStatistics.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/ThroughputStatistics.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.flinkBenchmark; +package stream.scotty.flinkBenchmark; public class ThroughputStatistics { diff --git a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/aggregations/SumAggregation.java b/benchmark/src/main/java/stream/scotty/flinkBenchmark/aggregations/SumAggregation.java similarity index 88% rename from benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/aggregations/SumAggregation.java rename to benchmark/src/main/java/stream/scotty/flinkBenchmark/aggregations/SumAggregation.java index 8d1e69f0..03a24569 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/flinkBenchmark/aggregations/SumAggregation.java +++ b/benchmark/src/main/java/stream/scotty/flinkBenchmark/aggregations/SumAggregation.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.flinkBenchmark.aggregations; +package stream.scotty.flinkBenchmark.aggregations; -import de.tub.dima.scotty.core.windowFunction.*; +import stream.scotty.core.windowFunction.*; import org.apache.flink.api.java.tuple.*; import java.io.*; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/AggregationStateInline.java b/benchmark/src/main/java/stream/scotty/microbenchmark/AggregationStateInline.java similarity index 79% rename from benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/AggregationStateInline.java rename to benchmark/src/main/java/stream/scotty/microbenchmark/AggregationStateInline.java index 36454c59..c404ef7c 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/AggregationStateInline.java +++ b/benchmark/src/main/java/stream/scotty/microbenchmark/AggregationStateInline.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.microbenchmark; +package stream.scotty.microbenchmark; -import de.tub.dima.scotty.state.StateFactory; -import de.tub.dima.scotty.state.ValueState; +import stream.scotty.state.StateFactory; +import stream.scotty.state.ValueState; import java.util.ArrayList; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/AggregationStoreBenchmark.java b/benchmark/src/main/java/stream/scotty/microbenchmark/AggregationStoreBenchmark.java similarity index 87% rename from benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/AggregationStoreBenchmark.java rename to benchmark/src/main/java/stream/scotty/microbenchmark/AggregationStoreBenchmark.java index 2563030e..2e7d5022 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/AggregationStoreBenchmark.java +++ b/benchmark/src/main/java/stream/scotty/microbenchmark/AggregationStoreBenchmark.java @@ -1,8 +1,8 @@ -package de.tub.dima.scotty.microbenchmark; +package stream.scotty.microbenchmark; -import de.tub.dima.scotty.slicing.state.AggregateState; -import de.tub.dima.scotty.state.memory.MemoryStateFactory; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.slicing.state.AggregateState; +import stream.scotty.state.memory.MemoryStateFactory; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.RunnerException; diff --git a/benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/SlicingWindowOperatorBenchmark.java b/benchmark/src/main/java/stream/scotty/microbenchmark/SlicingWindowOperatorBenchmark.java similarity index 82% rename from benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/SlicingWindowOperatorBenchmark.java rename to benchmark/src/main/java/stream/scotty/microbenchmark/SlicingWindowOperatorBenchmark.java index 929a3859..358e37a6 100644 --- a/benchmark/src/main/java/de/tub/dima/scotty/microbenchmark/SlicingWindowOperatorBenchmark.java +++ b/benchmark/src/main/java/stream/scotty/microbenchmark/SlicingWindowOperatorBenchmark.java @@ -1,10 +1,10 @@ -package de.tub.dima.scotty.microbenchmark; +package stream.scotty.microbenchmark; -import de.tub.dima.scotty.slicing.SlicingWindowOperator; -import de.tub.dima.scotty.state.memory.MemoryStateFactory; -import de.tub.dima.scotty.core.windowType.TumblingWindow; -import de.tub.dima.scotty.core.windowType.WindowMeasure; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.slicing.SlicingWindowOperator; +import stream.scotty.state.memory.MemoryStateFactory; +import stream.scotty.core.windowType.TumblingWindow; +import stream.scotty.core.windowType.WindowMeasure; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.RunnerException; diff --git a/core/pom.xml b/core/pom.xml index c767e2ce..4a8e4170 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> parent - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/ForwardContextAware.java b/core/src/main/java/de/tub/dima/scotty/core/windowType/ForwardContextAware.java deleted file mode 100644 index 3f98e5e6..00000000 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/ForwardContextAware.java +++ /dev/null @@ -1,9 +0,0 @@ -package de.tub.dima.scotty.core.windowType; - -import de.tub.dima.scotty.core.windowType.windowContext.*; -import de.tub.dima.scotty.core.windowType.windowContext.*; - -public interface ForwardContextAware extends Window { - - WindowContext createContext(); -} diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/ForwardContextFree.java b/core/src/main/java/de/tub/dima/scotty/core/windowType/ForwardContextFree.java deleted file mode 100644 index ae39aa98..00000000 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/ForwardContextFree.java +++ /dev/null @@ -1,8 +0,0 @@ -package de.tub.dima.scotty.core.windowType; - -import de.tub.dima.scotty.core.windowType.windowContext.*; - -public interface ForwardContextFree extends Window { - - WindowContext createContext(); -} diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/WindowModifications.java b/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/WindowModifications.java deleted file mode 100644 index 9bf4e382..00000000 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/WindowModifications.java +++ /dev/null @@ -1,4 +0,0 @@ -package de.tub.dima.scotty.core.windowType.windowContext; - -public interface WindowModifications { -} diff --git a/core/src/main/java/de/tub/dima/scotty/core/AggregateWindow.java b/core/src/main/java/stream/scotty/core/AggregateWindow.java similarity index 77% rename from core/src/main/java/de/tub/dima/scotty/core/AggregateWindow.java rename to core/src/main/java/stream/scotty/core/AggregateWindow.java index 9b4ae82d..f1169295 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/AggregateWindow.java +++ b/core/src/main/java/stream/scotty/core/AggregateWindow.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.core; +package stream.scotty.core; -import de.tub.dima.scotty.core.windowType.*; +import stream.scotty.core.windowType.*; import java.io.*; import java.util.List; diff --git a/core/src/main/java/de/tub/dima/scotty/core/TimeMeasure.java b/core/src/main/java/stream/scotty/core/TimeMeasure.java similarity index 98% rename from core/src/main/java/de/tub/dima/scotty/core/TimeMeasure.java rename to core/src/main/java/stream/scotty/core/TimeMeasure.java index b3e80b7b..318cd837 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/TimeMeasure.java +++ b/core/src/main/java/stream/scotty/core/TimeMeasure.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tub.dima.scotty.core; +package stream.scotty.core; import java.util.concurrent.TimeUnit; /** diff --git a/core/src/main/java/de/tub/dima/scotty/core/WindowCollector.java b/core/src/main/java/stream/scotty/core/WindowCollector.java similarity index 58% rename from core/src/main/java/de/tub/dima/scotty/core/WindowCollector.java rename to core/src/main/java/stream/scotty/core/WindowCollector.java index 57d75496..ab421fd0 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/WindowCollector.java +++ b/core/src/main/java/stream/scotty/core/WindowCollector.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.core; +package stream.scotty.core; -import de.tub.dima.scotty.core.windowType.*; +import stream.scotty.core.windowType.*; public interface WindowCollector { diff --git a/core/src/main/java/de/tub/dima/scotty/core/WindowOperator.java b/core/src/main/java/stream/scotty/core/WindowOperator.java similarity index 86% rename from core/src/main/java/de/tub/dima/scotty/core/WindowOperator.java rename to core/src/main/java/stream/scotty/core/WindowOperator.java index d6339f73..61786a98 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/WindowOperator.java +++ b/core/src/main/java/stream/scotty/core/WindowOperator.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.core; +package stream.scotty.core; -import de.tub.dima.scotty.core.windowType.*; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowType.*; +import stream.scotty.core.windowFunction.AggregateFunction; import java.io.*; import java.util.List; diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/AggregateFunction.java b/core/src/main/java/stream/scotty/core/windowFunction/AggregateFunction.java similarity index 98% rename from core/src/main/java/de/tub/dima/scotty/core/windowFunction/AggregateFunction.java rename to core/src/main/java/stream/scotty/core/windowFunction/AggregateFunction.java index dea964b3..e0f5cde3 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/AggregateFunction.java +++ b/core/src/main/java/stream/scotty/core/windowFunction/AggregateFunction.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowFunction; +package stream.scotty.core.windowFunction; import java.io.*; diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/CloneablePartialStateFunction.java b/core/src/main/java/stream/scotty/core/windowFunction/CloneablePartialStateFunction.java similarity index 86% rename from core/src/main/java/de/tub/dima/scotty/core/windowFunction/CloneablePartialStateFunction.java rename to core/src/main/java/stream/scotty/core/windowFunction/CloneablePartialStateFunction.java index b2a246ef..900ac611 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/CloneablePartialStateFunction.java +++ b/core/src/main/java/stream/scotty/core/windowFunction/CloneablePartialStateFunction.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowFunction; +package stream.scotty.core.windowFunction; public interface CloneablePartialStateFunction { diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/CommutativeAggregateFunction.java b/core/src/main/java/stream/scotty/core/windowFunction/CommutativeAggregateFunction.java similarity index 79% rename from core/src/main/java/de/tub/dima/scotty/core/windowFunction/CommutativeAggregateFunction.java rename to core/src/main/java/stream/scotty/core/windowFunction/CommutativeAggregateFunction.java index 67f14764..81e54cf7 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/CommutativeAggregateFunction.java +++ b/core/src/main/java/stream/scotty/core/windowFunction/CommutativeAggregateFunction.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowFunction; +package stream.scotty.core.windowFunction; public interface CommutativeAggregateFunction extends AggregateFunction { } diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/InvertibleAggregateFunction.java b/core/src/main/java/stream/scotty/core/windowFunction/InvertibleAggregateFunction.java similarity index 93% rename from core/src/main/java/de/tub/dima/scotty/core/windowFunction/InvertibleAggregateFunction.java rename to core/src/main/java/stream/scotty/core/windowFunction/InvertibleAggregateFunction.java index d3e57c8b..2a7d03e4 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/InvertibleAggregateFunction.java +++ b/core/src/main/java/stream/scotty/core/windowFunction/InvertibleAggregateFunction.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowFunction; +package stream.scotty.core.windowFunction; public interface InvertibleAggregateFunction extends AggregateFunction { /** diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/InvertibleReduceAggregateFunction.java b/core/src/main/java/stream/scotty/core/windowFunction/InvertibleReduceAggregateFunction.java similarity index 76% rename from core/src/main/java/de/tub/dima/scotty/core/windowFunction/InvertibleReduceAggregateFunction.java rename to core/src/main/java/stream/scotty/core/windowFunction/InvertibleReduceAggregateFunction.java index 7966840e..fde46e89 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/InvertibleReduceAggregateFunction.java +++ b/core/src/main/java/stream/scotty/core/windowFunction/InvertibleReduceAggregateFunction.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowFunction; +package stream.scotty.core.windowFunction; public interface InvertibleReduceAggregateFunction extends ReduceAggregateFunction, InvertibleAggregateFunction { diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/ReduceAggregateFunction.java b/core/src/main/java/stream/scotty/core/windowFunction/ReduceAggregateFunction.java similarity index 87% rename from core/src/main/java/de/tub/dima/scotty/core/windowFunction/ReduceAggregateFunction.java rename to core/src/main/java/stream/scotty/core/windowFunction/ReduceAggregateFunction.java index 70c6c704..335b55c8 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowFunction/ReduceAggregateFunction.java +++ b/core/src/main/java/stream/scotty/core/windowFunction/ReduceAggregateFunction.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowFunction; +package stream.scotty.core.windowFunction; @FunctionalInterface diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/ContextFreeWindow.java b/core/src/main/java/stream/scotty/core/windowType/ContextFreeWindow.java similarity index 67% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/ContextFreeWindow.java rename to core/src/main/java/stream/scotty/core/windowType/ContextFreeWindow.java index b1b8a96f..5f5745f2 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/ContextFreeWindow.java +++ b/core/src/main/java/stream/scotty/core/windowType/ContextFreeWindow.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; -import de.tub.dima.scotty.core.*; -import de.tub.dima.scotty.core.*; +import stream.scotty.core.*; +import stream.scotty.core.*; public interface ContextFreeWindow extends Window { diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/FixedBandWindow.java b/core/src/main/java/stream/scotty/core/windowType/FixedBandWindow.java similarity index 96% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/FixedBandWindow.java rename to core/src/main/java/stream/scotty/core/windowType/FixedBandWindow.java index 385e06a7..71bf48ad 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/FixedBandWindow.java +++ b/core/src/main/java/stream/scotty/core/windowType/FixedBandWindow.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; -import de.tub.dima.scotty.core.WindowCollector; +import stream.scotty.core.WindowCollector; public class FixedBandWindow implements ContextFreeWindow { /** diff --git a/core/src/main/java/stream/scotty/core/windowType/ForwardContextAware.java b/core/src/main/java/stream/scotty/core/windowType/ForwardContextAware.java new file mode 100644 index 00000000..734b13dd --- /dev/null +++ b/core/src/main/java/stream/scotty/core/windowType/ForwardContextAware.java @@ -0,0 +1,9 @@ +package stream.scotty.core.windowType; + +import stream.scotty.core.windowType.windowContext.*; +import stream.scotty.core.windowType.windowContext.*; + +public interface ForwardContextAware extends Window { + + WindowContext createContext(); +} diff --git a/core/src/main/java/stream/scotty/core/windowType/ForwardContextFree.java b/core/src/main/java/stream/scotty/core/windowType/ForwardContextFree.java new file mode 100644 index 00000000..14e868cf --- /dev/null +++ b/core/src/main/java/stream/scotty/core/windowType/ForwardContextFree.java @@ -0,0 +1,8 @@ +package stream.scotty.core.windowType; + +import stream.scotty.core.windowType.windowContext.*; + +public interface ForwardContextFree extends Window { + + WindowContext createContext(); +} diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/PunctuationWindow.java b/core/src/main/java/stream/scotty/core/windowType/PunctuationWindow.java similarity index 94% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/PunctuationWindow.java rename to core/src/main/java/stream/scotty/core/windowType/PunctuationWindow.java index 6ca7c5ec..d3b0e000 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/PunctuationWindow.java +++ b/core/src/main/java/stream/scotty/core/windowType/PunctuationWindow.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; -import de.tub.dima.scotty.core.WindowCollector; -import de.tub.dima.scotty.core.windowType.windowContext.WindowContext; +import stream.scotty.core.WindowCollector; +import stream.scotty.core.windowType.windowContext.WindowContext; import org.apache.flink.api.java.tuple.Tuple; public class PunctuationWindow implements ForwardContextFree { @@ -13,8 +13,8 @@ public class PunctuationWindow implements ForwardContextFree { /** * the measure of the Punctuation Window is time * @param punctuation defines how the punctuation tuple looks like - * @see de.tub.dima.scotty.slicing.aggregationstore.test.windowTest.PunctuationWindowTest - * and de.tub.dima.scotty.slicing.aggregationstore.test.windowTest.PunctuationWindowTupleTest + * @see stream.scotty.slicing.aggregationstore.test.windowTest.PunctuationWindowTest + * and stream.scotty.slicing.aggregationstore.test.windowTest.PunctuationWindowTupleTest * for examples for punctuations */ public PunctuationWindow(Object punctuation) { diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/SessionWindow.java b/core/src/main/java/stream/scotty/core/windowType/SessionWindow.java similarity index 96% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/SessionWindow.java rename to core/src/main/java/stream/scotty/core/windowType/SessionWindow.java index c30128aa..5ea37a79 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/SessionWindow.java +++ b/core/src/main/java/stream/scotty/core/windowType/SessionWindow.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; -import de.tub.dima.scotty.core.*; -import de.tub.dima.scotty.core.windowType.windowContext.*; +import stream.scotty.core.*; +import stream.scotty.core.windowType.windowContext.*; public class SessionWindow implements ForwardContextAware { diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/SlidingWindow.java b/core/src/main/java/stream/scotty/core/windowType/SlidingWindow.java similarity index 94% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/SlidingWindow.java rename to core/src/main/java/stream/scotty/core/windowType/SlidingWindow.java index 50aed683..4673b3d6 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/SlidingWindow.java +++ b/core/src/main/java/stream/scotty/core/windowType/SlidingWindow.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; -import de.tub.dima.scotty.core.*; -import de.tub.dima.scotty.core.*; +import stream.scotty.core.*; +import stream.scotty.core.*; public class SlidingWindow implements ContextFreeWindow { diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/TumblingWindow.java b/core/src/main/java/stream/scotty/core/windowType/TumblingWindow.java similarity index 91% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/TumblingWindow.java rename to core/src/main/java/stream/scotty/core/windowType/TumblingWindow.java index b0181c02..80e289fe 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/TumblingWindow.java +++ b/core/src/main/java/stream/scotty/core/windowType/TumblingWindow.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; -import de.tub.dima.scotty.core.*; -import de.tub.dima.scotty.core.*; +import stream.scotty.core.*; +import stream.scotty.core.*; public class TumblingWindow implements ContextFreeWindow { diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/TupleContext.java b/core/src/main/java/stream/scotty/core/windowType/TupleContext.java similarity index 78% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/TupleContext.java rename to core/src/main/java/stream/scotty/core/windowType/TupleContext.java index f2293edb..baf584e6 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/TupleContext.java +++ b/core/src/main/java/stream/scotty/core/windowType/TupleContext.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; public interface TupleContext { diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/Window.java b/core/src/main/java/stream/scotty/core/windowType/Window.java similarity index 58% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/Window.java rename to core/src/main/java/stream/scotty/core/windowType/Window.java index 7a9d2937..7229255c 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/Window.java +++ b/core/src/main/java/stream/scotty/core/windowType/Window.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; -import de.tub.dima.scotty.core.*; +import stream.scotty.core.*; import java.io.*; diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/WindowMeasure.java b/core/src/main/java/stream/scotty/core/windowType/WindowMeasure.java similarity index 51% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/WindowMeasure.java rename to core/src/main/java/stream/scotty/core/windowType/WindowMeasure.java index 8c3f5cf2..092c12ad 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/WindowMeasure.java +++ b/core/src/main/java/stream/scotty/core/windowType/WindowMeasure.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowType; +package stream.scotty.core.windowType; public enum WindowMeasure { Time, Count diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/AddModification.java b/core/src/main/java/stream/scotty/core/windowType/windowContext/AddModification.java similarity index 73% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/AddModification.java rename to core/src/main/java/stream/scotty/core/windowType/windowContext/AddModification.java index 2c898d15..a6a90a85 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/AddModification.java +++ b/core/src/main/java/stream/scotty/core/windowType/windowContext/AddModification.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowType.windowContext; +package stream.scotty.core.windowType.windowContext; public class AddModification implements WindowModifications { public final long post; diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/DeleteModification.java b/core/src/main/java/stream/scotty/core/windowType/windowContext/DeleteModification.java similarity index 74% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/DeleteModification.java rename to core/src/main/java/stream/scotty/core/windowType/windowContext/DeleteModification.java index 46b08920..c4492a16 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/DeleteModification.java +++ b/core/src/main/java/stream/scotty/core/windowType/windowContext/DeleteModification.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowType.windowContext; +package stream.scotty.core.windowType.windowContext; public class DeleteModification implements WindowModifications { public final long pre; diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/ShiftModification.java b/core/src/main/java/stream/scotty/core/windowType/windowContext/ShiftModification.java similarity index 79% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/ShiftModification.java rename to core/src/main/java/stream/scotty/core/windowType/windowContext/ShiftModification.java index 8bb0e4ba..16d8dbea 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/ShiftModification.java +++ b/core/src/main/java/stream/scotty/core/windowType/windowContext/ShiftModification.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.core.windowType.windowContext; +package stream.scotty.core.windowType.windowContext; public class ShiftModification implements WindowModifications { public final long pre; diff --git a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/WindowContext.java b/core/src/main/java/stream/scotty/core/windowType/windowContext/WindowContext.java similarity index 96% rename from core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/WindowContext.java rename to core/src/main/java/stream/scotty/core/windowType/windowContext/WindowContext.java index bb0730ed..67d71db9 100644 --- a/core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/WindowContext.java +++ b/core/src/main/java/stream/scotty/core/windowType/windowContext/WindowContext.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.core.windowType.windowContext; +package stream.scotty.core.windowType.windowContext; -import de.tub.dima.scotty.core.*; -import de.tub.dima.scotty.core.*; +import stream.scotty.core.*; +import stream.scotty.core.*; import java.io.*; import java.util.*; diff --git a/core/src/main/java/stream/scotty/core/windowType/windowContext/WindowModifications.java b/core/src/main/java/stream/scotty/core/windowType/windowContext/WindowModifications.java new file mode 100644 index 00000000..4ac32062 --- /dev/null +++ b/core/src/main/java/stream/scotty/core/windowType/windowContext/WindowModifications.java @@ -0,0 +1,4 @@ +package stream.scotty.core.windowType.windowContext; + +public interface WindowModifications { +} diff --git a/demo/beam-demo/pom.xml b/demo/beam-demo/pom.xml index 560b49b0..6bcb5f9d 100644 --- a/demo/beam-demo/pom.xml +++ b/demo/beam-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> demo - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 @@ -12,7 +12,7 @@ beam-demo - de.tub.dima.scotty + stream.scotty beam-connector 0.4 diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/BeamSumDemo.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/BeamSumDemo.java similarity index 75% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/BeamSumDemo.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/BeamSumDemo.java index 0a42e7b4..13d7dd4e 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/BeamSumDemo.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/BeamSumDemo.java @@ -1,13 +1,11 @@ -package de.tub.dima.scotty.demo.beam; - -import de.tub.dima.scotty.beamconnector.KeyedScottyWindowOperator; -import de.tub.dima.scotty.demo.beam.dataGenerator.DataGeneratorSource; -import de.tub.dima.scotty.demo.beam.dataGenerator.TimeStampGenerator; -import de.tub.dima.scotty.demo.beam.windowFunctions.Sum; -import de.tub.dima.scotty.core.windowType.SessionWindow; -import de.tub.dima.scotty.core.windowType.SlidingWindow; -import de.tub.dima.scotty.core.windowType.TumblingWindow; -import de.tub.dima.scotty.core.windowType.WindowMeasure; +package stream.scotty.demo.beam; + +import stream.scotty.beamconnector.KeyedScottyWindowOperator; +import stream.scotty.demo.beam.dataGenerator.DataGeneratorSource; +import stream.scotty.demo.beam.dataGenerator.TimeStampGenerator; +import stream.scotty.demo.beam.windowFunctions.Sum; +import stream.scotty.core.windowType.TumblingWindow; +import stream.scotty.core.windowType.WindowMeasure; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.io.Read; import org.apache.beam.sdk.options.PipelineOptions; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/Checkpoint.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/Checkpoint.java similarity index 96% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/Checkpoint.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/Checkpoint.java index bd6f1c44..c0e95f95 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/Checkpoint.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/Checkpoint.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.beam.dataGenerator; +package stream.scotty.demo.beam.dataGenerator; import org.apache.beam.sdk.coders.AvroCoder; import org.apache.beam.sdk.coders.DefaultCoder; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/DataGeneratorReader.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/DataGeneratorReader.java similarity index 98% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/DataGeneratorReader.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/DataGeneratorReader.java index 6940c831..97e948a2 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/DataGeneratorReader.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/DataGeneratorReader.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.beam.dataGenerator; +package stream.scotty.demo.beam.dataGenerator; import org.apache.beam.sdk.io.UnboundedSource; import org.apache.beam.sdk.values.KV; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/DataGeneratorSource.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/DataGeneratorSource.java similarity index 97% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/DataGeneratorSource.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/DataGeneratorSource.java index e528eae4..cebfd9ab 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/DataGeneratorSource.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/DataGeneratorSource.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.beam.dataGenerator; +package stream.scotty.demo.beam.dataGenerator; import org.apache.beam.sdk.coders.AvroCoder; import org.apache.beam.sdk.coders.Coder; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/TimeStampGenerator.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/TimeStampGenerator.java similarity index 98% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/TimeStampGenerator.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/TimeStampGenerator.java index c170ad15..6e9eb847 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/dataGenerator/TimeStampGenerator.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/dataGenerator/TimeStampGenerator.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.beam.dataGenerator; +package stream.scotty.demo.beam.dataGenerator; import org.apache.beam.sdk.transforms.SerializableFunction; import org.joda.time.Duration; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Count.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Count.java similarity index 85% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Count.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Count.java index d8dce7f5..7dc01fc6 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Count.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Count.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.beam.windowFunctions; +package stream.scotty.demo.beam.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.InvertibleReduceAggregateFunction; +import stream.scotty.core.windowFunction.InvertibleReduceAggregateFunction; import org.apache.beam.sdk.values.KV; import java.io.Serializable; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Max.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Max.java similarity index 77% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Max.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Max.java index 8225b3b8..8aef7b6e 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Max.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Max.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.beam.windowFunctions; +package stream.scotty.demo.beam.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; import org.apache.beam.sdk.values.KV; import java.io.Serializable; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Mean.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Mean.java similarity index 91% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Mean.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Mean.java index 7f2c5a3e..f626d288 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Mean.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Mean.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.beam.windowFunctions; +package stream.scotty.demo.beam.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowFunction.AggregateFunction; import org.apache.beam.sdk.values.KV; import java.io.Serializable; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Min.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Min.java similarity index 77% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Min.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Min.java index 5e001a7c..8e1326c1 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Min.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Min.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.beam.windowFunctions; +package stream.scotty.demo.beam.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; import org.apache.beam.sdk.values.KV; import java.io.Serializable; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Quantile.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Quantile.java similarity index 88% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Quantile.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Quantile.java index 4e03a546..a7049aa6 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Quantile.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Quantile.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.demo.beam.windowFunctions; +package stream.scotty.demo.beam.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; -import de.tub.dima.scotty.core.windowFunction.CloneablePartialStateFunction; +import stream.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowFunction.CloneablePartialStateFunction; import org.apache.beam.sdk.values.KV; import java.io.Serializable; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/QuantileTreeMap.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/QuantileTreeMap.java similarity index 98% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/QuantileTreeMap.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/QuantileTreeMap.java index 738a2df8..84269b2a 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/QuantileTreeMap.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/QuantileTreeMap.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.beam.windowFunctions; +package stream.scotty.demo.beam.windowFunctions; import java.util.Map; import java.util.TreeMap; diff --git a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Sum.java b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Sum.java similarity index 82% rename from demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Sum.java rename to demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Sum.java index 6d2ee3c4..d2940ccb 100644 --- a/demo/beam-demo/src/main/java/de/tub/dima/scotty/demo/beam/windowFunctions/Sum.java +++ b/demo/beam-demo/src/main/java/stream/scotty/demo/beam/windowFunctions/Sum.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.beam.windowFunctions; +package stream.scotty.demo.beam.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.InvertibleReduceAggregateFunction; +import stream.scotty.core.windowFunction.InvertibleReduceAggregateFunction; import org.apache.beam.sdk.values.KV; import java.io.Serializable; diff --git a/demo/flink-demo/pom.xml b/demo/flink-demo/pom.xml index 67105aff..9ede474c 100644 --- a/demo/flink-demo/pom.xml +++ b/demo/flink-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> demo - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 @@ -12,7 +12,7 @@ flink-demo - de.tub.dima.scotty + stream.scotty flink-connector 0.4 diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/DemoSource.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/DemoSource.java similarity index 97% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/DemoSource.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/DemoSource.java index 8869ffe3..fa2c9b3b 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/DemoSource.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/DemoSource.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.flink; +package stream.scotty.demo.flink; import org.apache.flink.api.java.tuple.*; import org.apache.flink.configuration.*; diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkPunctuationDemo.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkPunctuationDemo.java similarity index 85% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkPunctuationDemo.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkPunctuationDemo.java index 6066a216..6ab32683 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkPunctuationDemo.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkPunctuationDemo.java @@ -1,8 +1,8 @@ -package de.tub.dima.scotty.demo.flink; +package stream.scotty.demo.flink; -import de.tub.dima.scotty.core.windowType.PunctuationWindow; -import de.tub.dima.scotty.demo.flink.windowFunctions.SumWindowFunction; -import de.tub.dima.scotty.flinkconnector.KeyedScottyWindowOperator; +import stream.scotty.core.windowType.PunctuationWindow; +import stream.scotty.demo.flink.windowFunctions.SumWindowFunction; +import stream.scotty.flinkconnector.KeyedScottyWindowOperator; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.api.TimeCharacteristic; diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkQuantileDemo.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkQuantileDemo.java similarity index 85% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkQuantileDemo.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkQuantileDemo.java index 486a01b8..84000a99 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkQuantileDemo.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkQuantileDemo.java @@ -1,8 +1,8 @@ -package de.tub.dima.scotty.demo.flink; +package stream.scotty.demo.flink; -import de.tub.dima.scotty.core.windowType.*; -import de.tub.dima.scotty.flinkconnector.*; -import de.tub.dima.scotty.demo.flink.windowFunctions.*; +import stream.scotty.core.windowType.*; +import stream.scotty.flinkconnector.*; +import stream.scotty.demo.flink.windowFunctions.*; import org.apache.flink.api.java.tuple.*; import org.apache.flink.streaming.api.*; import org.apache.flink.streaming.api.datastream.*; diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkSumCountWindowDemo.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkSumCountWindowDemo.java similarity index 85% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkSumCountWindowDemo.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkSumCountWindowDemo.java index 8a64b5d4..5091299a 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkSumCountWindowDemo.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkSumCountWindowDemo.java @@ -1,8 +1,8 @@ -package de.tub.dima.scotty.demo.flink; +package stream.scotty.demo.flink; -import de.tub.dima.scotty.core.windowType.*; -import de.tub.dima.scotty.flinkconnector.*; -import de.tub.dima.scotty.demo.flink.windowFunctions.*; +import stream.scotty.core.windowType.*; +import stream.scotty.flinkconnector.*; +import stream.scotty.demo.flink.windowFunctions.*; import org.apache.flink.api.java.tuple.*; import org.apache.flink.streaming.api.*; import org.apache.flink.streaming.api.datastream.*; diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkSumDemo.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkSumDemo.java similarity index 86% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkSumDemo.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkSumDemo.java index 7fbbc1d5..8a76b6ae 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/FlinkSumDemo.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/FlinkSumDemo.java @@ -1,8 +1,8 @@ -package de.tub.dima.scotty.demo.flink; +package stream.scotty.demo.flink; -import de.tub.dima.scotty.core.windowType.*; -import de.tub.dima.scotty.flinkconnector.*; -import de.tub.dima.scotty.demo.flink.windowFunctions.*; +import stream.scotty.core.windowType.*; +import stream.scotty.flinkconnector.*; +import stream.scotty.demo.flink.windowFunctions.*; import org.apache.flink.api.java.tuple.*; import org.apache.flink.streaming.api.*; import org.apache.flink.streaming.api.datastream.*; diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/MaxWindowFunction.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/MaxWindowFunction.java similarity index 80% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/MaxWindowFunction.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/MaxWindowFunction.java index 3ad91382..8ceeccda 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/MaxWindowFunction.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/MaxWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.flink.windowFunctions; +package stream.scotty.demo.flink.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.*; +import stream.scotty.core.windowFunction.*; import org.apache.flink.api.java.tuple.*; import java.io.*; diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/MinWindowFunction.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/MinWindowFunction.java similarity index 80% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/MinWindowFunction.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/MinWindowFunction.java index f4f60138..5e9b105b 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/MinWindowFunction.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/MinWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.flink.windowFunctions; +package stream.scotty.demo.flink.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.*; +import stream.scotty.core.windowFunction.*; import org.apache.flink.api.java.tuple.*; import java.io.*; diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/QuantileTreeMap.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/QuantileTreeMap.java similarity index 98% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/QuantileTreeMap.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/QuantileTreeMap.java index 4624f587..e6f009e2 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/QuantileTreeMap.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/QuantileTreeMap.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.flink.windowFunctions; +package stream.scotty.demo.flink.windowFunctions; import java.util.Map; import java.util.TreeMap; diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/QuantileWindowFunction.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/QuantileWindowFunction.java similarity index 93% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/QuantileWindowFunction.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/QuantileWindowFunction.java index ac01ef32..3ac37f28 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/QuantileWindowFunction.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/QuantileWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.flink.windowFunctions; +package stream.scotty.demo.flink.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.*; +import stream.scotty.core.windowFunction.*; import org.apache.flink.api.java.tuple.*; public class QuantileWindowFunction implements AggregateFunction, diff --git a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/SumWindowFunction.java b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/SumWindowFunction.java similarity index 86% rename from demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/SumWindowFunction.java rename to demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/SumWindowFunction.java index b26e93e8..b29284e0 100644 --- a/demo/flink-demo/src/main/java/de/tub/dima/scotty/demo/flink/windowFunctions/SumWindowFunction.java +++ b/demo/flink-demo/src/main/java/stream/scotty/demo/flink/windowFunctions/SumWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.flink.windowFunctions; +package stream.scotty.demo.flink.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.*; +import stream.scotty.core.windowFunction.*; import org.apache.flink.api.java.tuple.*; import java.io.*; diff --git a/demo/kafka-demo/pom.xml b/demo/kafka-demo/pom.xml index dc66211f..71d0c737 100644 --- a/demo/kafka-demo/pom.xml +++ b/demo/kafka-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> demo - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 @@ -12,7 +12,7 @@ kafka-demo - de.tub.dima.scotty + stream.scotty kafkaStreams-connector 0.4 diff --git a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/DemoKafkaProducer.java b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/DemoKafkaProducer.java similarity index 96% rename from demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/DemoKafkaProducer.java rename to demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/DemoKafkaProducer.java index 9732fa11..b6e87729 100644 --- a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/DemoKafkaProducer.java +++ b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/DemoKafkaProducer.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.kafkaStreams; +package stream.scotty.demo.kafkaStreams; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/DemoPrinter.java b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/DemoPrinter.java similarity index 92% rename from demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/DemoPrinter.java rename to demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/DemoPrinter.java index 77800a43..7117f68f 100644 --- a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/DemoPrinter.java +++ b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/DemoPrinter.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.kafkaStreams; +package stream.scotty.demo.kafkaStreams; import org.apache.kafka.streams.processor.Processor; import org.apache.kafka.streams.processor.ProcessorContext; diff --git a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/KafkaStreamsSumDemo.java b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/KafkaStreamsSumDemo.java similarity index 84% rename from demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/KafkaStreamsSumDemo.java rename to demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/KafkaStreamsSumDemo.java index 4039aba4..7f2f7783 100644 --- a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/KafkaStreamsSumDemo.java +++ b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/KafkaStreamsSumDemo.java @@ -1,11 +1,10 @@ -package de.tub.dima.scotty.demo.kafkaStreams; +package stream.scotty.demo.kafkaStreams; -import de.tub.dima.scotty.core.windowType.SlidingWindow; -import de.tub.dima.scotty.core.windowType.TumblingWindow; -import de.tub.dima.scotty.core.windowType.WindowMeasure; -import de.tub.dima.scotty.kafkastreamsconnector.KeyedScottyWindowOperator; -import de.tub.dima.scotty.kafkastreamsconnector.KeyedScottyWindowOperatorSupplier; -import de.tub.dima.scotty.demo.kafkaStreams.windowFunctions.SumWindowFunction; +import stream.scotty.core.windowType.SlidingWindow; +import stream.scotty.core.windowType.TumblingWindow; +import stream.scotty.core.windowType.WindowMeasure; +import stream.scotty.kafkastreamsconnector.KeyedScottyWindowOperatorSupplier; +import stream.scotty.demo.kafkaStreams.windowFunctions.SumWindowFunction; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsConfig; diff --git a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/MaxWindowFunction.java b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/MaxWindowFunction.java similarity index 66% rename from demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/MaxWindowFunction.java rename to demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/MaxWindowFunction.java index fee982c6..8e91ce3e 100644 --- a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/MaxWindowFunction.java +++ b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/MaxWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.samza.windowFunctions; +package stream.scotty.demo.kafkaStreams.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; public class MaxWindowFunction implements ReduceAggregateFunction { @Override diff --git a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/MinWindowFunction.java b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/MinWindowFunction.java similarity index 66% rename from demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/MinWindowFunction.java rename to demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/MinWindowFunction.java index f8bf71da..bb21eadd 100644 --- a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/MinWindowFunction.java +++ b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/MinWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.samza.windowFunctions; +package stream.scotty.demo.kafkaStreams.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; public class MinWindowFunction implements ReduceAggregateFunction { @Override diff --git a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/QuantileTreeMap.java b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/QuantileTreeMap.java similarity index 98% rename from demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/QuantileTreeMap.java rename to demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/QuantileTreeMap.java index 46508293..169ca093 100644 --- a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/QuantileTreeMap.java +++ b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/QuantileTreeMap.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.kafkaStreams.windowFunctions; +package stream.scotty.demo.kafkaStreams.windowFunctions; import java.util.Map; import java.util.TreeMap; diff --git a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/QuantileWindowFunction.java b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/QuantileWindowFunction.java similarity index 84% rename from demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/QuantileWindowFunction.java rename to demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/QuantileWindowFunction.java index f6406177..f0844deb 100644 --- a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/QuantileWindowFunction.java +++ b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/QuantileWindowFunction.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.demo.samza.windowFunctions; +package stream.scotty.demo.kafkaStreams.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; -import de.tub.dima.scotty.core.windowFunction.CloneablePartialStateFunction; +import stream.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowFunction.CloneablePartialStateFunction; public class QuantileWindowFunction implements AggregateFunction, CloneablePartialStateFunction { private final double quantile; @@ -36,3 +36,4 @@ public QuantileTreeMap clone(QuantileTreeMap partialAggregate) { return partialAggregate.clone(); } } + diff --git a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/SumWindowFunction.java b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/SumWindowFunction.java similarity index 72% rename from demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/SumWindowFunction.java rename to demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/SumWindowFunction.java index cf194c83..91512958 100644 --- a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/SumWindowFunction.java +++ b/demo/kafka-demo/src/main/java/stream/scotty/demo/kafkaStreams/windowFunctions/SumWindowFunction.java @@ -1,5 +1,5 @@ -package de.tub.dima.scotty.demo.kafkaStreams.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.InvertibleReduceAggregateFunction; +package stream.scotty.demo.kafkaStreams.windowFunctions; +import stream.scotty.core.windowFunction.InvertibleReduceAggregateFunction; public class SumWindowFunction implements InvertibleReduceAggregateFunction { @Override diff --git a/demo/pom.xml b/demo/pom.xml index e4d0d042..b33c4d70 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> parent - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 diff --git a/demo/samza-demo/pom.xml b/demo/samza-demo/pom.xml index 0e539b0c..8bc3ef38 100644 --- a/demo/samza-demo/pom.xml +++ b/demo/samza-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> demo - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 @@ -12,7 +12,7 @@ samza-demo - de.tub.dima.scotty + stream.scotty samza-connector 0.4 diff --git a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/DemoKafkaProducer.java b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/DemoKafkaProducer.java similarity index 97% rename from demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/DemoKafkaProducer.java rename to demo/samza-demo/src/main/java/stream/scotty/demo/samza/DemoKafkaProducer.java index 9c5894ba..6ae19bf6 100644 --- a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/DemoKafkaProducer.java +++ b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/DemoKafkaProducer.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.samza; +package stream.scotty.demo.samza; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/DemoTaskFactory.java b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/DemoTaskFactory.java similarity index 73% rename from demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/DemoTaskFactory.java rename to demo/samza-demo/src/main/java/stream/scotty/demo/samza/DemoTaskFactory.java index 3356db88..d9035806 100644 --- a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/DemoTaskFactory.java +++ b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/DemoTaskFactory.java @@ -1,10 +1,10 @@ -package de.tub.dima.scotty.demo.samza; +package stream.scotty.demo.samza; -import de.tub.dima.scotty.core.windowType.SlidingWindow; -import de.tub.dima.scotty.core.windowType.TumblingWindow; -import de.tub.dima.scotty.core.windowType.WindowMeasure; -import de.tub.dima.scotty.samzaconnector.KeyedScottyWindowOperator; -import de.tub.dima.scotty.demo.samza.windowFunctions.SumWindowFunction; +import stream.scotty.core.windowType.SlidingWindow; +import stream.scotty.core.windowType.TumblingWindow; +import stream.scotty.core.windowType.WindowMeasure; +import stream.scotty.samzaconnector.KeyedScottyWindowOperator; +import stream.scotty.demo.samza.windowFunctions.SumWindowFunction; import org.apache.samza.system.SystemStream; import org.apache.samza.task.StreamTask; import org.apache.samza.task.StreamTaskFactory; diff --git a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/SamzaSumDemo.java b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/SamzaSumDemo.java similarity index 98% rename from demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/SamzaSumDemo.java rename to demo/samza-demo/src/main/java/stream/scotty/demo/samza/SamzaSumDemo.java index a8c0a0e4..433735ba 100644 --- a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/SamzaSumDemo.java +++ b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/SamzaSumDemo.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.samza; +package stream.scotty.demo.samza; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/MaxWindowFunction.java b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/MaxWindowFunction.java similarity index 66% rename from demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/MaxWindowFunction.java rename to demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/MaxWindowFunction.java index 54b75e7e..a9f38bfa 100644 --- a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/MaxWindowFunction.java +++ b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/MaxWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.spark.windowFunctions; +package stream.scotty.demo.samza.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; public class MaxWindowFunction implements ReduceAggregateFunction { @Override diff --git a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/MinWindowFunction.java b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/MinWindowFunction.java similarity index 66% rename from demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/MinWindowFunction.java rename to demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/MinWindowFunction.java index fe0a25ee..a462846a 100644 --- a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/MinWindowFunction.java +++ b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/MinWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.spark.windowFunctions; +package stream.scotty.demo.samza.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; public class MinWindowFunction implements ReduceAggregateFunction { @Override diff --git a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/QuantileTreeMap.java b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/QuantileTreeMap.java similarity index 98% rename from demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/QuantileTreeMap.java rename to demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/QuantileTreeMap.java index 136c2331..0c1ce5dc 100644 --- a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/QuantileTreeMap.java +++ b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/QuantileTreeMap.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.samza.windowFunctions; +package stream.scotty.demo.samza.windowFunctions; import java.util.Map; import java.util.TreeMap; diff --git a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/QuantileWindowFunction.java b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/QuantileWindowFunction.java similarity index 84% rename from demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/QuantileWindowFunction.java rename to demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/QuantileWindowFunction.java index 8f51818c..f7af76c1 100644 --- a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/QuantileWindowFunction.java +++ b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/QuantileWindowFunction.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.demo.spark.windowFunctions; +package stream.scotty.demo.samza.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; -import de.tub.dima.scotty.core.windowFunction.CloneablePartialStateFunction; +import stream.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowFunction.CloneablePartialStateFunction; public class QuantileWindowFunction implements AggregateFunction, CloneablePartialStateFunction { private final double quantile; diff --git a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/SumWindowFunction.java b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/SumWindowFunction.java similarity index 73% rename from demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/SumWindowFunction.java rename to demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/SumWindowFunction.java index c8434494..bcb6f30c 100644 --- a/demo/samza-demo/src/main/java/de/tub/dima/scotty/demo/samza/windowFunctions/SumWindowFunction.java +++ b/demo/samza-demo/src/main/java/stream/scotty/demo/samza/windowFunctions/SumWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.samza.windowFunctions; +package stream.scotty.demo.samza.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.InvertibleReduceAggregateFunction; +import stream.scotty.core.windowFunction.InvertibleReduceAggregateFunction; public class SumWindowFunction implements InvertibleReduceAggregateFunction { @Override diff --git a/demo/spark-demo/pom.xml b/demo/spark-demo/pom.xml index cfd50ac0..9a8df7a8 100644 --- a/demo/spark-demo/pom.xml +++ b/demo/spark-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> demo - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 @@ -12,7 +12,7 @@ spark-demo - de.tub.dima.scotty + stream.scotty spark-connector 0.4 diff --git a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/DemoKafkaProducer.java b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/DemoKafkaProducer.java similarity index 97% rename from demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/DemoKafkaProducer.java rename to demo/spark-demo/src/main/java/stream/scotty/demo/spark/DemoKafkaProducer.java index d3c013a2..29099df5 100644 --- a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/DemoKafkaProducer.java +++ b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/DemoKafkaProducer.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.spark; +package stream.scotty.demo.spark; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/SparkSumDemo.java b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/SparkSumDemo.java similarity index 88% rename from demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/SparkSumDemo.java rename to demo/spark-demo/src/main/java/stream/scotty/demo/spark/SparkSumDemo.java index 538c0d15..5d335af2 100644 --- a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/SparkSumDemo.java +++ b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/SparkSumDemo.java @@ -1,9 +1,9 @@ -package de.tub.dima.scotty.demo.spark; +package stream.scotty.demo.spark; -import de.tub.dima.scotty.core.windowType.SlidingWindow; -import de.tub.dima.scotty.core.windowType.TumblingWindow; -import de.tub.dima.scotty.core.windowType.WindowMeasure; -import de.tub.dima.scotty.sparkconnector.demo.DemoEvent; +import stream.scotty.core.windowType.SlidingWindow; +import stream.scotty.core.windowType.TumblingWindow; +import stream.scotty.core.windowType.WindowMeasure; +import stream.scotty.sparkconnector.demo.DemoEvent; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.spark.api.java.function.MapFunction; @@ -13,8 +13,8 @@ import org.apache.spark.sql.streaming.StreamingQuery; import org.apache.spark.sql.streaming.Trigger; import scala.Tuple3; -import de.tub.dima.scotty.sparkconnector.KeyedScottyWindowOperator; -import de.tub.dima.scotty.demo.spark.windowFunctions.SumWindowFunction; +import stream.scotty.sparkconnector.KeyedScottyWindowOperator; +import stream.scotty.demo.spark.windowFunctions.SumWindowFunction; import java.sql.Timestamp; diff --git a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/MaxWindowFunction.java b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/MaxWindowFunction.java similarity index 64% rename from demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/MaxWindowFunction.java rename to demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/MaxWindowFunction.java index 5e3ec8c4..1331ce63 100644 --- a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/MaxWindowFunction.java +++ b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/MaxWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.kafkaStreams.windowFunctions; +package stream.scotty.demo.spark.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; public class MaxWindowFunction implements ReduceAggregateFunction { @Override diff --git a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/MinWindowFunction.java b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/MinWindowFunction.java similarity index 65% rename from demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/MinWindowFunction.java rename to demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/MinWindowFunction.java index 0bf57cfe..59c4d702 100644 --- a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/MinWindowFunction.java +++ b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/MinWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.kafkaStreams.windowFunctions; +package stream.scotty.demo.spark.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; public class MinWindowFunction implements ReduceAggregateFunction { @Override diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/QuantileTreeMap.java b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/QuantileTreeMap.java similarity index 98% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/QuantileTreeMap.java rename to demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/QuantileTreeMap.java index 17b57c43..8bfd91f6 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/QuantileTreeMap.java +++ b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/QuantileTreeMap.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.storm.windowFunctions; +package stream.scotty.demo.spark.windowFunctions; import java.util.Map; import java.util.TreeMap; diff --git a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/QuantileWindowFunction.java b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/QuantileWindowFunction.java similarity index 83% rename from demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/QuantileWindowFunction.java rename to demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/QuantileWindowFunction.java index 7e9f2d7d..95dafeea 100644 --- a/demo/kafka-demo/src/main/java/de/tub/dima/scotty/demo/kafkaStreams/windowFunctions/QuantileWindowFunction.java +++ b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/QuantileWindowFunction.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.demo.kafkaStreams.windowFunctions; +package stream.scotty.demo.spark.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; -import de.tub.dima.scotty.core.windowFunction.CloneablePartialStateFunction; +import stream.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowFunction.CloneablePartialStateFunction; public class QuantileWindowFunction implements AggregateFunction, CloneablePartialStateFunction { private final double quantile; @@ -36,4 +36,3 @@ public QuantileTreeMap clone(QuantileTreeMap partialAggregate) { return partialAggregate.clone(); } } - diff --git a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/SumWindowFunction.java b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/SumWindowFunction.java similarity index 73% rename from demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/SumWindowFunction.java rename to demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/SumWindowFunction.java index 61bcbc7b..6bddd06c 100644 --- a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/SumWindowFunction.java +++ b/demo/spark-demo/src/main/java/stream/scotty/demo/spark/windowFunctions/SumWindowFunction.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.spark.windowFunctions; +package stream.scotty.demo.spark.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.InvertibleReduceAggregateFunction; +import stream.scotty.core.windowFunction.InvertibleReduceAggregateFunction; public class SumWindowFunction implements InvertibleReduceAggregateFunction { @Override diff --git a/demo/storm-demo/pom.xml b/demo/storm-demo/pom.xml index 2597208b..765d61ab 100644 --- a/demo/storm-demo/pom.xml +++ b/demo/storm-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> demo - de.tub.dima.scotty + stream.scotty 0.4 4.0.0 @@ -12,7 +12,7 @@ storm-demo - de.tub.dima.scotty + stream.scotty storm-connector 0.4 diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/DataGeneratorSpout.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/DataGeneratorSpout.java similarity index 98% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/DataGeneratorSpout.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/DataGeneratorSpout.java index 3bb8adb4..92832034 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/DataGeneratorSpout.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/DataGeneratorSpout.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.storm; +package stream.scotty.demo.storm; import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/PrinterBolt.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/PrinterBolt.java similarity index 97% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/PrinterBolt.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/PrinterBolt.java index 2f4145b5..a89fbcf7 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/PrinterBolt.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/PrinterBolt.java @@ -10,7 +10,7 @@ * and limitations under the License. */ -package de.tub.dima.scotty.demo.storm; +package stream.scotty.demo.storm; import org.apache.storm.topology.BasicOutputCollector; import org.apache.storm.topology.OutputFieldsDeclarer; diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/ScottyDemoTopology.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/ScottyDemoTopology.java similarity index 79% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/ScottyDemoTopology.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/ScottyDemoTopology.java index 9f50c511..4f304c86 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/ScottyDemoTopology.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/ScottyDemoTopology.java @@ -1,11 +1,11 @@ -package de.tub.dima.scotty.demo.storm; - -import de.tub.dima.scotty.core.windowType.SessionWindow; -import de.tub.dima.scotty.core.windowType.SlidingWindow; -import de.tub.dima.scotty.core.windowType.TumblingWindow; -import de.tub.dima.scotty.core.windowType.WindowMeasure; -import de.tub.dima.scotty.stormconnector.KeyedScottyWindowOperator; -import de.tub.dima.scotty.demo.storm.windowFunctions.Sum; +package stream.scotty.demo.storm; + +import stream.scotty.core.windowType.SessionWindow; +import stream.scotty.core.windowType.SlidingWindow; +import stream.scotty.core.windowType.TumblingWindow; +import stream.scotty.core.windowType.WindowMeasure; +import stream.scotty.stormconnector.KeyedScottyWindowOperator; +import stream.scotty.demo.storm.windowFunctions.Sum; import org.apache.storm.Config; import org.apache.storm.LocalCluster; import org.apache.storm.topology.TopologyBuilder; diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Count.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Count.java similarity index 76% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Count.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Count.java index 9608bdc8..f71db021 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Count.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Count.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.storm.windowFunctions; +package stream.scotty.demo.storm.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.InvertibleReduceAggregateFunction; +import stream.scotty.core.windowFunction.InvertibleReduceAggregateFunction; public class Count implements InvertibleReduceAggregateFunction { diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Max.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Max.java similarity index 64% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Max.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Max.java index 74a9752c..a335024e 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Max.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Max.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.storm.windowFunctions; +package stream.scotty.demo.storm.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; public class Max implements ReduceAggregateFunction { diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Mean.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Mean.java similarity index 87% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Mean.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Mean.java index a92bcd47..9d52bc5e 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Mean.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Mean.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.storm.windowFunctions; +package stream.scotty.demo.storm.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowFunction.AggregateFunction; public class Mean implements AggregateFunction { diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Min.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Min.java similarity index 64% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Min.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Min.java index 12dd0771..acfca268 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Min.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Min.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.storm.windowFunctions; +package stream.scotty.demo.storm.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction; +import stream.scotty.core.windowFunction.ReduceAggregateFunction; public class Min implements ReduceAggregateFunction { diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Quantile.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Quantile.java similarity index 83% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Quantile.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Quantile.java index b1c1ed65..c9a5b14f 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Quantile.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Quantile.java @@ -1,7 +1,7 @@ -package de.tub.dima.scotty.demo.storm.windowFunctions; +package stream.scotty.demo.storm.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.AggregateFunction; -import de.tub.dima.scotty.core.windowFunction.CloneablePartialStateFunction; +import stream.scotty.core.windowFunction.AggregateFunction; +import stream.scotty.core.windowFunction.CloneablePartialStateFunction; public class Quantile implements AggregateFunction, CloneablePartialStateFunction { private final double quantile; diff --git a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/QuantileTreeMap.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/QuantileTreeMap.java similarity index 98% rename from demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/QuantileTreeMap.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/QuantileTreeMap.java index 6a5ab551..1f6191e0 100644 --- a/demo/spark-demo/src/main/java/de/tub/dima/scotty/demo/spark/windowFunctions/QuantileTreeMap.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/QuantileTreeMap.java @@ -1,4 +1,4 @@ -package de.tub.dima.scotty.demo.spark.windowFunctions; +package stream.scotty.demo.storm.windowFunctions; import java.util.Map; import java.util.TreeMap; diff --git a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Sum.java b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Sum.java similarity index 73% rename from demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Sum.java rename to demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Sum.java index bb0d99ce..28537820 100644 --- a/demo/storm-demo/src/main/java/de/tub/dima/scotty/demo/storm/windowFunctions/Sum.java +++ b/demo/storm-demo/src/main/java/stream/scotty/demo/storm/windowFunctions/Sum.java @@ -1,6 +1,6 @@ -package de.tub.dima.scotty.demo.storm.windowFunctions; +package stream.scotty.demo.storm.windowFunctions; -import de.tub.dima.scotty.core.windowFunction.InvertibleReduceAggregateFunction; +import stream.scotty.core.windowFunction.InvertibleReduceAggregateFunction; public class Sum implements InvertibleReduceAggregateFunction { @Override diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index 664104b6..adbcde5d 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -12,82 +12,82 @@

All Classes

diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index eedd244f..a1d909d5 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -12,82 +12,82 @@

All Classes

diff --git a/docs/de/tub/dima/scotty/core/AggregateWindow.html b/docs/de/tub/dima/scotty/core/AggregateWindow.html index 22028aec..9b1c4638 100644 --- a/docs/de/tub/dima/scotty/core/AggregateWindow.html +++ b/docs/de/tub/dima/scotty/core/AggregateWindow.html @@ -49,7 +49,7 @@