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

---
 theodolite-benchmarks/uc3-hazelcastjet/build.gradle       | 2 +-
 .../benchmarks/uc3/hazelcastjet}/HistoryService.java      | 2 +-
 .../uc3/hazelcastjet}/Uc3HazelcastJetFactory.java         | 6 +++---
 .../uc3/hazelcastjet}/Uc3KafkaPropertiesBuilder.java      | 2 +-
 .../benchmarks/uc3/hazelcastjet}/Uc3PipelineBuilder.java  | 8 ++++----
 .../uc3/hazelcastjet}/uc3specifics/HourOfDayKey.java      | 2 +-
 .../uc3specifics/HourOfDayKeySerializer.java              | 2 +-
 .../hazelcastjet}/uc3specifics/HoursOfDayKeyFactory.java  | 2 +-
 .../uc3/hazelcastjet}/uc3specifics/StatsKeyFactory.java   | 2 +-
 .../java/theodolite/uc3/application/Uc3PipelineTest.java  | 5 +++--
 10 files changed, 17 insertions(+), 16 deletions(-)
 rename theodolite-benchmarks/uc3-hazelcastjet/src/main/java/{theodolite/uc3/application => rocks/theodolite/benchmarks/uc3/hazelcastjet}/HistoryService.java (97%)
 rename theodolite-benchmarks/uc3-hazelcastjet/src/main/java/{theodolite/uc3/application => rocks/theodolite/benchmarks/uc3/hazelcastjet}/Uc3HazelcastJetFactory.java (98%)
 rename theodolite-benchmarks/uc3-hazelcastjet/src/main/java/{theodolite/uc3/application => rocks/theodolite/benchmarks/uc3/hazelcastjet}/Uc3KafkaPropertiesBuilder.java (98%)
 rename theodolite-benchmarks/uc3-hazelcastjet/src/main/java/{theodolite/uc3/application => rocks/theodolite/benchmarks/uc3/hazelcastjet}/Uc3PipelineBuilder.java (94%)
 rename theodolite-benchmarks/uc3-hazelcastjet/src/main/java/{theodolite/uc3/application => rocks/theodolite/benchmarks/uc3/hazelcastjet}/uc3specifics/HourOfDayKey.java (93%)
 rename theodolite-benchmarks/uc3-hazelcastjet/src/main/java/{theodolite/uc3/application => rocks/theodolite/benchmarks/uc3/hazelcastjet}/uc3specifics/HourOfDayKeySerializer.java (92%)
 rename theodolite-benchmarks/uc3-hazelcastjet/src/main/java/{theodolite/uc3/application => rocks/theodolite/benchmarks/uc3/hazelcastjet}/uc3specifics/HoursOfDayKeyFactory.java (87%)
 rename theodolite-benchmarks/uc3-hazelcastjet/src/main/java/{theodolite/uc3/application => rocks/theodolite/benchmarks/uc3/hazelcastjet}/uc3specifics/StatsKeyFactory.java (82%)

diff --git a/theodolite-benchmarks/uc3-hazelcastjet/build.gradle b/theodolite-benchmarks/uc3-hazelcastjet/build.gradle
index bb5dfc7ef..737ef6af1 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/build.gradle
+++ b/theodolite-benchmarks/uc3-hazelcastjet/build.gradle
@@ -2,4 +2,4 @@ plugins {
   id 'theodolite.hazelcastjet'
 }
 
-mainClassName = "theodolite.uc3.application.HistoryService"
+mainClassName = "rocks.theodolite.benchmarks.uc3.hazelcastjet.HistoryService"
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/HistoryService.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/HistoryService.java
similarity index 97%
rename from theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/HistoryService.java
rename to theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/HistoryService.java
index a9f2d0833..18a275cc7 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/HistoryService.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/HistoryService.java
@@ -1,4 +1,4 @@
-package theodolite.uc3.application;
+package rocks.theodolite.benchmarks.uc3.hazelcastjet;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3HazelcastJetFactory.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3HazelcastJetFactory.java
similarity index 98%
rename from theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3HazelcastJetFactory.java
rename to theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3HazelcastJetFactory.java
index 273de79af..2e869056c 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3HazelcastJetFactory.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3HazelcastJetFactory.java
@@ -1,4 +1,4 @@
-package theodolite.uc3.application;
+package rocks.theodolite.benchmarks.uc3.hazelcastjet;
 
 import com.hazelcast.jet.JetInstance;
 import com.hazelcast.jet.config.JobConfig;
