From 8a79f9c8c5d9fa8fa4d810ce632395a1a7ba9f9c Mon Sep 17 00:00:00 2001
From: lorenz <stu203404@mail.uni-kiel.de>
Date: Tue, 8 Mar 2022 18:06:52 +0100
Subject: [PATCH] Align package structure uc2 hzj

---
 theodolite-benchmarks/uc2-hazelcastjet/build.gradle           | 2 +-
 .../benchmarks/uc2/hazelcastjet}/HistoryService.java          | 2 +-
 .../benchmarks/uc2/hazelcastjet}/Uc2HazelcastJetFactory.java  | 4 ++--
 .../uc2/hazelcastjet}/Uc2KafkaPropertiesBuilder.java          | 2 +-
 .../benchmarks/uc2/hazelcastjet}/Uc2PipelineBuilder.java      | 4 ++--
 .../uc2specifics/StatsAccumulatorSerializer.java              | 2 +-
 .../hazelcastjet}/uc2specifics/StatsAccumulatorSupplier.java  | 2 +-
 .../test/java/theodolite/uc2/application/Uc2PipelineTest.java | 1 +
 8 files changed, 10 insertions(+), 9 deletions(-)
 rename theodolite-benchmarks/uc2-hazelcastjet/src/main/java/{theodolite/uc2/application => rocks/theodolite/benchmarks/uc2/hazelcastjet}/HistoryService.java (97%)
 rename theodolite-benchmarks/uc2-hazelcastjet/src/main/java/{theodolite/uc2/application => rocks/theodolite/benchmarks/uc2/hazelcastjet}/Uc2HazelcastJetFactory.java (98%)
 rename theodolite-benchmarks/uc2-hazelcastjet/src/main/java/{theodolite/uc2/application => rocks/theodolite/benchmarks/uc2/hazelcastjet}/Uc2KafkaPropertiesBuilder.java (98%)
 rename theodolite-benchmarks/uc2-hazelcastjet/src/main/java/{theodolite/uc2/application => rocks/theodolite/benchmarks/uc2/hazelcastjet}/Uc2PipelineBuilder.java (97%)
 rename theodolite-benchmarks/uc2-hazelcastjet/src/main/java/{theodolite/uc2/application => rocks/theodolite/benchmarks/uc2/hazelcastjet}/uc2specifics/StatsAccumulatorSerializer.java (94%)
 rename theodolite-benchmarks/uc2-hazelcastjet/src/main/java/{theodolite/uc2/application => rocks/theodolite/benchmarks/uc2/hazelcastjet}/uc2specifics/StatsAccumulatorSupplier.java (88%)

diff --git a/theodolite-benchmarks/uc2-hazelcastjet/build.gradle b/theodolite-benchmarks/uc2-hazelcastjet/build.gradle
index ee5efc5c1..ef1597413 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/build.gradle
+++ b/theodolite-benchmarks/uc2-hazelcastjet/build.gradle
@@ -2,4 +2,4 @@ plugins {
   id 'theodolite.hazelcastjet'
 }
 
-mainClassName = "theodolite.uc2.application.HistoryService"
+mainClassName = "rocks.theodolite.benchmarks.uc2.hazelcastjet.HistoryService"
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/HistoryService.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/HistoryService.java
similarity index 97%
rename from theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/HistoryService.java
rename to theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/HistoryService.java
index f099b7e43..2bea05454 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/HistoryService.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/HistoryService.java
@@ -1,4 +1,4 @@
-package theodolite.uc2.application;
+package rocks.theodolite.benchmarks.uc2.hazelcastjet;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2HazelcastJetFactory.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2HazelcastJetFactory.java
similarity index 98%
rename from theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2HazelcastJetFactory.java
rename to theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2HazelcastJetFactory.java
index 4151f56fb..ca4f95712 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2HazelcastJetFactory.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2HazelcastJetFactory.java
@@ -1,4 +1,4 @@
-package theodolite.uc2.application;
+package rocks.theodolite.benchmarks.uc2.hazelcastjet;
 
 import com.google.common.math.StatsAccumulator;
 import com.hazelcast.jet.JetInstance;
