From 1a8592433c82441649fc32e9d340c841c1fb88d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Wed, 23 Feb 2022 17:13:22 +0100
Subject: [PATCH] Align package structure for load generator commons
---
.../java/rocks/theodolite/benchmarks/httpbridge/Endpoint.java | 2 +-
.../benchmarks/httpbridge/EnvVarHttpBridgeFactory.java | 4 ++--
.../rocks/theodolite/benchmarks/httpbridge/HttpBridge.java | 2 +-
.../theodolite/benchmarks/loadgenerator}/BeforeAction.java | 2 +-
.../theodolite/benchmarks/loadgenerator}/ClusterConfig.java | 2 +-
.../benchmarks/loadgenerator}/ConfigurationKeys.java | 2 +-
.../benchmarks/loadgenerator}/EnvVarLoadGeneratorFactory.java | 2 +-
.../theodolite/benchmarks/loadgenerator}/GeneratorAction.java | 2 +-
.../theodolite/benchmarks/loadgenerator}/HazelcastRunner.java | 2 +-
.../loadgenerator}/HazelcastRunnerStateInstance.java | 2 +-
.../benchmarks/loadgenerator}/HttpRecordSender.java | 2 +-
.../benchmarks/loadgenerator}/KafkaRecordSender.java | 2 +-
.../theodolite/benchmarks/loadgenerator}/KeySpace.java | 2 +-
.../theodolite/benchmarks/loadgenerator}/LoadGenerator.java | 2 +-
.../benchmarks/loadgenerator}/LoadGeneratorConfig.java | 2 +-
.../benchmarks/loadgenerator}/LoadGeneratorExecution.java | 2 +-
.../benchmarks/loadgenerator}/LoadGeneratorTarget.java | 2 +-
.../benchmarks/loadgenerator}/PubSubRecordSender.java | 2 +-
.../theodolite/benchmarks/loadgenerator}/RecordGenerator.java | 2 +-
.../theodolite/benchmarks/loadgenerator}/RecordSender.java | 2 +-
.../benchmarks/loadgenerator}/TitanKafkaSenderFactory.java | 2 +-
.../benchmarks/loadgenerator}/TitanPubSubSenderFactory.java | 2 +-
.../benchmarks/loadgenerator}/TitanRecordGenerator.java | 2 +-
.../benchmarks/loadgenerator}/WorkloadDefinition.java | 2 +-
.../benchmarks/loadgenerator}/HttpRecordSenderTest.java | 3 ++-
.../theodolite/benchmarks/loadgenerator}/KeySpaceTest.java | 3 ++-
.../benchmarks/loadgenerator}/LoadGeneratorTargetTest.java | 3 ++-
.../benchmarks/loadgenerator}/TitanRecordGeneratorTest.java | 3 ++-
.../benchmarks/loadgenerator}/WorkloadDefinitionTest.java | 4 +++-
.../java/theodolite/uc1/workloadgenerator/LoadGenerator.java | 2 +-
.../java/theodolite/uc2/workloadgenerator/LoadGenerator.java | 2 +-
.../java/theodolite/uc3/workloadgenerator/LoadGenerator.java | 2 +-
.../java/theodolite/uc4/workloadgenerator/LoadGenerator.java | 4 ++--
33 files changed, 41 insertions(+), 35 deletions(-)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/BeforeAction.java (82%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/ClusterConfig.java (97%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/ConfigurationKeys.java (96%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/EnvVarLoadGeneratorFactory.java (99%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/GeneratorAction.java (88%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/HazelcastRunner.java (98%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/HazelcastRunnerStateInstance.java (99%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/HttpRecordSender.java (98%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/KafkaRecordSender.java (98%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/KeySpace.java (97%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/LoadGenerator.java (98%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/LoadGeneratorConfig.java (95%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/LoadGeneratorExecution.java (97%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/LoadGeneratorTarget.java (91%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/PubSubRecordSender.java (99%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/RecordGenerator.java (85%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/RecordSender.java (86%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/TitanKafkaSenderFactory.java (96%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/TitanPubSubSenderFactory.java (96%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/TitanRecordGenerator.java (95%)
rename theodolite-benchmarks/load-generator-commons/src/main/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/WorkloadDefinition.java (97%)
rename theodolite-benchmarks/load-generator-commons/src/test/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/HttpRecordSenderTest.java (93%)
rename theodolite-benchmarks/load-generator-commons/src/test/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/KeySpaceTest.java (85%)
rename theodolite-benchmarks/load-generator-commons/src/test/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/LoadGeneratorTargetTest.java (83%)
rename theodolite-benchmarks/load-generator-commons/src/test/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/TitanRecordGeneratorTest.java (92%)
rename theodolite-benchmarks/load-generator-commons/src/test/java/{theodolite/commons/workloadgeneration => rocks/theodolite/benchmarks/loadgenerator}/WorkloadDefinitionTest.java (96%)
diff --git a/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/Endpoint.java b/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/Endpoint.java
index 996643808..ac83574ad 100644
--- a/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/Endpoint.java
+++ b/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/Endpoint.java
@@ -1,6 +1,6 @@
package rocks.theodolite.benchmarks.httpbridge;
-import theodolite.commons.workloadgeneration.RecordSender;
+import rocks.theodolite.benchmarks.loadgenerator.RecordSender;
/**
* Class describing an endpoint of the {@link HttpBridge}, which converts JSON objects to Java
diff --git a/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/EnvVarHttpBridgeFactory.java b/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/EnvVarHttpBridgeFactory.java
index cec47284c..d3c172ac8 100644
--- a/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/EnvVarHttpBridgeFactory.java
+++ b/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/EnvVarHttpBridgeFactory.java
@@ -3,8 +3,8 @@ package rocks.theodolite.benchmarks.httpbridge;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
-import theodolite.commons.workloadgeneration.ConfigurationKeys;
-import theodolite.commons.workloadgeneration.TitanKafkaSenderFactory;
+import rocks.theodolite.benchmarks.loadgenerator.ConfigurationKeys;
+import rocks.theodolite.benchmarks.loadgenerator.TitanKafkaSenderFactory;
import titan.ccp.model.records.ActivePowerRecord;
class EnvVarHttpBridgeFactory {
diff --git a/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/HttpBridge.java b/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/HttpBridge.java
index fdcdea12a..3de0bc594 100644
--- a/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/HttpBridge.java
+++ b/theodolite-benchmarks/http-bridge/src/main/java/rocks/theodolite/benchmarks/httpbridge/HttpBridge.java
@@ -1,7 +1,7 @@
package rocks.theodolite.benchmarks.httpbridge;
import java.util.List;
-import theodolite.commons.workloadgeneration.RecordSender;
+import rocks.theodolite.benchmarks.loadgenerator.RecordSender;
/**
* Class that creates a webserver with potentially multiple {@link Endpoint}s, which receives JSON
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/BeforeAction.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/BeforeAction.java
similarity index 82%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/BeforeAction.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/BeforeAction.java
index 56af95d70..852d5da82 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/BeforeAction.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/BeforeAction.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
/**
* Describes the before action which is executed before every sub experiment.
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ClusterConfig.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/ClusterConfig.java
similarity index 97%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ClusterConfig.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/ClusterConfig.java
index 9d84dc674..ae8778db3 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ClusterConfig.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/ClusterConfig.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
/**
* Configuration of a load generator cluster.
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ConfigurationKeys.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/ConfigurationKeys.java
similarity index 96%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ConfigurationKeys.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/ConfigurationKeys.java
index e94a11425..30735a561 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ConfigurationKeys.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/ConfigurationKeys.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
/**
* Keys to access configuration parameters.
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/EnvVarLoadGeneratorFactory.java
similarity index 99%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/EnvVarLoadGeneratorFactory.java
index 2901b68d8..7123cfe54 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/EnvVarLoadGeneratorFactory.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/EnvVarLoadGeneratorFactory.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.net.URI;
import java.time.Duration;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/GeneratorAction.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/GeneratorAction.java
similarity index 88%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/GeneratorAction.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/GeneratorAction.java
index 11a9cbf2d..e8a03fc87 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/GeneratorAction.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/GeneratorAction.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
/**
* Interface representing a record generator action consisting of generating a record and sending
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunner.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HazelcastRunner.java
similarity index 98%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunner.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HazelcastRunner.java
index c01049295..7d298c627 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunner.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HazelcastRunner.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import com.hazelcast.cluster.Member;
import com.hazelcast.cluster.MembershipEvent;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunnerStateInstance.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HazelcastRunnerStateInstance.java
similarity index 99%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunnerStateInstance.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HazelcastRunnerStateInstance.java
index d8fd7de42..79b86b6ee 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunnerStateInstance.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HazelcastRunnerStateInstance.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import com.google.common.collect.Streams;
import com.hazelcast.cluster.Member;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HttpRecordSender.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSender.java
similarity index 98%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HttpRecordSender.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSender.java
index 6b7a5db06..f9c0d3830 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HttpRecordSender.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSender.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import com.google.gson.Gson;
import java.net.URI;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KafkaRecordSender.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KafkaRecordSender.java
similarity index 98%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KafkaRecordSender.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KafkaRecordSender.java
index 44ff8a92a..45731e8bc 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KafkaRecordSender.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KafkaRecordSender.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.util.Properties;
import java.util.function.Function;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KeySpace.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KeySpace.java
similarity index 97%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KeySpace.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KeySpace.java
index 51255d774..ed5d9a498 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KeySpace.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KeySpace.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.io.Serializable;
import java.util.Collection;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGenerator.java
similarity index 98%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGenerator.java
index 1f02a0e0c..6866b39e5 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGenerator.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.time.Duration;
import java.util.Objects;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorConfig.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorConfig.java
similarity index 95%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorConfig.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorConfig.java
index 4b5fea3e4..97ed0b8fc 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorConfig.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorConfig.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
/**
* Configuration of a load generator.
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorExecution.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorExecution.java
similarity index 97%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorExecution.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorExecution.java
index e1a2a7e1b..809c93c2e 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorExecution.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorExecution.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.util.Random;
import java.util.concurrent.Executors;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorTarget.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorTarget.java
similarity index 91%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorTarget.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorTarget.java
index 61ae6e86d..2fe7628d0 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorTarget.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorTarget.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.util.stream.Stream;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/PubSubRecordSender.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/PubSubRecordSender.java
similarity index 99%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/PubSubRecordSender.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/PubSubRecordSender.java
index ccbeb7292..97c4533dc 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/PubSubRecordSender.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/PubSubRecordSender.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import com.google.api.core.ApiFuture;
import com.google.api.gax.core.CredentialsProvider;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/RecordGenerator.java
similarity index 85%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordGenerator.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/RecordGenerator.java
index ea6501f38..0b64ace46 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordGenerator.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/RecordGenerator.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
/**
* This interface describes a function that takes meta information from a string key and produces an
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordSender.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/RecordSender.java
similarity index 86%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordSender.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/RecordSender.java
index ee57f2f23..71732b88d 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordSender.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/RecordSender.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
/**
* This interface describes a function that consumes a message {@code T}. This function is dedicated
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanKafkaSenderFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanKafkaSenderFactory.java
similarity index 96%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanKafkaSenderFactory.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanKafkaSenderFactory.java
index 0cdf8d91e..063bbaaab 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanKafkaSenderFactory.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanKafkaSenderFactory.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.util.Properties;
import titan.ccp.model.records.ActivePowerRecord;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanPubSubSenderFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanPubSubSenderFactory.java
similarity index 96%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanPubSubSenderFactory.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanPubSubSenderFactory.java
index 5a18376ab..569d98fb9 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanPubSubSenderFactory.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanPubSubSenderFactory.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanRecordGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGenerator.java
similarity index 95%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanRecordGenerator.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGenerator.java
index cebdacaee..34b17db42 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanRecordGenerator.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGenerator.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.time.Clock;
import titan.ccp.model.records.ActivePowerRecord;
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/WorkloadDefinition.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/WorkloadDefinition.java
similarity index 97%
rename from theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/WorkloadDefinition.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/WorkloadDefinition.java
index 5795cad7a..458997cce 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/WorkloadDefinition.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/WorkloadDefinition.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.io.Serializable;
import java.time.Duration;
diff --git a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/HttpRecordSenderTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSenderTest.java
similarity index 93%
rename from theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/HttpRecordSenderTest.java
rename to theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSenderTest.java
index 0d331a900..dbd0b618d 100644
--- a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/HttpRecordSenderTest.java
+++ b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSenderTest.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
@@ -14,6 +14,7 @@ import java.net.URI;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import rocks.theodolite.benchmarks.loadgenerator.HttpRecordSender;
import titan.ccp.model.records.ActivePowerRecord;
public class HttpRecordSenderTest {
diff --git a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/KeySpaceTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/KeySpaceTest.java
similarity index 85%
rename from theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/KeySpaceTest.java
rename to theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/KeySpaceTest.java
index 49004839a..ed7b5fb82 100644
--- a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/KeySpaceTest.java
+++ b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/KeySpaceTest.java
@@ -1,7 +1,8 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import org.junit.Assert;
import org.junit.Test;
+import rocks.theodolite.benchmarks.loadgenerator.KeySpace;
public class KeySpaceTest {
diff --git a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/LoadGeneratorTargetTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorTargetTest.java
similarity index 83%
rename from theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/LoadGeneratorTargetTest.java
rename to theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorTargetTest.java
index 644ffad9a..0454f2693 100644
--- a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/LoadGeneratorTargetTest.java
+++ b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/LoadGeneratorTargetTest.java
@@ -1,7 +1,8 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import org.junit.Assert;
import org.junit.Test;
+import rocks.theodolite.benchmarks.loadgenerator.LoadGeneratorTarget;
public class LoadGeneratorTargetTest {
diff --git a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/TitanRecordGeneratorTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGeneratorTest.java
similarity index 92%
rename from theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/TitanRecordGeneratorTest.java
rename to theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGeneratorTest.java
index 04ba38b9c..404bf452a 100644
--- a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/TitanRecordGeneratorTest.java
+++ b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGeneratorTest.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.time.Clock;
import java.time.Instant;
@@ -7,6 +7,7 @@ import java.time.ZoneId;
import java.time.ZoneOffset;
import org.junit.Assert;
import org.junit.Test;
+import rocks.theodolite.benchmarks.loadgenerator.TitanRecordGenerator;
import titan.ccp.model.records.ActivePowerRecord;
public class TitanRecordGeneratorTest {
diff --git a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/WorkloadDefinitionTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/WorkloadDefinitionTest.java
similarity index 96%
rename from theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/WorkloadDefinitionTest.java
rename to theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/WorkloadDefinitionTest.java
index 9a5dbf2d2..a8b5f13a6 100644
--- a/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/WorkloadDefinitionTest.java
+++ b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/WorkloadDefinitionTest.java
@@ -1,4 +1,4 @@
-package theodolite.commons.workloadgeneration;
+package rocks.theodolite.benchmarks.loadgenerator;
import java.time.Duration;
import java.util.Comparator;
@@ -7,6 +7,8 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.junit.Assert;
import org.junit.Test;
+import rocks.theodolite.benchmarks.loadgenerator.KeySpace;
+import rocks.theodolite.benchmarks.loadgenerator.WorkloadDefinition;
public class WorkloadDefinitionTest {
diff --git a/theodolite-benchmarks/uc1-load-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc1-load-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java
index 26741eb33..c9cd31960 100644
--- a/theodolite-benchmarks/uc1-load-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java
+++ b/theodolite-benchmarks/uc1-load-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java
@@ -18,6 +18,6 @@ public final class LoadGenerator {
*/
public static void main(final String[] args) throws InterruptedException, IOException {
LOGGER.info("Start workload generator for use case UC1.");
- theodolite.commons.workloadgeneration.LoadGenerator.fromEnvironment().run();
+ rocks.theodolite.benchmarks.loadgenerator.LoadGenerator.fromEnvironment().run();
}
}
diff --git a/theodolite-benchmarks/uc2-load-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc2-load-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java
index 2c5b59bc1..52ea720b4 100644
--- a/theodolite-benchmarks/uc2-load-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java
+++ b/theodolite-benchmarks/uc2-load-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java
@@ -14,6 +14,6 @@ public final class LoadGenerator {
public static void main(final String[] args) {
LOGGER.info("Start workload generator for use case UC2");
- theodolite.commons.workloadgeneration.LoadGenerator.fromEnvironment().run();
+ rocks.theodolite.benchmarks.loadgenerator.LoadGenerator.fromEnvironment().run();
}
}
diff --git a/theodolite-benchmarks/uc3-load-generator/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc3-load-generator/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java
index 97527abfd..810fb74a8 100644
--- a/theodolite-benchmarks/uc3-load-generator/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java
+++ b/theodolite-benchmarks/uc3-load-generator/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java
@@ -16,7 +16,7 @@ public final class LoadGenerator {
public static void main(final String[] args) {
LOGGER.info("Start workload generator for use case UC3");
- theodolite.commons.workloadgeneration.LoadGenerator.fromEnvironment().run();
+ rocks.theodolite.benchmarks.loadgenerator.LoadGenerator.fromEnvironment().run();
}
}
diff --git a/theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java
index 8320d16b9..49b65060c 100644
--- a/theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java
+++ b/theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java
@@ -3,7 +3,7 @@ package theodolite.uc4.workloadgenerator;
import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import theodolite.commons.workloadgeneration.KeySpace;
+import rocks.theodolite.benchmarks.loadgenerator.KeySpace;
import titan.ccp.configuration.events.Event;
import titan.ccp.model.sensorregistry.SensorRegistry;
@@ -40,7 +40,7 @@ public final class LoadGenerator {
new SensorRegistryBuilder(numNestedGroups, numSensors).build();
LOGGER.info("Start workload generator for use case UC4");
- theodolite.commons.workloadgeneration.LoadGenerator.fromEnvironment()
+ rocks.theodolite.benchmarks.loadgenerator.LoadGenerator.fromEnvironment()
.withKeySpace(new KeySpace("s_", sensorRegistry.getMachineSensors().size()))
.withBeforeAction(() -> {
if (sendRegistry) {
--
GitLab