@@ -8,8 +8,8 @@ import java.util.Properties;
 import org.slf4j.Logger;
 import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
 import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
-import theodolite.uc3.application.uc3specifics.HourOfDayKey;
-import theodolite.uc3.application.uc3specifics.HourOfDayKeySerializer;
+import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.HourOfDayKey;
+import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.HourOfDayKeySerializer;
 
 /**
  * A Hazelcast Jet factory which can build a Hazelcast Jet Instance and Pipeline for the UC3
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3KafkaPropertiesBuilder.java
similarity index 98%
rename from theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java
rename to theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3KafkaPropertiesBuilder.java
index b2625019f..67cb917e2 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3KafkaPropertiesBuilder.java
@@ -1,4 +1,4 @@
-package theodolite.uc3.application;
+package rocks.theodolite.benchmarks.uc3.hazelcastjet;
 
 import io.confluent.kafka.serializers.KafkaAvroDeserializer;
 import java.util.Objects;
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3PipelineBuilder.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineBuilder.java
similarity index 94%
rename from theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3PipelineBuilder.java
rename to theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineBuilder.java
index 82bf0dd30..c8427de60 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3PipelineBuilder.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineBuilder.java
@@ -1,4 +1,4 @@
-package theodolite.uc3.application;
+package rocks.theodolite.benchmarks.uc3.hazelcastjet;
 
 import com.hazelcast.jet.aggregate.AggregateOperations;
 import com.hazelcast.jet.kafka.KafkaSinks;
@@ -15,9 +15,9 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
-import theodolite.uc3.application.uc3specifics.HourOfDayKey;
-import theodolite.uc3.application.uc3specifics.HoursOfDayKeyFactory;
-import theodolite.uc3.application.uc3specifics.StatsKeyFactory;
+import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.HourOfDayKey;
+import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.HoursOfDayKeyFactory;
+import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.StatsKeyFactory;
 import titan.ccp.model.records.ActivePowerRecord;
 
 /**
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HourOfDayKey.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HourOfDayKey.java
similarity index 93%
rename from theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HourOfDayKey.java
rename to theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HourOfDayKey.java
index c77f502c3..c69f433f3 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HourOfDayKey.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HourOfDayKey.java
@@ -1,4 +1,4 @@
-package theodolite.uc3.application.uc3specifics;
+package rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics;
 
 import java.util.Objects;
 
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HourOfDayKeySerializer.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HourOfDayKeySerializer.java
similarity index 92%
rename from theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HourOfDayKeySerializer.java
rename to theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HourOfDayKeySerializer.java
index 065061c44..91ba3f2be 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HourOfDayKeySerializer.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HourOfDayKeySerializer.java
@@ -1,4 +1,4 @@
-package theodolite.uc3.application.uc3specifics;
+package rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics;
 
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HoursOfDayKeyFactory.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HoursOfDayKeyFactory.java
similarity index 87%
rename from theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HoursOfDayKeyFactory.java
rename to theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HoursOfDayKeyFactory.java
index aa4814ff9..4eddb85ef 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/HoursOfDayKeyFactory.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/HoursOfDayKeyFactory.java
@@ -1,4 +1,4 @@
-package theodolite.uc3.application.uc3specifics;
+package rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics;
 
 import java.time.LocalDateTime;
 
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/StatsKeyFactory.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/StatsKeyFactory.java
similarity index 82%
rename from theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/StatsKeyFactory.java
rename to theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/StatsKeyFactory.java
index 00f7d6e66..2a404781e 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/uc3specifics/StatsKeyFactory.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/uc3specifics/StatsKeyFactory.java
@@ -1,4 +1,4 @@
-package theodolite.uc3.application.uc3specifics;
+package rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics;
 
 import java.time.LocalDateTime;
 
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/theodolite/uc3/application/Uc3PipelineTest.java b/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/theodolite/uc3/application/Uc3PipelineTest.java
index 80f85104e..a2d0067ed 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/theodolite/uc3/application/Uc3PipelineTest.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/theodolite/uc3/application/Uc3PipelineTest.java
@@ -24,8 +24,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import theodolite.uc3.application.uc3specifics.HourOfDayKey;
-import theodolite.uc3.application.uc3specifics.HourOfDayKeySerializer;
+import rocks.theodolite.benchmarks.uc3.hazelcastjet.Uc3PipelineBuilder;
+import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.HourOfDayKey;
+import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.HourOfDayKeySerializer;
 import titan.ccp.model.records.ActivePowerRecord;
 
 /**
-- 
GitLab