@@ -9,7 +9,7 @@ import java.util.Properties;
 import org.slf4j.Logger;
 import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
 import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
-import theodolite.uc2.application.uc2specifics.StatsAccumulatorSerializer;
+import rocks.theodolite.benchmarks.uc2.hazelcastjet.uc2specifics.StatsAccumulatorSerializer;
 
 /**
  * A Hazelcast Jet factory which can build a Hazelcast Jet Instance and Pipeline for the UC2
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2KafkaPropertiesBuilder.java
similarity index 98%
rename from theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java
rename to theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2KafkaPropertiesBuilder.java
index 702b5664d..78a4ef5b0 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2KafkaPropertiesBuilder.java
@@ -1,4 +1,4 @@
-package theodolite.uc2.application;
+package rocks.theodolite.benchmarks.uc2.hazelcastjet;
 
 import io.confluent.kafka.serializers.KafkaAvroDeserializer;
 import java.util.Objects;
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2PipelineBuilder.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineBuilder.java
similarity index 97%
rename from theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2PipelineBuilder.java
rename to theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineBuilder.java
index 12e0b902c..73377de61 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2PipelineBuilder.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineBuilder.java
@@ -1,4 +1,4 @@
-package theodolite.uc2.application;
+package rocks.theodolite.benchmarks.uc2.hazelcastjet;
 
 import com.google.common.math.Stats;
 import com.google.common.math.StatsAccumulator;
@@ -14,7 +14,7 @@ import com.hazelcast.jet.pipeline.WindowDefinition;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
-import theodolite.uc2.application.uc2specifics.StatsAccumulatorSupplier;
+import rocks.theodolite.benchmarks.uc2.hazelcastjet.uc2specifics.StatsAccumulatorSupplier;
 import titan.ccp.model.records.ActivePowerRecord;
 
 /**
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/uc2specifics/StatsAccumulatorSerializer.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/uc2specifics/StatsAccumulatorSerializer.java
similarity index 94%
rename from theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/uc2specifics/StatsAccumulatorSerializer.java
rename to theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/uc2specifics/StatsAccumulatorSerializer.java
index 8d89fb274..5c22b8dd6 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/uc2specifics/StatsAccumulatorSerializer.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/uc2specifics/StatsAccumulatorSerializer.java
@@ -1,4 +1,4 @@
-package theodolite.uc2.application.uc2specifics;
+package rocks.theodolite.benchmarks.uc2.hazelcastjet.uc2specifics;
 
 import com.google.common.math.Stats;
 import com.google.common.math.StatsAccumulator;
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/uc2specifics/StatsAccumulatorSupplier.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/uc2specifics/StatsAccumulatorSupplier.java
similarity index 88%
rename from theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/uc2specifics/StatsAccumulatorSupplier.java
rename to theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/uc2specifics/StatsAccumulatorSupplier.java
index 050cdc667..f4d203f03 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/uc2specifics/StatsAccumulatorSupplier.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/uc2specifics/StatsAccumulatorSupplier.java
@@ -1,4 +1,4 @@
-package theodolite.uc2.application.uc2specifics;
+package rocks.theodolite.benchmarks.uc2.hazelcastjet.uc2specifics;
 
 import com.google.common.math.StatsAccumulator;
 import com.hazelcast.function.SupplierEx;
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/test/java/theodolite/uc2/application/Uc2PipelineTest.java b/theodolite-benchmarks/uc2-hazelcastjet/src/test/java/theodolite/uc2/application/Uc2PipelineTest.java
index c16fc9d14..ac1f3cb8d 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/test/java/theodolite/uc2/application/Uc2PipelineTest.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/test/java/theodolite/uc2/application/Uc2PipelineTest.java
@@ -20,6 +20,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import rocks.theodolite.benchmarks.uc2.hazelcastjet.Uc2PipelineBuilder;
 import titan.ccp.model.records.ActivePowerRecord;
 
 /**
-- 
GitLab