diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/DefaultPartitioner.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/DefaultPartitioner.java similarity index 93% rename from sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/DefaultPartitioner.java rename to sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/DefaultPartitioner.java index 131e327876e79..2a1c5bcaee985 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/DefaultPartitioner.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/DefaultPartitioner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cz.seznam.euphoria.core.client.dataset; +package cz.seznam.euphoria.core.client.dataset.partitioning; /** * Default partitioner used in {@link Partitioning}. It is has its own type diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/HashPartitioner.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/HashPartitioner.java similarity index 92% rename from sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/HashPartitioner.java rename to sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/HashPartitioner.java index 10912a678bba7..a8025a0e04b73 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/HashPartitioner.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/HashPartitioner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cz.seznam.euphoria.core.client.dataset; +package cz.seznam.euphoria.core.client.dataset.partitioning; /** * Partitioner by hash of input. diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/HashPartitioning.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/HashPartitioning.java similarity index 94% rename from sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/HashPartitioning.java rename to sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/HashPartitioning.java index 7f92a3e70b753..8594c1d2ed210 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/HashPartitioning.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/HashPartitioning.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cz.seznam.euphoria.core.client.dataset; +package cz.seznam.euphoria.core.client.dataset.partitioning; /** * Partitioning by hashcode of input. diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/Partitioner.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/Partitioner.java similarity index 94% rename from sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/Partitioner.java rename to sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/Partitioner.java index cbc7694a7d746..d35d14099d216 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/Partitioner.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/Partitioner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cz.seznam.euphoria.core.client.dataset; +package cz.seznam.euphoria.core.client.dataset.partitioning; import java.io.Serializable; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/Partitioning.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/Partitioning.java similarity index 95% rename from sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/Partitioning.java rename to sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/Partitioning.java index 56f6847cb81c4..1ae5200c22b89 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/Partitioning.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/dataset/partitioning/Partitioning.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cz.seznam.euphoria.core.client.dataset; +package cz.seznam.euphoria.core.client.dataset.partitioning; import java.io.Serializable; @@ -23,7 +23,7 @@ * @param the type of elements this partitioning scheme is able to handle */ public interface Partitioning extends Serializable { - + Partitioner DEFAULT_PARTITIONER = new DefaultPartitioner(); /** @return the actual partitioner */ diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/CountByKey.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/CountByKey.java index d542e0737f4d8..64604c78a5294 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/CountByKey.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/CountByKey.java @@ -18,7 +18,7 @@ import cz.seznam.euphoria.core.annotation.operator.Derived; import cz.seznam.euphoria.core.annotation.operator.StateComplexity; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/DefaultPartitioning.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/DefaultPartitioning.java index b422bab10d1e7..74ad19df86bf4 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/DefaultPartitioning.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/DefaultPartitioning.java @@ -15,8 +15,8 @@ */ package cz.seznam.euphoria.core.client.operator; -import cz.seznam.euphoria.core.client.dataset.Partitioner; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import java.util.Objects; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Distinct.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Distinct.java index f05c7d50cf9b0..ae2b98877dd4d 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Distinct.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Distinct.java @@ -18,7 +18,7 @@ import cz.seznam.euphoria.core.annotation.operator.Recommended; import cz.seznam.euphoria.core.annotation.operator.StateComplexity; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Join.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Join.java index 976af510caeb1..885b151b18314 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Join.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Join.java @@ -18,7 +18,7 @@ import cz.seznam.euphoria.core.annotation.operator.Recommended; import cz.seznam.euphoria.core.annotation.operator.StateComplexity; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/PartitioningAware.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/PartitioningAware.java index c44bbcd0b2318..928d64f3506d0 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/PartitioningAware.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/PartitioningAware.java @@ -15,8 +15,8 @@ */ package cz.seznam.euphoria.core.client.operator; -import cz.seznam.euphoria.core.client.dataset.Partitioner; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import java.util.Objects; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceByKey.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceByKey.java index 76857d12be280..9520330aac7fb 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceByKey.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceByKey.java @@ -19,7 +19,7 @@ import cz.seznam.euphoria.core.annotation.operator.StateComplexity; import cz.seznam.euphoria.core.client.operator.state.State; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceStateByKey.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceStateByKey.java index ae74137a5e7b0..674229d96d158 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceStateByKey.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceStateByKey.java @@ -18,7 +18,7 @@ import cz.seznam.euphoria.core.annotation.operator.Basic; import cz.seznam.euphoria.core.annotation.operator.StateComplexity; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceWindow.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceWindow.java index 579f20c5e4e95..2d572c5b106dd 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceWindow.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/ReduceWindow.java @@ -18,8 +18,8 @@ import cz.seznam.euphoria.core.annotation.operator.Derived; import cz.seznam.euphoria.core.annotation.operator.StateComplexity; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioner; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Repartition.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Repartition.java index 3c94985a44231..24c31c69cd40f 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Repartition.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/Repartition.java @@ -18,7 +18,7 @@ import cz.seznam.euphoria.core.annotation.operator.Basic; import cz.seznam.euphoria.core.annotation.operator.StateComplexity; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.flow.Flow; import java.util.Objects; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareElementWiseOperator.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareElementWiseOperator.java index e29a0167a9788..d3c4c1505c668 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareElementWiseOperator.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareElementWiseOperator.java @@ -17,7 +17,7 @@ package cz.seznam.euphoria.core.client.operator; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.flow.Flow; import cz.seznam.euphoria.core.client.functional.UnaryFunction; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareWindowWiseOperator.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareWindowWiseOperator.java index 74cf446ece3a9..891b20b5ee7e1 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareWindowWiseOperator.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareWindowWiseOperator.java @@ -15,8 +15,8 @@ */ package cz.seznam.euphoria.core.client.operator; -import cz.seznam.euphoria.core.client.dataset.Partitioner; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareWindowWiseSingleInputOperator.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareWindowWiseSingleInputOperator.java index cac790fb335ff..1785a70f5845a 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareWindowWiseSingleInputOperator.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/StateAwareWindowWiseSingleInputOperator.java @@ -16,7 +16,7 @@ package cz.seznam.euphoria.core.client.operator; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/SumByKey.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/SumByKey.java index 8d23e2cecbdae..698a96370b7f4 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/SumByKey.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/SumByKey.java @@ -17,9 +17,8 @@ import cz.seznam.euphoria.core.annotation.operator.Derived; import cz.seznam.euphoria.core.annotation.operator.StateComplexity; -import cz.seznam.euphoria.core.client.dataset.windowing.Batch; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/TopPerKey.java b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/TopPerKey.java index 15e80c7ba992b..c0bcbec4b6e58 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/TopPerKey.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/main/java/cz/seznam/euphoria/core/client/operator/TopPerKey.java @@ -21,7 +21,7 @@ import cz.seznam.euphoria.core.client.operator.state.StorageProvider; import cz.seznam.euphoria.core.client.operator.state.ValueStorage; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Windowing; import cz.seznam.euphoria.core.client.dataset.windowing.Window; import cz.seznam.euphoria.core.client.flow.Flow; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/CountByKeyTest.java b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/CountByKeyTest.java index 3b475601d74d6..404737a1fcd9a 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/CountByKeyTest.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/CountByKeyTest.java @@ -16,8 +16,8 @@ package cz.seznam.euphoria.core.client.operator; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.HashPartitioner; -import cz.seznam.euphoria.core.client.dataset.HashPartitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Time; import cz.seznam.euphoria.core.client.flow.Flow; import cz.seznam.euphoria.core.client.util.Pair; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/DistinctTest.java b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/DistinctTest.java index 657cae7fc6455..deb9f4ec5a408 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/DistinctTest.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/DistinctTest.java @@ -16,8 +16,8 @@ package cz.seznam.euphoria.core.client.operator; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.HashPartitioner; -import cz.seznam.euphoria.core.client.dataset.HashPartitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Time; import cz.seznam.euphoria.core.client.flow.Flow; import org.junit.Test; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/JoinTest.java b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/JoinTest.java index 57302902706af..22185ded6e692 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/JoinTest.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/JoinTest.java @@ -16,8 +16,8 @@ package cz.seznam.euphoria.core.client.operator; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.HashPartitioner; -import cz.seznam.euphoria.core.client.dataset.HashPartitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Time; import cz.seznam.euphoria.core.client.flow.Flow; import cz.seznam.euphoria.core.client.io.Context; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/ReduceByKeyTest.java b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/ReduceByKeyTest.java index 7671cff03c99c..8f15a732bbc3c 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/ReduceByKeyTest.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/ReduceByKeyTest.java @@ -16,11 +16,10 @@ package cz.seznam.euphoria.core.client.operator; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.HashPartitioner; -import cz.seznam.euphoria.core.client.dataset.HashPartitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Time; import cz.seznam.euphoria.core.client.flow.Flow; -import cz.seznam.euphoria.core.client.io.Context; import cz.seznam.euphoria.core.client.util.Pair; import cz.seznam.euphoria.core.client.util.Sums; import org.junit.Test; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/ReduceStateByKeyTest.java b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/ReduceStateByKeyTest.java index d0a173c395929..5e835b6cf992d 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/ReduceStateByKeyTest.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/ReduceStateByKeyTest.java @@ -16,8 +16,8 @@ package cz.seznam.euphoria.core.client.operator; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.HashPartitioner; -import cz.seznam.euphoria.core.client.dataset.HashPartitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Time; import cz.seznam.euphoria.core.client.flow.Flow; import cz.seznam.euphoria.core.client.io.Context; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/RepartitionTest.java b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/RepartitionTest.java index 9470944959ec6..7e40c314baf12 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/RepartitionTest.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/RepartitionTest.java @@ -16,7 +16,7 @@ package cz.seznam.euphoria.core.client.operator; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.HashPartitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner; import cz.seznam.euphoria.core.client.flow.Flow; import org.junit.Test; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/SumByKeyTest.java b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/SumByKeyTest.java index 96bf2eefef542..1da3818934aaa 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/SumByKeyTest.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/SumByKeyTest.java @@ -15,10 +15,9 @@ */ package cz.seznam.euphoria.core.client.operator; -import cz.seznam.euphoria.core.client.dataset.windowing.Batch; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.HashPartitioner; -import cz.seznam.euphoria.core.client.dataset.HashPartitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Time; import cz.seznam.euphoria.core.client.flow.Flow; import cz.seznam.euphoria.core.client.util.Pair; diff --git a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/TopPerKeyKeyTest.java b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/TopPerKeyKeyTest.java index b3608d1d53cd1..f352fe87f7a9a 100644 --- a/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/TopPerKeyKeyTest.java +++ b/sdks/java/extensions/euphoria/euphoria-core/src/test/java/cz/seznam/euphoria/core/client/operator/TopPerKeyKeyTest.java @@ -17,8 +17,8 @@ import com.google.common.collect.Iterables; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.HashPartitioner; -import cz.seznam.euphoria.core.client.dataset.HashPartitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.HashPartitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Time; import cz.seznam.euphoria.core.client.flow.Flow; import cz.seznam.euphoria.core.client.util.Triple; diff --git a/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/batch/RepartitionTranslator.java b/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/batch/RepartitionTranslator.java index b400c5c907bd8..9e1c4922d6648 100644 --- a/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/batch/RepartitionTranslator.java +++ b/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/batch/RepartitionTranslator.java @@ -15,7 +15,7 @@ */ package cz.seznam.euphoria.flink.batch; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.WindowedElement; import cz.seznam.euphoria.core.client.operator.Repartition; import cz.seznam.euphoria.flink.FlinkOperator; diff --git a/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/functions/PartitionerWrapper.java b/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/functions/PartitionerWrapper.java index b55f42ed89fad..55a601e271643 100644 --- a/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/functions/PartitionerWrapper.java +++ b/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/functions/PartitionerWrapper.java @@ -15,7 +15,7 @@ */ package cz.seznam.euphoria.flink.functions; -import cz.seznam.euphoria.core.client.dataset.Partitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner; public class PartitionerWrapper implements org.apache.flink.api.common.functions.Partitioner diff --git a/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/streaming/RepartitionTranslator.java b/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/streaming/RepartitionTranslator.java index dd48ee83ea603..c96f0ed5ce924 100644 --- a/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/streaming/RepartitionTranslator.java +++ b/sdks/java/extensions/euphoria/euphoria-flink/src/main/java/cz/seznam/euphoria/flink/streaming/RepartitionTranslator.java @@ -15,7 +15,7 @@ */ package cz.seznam.euphoria.flink.streaming; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.operator.Repartition; import cz.seznam.euphoria.flink.FlinkOperator; import cz.seznam.euphoria.flink.functions.PartitionerWrapper; diff --git a/sdks/java/extensions/euphoria/euphoria-fluent/src/main/java/cz/seznam/euphoria/fluent/Dataset.java b/sdks/java/extensions/euphoria/euphoria-fluent/src/main/java/cz/seznam/euphoria/fluent/Dataset.java index 23bd20d5f6c58..9402ac8f784e1 100644 --- a/sdks/java/extensions/euphoria/euphoria-fluent/src/main/java/cz/seznam/euphoria/fluent/Dataset.java +++ b/sdks/java/extensions/euphoria/euphoria-fluent/src/main/java/cz/seznam/euphoria/fluent/Dataset.java @@ -15,7 +15,7 @@ */ package cz.seznam.euphoria.fluent; -import cz.seznam.euphoria.core.client.dataset.Partitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner; import cz.seznam.euphoria.core.client.functional.UnaryFunction; import cz.seznam.euphoria.core.client.functional.UnaryFunctor; import cz.seznam.euphoria.core.client.io.DataSink; diff --git a/sdks/java/extensions/euphoria/euphoria-inmem/src/main/java/cz/seznam/euphoria/inmem/InMemExecutor.java b/sdks/java/extensions/euphoria/euphoria-inmem/src/main/java/cz/seznam/euphoria/inmem/InMemExecutor.java index 1755982ae0092..b4290323f9e81 100644 --- a/sdks/java/extensions/euphoria/euphoria-inmem/src/main/java/cz/seznam/euphoria/inmem/InMemExecutor.java +++ b/sdks/java/extensions/euphoria/euphoria-inmem/src/main/java/cz/seznam/euphoria/inmem/InMemExecutor.java @@ -16,7 +16,7 @@ package cz.seznam.euphoria.inmem; import com.google.common.collect.Iterables; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.Batch; import cz.seznam.euphoria.core.client.dataset.windowing.MergingWindowing; import cz.seznam.euphoria.core.client.dataset.windowing.Window; diff --git a/sdks/java/extensions/euphoria/euphoria-inmem/src/test/java/cz/seznam/euphoria/inmem/WindowingTest.java b/sdks/java/extensions/euphoria/euphoria-inmem/src/test/java/cz/seznam/euphoria/inmem/WindowingTest.java index a3aee2018c120..262186df0d928 100644 --- a/sdks/java/extensions/euphoria/euphoria-inmem/src/test/java/cz/seznam/euphoria/inmem/WindowingTest.java +++ b/sdks/java/extensions/euphoria/euphoria-inmem/src/test/java/cz/seznam/euphoria/inmem/WindowingTest.java @@ -17,7 +17,7 @@ import com.google.common.collect.Sets; import cz.seznam.euphoria.core.client.dataset.Dataset; -import cz.seznam.euphoria.core.client.dataset.Partitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner; import cz.seznam.euphoria.core.client.dataset.windowing.Count; import cz.seznam.euphoria.core.client.dataset.windowing.Time; import cz.seznam.euphoria.core.client.dataset.windowing.TimeInterval; diff --git a/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/PartitioningWrapper.java b/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/PartitioningWrapper.java index 8f7f234ae58c9..4acca26c57813 100644 --- a/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/PartitioningWrapper.java +++ b/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/PartitioningWrapper.java @@ -15,7 +15,7 @@ */ package cz.seznam.euphoria.spark; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import org.apache.spark.Partitioner; /** @@ -23,7 +23,7 @@ */ class PartitioningWrapper extends Partitioner { - private final cz.seznam.euphoria.core.client.dataset.Partitioner partitioner; + private final cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner partitioner; private final int numPartitions; public PartitioningWrapper(Partitioning partitioning) { diff --git a/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/ReduceByKeyTranslator.java b/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/ReduceByKeyTranslator.java index 4bdb422ce6215..0924d3dd76619 100644 --- a/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/ReduceByKeyTranslator.java +++ b/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/ReduceByKeyTranslator.java @@ -16,7 +16,7 @@ package cz.seznam.euphoria.spark; import com.google.common.base.Preconditions; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.MergingWindowing; import cz.seznam.euphoria.core.client.dataset.windowing.TimedWindow; import cz.seznam.euphoria.core.client.dataset.windowing.Window; diff --git a/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/RepartitionTranslator.java b/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/RepartitionTranslator.java index fdbb16fd4784e..c348ae3b97708 100644 --- a/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/RepartitionTranslator.java +++ b/sdks/java/extensions/euphoria/euphoria-spark/src/main/java/cz/seznam/euphoria/spark/RepartitionTranslator.java @@ -15,8 +15,8 @@ */ package cz.seznam.euphoria.spark; -import cz.seznam.euphoria.core.client.dataset.Partitioner; -import cz.seznam.euphoria.core.client.dataset.Partitioning; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioner; +import cz.seznam.euphoria.core.client.dataset.partitioning.Partitioning; import cz.seznam.euphoria.core.client.dataset.windowing.WindowedElement; import cz.seznam.euphoria.core.client.operator.Repartition; import org.apache.spark.api.java.JavaPairRDD;