diff --git a/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/BeamService.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/BeamService.java
index bf4bb9397ff808fbd016eb3aaa34c8a6db35d3d1..4897f4171f96dea72d1c5c002c5f817a5f3e2ba2 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/BeamService.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/BeamService.java
@@ -10,7 +10,7 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.commons.configuration2.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
/**
* A general Apache Beam-based microservice. It is configured by Beam pipeline, a Beam runner and
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/ActivePowerRecordDeserializer.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/ActivePowerRecordDeserializer.java
index 7f0f20c46f199f216db5a533eebeccf8a36e260e..8ab579d0cb2be846c715d5f16430371eb5952d2d 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/ActivePowerRecordDeserializer.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/ActivePowerRecordDeserializer.java
@@ -2,7 +2,8 @@ package rocks.theodolite.benchmarks.commons.beam.kafka;
import io.confluent.kafka.streams.serdes.avro.SpecificAvroDeserializer;
import org.apache.kafka.common.serialization.Deserializer;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+
/**
* A Kafka {@link Deserializer} for typed Schema Registry {@link ActivePowerRecord}.
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/EventTimePolicy.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/EventTimePolicy.java
index f4cd67f247a5b2b2ab8cc96ef5f7c523386bdacb..a63b5f4939566134a0aeec765fe084ea5bcc41ff 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/EventTimePolicy.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/EventTimePolicy.java
@@ -5,7 +5,7 @@ import org.apache.beam.sdk.io.kafka.KafkaRecord;
import org.apache.beam.sdk.io.kafka.TimestampPolicy;
import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.joda.time.Instant;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* TimeStampPolicy to use event time based on the timestamp of the record value.
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaActivePowerTimestampReader.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaActivePowerTimestampReader.java
index d7d25ae91af795fbfabf7b754aaaea44b7ecf617..31cd3e6be851bc0f0711cc17a591df6620951dc7 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaActivePowerTimestampReader.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaActivePowerTimestampReader.java
@@ -8,7 +8,7 @@ import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PBegin;
import org.apache.beam.sdk.values.PCollection;
import org.apache.kafka.common.serialization.StringDeserializer;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Simple {@link PTransform} that reads from Kafka using {@link KafkaIO} with event time.
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.hazelcastjet.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.hazelcastjet.gradle
index b092c97cf0e79895d4d6aafc594979b8f48dd167..0bade8fddc045f19b13074966d29996e26a72e77 100644
--- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.hazelcastjet.gradle
+++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.hazelcastjet.gradle
@@ -17,13 +17,12 @@ repositories {
}
dependencies {
- implementation('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true }
- implementation('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true }
+ implementation project(':commons')
+
implementation 'com.google.guava:guava:24.1-jre'
implementation 'org.slf4j:slf4j-api:1.7.30'
implementation 'org.slf4j:slf4j-simple:1.7.30'
-
implementation 'io.confluent:kafka-avro-serializer:5.3.0'
implementation 'com.hazelcast.jet:hazelcast-jet:4.5'
diff --git a/theodolite-benchmarks/commons/build.gradle b/theodolite-benchmarks/commons/build.gradle
index b12eaf4e1c807cb194eb377c9436bfa69c309bb6..2b00b6619f813ec83031585b86e51a0f1a0e43ed 100644
--- a/theodolite-benchmarks/commons/build.gradle
+++ b/theodolite-benchmarks/commons/build.gradle
@@ -19,7 +19,6 @@ repositories {
dependencies {
// These dependencies is exported to consumers, that is to say found on their compile classpath.
- implementation 'org.apache.kafka:kafka-clients:2.4.0'
api 'org.apache.commons:commons-configuration2:2.0'
api "org.apache.avro:avro:1.11.0"
api 'org.apache.kafka:kafka-streams:2.4.0' // needed in flink uc3
@@ -29,6 +28,7 @@ dependencies {
implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.google.guava:guava:24.1-jre'
implementation 'org.slf4j:slf4j-api:1.7.25'
+ implementation 'org.apache.kafka:kafka-clients:2.4.0'
implementation ('io.confluent:kafka-streams-avro-serde:5.3.2') {
// Kafka client is already included from Kafka Streams in version 2.4.0
exclude group: 'org.apache.kafka', module: 'kafka-clients'
@@ -51,7 +51,7 @@ sourceSets {
}
-//// Local avro creation
+// Local avro creation
avro {
fieldVisibility = "PRIVATE"
// Setters required for flink because of https://issues.apache.org/jira/browse/FLINK-13703
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/ActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/ActivePowerRecord.avsc
similarity index 80%
rename from theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/ActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/ActivePowerRecord.avsc
index 334ff29afce074aa6b5f56f411a5afba797bc3aa..91f1168632267b6d69f1b22aed658897d95958b1 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/ActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/ActivePowerRecord.avsc
@@ -1,7 +1,7 @@
{
"type" : "record",
"name" : "ActivePowerRecord",
- "namespace" : "rocks.theodolite.commons.model.records",
+ "namespace" : "rocks.theodolite.benchmarks.commons.model.records",
"fields" : [ {
"name" : "identifier",
"type" : "string",
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/AggregatedActivePowerRecord.avsc
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/AggregatedActivePowerRecord.avsc
index 4f5762fb10ea9a11e4a92d21e55d1c18baee0366..336476e8417a5b7245eea1a1c6b2b454fcc11001 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/AggregatedActivePowerRecord.avsc
@@ -1,7 +1,7 @@
{
"type" : "record",
"name" : "AggregatedActivePowerRecord",
- "namespace" : "rocks.theodolite.commons.model.records",
+ "namespace" : "rocks.theodolite.benchmarks.commons.model.records",
"fields" : [ {
"name" : "identifier",
"type" : "string",
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/DayOfWeekActivePowerRecord.avsc
similarity index 88%
rename from theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/DayOfWeekActivePowerRecord.avsc
index e879a4df831d8c7d34945724dc2cc2b7e3cb9d1a..c029937dd0d17e0a14bb613a59dff6f72635f009 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/DayOfWeekActivePowerRecord.avsc
@@ -1,7 +1,7 @@
{
"type" : "record",
"name" : "DayOfWeekActivePowerRecord",
- "namespace" : "rocks.theodolite.commons.model.records",
+ "namespace" : "rocks.theodolite.benchmarks.commons.model.records",
"fields" : [ {
"name" : "identifier",
"type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/HourOfDayActivePowerRecord.avsc
similarity index 88%
rename from theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/HourOfDayActivePowerRecord.avsc
index 266a7cf9dfbf431b22f9ea0a927336d53ba5357a..3ad6d6ade5d2f29718db04e066565a11f2db412d 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/HourOfDayActivePowerRecord.avsc
@@ -1,7 +1,7 @@
{
"type" : "record",
"name" : "HourOfDayActivePowerRecord",
- "namespace" : "rocks.theodolite.commons.model.records",
+ "namespace" : "rocks.theodolite.benchmarks.commons.model.records",
"fields" : [ {
"name" : "identifier",
"type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/HourOfWeekActivePowerRecord.avsc
similarity index 89%
rename from theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/HourOfWeekActivePowerRecord.avsc
index 325b1f527cf2f2b7fcb160703e917b06199d8e03..74739f5bd074ba330cee631c433ea4ab1c1fa8d9 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/HourOfWeekActivePowerRecord.avsc
@@ -1,7 +1,7 @@
{
"type" : "record",
"name" : "HourOfWeekActivePowerRecord",
- "namespace" : "rocks.theodolite.commons.model.records",
+ "namespace" : "rocks.theodolite.benchmarks.commons.model.records",
"fields" : [ {
"name" : "identifier",
"type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/MonthOfYearActivePowerRecord.avsc
similarity index 89%
rename from theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/MonthOfYearActivePowerRecord.avsc
index daf964283cb379d1922263937fc79bf9da5b1fc6..70dd7eda5b5aaa6bb27b2ebca4ac7f4b251c630f 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/MonthOfYearActivePowerRecord.avsc
@@ -1,7 +1,7 @@
{
"type" : "record",
"name" : "MonthOfYearActivePowerRecord",
- "namespace" : "rocks.theodolite.commons.model.records",
+ "namespace" : "rocks.theodolite.benchmarks.commons.model.records",
"fields" : [ {
"name" : "identifier",
"type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/YearActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/YearActivePowerRecord.avsc
similarity index 88%
rename from theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/YearActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/YearActivePowerRecord.avsc
index 12b071e70dc7d32238cbf777b80e115086621cb2..2bfc06b6649630fbde85f068e5b3a9d0312f5424 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/YearActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/benchmarks/commons/model/records/YearActivePowerRecord.avsc
@@ -1,7 +1,7 @@
{
"type" : "record",
"name" : "YearActivePowerRecord",
- "namespace" : "rocks.theodolite.commons.model.records",
+ "namespace" : "rocks.theodolite.benchmarks.commons.model.records",
"fields" : [ {
"name" : "identifier",
"type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/ActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/ActivePowerRecord.java
similarity index 85%
rename from theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/ActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/ActivePowerRecord.java
index f5df311856c711f17372b3e5ca9da2b6b224f86d..27e0f39076e5384a89e3d8a91e4b08808244aa2a 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/ActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/ActivePowerRecord.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT DIRECTLY
*/
-package rocks.theodolite.commons.model.records;
+package rocks.theodolite.benchmarks.commons.model.records;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
@org.apache.avro.specific.AvroGenerated
public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- private static final long serialVersionUID = 5490311872603136978L;
+ private static final long serialVersionUID = -5809432381123606133L;
- public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"ActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"*\"},{\"name\":\"timestamp\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"valueInW\",\"type\":\"double\",\"doc\":\"*\"}]}");
+ public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"ActivePowerRecord\",\"namespace\":\"rocks.theodolite.benchmarks.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"*\"},{\"name\":\"timestamp\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"valueInW\",\"type\":\"double\",\"doc\":\"*\"}]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
private static final SpecificData MODEL$ = new SpecificData();
@@ -180,8 +180,8 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* Creates a new ActivePowerRecord RecordBuilder.
* @return A new ActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder() {
- return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder();
+ public static rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder newBuilder() {
+ return new rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder();
}
/**
@@ -189,11 +189,11 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* @param other The existing builder to copy.
* @return A new ActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.ActivePowerRecord.Builder other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder(other);
}
}
@@ -202,11 +202,11 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* @param other The existing instance to copy.
* @return A new ActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.ActivePowerRecord other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder(other);
}
}
@@ -233,7 +233,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.ActivePowerRecord.Builder other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder other) {
super(other);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -253,7 +253,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* Creates a Builder by copying an existing ActivePowerRecord instance
* @param other The existing instance to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.ActivePowerRecord other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord other) {
super(SCHEMA$, MODEL$);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -285,7 +285,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* @param value The value of 'identifier'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+ public rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder setIdentifier(java.lang.String value) {
validate(fields()[0], value);
this.identifier = value;
fieldSetFlags()[0] = true;
@@ -307,7 +307,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* *
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder clearIdentifier() {
+ public rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder clearIdentifier() {
identifier = null;
fieldSetFlags()[0] = false;
return this;
@@ -329,7 +329,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* @param value The value of 'timestamp'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder setTimestamp(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder setTimestamp(long value) {
validate(fields()[1], value);
this.timestamp = value;
fieldSetFlags()[1] = true;
@@ -351,7 +351,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* *
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder clearTimestamp() {
+ public rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder clearTimestamp() {
fieldSetFlags()[1] = false;
return this;
}
@@ -372,7 +372,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* @param value The value of 'valueInW'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder setValueInW(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder setValueInW(double value) {
validate(fields()[2], value);
this.valueInW = value;
fieldSetFlags()[2] = true;
@@ -394,7 +394,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
* *
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder clearValueInW() {
+ public rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord.Builder clearValueInW() {
fieldSetFlags()[2] = false;
return this;
}
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/AggregatedActivePowerRecord.java
similarity index 85%
rename from theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/AggregatedActivePowerRecord.java
index ab7d4d143a594097094c28f05922163412888c4a..7aa6e0b5f988bae1f63d8a2817a1fed2b4880b6a 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/AggregatedActivePowerRecord.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT DIRECTLY
*/
-package rocks.theodolite.commons.model.records;
+package rocks.theodolite.benchmarks.commons.model.records;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
@org.apache.avro.specific.AvroGenerated
public class AggregatedActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- private static final long serialVersionUID = -8754457068762464277L;
+ private static final long serialVersionUID = 334342381382209426L;
- public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"AggregatedActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"*\"},{\"name\":\"timestamp\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"count\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"sumInW\",\"type\":\"double\",\"doc\":\"*\"},{\"name\":\"averageInW\",\"type\":\"double\",\"doc\":\"*\"}]}");
+ public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"AggregatedActivePowerRecord\",\"namespace\":\"rocks.theodolite.benchmarks.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"*\"},{\"name\":\"timestamp\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"count\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"sumInW\",\"type\":\"double\",\"doc\":\"*\"},{\"name\":\"averageInW\",\"type\":\"double\",\"doc\":\"*\"}]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
private static final SpecificData MODEL$ = new SpecificData();
@@ -228,8 +228,8 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* Creates a new AggregatedActivePowerRecord RecordBuilder.
* @return A new AggregatedActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder() {
- return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
+ public static rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder() {
+ return new rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder();
}
/**
@@ -237,11 +237,11 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* @param other The existing builder to copy.
* @return A new AggregatedActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder(other);
}
}
@@ -250,11 +250,11 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* @param other The existing instance to copy.
* @return A new AggregatedActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.AggregatedActivePowerRecord other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder(other);
}
}
@@ -285,7 +285,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder other) {
super(other);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -313,7 +313,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* Creates a Builder by copying an existing AggregatedActivePowerRecord instance
* @param other The existing instance to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.AggregatedActivePowerRecord other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord other) {
super(SCHEMA$, MODEL$);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -353,7 +353,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'identifier'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder setIdentifier(java.lang.String value) {
validate(fields()[0], value);
this.identifier = value;
fieldSetFlags()[0] = true;
@@ -375,7 +375,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* *
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearIdentifier() {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder clearIdentifier() {
identifier = null;
fieldSetFlags()[0] = false;
return this;
@@ -397,7 +397,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'timestamp'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setTimestamp(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder setTimestamp(long value) {
validate(fields()[1], value);
this.timestamp = value;
fieldSetFlags()[1] = true;
@@ -419,7 +419,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* *
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearTimestamp() {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder clearTimestamp() {
fieldSetFlags()[1] = false;
return this;
}
@@ -440,7 +440,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'count'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setCount(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder setCount(long value) {
validate(fields()[2], value);
this.count = value;
fieldSetFlags()[2] = true;
@@ -462,7 +462,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* *
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearCount() {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder clearCount() {
fieldSetFlags()[2] = false;
return this;
}
@@ -483,7 +483,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'sumInW'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setSumInW(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder setSumInW(double value) {
validate(fields()[3], value);
this.sumInW = value;
fieldSetFlags()[3] = true;
@@ -505,7 +505,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* *
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearSumInW() {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder clearSumInW() {
fieldSetFlags()[3] = false;
return this;
}
@@ -526,7 +526,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'averageInW'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setAverageInW(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder setAverageInW(double value) {
validate(fields()[4], value);
this.averageInW = value;
fieldSetFlags()[4] = true;
@@ -548,7 +548,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
* *
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearAverageInW() {
+ public rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord.Builder clearAverageInW() {
fieldSetFlags()[4] = false;
return this;
}
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/DayOfWeekActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/DayOfWeekActivePowerRecord.java
index c53c3192f1438db21edb7a40585a202df8bc7296..6e6917a6393f6b7deea3237384f08094a9cfc200 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/DayOfWeekActivePowerRecord.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT DIRECTLY
*/
-package rocks.theodolite.commons.model.records;
+package rocks.theodolite.benchmarks.commons.model.records;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
@org.apache.avro.specific.AvroGenerated
public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- private static final long serialVersionUID = 4537540003856933738L;
+ private static final long serialVersionUID = 874988617222069934L;
- public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DayOfWeekActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"dayOfWeek\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+ public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DayOfWeekActivePowerRecord\",\"namespace\":\"rocks.theodolite.benchmarks.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"dayOfWeek\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
private static final SpecificData MODEL$ = new SpecificData();
@@ -306,8 +306,8 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Creates a new DayOfWeekActivePowerRecord RecordBuilder.
* @return A new DayOfWeekActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder() {
- return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
+ public static rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder() {
+ return new rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder();
}
/**
@@ -315,11 +315,11 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param other The existing builder to copy.
* @return A new DayOfWeekActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder(other);
}
}
@@ -328,11 +328,11 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param other The existing instance to copy.
* @return A new DayOfWeekActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder(other);
}
}
@@ -362,7 +362,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder other) {
super(other);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -406,7 +406,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Creates a Builder by copying an existing DayOfWeekActivePowerRecord instance
* @param other The existing instance to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord other) {
super(SCHEMA$, MODEL$);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -460,7 +460,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'identifier'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setIdentifier(java.lang.String value) {
validate(fields()[0], value);
this.identifier = value;
fieldSetFlags()[0] = true;
@@ -480,7 +480,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'identifier' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearIdentifier() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearIdentifier() {
identifier = null;
fieldSetFlags()[0] = false;
return this;
@@ -500,7 +500,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'dayOfWeek'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setDayOfWeek(int value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setDayOfWeek(int value) {
validate(fields()[1], value);
this.dayOfWeek = value;
fieldSetFlags()[1] = true;
@@ -520,7 +520,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'dayOfWeek' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearDayOfWeek() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearDayOfWeek() {
fieldSetFlags()[1] = false;
return this;
}
@@ -539,7 +539,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'periodStart'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPeriodStart(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setPeriodStart(long value) {
validate(fields()[2], value);
this.periodStart = value;
fieldSetFlags()[2] = true;
@@ -559,7 +559,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'periodStart' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPeriodStart() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPeriodStart() {
fieldSetFlags()[2] = false;
return this;
}
@@ -578,7 +578,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'periodEnd'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPeriodEnd(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setPeriodEnd(long value) {
validate(fields()[3], value);
this.periodEnd = value;
fieldSetFlags()[3] = true;
@@ -598,7 +598,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'periodEnd' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPeriodEnd() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPeriodEnd() {
fieldSetFlags()[3] = false;
return this;
}
@@ -617,7 +617,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'count'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setCount(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setCount(long value) {
validate(fields()[4], value);
this.count = value;
fieldSetFlags()[4] = true;
@@ -637,7 +637,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'count' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearCount() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearCount() {
fieldSetFlags()[4] = false;
return this;
}
@@ -656,7 +656,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'mean'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMean(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setMean(double value) {
validate(fields()[5], value);
this.mean = value;
fieldSetFlags()[5] = true;
@@ -676,7 +676,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'mean' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMean() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMean() {
fieldSetFlags()[5] = false;
return this;
}
@@ -695,7 +695,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'populationVariance'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPopulationVariance(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setPopulationVariance(double value) {
validate(fields()[6], value);
this.populationVariance = value;
fieldSetFlags()[6] = true;
@@ -715,7 +715,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'populationVariance' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPopulationVariance() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPopulationVariance() {
fieldSetFlags()[6] = false;
return this;
}
@@ -734,7 +734,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'min'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMin(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setMin(double value) {
validate(fields()[7], value);
this.min = value;
fieldSetFlags()[7] = true;
@@ -754,7 +754,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'min' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMin() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMin() {
fieldSetFlags()[7] = false;
return this;
}
@@ -773,7 +773,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'max'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMax(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder setMax(double value) {
validate(fields()[8], value);
this.max = value;
fieldSetFlags()[8] = true;
@@ -793,7 +793,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'max' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMax() {
+ public rocks.theodolite.benchmarks.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMax() {
fieldSetFlags()[8] = false;
return this;
}
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/HourOfDayActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/HourOfDayActivePowerRecord.java
index 154109665c779b1a1181887fc6fa3ac07677fb01..491a91f4dfe5d439d094d66290d82d77001e72c9 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/HourOfDayActivePowerRecord.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT DIRECTLY
*/
-package rocks.theodolite.commons.model.records;
+package rocks.theodolite.benchmarks.commons.model.records;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
@org.apache.avro.specific.AvroGenerated
public class HourOfDayActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- private static final long serialVersionUID = 7743335456275043826L;
+ private static final long serialVersionUID = 6460936513507715126L;
- public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HourOfDayActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"hourOfDay\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+ public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HourOfDayActivePowerRecord\",\"namespace\":\"rocks.theodolite.benchmarks.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"hourOfDay\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
private static final SpecificData MODEL$ = new SpecificData();
@@ -306,8 +306,8 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Creates a new HourOfDayActivePowerRecord RecordBuilder.
* @return A new HourOfDayActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder() {
- return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
+ public static rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder() {
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder();
}
/**
@@ -315,11 +315,11 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param other The existing builder to copy.
* @return A new HourOfDayActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder(other);
}
}
@@ -328,11 +328,11 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param other The existing instance to copy.
* @return A new HourOfDayActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder(other);
}
}
@@ -362,7 +362,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder other) {
super(other);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -406,7 +406,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Creates a Builder by copying an existing HourOfDayActivePowerRecord instance
* @param other The existing instance to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord other) {
super(SCHEMA$, MODEL$);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -460,7 +460,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'identifier'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setIdentifier(java.lang.String value) {
validate(fields()[0], value);
this.identifier = value;
fieldSetFlags()[0] = true;
@@ -480,7 +480,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'identifier' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearIdentifier() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearIdentifier() {
identifier = null;
fieldSetFlags()[0] = false;
return this;
@@ -500,7 +500,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'hourOfDay'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setHourOfDay(int value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setHourOfDay(int value) {
validate(fields()[1], value);
this.hourOfDay = value;
fieldSetFlags()[1] = true;
@@ -520,7 +520,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'hourOfDay' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearHourOfDay() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearHourOfDay() {
fieldSetFlags()[1] = false;
return this;
}
@@ -539,7 +539,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'periodStart'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPeriodStart(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setPeriodStart(long value) {
validate(fields()[2], value);
this.periodStart = value;
fieldSetFlags()[2] = true;
@@ -559,7 +559,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'periodStart' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPeriodStart() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearPeriodStart() {
fieldSetFlags()[2] = false;
return this;
}
@@ -578,7 +578,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'periodEnd'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPeriodEnd(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setPeriodEnd(long value) {
validate(fields()[3], value);
this.periodEnd = value;
fieldSetFlags()[3] = true;
@@ -598,7 +598,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'periodEnd' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPeriodEnd() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearPeriodEnd() {
fieldSetFlags()[3] = false;
return this;
}
@@ -617,7 +617,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'count'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setCount(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setCount(long value) {
validate(fields()[4], value);
this.count = value;
fieldSetFlags()[4] = true;
@@ -637,7 +637,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'count' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearCount() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearCount() {
fieldSetFlags()[4] = false;
return this;
}
@@ -656,7 +656,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'mean'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMean(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setMean(double value) {
validate(fields()[5], value);
this.mean = value;
fieldSetFlags()[5] = true;
@@ -676,7 +676,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'mean' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMean() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearMean() {
fieldSetFlags()[5] = false;
return this;
}
@@ -695,7 +695,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'populationVariance'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPopulationVariance(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setPopulationVariance(double value) {
validate(fields()[6], value);
this.populationVariance = value;
fieldSetFlags()[6] = true;
@@ -715,7 +715,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'populationVariance' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPopulationVariance() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearPopulationVariance() {
fieldSetFlags()[6] = false;
return this;
}
@@ -734,7 +734,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'min'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMin(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setMin(double value) {
validate(fields()[7], value);
this.min = value;
fieldSetFlags()[7] = true;
@@ -754,7 +754,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'min' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMin() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearMin() {
fieldSetFlags()[7] = false;
return this;
}
@@ -773,7 +773,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* @param value The value of 'max'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMax(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder setMax(double value) {
validate(fields()[8], value);
this.max = value;
fieldSetFlags()[8] = true;
@@ -793,7 +793,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
* Clears the value of the 'max' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMax() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord.Builder clearMax() {
fieldSetFlags()[8] = false;
return this;
}
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/HourOfWeekActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/HourOfWeekActivePowerRecord.java
index 6bb063d21f620b5d5ad2073be3ea5756e835223b..112e1f7bc1c180e658367fb42b997405eb31a62c 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/HourOfWeekActivePowerRecord.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT DIRECTLY
*/
-package rocks.theodolite.commons.model.records;
+package rocks.theodolite.benchmarks.commons.model.records;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
@org.apache.avro.specific.AvroGenerated
public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- private static final long serialVersionUID = 2784889086011309745L;
+ private static final long serialVersionUID = -2060891996492175489L;
- public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HourOfWeekActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"dayOfWeek\",\"type\":\"int\"},{\"name\":\"hourOfDay\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+ public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HourOfWeekActivePowerRecord\",\"namespace\":\"rocks.theodolite.benchmarks.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"dayOfWeek\",\"type\":\"int\"},{\"name\":\"hourOfDay\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
private static final SpecificData MODEL$ = new SpecificData();
@@ -328,8 +328,8 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Creates a new HourOfWeekActivePowerRecord RecordBuilder.
* @return A new HourOfWeekActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder() {
- return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
+ public static rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder() {
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder();
}
/**
@@ -337,11 +337,11 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param other The existing builder to copy.
* @return A new HourOfWeekActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder(other);
}
}
@@ -350,11 +350,11 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param other The existing instance to copy.
* @return A new HourOfWeekActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder(other);
}
}
@@ -385,7 +385,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder other) {
super(other);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -433,7 +433,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Creates a Builder by copying an existing HourOfWeekActivePowerRecord instance
* @param other The existing instance to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord other) {
super(SCHEMA$, MODEL$);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -491,7 +491,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'identifier'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setIdentifier(java.lang.String value) {
validate(fields()[0], value);
this.identifier = value;
fieldSetFlags()[0] = true;
@@ -511,7 +511,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'identifier' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearIdentifier() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearIdentifier() {
identifier = null;
fieldSetFlags()[0] = false;
return this;
@@ -531,7 +531,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'dayOfWeek'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setDayOfWeek(int value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setDayOfWeek(int value) {
validate(fields()[1], value);
this.dayOfWeek = value;
fieldSetFlags()[1] = true;
@@ -551,7 +551,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'dayOfWeek' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearDayOfWeek() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearDayOfWeek() {
fieldSetFlags()[1] = false;
return this;
}
@@ -570,7 +570,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'hourOfDay'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setHourOfDay(int value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setHourOfDay(int value) {
validate(fields()[2], value);
this.hourOfDay = value;
fieldSetFlags()[2] = true;
@@ -590,7 +590,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'hourOfDay' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearHourOfDay() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearHourOfDay() {
fieldSetFlags()[2] = false;
return this;
}
@@ -609,7 +609,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'periodStart'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPeriodStart(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setPeriodStart(long value) {
validate(fields()[3], value);
this.periodStart = value;
fieldSetFlags()[3] = true;
@@ -629,7 +629,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'periodStart' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPeriodStart() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPeriodStart() {
fieldSetFlags()[3] = false;
return this;
}
@@ -648,7 +648,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'periodEnd'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPeriodEnd(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setPeriodEnd(long value) {
validate(fields()[4], value);
this.periodEnd = value;
fieldSetFlags()[4] = true;
@@ -668,7 +668,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'periodEnd' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPeriodEnd() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPeriodEnd() {
fieldSetFlags()[4] = false;
return this;
}
@@ -687,7 +687,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'count'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setCount(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setCount(long value) {
validate(fields()[5], value);
this.count = value;
fieldSetFlags()[5] = true;
@@ -707,7 +707,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'count' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearCount() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearCount() {
fieldSetFlags()[5] = false;
return this;
}
@@ -726,7 +726,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'mean'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMean(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setMean(double value) {
validate(fields()[6], value);
this.mean = value;
fieldSetFlags()[6] = true;
@@ -746,7 +746,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'mean' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMean() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMean() {
fieldSetFlags()[6] = false;
return this;
}
@@ -765,7 +765,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'populationVariance'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPopulationVariance(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setPopulationVariance(double value) {
validate(fields()[7], value);
this.populationVariance = value;
fieldSetFlags()[7] = true;
@@ -785,7 +785,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'populationVariance' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPopulationVariance() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPopulationVariance() {
fieldSetFlags()[7] = false;
return this;
}
@@ -804,7 +804,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'min'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMin(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setMin(double value) {
validate(fields()[8], value);
this.min = value;
fieldSetFlags()[8] = true;
@@ -824,7 +824,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'min' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMin() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMin() {
fieldSetFlags()[8] = false;
return this;
}
@@ -843,7 +843,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* @param value The value of 'max'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMax(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder setMax(double value) {
validate(fields()[9], value);
this.max = value;
fieldSetFlags()[9] = true;
@@ -863,7 +863,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
* Clears the value of the 'max' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMax() {
+ public rocks.theodolite.benchmarks.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMax() {
fieldSetFlags()[9] = false;
return this;
}
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/MonthOfYearActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/MonthOfYearActivePowerRecord.java
index a76f31c0d88bd798b2c1936c294201bad5d0683e..4c1cd52fee2fd703e0f98bfdc0bf08b069321952 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/MonthOfYearActivePowerRecord.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT DIRECTLY
*/
-package rocks.theodolite.commons.model.records;
+package rocks.theodolite.benchmarks.commons.model.records;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
@org.apache.avro.specific.AvroGenerated
public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- private static final long serialVersionUID = -7083099557783425969L;
+ private static final long serialVersionUID = -6007754522109150657L;
- public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"MonthOfYearActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"monthOfYear\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+ public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"MonthOfYearActivePowerRecord\",\"namespace\":\"rocks.theodolite.benchmarks.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"monthOfYear\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
private static final SpecificData MODEL$ = new SpecificData();
@@ -306,8 +306,8 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Creates a new MonthOfYearActivePowerRecord RecordBuilder.
* @return A new MonthOfYearActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder() {
- return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
+ public static rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder() {
+ return new rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder();
}
/**
@@ -315,11 +315,11 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param other The existing builder to copy.
* @return A new MonthOfYearActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder(other);
}
}
@@ -328,11 +328,11 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param other The existing instance to copy.
* @return A new MonthOfYearActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder(other);
}
}
@@ -362,7 +362,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder other) {
super(other);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -406,7 +406,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Creates a Builder by copying an existing MonthOfYearActivePowerRecord instance
* @param other The existing instance to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord other) {
super(SCHEMA$, MODEL$);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -460,7 +460,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'identifier'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setIdentifier(java.lang.String value) {
validate(fields()[0], value);
this.identifier = value;
fieldSetFlags()[0] = true;
@@ -480,7 +480,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'identifier' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearIdentifier() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearIdentifier() {
identifier = null;
fieldSetFlags()[0] = false;
return this;
@@ -500,7 +500,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'monthOfYear'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMonthOfYear(int value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setMonthOfYear(int value) {
validate(fields()[1], value);
this.monthOfYear = value;
fieldSetFlags()[1] = true;
@@ -520,7 +520,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'monthOfYear' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMonthOfYear() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMonthOfYear() {
fieldSetFlags()[1] = false;
return this;
}
@@ -539,7 +539,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'periodStart'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPeriodStart(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setPeriodStart(long value) {
validate(fields()[2], value);
this.periodStart = value;
fieldSetFlags()[2] = true;
@@ -559,7 +559,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'periodStart' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPeriodStart() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPeriodStart() {
fieldSetFlags()[2] = false;
return this;
}
@@ -578,7 +578,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'periodEnd'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPeriodEnd(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setPeriodEnd(long value) {
validate(fields()[3], value);
this.periodEnd = value;
fieldSetFlags()[3] = true;
@@ -598,7 +598,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'periodEnd' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPeriodEnd() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPeriodEnd() {
fieldSetFlags()[3] = false;
return this;
}
@@ -617,7 +617,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'count'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setCount(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setCount(long value) {
validate(fields()[4], value);
this.count = value;
fieldSetFlags()[4] = true;
@@ -637,7 +637,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'count' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearCount() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearCount() {
fieldSetFlags()[4] = false;
return this;
}
@@ -656,7 +656,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'mean'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMean(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setMean(double value) {
validate(fields()[5], value);
this.mean = value;
fieldSetFlags()[5] = true;
@@ -676,7 +676,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'mean' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMean() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMean() {
fieldSetFlags()[5] = false;
return this;
}
@@ -695,7 +695,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'populationVariance'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPopulationVariance(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setPopulationVariance(double value) {
validate(fields()[6], value);
this.populationVariance = value;
fieldSetFlags()[6] = true;
@@ -715,7 +715,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'populationVariance' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPopulationVariance() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPopulationVariance() {
fieldSetFlags()[6] = false;
return this;
}
@@ -734,7 +734,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'min'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMin(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setMin(double value) {
validate(fields()[7], value);
this.min = value;
fieldSetFlags()[7] = true;
@@ -754,7 +754,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'min' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMin() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMin() {
fieldSetFlags()[7] = false;
return this;
}
@@ -773,7 +773,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* @param value The value of 'max'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMax(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder setMax(double value) {
validate(fields()[8], value);
this.max = value;
fieldSetFlags()[8] = true;
@@ -793,7 +793,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
* Clears the value of the 'max' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMax() {
+ public rocks.theodolite.benchmarks.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMax() {
fieldSetFlags()[8] = false;
return this;
}
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/YearActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/YearActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/YearActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/YearActivePowerRecord.java
index 448d1ba5a885a4ad590794e56dddb400ac0991bd..0471c825551cc048e5e553309ddf2751b6e7ba3d 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/YearActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/benchmarks/commons/model/records/YearActivePowerRecord.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT DIRECTLY
*/
-package rocks.theodolite.commons.model.records;
+package rocks.theodolite.benchmarks.commons.model.records;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
@org.apache.avro.specific.AvroGenerated
public class YearActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
- private static final long serialVersionUID = -7591848668729692169L;
+ private static final long serialVersionUID = 1269303032337461873L;
- public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"YearActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"year\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+ public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"YearActivePowerRecord\",\"namespace\":\"rocks.theodolite.benchmarks.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"year\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
private static final SpecificData MODEL$ = new SpecificData();
@@ -306,8 +306,8 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Creates a new YearActivePowerRecord RecordBuilder.
* @return A new YearActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder() {
- return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder();
+ public static rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder newBuilder() {
+ return new rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder();
}
/**
@@ -315,11 +315,11 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param other The existing builder to copy.
* @return A new YearActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder(other);
}
}
@@ -328,11 +328,11 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param other The existing instance to copy.
* @return A new YearActivePowerRecord RecordBuilder
*/
- public static rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.YearActivePowerRecord other) {
+ public static rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder newBuilder(rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord other) {
if (other == null) {
- return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder();
+ return new rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder();
} else {
- return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder(other);
+ return new rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder(other);
}
}
@@ -362,7 +362,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder other) {
super(other);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -406,7 +406,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Creates a Builder by copying an existing YearActivePowerRecord instance
* @param other The existing instance to copy.
*/
- private Builder(rocks.theodolite.commons.model.records.YearActivePowerRecord other) {
+ private Builder(rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord other) {
super(SCHEMA$, MODEL$);
if (isValidValue(fields()[0], other.identifier)) {
this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -460,7 +460,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'identifier'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setIdentifier(java.lang.String value) {
validate(fields()[0], value);
this.identifier = value;
fieldSetFlags()[0] = true;
@@ -480,7 +480,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'identifier' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearIdentifier() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearIdentifier() {
identifier = null;
fieldSetFlags()[0] = false;
return this;
@@ -500,7 +500,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'year'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setYear(int value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setYear(int value) {
validate(fields()[1], value);
this.year = value;
fieldSetFlags()[1] = true;
@@ -520,7 +520,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'year' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearYear() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearYear() {
fieldSetFlags()[1] = false;
return this;
}
@@ -539,7 +539,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'periodStart'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setPeriodStart(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setPeriodStart(long value) {
validate(fields()[2], value);
this.periodStart = value;
fieldSetFlags()[2] = true;
@@ -559,7 +559,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'periodStart' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearPeriodStart() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearPeriodStart() {
fieldSetFlags()[2] = false;
return this;
}
@@ -578,7 +578,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'periodEnd'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setPeriodEnd(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setPeriodEnd(long value) {
validate(fields()[3], value);
this.periodEnd = value;
fieldSetFlags()[3] = true;
@@ -598,7 +598,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'periodEnd' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearPeriodEnd() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearPeriodEnd() {
fieldSetFlags()[3] = false;
return this;
}
@@ -617,7 +617,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'count'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setCount(long value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setCount(long value) {
validate(fields()[4], value);
this.count = value;
fieldSetFlags()[4] = true;
@@ -637,7 +637,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'count' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearCount() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearCount() {
fieldSetFlags()[4] = false;
return this;
}
@@ -656,7 +656,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'mean'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setMean(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setMean(double value) {
validate(fields()[5], value);
this.mean = value;
fieldSetFlags()[5] = true;
@@ -676,7 +676,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'mean' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearMean() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearMean() {
fieldSetFlags()[5] = false;
return this;
}
@@ -695,7 +695,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'populationVariance'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setPopulationVariance(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setPopulationVariance(double value) {
validate(fields()[6], value);
this.populationVariance = value;
fieldSetFlags()[6] = true;
@@ -715,7 +715,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'populationVariance' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearPopulationVariance() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearPopulationVariance() {
fieldSetFlags()[6] = false;
return this;
}
@@ -734,7 +734,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'min'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setMin(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setMin(double value) {
validate(fields()[7], value);
this.min = value;
fieldSetFlags()[7] = true;
@@ -754,7 +754,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'min' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearMin() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearMin() {
fieldSetFlags()[7] = false;
return this;
}
@@ -773,7 +773,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* @param value The value of 'max'.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setMax(double value) {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder setMax(double value) {
validate(fields()[8], value);
this.max = value;
fieldSetFlags()[8] = true;
@@ -793,7 +793,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
* Clears the value of the 'max' field.
* @return This builder.
*/
- public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearMax() {
+ public rocks.theodolite.benchmarks.commons.model.records.YearActivePowerRecord.Builder clearMax() {
fieldSetFlags()[8] = false;
return this;
}
diff --git a/theodolite-benchmarks/commons/src/main/avro/ActivePower.avdl b/theodolite-benchmarks/commons/src/main/avro/ActivePower.avdl
index 482a98c8c2729abc6fbfbd01aa8a839fa25fe508..6ee82d6becc6393617d569de27d0b162f892e192 100644
--- a/theodolite-benchmarks/commons/src/main/avro/ActivePower.avdl
+++ b/theodolite-benchmarks/commons/src/main/avro/ActivePower.avdl
@@ -1,4 +1,4 @@
-@namespace("rocks.theodolite.commons.model.records")
+@namespace("rocks.theodolite.benchmarks.commons.model.records")
protocol ActivePower {
record ActivePowerRecord {
diff --git a/theodolite-benchmarks/commons/src/main/avro/AggregatedActivePower.avdl b/theodolite-benchmarks/commons/src/main/avro/AggregatedActivePower.avdl
index 23bacac57fd2f28a6bb509379f0e984ebbefe62a..571f30f3247cae7c829aaa7742a37f8f3c89cfed 100644
--- a/theodolite-benchmarks/commons/src/main/avro/AggregatedActivePower.avdl
+++ b/theodolite-benchmarks/commons/src/main/avro/AggregatedActivePower.avdl
@@ -1,4 +1,4 @@
-@namespace("rocks.theodolite.commons.model.records")
+@namespace("rocks.theodolite.benchmarks.commons.model.records")
protocol AggregatedActivePower {
record AggregatedActivePowerRecord {
diff --git a/theodolite-benchmarks/commons/src/main/avro/StatsActivePower.avdl b/theodolite-benchmarks/commons/src/main/avro/StatsActivePower.avdl
index 3facc848eb40a086ce2599dd8f17ba0f948c05dd..9f4c6360661a6b40f267a17ae8205b8178044895 100644
--- a/theodolite-benchmarks/commons/src/main/avro/StatsActivePower.avdl
+++ b/theodolite-benchmarks/commons/src/main/avro/StatsActivePower.avdl
@@ -1,4 +1,4 @@
-@namespace("rocks.theodolite.commons.model.records")
+@namespace("rocks.theodolite.benchmarks.commons.model.records")
protocol StatsActivePower {
record HourOfDayActivePowerRecord {
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
similarity index 93%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
index 6c5c3b6fa285ef2a0fba803aca72599a569d27a0..fb29d078d2fb5125103188247f1673a1da766536 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.commons.configuration;
+package rocks.theodolite.benchmarks.commons.commons.configuration;
import java.util.Locale;
import org.apache.commons.configuration2.EnvironmentConfiguration;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/ServiceConfigurations.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/commons/configuration/ServiceConfigurations.java
similarity index 98%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/ServiceConfigurations.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/commons/configuration/ServiceConfigurations.java
index 26d5e9f9269c13a6353c915522e605407cc1fdc6..6ad0703697aa02f641c9b86f7384bfd9b9e1956c 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/ServiceConfigurations.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/commons/configuration/ServiceConfigurations.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.commons.configuration;
+package rocks.theodolite.benchmarks.commons.commons.configuration;
import com.google.common.io.Resources;
import java.nio.file.Files;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/Event.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/configuration/events/Event.java
similarity index 61%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/Event.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/configuration/events/Event.java
index 916514308e8bd8672698efcb3fbc93902de1c111..895b3401c5d59abb6863caa246414e9ead69d773 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/Event.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/configuration/events/Event.java
@@ -1,6 +1,6 @@
-package rocks.theodolite.commons.configuration.events;
+package rocks.theodolite.benchmarks.commons.configuration.events;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
/**
* Events that could occur when modifying a {@link SensorRegistry}. Currently only a general change
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/EventSerde.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/configuration/events/EventSerde.java
similarity index 97%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/EventSerde.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/configuration/events/EventSerde.java
index 65c0307565204d2debb15b0dc2f8cf4d7f8ba0e1..50a3faad61d6c6179efe983b0c172e66e0d28367 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/EventSerde.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/configuration/events/EventSerde.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.configuration.events;
+package rocks.theodolite.benchmarks.commons.configuration.events;
import java.nio.ByteBuffer;
import java.util.Map;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/avro/SchemaRegistryAvroSerdeFactory.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/avro/SchemaRegistryAvroSerdeFactory.java
similarity index 95%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/avro/SchemaRegistryAvroSerdeFactory.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/avro/SchemaRegistryAvroSerdeFactory.java
index 1ba798c3a717c13bf12341080c05fe722c0d18dc..9f3d5721efd90000b9265b593be5656b989c4f44 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/avro/SchemaRegistryAvroSerdeFactory.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/avro/SchemaRegistryAvroSerdeFactory.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.avro;
+package rocks.theodolite.benchmarks.commons.kafka.avro;
import io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig;
import io.confluent.kafka.streams.serdes.avro.SpecificAvroSerde;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferConstants.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferConstants.java
similarity index 84%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferConstants.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferConstants.java
index 7c1a4321288dd06b63b69a251d0b5dea0ef6a506..b29c05359d04ebf2552da7a3c3a6b915ede1cd35 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferConstants.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferConstants.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
import java.nio.charset.Charset;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferDeserializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferDeserializer.java
similarity index 78%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferDeserializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferDeserializer.java
index 03055c4fa78f6c6e5e46f4db4144ac76032e9679..88fba611be5600d3a5557b34d5244e523dcbb017 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferDeserializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferDeserializer.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
/**
* Deserializer to deserialize a {@link ReadBuffer} to an object.
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferSerde.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferSerde.java
similarity index 81%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferSerde.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferSerde.java
index 77c517bdfb4805fa5a01a96591345bc973a2c7ad..e14f03e2b36e5551911536f2dff20f70e8efe08a 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferSerde.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferSerde.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
/**
* Combine {@link BufferSerializer} and {@link BufferDeserializer} into one type. This allows
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferSerializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferSerializer.java
similarity index 78%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferSerializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferSerializer.java
index 9ea1cb107ca1b9fb7e1fa69f42dc4d4ee0e83fc5..9c7353a64a39839f183ad4153f369e3d33bcfe5b 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/BufferSerializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/BufferSerializer.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
/**
* Serializer to serialize an object to a {@link WriteBuffer}.
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/ReadBuffer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/ReadBuffer.java
similarity index 95%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/ReadBuffer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/ReadBuffer.java
index ff96d69d7005f7793fb246cf8a822b3e73f65f3c..cf0e7af93c31b20e7136d4f6b1c870691cd4801d 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/ReadBuffer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/ReadBuffer.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
import java.nio.ByteBuffer;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleDeserializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleDeserializer.java
similarity index 93%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleDeserializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleDeserializer.java
index 804c806c92d591002ca71e7a4726b21081452c67..d3d2b6756c417f62c85bfd5a269d0d47d36daa7c 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleDeserializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleDeserializer.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
import java.util.Map;
import org.apache.kafka.common.serialization.Deserializer;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleSerdes.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleSerdes.java
similarity index 91%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleSerdes.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleSerdes.java
index 19346e5e7c9fbfe165bb2c596e9b6609cb295b4b..ae1c0530f8283122451b7e20d32f56300cdf6ef7 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleSerdes.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleSerdes.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.common.serialization.Serdes;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleSerializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleSerializer.java
similarity index 93%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleSerializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleSerializer.java
index a6b8f5ce4daa97bdaa1e20c39591eb15f58b3326..4ed3d91f74a3ad6bc3a0ff8f52d91e53a741e65d 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/SimpleSerializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/SimpleSerializer.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
import java.util.Map;
import org.apache.kafka.common.serialization.Serializer;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/WriteBuffer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/WriteBuffer.java
similarity index 96%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/WriteBuffer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/WriteBuffer.java
index 25ffe985915acbe3c31f464b2b5e60d1d4cfae7d..144b125f031250c09900360898f98f871643f036 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/kafka/simpleserdes/WriteBuffer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/kafka/simpleserdes/WriteBuffer.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.kafka.simpleserdes;
+package rocks.theodolite.benchmarks.commons.kafka.simpleserdes;
import java.nio.ByteBuffer;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AbstractSensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/AbstractSensor.java
similarity index 86%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AbstractSensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/AbstractSensor.java
index f495cd5746fe5c0cd0784e1a74590e80f005b549..3dad538bb9ddb41959511ee41591d069450b7f69 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AbstractSensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/AbstractSensor.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import java.util.Optional;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AggregatedSensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/AggregatedSensor.java
similarity index 93%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AggregatedSensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/AggregatedSensor.java
index dc2fe2c725b26a1515d610b0ba9c3c6522862a54..fa8717ded4643f2350174e4c26dd10ffe608d2ac 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AggregatedSensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/AggregatedSensor.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ImmutableSensorRegistry.java
similarity index 88%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ImmutableSensorRegistry.java
index a9bf03403b76e7a85891c00fe47b356bbec80fa7..7cbd1264f9f99a60fe43aa65a31011a489dde148 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ImmutableSensorRegistry.java
@@ -1,17 +1,19 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.ImmutableMap;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.MachineSensorSerializer;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.SensorRegistryDeserializer;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
+
import java.util.Collection;
import java.util.Objects;
import java.util.Optional;
-import rocks.theodolite.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
-import rocks.theodolite.commons.model.sensorregistry.serialization.MachineSensorSerializer;
-import rocks.theodolite.commons.model.sensorregistry.serialization.SensorRegistryDeserializer;
-import rocks.theodolite.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
/**
* Implementation of a {@link SensorRegistry} that is immutable.
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MachineSensor.java
similarity index 86%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MachineSensor.java
index 158f172e93e1091281bcec1b71f59a352f50a73c..cdb4b535bffd807acb92fbfd057f5986b4840ba8 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MachineSensor.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import java.util.ArrayList;
import java.util.List;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensorImpl.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MachineSensorImpl.java
similarity index 88%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensorImpl.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MachineSensorImpl.java
index 0d30263b6dbe9b09ec73a50e89b546643e8033c9..191664bfdee31874003d7420ef7f81560c4fe29b 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensorImpl.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MachineSensorImpl.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import java.util.Objects;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableAggregatedSensor.java
similarity index 94%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableAggregatedSensor.java
index 1eb683b4cfcfc1e129ad6b7bee7dc236cd331754..c0b5e42c83998622294adcb38dab50fd591d286d 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableAggregatedSensor.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableSensorRegistry.java
similarity index 83%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableSensorRegistry.java
index 1096ccba99849516ebe67d1e6b604e80ed880e6a..dd54928f05f9dfcc41189882a58892a8d5fc2999 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableSensorRegistry.java
@@ -1,16 +1,18 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.MachineSensorSerializer;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
+
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import rocks.theodolite.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
-import rocks.theodolite.commons.model.sensorregistry.serialization.MachineSensorSerializer;
-import rocks.theodolite.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
/**
* A {@link SensorRegistry} to which sensors can be added.
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/Sensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/Sensor.java
similarity index 72%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/Sensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/Sensor.java
index 8c261442776ed62d193062fe08d2f6a1a454f184..b22cc81d3912d8094ae67475ce261ce958d3d236 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/Sensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/Sensor.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import java.util.Optional;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/SensorRegistry.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/SensorRegistry.java
similarity index 92%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/SensorRegistry.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/SensorRegistry.java
index df1852879a31cd7d46edd3c17629a00658a78197..e079f5c12e4a3ddfe9f680860444c239ae51aa6b 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/SensorRegistry.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/SensorRegistry.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import java.util.Collection;
import java.util.Optional;
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
similarity index 82%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
index 65aa301747866d34b3583c6ebedb8032bc31c1f6..7989a097d4944da9350b46c12b06832180d0eb0c 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
@@ -1,11 +1,13 @@
-package rocks.theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+
import java.lang.reflect.Type;
-import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
/**
* {@link JsonSerializer} for {@link AggregatedSensor}s.
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
similarity index 81%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
index 8bdba5e3b2c2e2bb8c9e6021c6a6b4cd45635cfc..3b842dfa7e8d4d35ddb7e2f87da6d9e578364b6f 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
@@ -1,11 +1,13 @@
-package rocks.theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MachineSensor;
+
import java.lang.reflect.Type;
-import rocks.theodolite.commons.model.sensorregistry.MachineSensor;
/**
* {@link JsonSerializer} for {@link MachineSensor}s.
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
similarity index 89%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
index df976f5606492fe8b7496cd4c985870704854b6d..99f05abd431d366eb4d38eefa7222a0f16013199 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
@@ -6,12 +6,14 @@ import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
+
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableAggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
+
import java.lang.reflect.Type;
-import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.ImmutableSensorRegistry;
-import rocks.theodolite.commons.model.sensorregistry.MutableAggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.MutableSensorRegistry;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
/**
* {@link JsonDeserializer} for {@link AggregatedSensor}s.
diff --git a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
similarity index 76%
rename from theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
index 9d829b160e2fb1123542371afbd5cf75c5f03ab9..4c5658f7caf582c981c5fe791fc406802a85c8ed 100644
--- a/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
@@ -1,10 +1,12 @@
-package rocks.theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization;
import com.google.gson.JsonElement;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
+
import java.lang.reflect.Type;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
/**
* {@link JsonSerializer} for {@link SensorRegistry}s.
diff --git a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/common/configuration/NameResolvingEnvironmentConfigurationTest.java b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/common/configuration/NameResolvingEnvironmentConfigurationTest.java
similarity index 94%
rename from theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/common/configuration/NameResolvingEnvironmentConfigurationTest.java
rename to theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/common/configuration/NameResolvingEnvironmentConfigurationTest.java
index b7e31d29281801390f2a97281973e68be6c92bd7..c53112255797340ff011c1af75d3720525b02cd6 100644
--- a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/common/configuration/NameResolvingEnvironmentConfigurationTest.java
+++ b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/common/configuration/NameResolvingEnvironmentConfigurationTest.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.common.configuration;
+package rocks.theodolite.benchmarks.commons.common.configuration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -8,7 +8,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
-import rocks.theodolite.commons.commons.configuration.NameResolvingEnvironmentConfiguration;
+import rocks.theodolite.benchmarks.commons.commons.configuration.NameResolvingEnvironmentConfiguration;
public class NameResolvingEnvironmentConfigurationTest {
diff --git a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/ExampleSensors.java b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ExampleSensors.java
similarity index 72%
rename from theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/ExampleSensors.java
rename to theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ExampleSensors.java
index a0705877f65d9c48dfc6c5441f0a661955e8d172..9c0dff92179fc36541f52ad792a2a6974e8f1455 100644
--- a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/ExampleSensors.java
+++ b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ExampleSensors.java
@@ -1,8 +1,14 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import java.util.List;
import java.util.stream.Collectors;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MachineSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableAggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
+
public final class ExampleSensors {
private static final SensorRegistry REGISTRY;
diff --git a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistryTest.java b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ImmutableSensorRegistryTest.java
similarity index 93%
rename from theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistryTest.java
rename to theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ImmutableSensorRegistryTest.java
index 1857d1b19a0f4a33e7c9a83acd59be5dd1b21461..ed561f6212c757fa9e500b0241f4ba8a24952354 100644
--- a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistryTest.java
+++ b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/ImmutableSensorRegistryTest.java
@@ -1,9 +1,13 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableAggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableSensorRegistry;
+
public class ImmutableSensorRegistryTest {
@Test
diff --git a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/MaschineSensorImplExposer.java b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MaschineSensorImplExposer.java
similarity index 57%
rename from theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/MaschineSensorImplExposer.java
rename to theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MaschineSensorImplExposer.java
index e650f40e5bfbfc20af82d9f157ebf40ed530e4cf..310a87e59ea863eb1c9adc7574672286094da607 100644
--- a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/MaschineSensorImplExposer.java
+++ b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MaschineSensorImplExposer.java
@@ -1,4 +1,7 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
+
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MachineSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MachineSensorImpl;
/**
* Helper class to allow tests in other packages access {@link MachineSensorImpl} class objects.
diff --git a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistryTest.java b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableSensorRegistryTest.java
similarity index 93%
rename from theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistryTest.java
rename to theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableSensorRegistryTest.java
index dbfe596962b4e7606e63ac9766bad17195ef565d..3e4032c1ae46fe3c23557a2810fe3a43b8f6a138 100644
--- a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistryTest.java
+++ b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/MutableSensorRegistryTest.java
@@ -1,10 +1,14 @@
-package rocks.theodolite.commons.model.sensorregistry;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.Optional;
import org.junit.Test;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableAggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableSensorRegistry;
+
public class MutableSensorRegistryTest {
@Test
diff --git a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializerTest.java b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistryDeserializerTest.java
similarity index 93%
rename from theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializerTest.java
rename to theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistryDeserializerTest.java
index 52dc7eb9689aa0eee317fcc3c759ba71fafe5ecc..a9821eb90a916e42fdff8750d5c0d7c3cfd265a8 100644
--- a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializerTest.java
+++ b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistryDeserializerTest.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -16,10 +16,11 @@ import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.MachineSensor;
-import rocks.theodolite.commons.model.sensorregistry.Sensor;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MachineSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.Sensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.SensorRegistryDeserializer;
public class SensorRegistryDeserializerTest {
diff --git a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializerTest.java b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistrySerializerTest.java
similarity index 80%
rename from theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializerTest.java
rename to theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistrySerializerTest.java
index 2662abb7e9ba1e295491cffeea7ab740ad178a8b..c2413b571c3445df71480f76cb2b0cf251ad6009 100644
--- a/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializerTest.java
+++ b/theodolite-benchmarks/commons/src/test/java/rocks/theodolite/benchmarks/commons/model/sensorregistry/serialization/SensorRegistrySerializerTest.java
@@ -1,4 +1,4 @@
-package rocks.theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization;
import static org.junit.Assert.assertEquals;
import com.google.gson.Gson;
@@ -6,9 +6,13 @@ import com.google.gson.GsonBuilder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import rocks.theodolite.commons.model.sensorregistry.MaschineSensorImplExposer;
-import rocks.theodolite.commons.model.sensorregistry.MutableAggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.MutableSensorRegistry;
+
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MaschineSensorImplExposer;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableAggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.MachineSensorSerializer;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
public class SensorRegistrySerializerTest {
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 25b39b30c062958c9dbd5d05888e86fbfa292db0..2d49f05eea8aee1a3ed72d63868fbd6a50a92f48 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,9 +3,9 @@ package rocks.theodolite.benchmarks.httpbridge;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.loadgenerator.ConfigurationKeys;
import rocks.theodolite.benchmarks.loadgenerator.TitanKafkaSenderFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
class EnvVarHttpBridgeFactory {
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/EnvVarLoadGeneratorFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/EnvVarLoadGeneratorFactory.java
index ff3905e824b1671cd638d39501b61b3ec6c194b3..5d5f3c0c64b4d8a0efc4f4c7c332986ea4b9560d 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/EnvVarLoadGeneratorFactory.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/EnvVarLoadGeneratorFactory.java
@@ -7,7 +7,7 @@ import java.util.Properties;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
class EnvVarLoadGeneratorFactory {
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KafkaRecordSender.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KafkaRecordSender.java
index 914d2881774610ba008189b77e1e7ec1585919f8..0593e850112bf20d0e02f0a6f2aa884b9ce4406e 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KafkaRecordSender.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/KafkaRecordSender.java
@@ -8,7 +8,7 @@ import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.Serializer;
import org.apache.kafka.common.serialization.StringSerializer;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
/**
* Sends records to Kafka.
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanKafkaSenderFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanKafkaSenderFactory.java
index 7f0a1289e2fe3956ec898c3fcf7ab6dc4989dfad..02a46952d9f21bfda5dc7ebea24fc1c7779e77bb 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanKafkaSenderFactory.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanKafkaSenderFactory.java
@@ -1,7 +1,7 @@
package rocks.theodolite.benchmarks.loadgenerator;
import java.util.Properties;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* A factory for creating {@link KafkaRecordSender}s that sends Titan {@link ActivePowerRecord}s.
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanPubSubSenderFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanPubSubSenderFactory.java
index 41a76a62a5c6df45bc8820a2a99ff708ed849d75..c355033343854004e0aa4dff066da6abdebd7f8b 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanPubSubSenderFactory.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanPubSubSenderFactory.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.loadgenerator;
import java.io.IOException;
import java.nio.ByteBuffer;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* A factory for creating {@link PubSubRecordSender}s that sends Titan {@link ActivePowerRecord}s.
diff --git a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGenerator.java
index ba4d6d125746110e9af158d037a34ec01f534b63..41ee632fccb836f0264251142e01386019746674 100644
--- a/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGenerator.java
+++ b/theodolite-benchmarks/load-generator-commons/src/main/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGenerator.java
@@ -1,7 +1,7 @@
package rocks.theodolite.benchmarks.loadgenerator;
import java.time.Clock;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* A factory for creating {@link RecordGenerator}s that creates Titan {@link ActivePowerRecord}s.
diff --git a/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSenderTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSenderTest.java
index cbb3906331d62146acc1f3f8814d614ad972afbe..74e10711643398c7d0eb79a80a8ba3ff033cb4a7 100644
--- a/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSenderTest.java
+++ b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/HttpRecordSenderTest.java
@@ -14,7 +14,7 @@ import java.net.URI;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
public class HttpRecordSenderTest {
diff --git a/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGeneratorTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGeneratorTest.java
index d1d66829e25d15a69dabaf214102206e46c5c226..7ef2ae41935120a0619f76379ee321bc83c9ba4c 100644
--- a/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGeneratorTest.java
+++ b/theodolite-benchmarks/load-generator-commons/src/test/java/rocks/theodolite/benchmarks/loadgenerator/TitanRecordGeneratorTest.java
@@ -7,7 +7,7 @@ import java.time.ZoneId;
import java.time.ZoneOffset;
import org.junit.Assert;
import org.junit.Test;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
public class TitanRecordGeneratorTest {
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/ConverterAdapter.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/ConverterAdapter.java
index fb3bd8055e6e6b2f1433bce11b2de49547159bf5..b32d0cb8213b57cbad7f97f97409992e90d03abd 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/ConverterAdapter.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/ConverterAdapter.java
@@ -2,8 +2,8 @@ package rocks.theodolite.benchmarks.uc1.beam;
import org.apache.beam.sdk.transforms.SimpleFunction;
import org.apache.beam.sdk.values.TypeDescriptor;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.commons.RecordConverter;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* {@link SimpleFunction} which wraps a {@link RecordConverter} to be used with Beam.
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/GenericSink.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/GenericSink.java
index fe33450ea7901ff23ebc6bd63bfcfc6f8a980015..e42b7dea8ce346af11e5379e258970949a9def45 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/GenericSink.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/GenericSink.java
@@ -4,8 +4,8 @@ import org.apache.beam.sdk.transforms.MapElements;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.values.PCollection;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.commons.DatabaseAdapter;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* A {@link PTransform} for a generic {@link DatabaseAdapter}.
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/PipelineFactory.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/PipelineFactory.java
index 4cdd0cfc60bcfd30dd590a857928ba891937f5e6..74271aca04e28ab213ef396d61e12adc30517035 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/PipelineFactory.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/PipelineFactory.java
@@ -9,8 +9,8 @@ import org.apache.beam.sdk.transforms.Values;
import org.apache.commons.configuration2.Configuration;
import rocks.theodolite.benchmarks.commons.beam.AbstractPipelineFactory;
import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.beam.firestore.FirestoreOptionsExpander;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* {@link AbstractPipelineFactory} for UC1.
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkFactory.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkFactory.java
index a45b4bc3e3fd915f8447267fce279131e671abb2..73b95bb2257c80a1523b76c1e6b136319e6537cf 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkFactory.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkFactory.java
@@ -3,7 +3,7 @@ package rocks.theodolite.benchmarks.uc1.beam;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.values.PCollection;
import org.apache.commons.configuration2.Configuration;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Interface for a class that creates sinks (i.e., {@link PTransform}s that map and store
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkType.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkType.java
index a1c9570411315be91d4826f2e5f1275b9b65d4e8..60eaabfddbbc7738c33f1c2b563703710e3f0a0e 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkType.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkType.java
@@ -4,9 +4,9 @@ import java.util.stream.Stream;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.values.PCollection;
import org.apache.commons.configuration2.Configuration;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.beam.firestore.FirestoreSink;
import rocks.theodolite.benchmarks.uc1.commons.logger.LogWriterFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* Supported Sink types, i.e., {@link PTransform} for converting and storing
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/DocumentMapper.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/DocumentMapper.java
index b72bedce2a7b2c43c935a89a7b798d4dada2e411..6d23c929688bbbcda1586fb41a454605f48e2ef7 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/DocumentMapper.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/DocumentMapper.java
@@ -4,7 +4,7 @@ import com.google.firestore.v1.Document;
import com.google.firestore.v1.Value;
import java.io.IOException;
import org.apache.beam.sdk.transforms.SimpleFunction;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
final class DocumentMapper extends SimpleFunction<ActivePowerRecord, Document> {
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreSink.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreSink.java
index ba6542f4a63d1f47adf821dda241b1f79f24d5ef..100bb6205bd91d2562f9141332943610ba3b5e3e 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreSink.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreSink.java
@@ -7,7 +7,7 @@ import org.apache.beam.sdk.transforms.MapElements;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.values.PCollection;
import org.apache.commons.configuration2.Configuration;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* A {@link PTransform} mapping {@link ActivePowerRecord}s to {@link Document}s, followed by storing
diff --git a/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/DatabaseAdapter.java b/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/DatabaseAdapter.java
index ca981b40f8c1d02b91951f7065a4fdd72e6efa13..99e59a6e6fcbef8e49fe04d7ecaf9ed929e9b13e 100644
--- a/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/DatabaseAdapter.java
+++ b/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/DatabaseAdapter.java
@@ -1,7 +1,7 @@
package rocks.theodolite.benchmarks.uc1.commons;
import java.util.Objects;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* A database adapter consisting of a {@link RecordConverter} and a {@link DatabaseWriter}.
diff --git a/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/RecordConverter.java b/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/RecordConverter.java
index d7979e80d24ea3d81d67461c1318d51768795d4a..a728e9d6b676a273c3847b89b2091e8928aba114 100644
--- a/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/RecordConverter.java
+++ b/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/RecordConverter.java
@@ -1,6 +1,6 @@
package rocks.theodolite.benchmarks.uc1.commons;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Converts an {@link ActivePowerRecord} to the type required by a database.
diff --git a/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/logger/JsonConverter.java b/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/logger/JsonConverter.java
index 11511d4f3d137a1753698c59ef8624e9cf4fdd56..a59f02687c1c6a0455f43e5a34c421c85e6972cd 100644
--- a/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/logger/JsonConverter.java
+++ b/theodolite-benchmarks/uc1-commons/src/main/java/rocks/theodolite/benchmarks/uc1/commons/logger/JsonConverter.java
@@ -2,8 +2,8 @@ package rocks.theodolite.benchmarks.uc1.commons.logger;
import com.google.gson.Gson;
import java.io.Serializable;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.commons.RecordConverter;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* {@link RecordConverter} that converts {@link ActivePowerRecord}s to JSON strings.
diff --git a/theodolite-benchmarks/uc1-flink/src/main/java/rocks/theodolite/benchmarks/uc1/flink/ConverterAdapter.java b/theodolite-benchmarks/uc1-flink/src/main/java/rocks/theodolite/benchmarks/uc1/flink/ConverterAdapter.java
index 05bd1432b3fbb4e83588c772f019ef2f8bdf4704..8380cdc09caa35814f3203bdf6dc1746875fdf9b 100644
--- a/theodolite-benchmarks/uc1-flink/src/main/java/rocks/theodolite/benchmarks/uc1/flink/ConverterAdapter.java
+++ b/theodolite-benchmarks/uc1-flink/src/main/java/rocks/theodolite/benchmarks/uc1/flink/ConverterAdapter.java
@@ -1,8 +1,8 @@
package rocks.theodolite.benchmarks.uc1.flink;
import org.apache.flink.api.common.functions.MapFunction;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.commons.RecordConverter;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* {@link MapFunction} which wraps a {@link RecordConverter} to be used with Flink.
diff --git a/theodolite-benchmarks/uc1-flink/src/main/java/rocks/theodolite/benchmarks/uc1/flink/HistoryServiceFlinkJob.java b/theodolite-benchmarks/uc1-flink/src/main/java/rocks/theodolite/benchmarks/uc1/flink/HistoryServiceFlinkJob.java
index dce779382843fca81c60841ec1c6f07331aa0605..83936d7482058e7db2ae6ebf2292ff3c22dbda09 100644
--- a/theodolite-benchmarks/uc1-flink/src/main/java/rocks/theodolite/benchmarks/uc1/flink/HistoryServiceFlinkJob.java
+++ b/theodolite-benchmarks/uc1-flink/src/main/java/rocks/theodolite/benchmarks/uc1/flink/HistoryServiceFlinkJob.java
@@ -7,11 +7,11 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
import rocks.theodolite.benchmarks.commons.flink.KafkaConnectorFactory;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.commons.DatabaseAdapter;
import rocks.theodolite.benchmarks.uc1.commons.logger.LogWriterFactory;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* The History microservice implemented as a Flink job.
diff --git a/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1PipelineBuilder.java b/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1PipelineBuilder.java
index c02ea1e7ea7fb3f27bdbf818248678011a93f6a2..865a3e78c51fdf12a5915528b29b704e2079ac33 100644
--- a/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1PipelineBuilder.java
+++ b/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1PipelineBuilder.java
@@ -1,7 +1,6 @@
package rocks.theodolite.benchmarks.uc1.hazelcastjet;
import static com.hazelcast.jet.pipeline.SinkBuilder.sinkBuilder;
-
import com.hazelcast.jet.kafka.KafkaSources;
import com.hazelcast.jet.pipeline.Pipeline;
import com.hazelcast.jet.pipeline.Sink;
@@ -9,10 +8,11 @@ import com.hazelcast.jet.pipeline.StreamSource;
import com.hazelcast.jet.pipeline.StreamStage;
import java.util.Map.Entry;
import java.util.Properties;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.commons.DatabaseAdapter;
import rocks.theodolite.benchmarks.uc1.commons.DatabaseWriter;
import rocks.theodolite.benchmarks.uc1.commons.logger.LogWriterFactory;
-import titan.ccp.model.records.ActivePowerRecord;
+
/**
* Builder to build a HazelcastJet Pipeline for UC1 which can be used for stream processing using
@@ -47,8 +47,8 @@ public class Uc1PipelineBuilder {
final DatabaseWriter<String> writer = this.databaseAdapter.getDatabaseWriter();
final Sink<String> sink = sinkBuilder(
"Sink into database", x -> writer)
- .<String>receiveFn(DatabaseWriter::write)
- .build();
+ .<String>receiveFn(DatabaseWriter::write)
+ .build();
uc1TopologyProduct.writeTo(sink);
diff --git a/theodolite-benchmarks/uc1-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc1/hazelcast/Uc1PipelineTest.java b/theodolite-benchmarks/uc1-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc1/hazelcast/Uc1PipelineTest.java
index 525327ddbcdcddb6cf1bfe4e2d6be62d3384fc0c..8ffde0487ab88c260655f51eac3d2701f31a7ab0 100644
--- a/theodolite-benchmarks/uc1-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc1/hazelcast/Uc1PipelineTest.java
+++ b/theodolite-benchmarks/uc1-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc1/hazelcast/Uc1PipelineTest.java
@@ -1,5 +1,7 @@
package rocks.theodolite.benchmarks.uc1.hazelcast;
+import static com.hazelcast.jet.pipeline.SinkBuilder.sinkBuilder;
+import static com.hazelcast.logging.Logger.getLogger;
import com.hazelcast.jet.Jet;
import com.hazelcast.jet.JetInstance;
import com.hazelcast.jet.config.JetConfig;
@@ -12,24 +14,21 @@ import com.hazelcast.jet.pipeline.test.AssertionCompletedException;
import com.hazelcast.jet.pipeline.test.Assertions;
import com.hazelcast.jet.pipeline.test.TestSources;
import com.hazelcast.jet.test.SerialTest;
+import com.hazelcast.logging.ILogger;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.CompletionException;
-import com.hazelcast.logging.ILogger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.commons.DatabaseAdapter;
import rocks.theodolite.benchmarks.uc1.commons.DatabaseWriter;
import rocks.theodolite.benchmarks.uc1.commons.logger.LogWriterFactory;
import rocks.theodolite.benchmarks.uc1.hazelcastjet.Uc1PipelineBuilder;
-import titan.ccp.model.records.ActivePowerRecord;
-
-import static com.hazelcast.jet.pipeline.SinkBuilder.sinkBuilder;
-import static com.hazelcast.logging.Logger.getLogger;
/**
* Test methods for the Hazelcast Jet Implementation of UC1.
@@ -44,7 +43,7 @@ public class Uc1PipelineTest extends JetTestSupport {
// Standart Logger
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(Uc1PipelineTest.class);
// HazelcastJet Logger
- private static final ILogger logger = getLogger(Uc1PipelineTest.class);
+ private static final ILogger logger = getLogger(Uc1PipelineTest.class);
private final DatabaseAdapter<String> databaseAdapter = LogWriterFactory.forJson();
@@ -55,7 +54,7 @@ public class Uc1PipelineTest extends JetTestSupport {
@Before
public void buildUc1Pipeline() {
- this.logger.info("Hazelcast Logger");
+ Uc1PipelineTest.logger.info("Hazelcast Logger");
LOGGER.info("Standard Logger");
@@ -67,9 +66,9 @@ public class Uc1PipelineTest extends JetTestSupport {
// Create mock jet instance with configuration
final String testClusterName = randomName();
final JetConfig testJetConfig = new JetConfig();
-// testJetConfig.setProperty( "hazelcast.logging.type", "slf4j" );
+ // testJetConfig.setProperty( "hazelcast.logging.type", "slf4j" );
testJetConfig.getHazelcastConfig().setClusterName(testClusterName);
- this.testInstance = createJetMember(testJetConfig);
+ this.testInstance = this.createJetMember(testJetConfig);
// Create a test source
@@ -92,17 +91,17 @@ public class Uc1PipelineTest extends JetTestSupport {
final DatabaseWriter<String> adapter = this.databaseAdapter.getDatabaseWriter();
final Sink<String> sink = sinkBuilder(
"database-sink", x -> adapter)
- .<String>receiveFn(DatabaseWriter::write)
- .build();
+ .<String>receiveFn(DatabaseWriter::write)
+ .build();
-// Map Stage, can be used instead of sink
-// StreamStage<String> log = uc1Topology.map(s -> {
-// LOGGER.info(s);
-// return s;
-// });
-// log.writeTo(sink);
+ // Map Stage, can be used instead of sink
+ // StreamStage<String> log = uc1Topology.map(s -> {
+ // LOGGER.info(s);
+ // return s;
+ // });
+ // log.writeTo(sink);
- //apply sink
+ // apply sink
this.uc1Topology.writeTo(sink);
}
@@ -121,8 +120,8 @@ public class Uc1PipelineTest extends JetTestSupport {
// Assertion
this.uc1Topology.apply(Assertions.assertCollectedEventually(assertTimeoutSeconds,
collection -> {
- //print the newest Record
-// LOGGER.info(collection.get(collection.size()-1));
+ // print the newest Record
+ // LOGGER.info(collection.get(collection.size()-1));
// Run pipeline until 5th item
Assert.assertTrue("Not enough data arrived in the end",
diff --git a/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/HistoryService.java b/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/HistoryService.java
index a93e225c3038bb3364443588155bece76988e0fc..dd792ac8a814514338d6fb27b4f67f4b6f033105 100644
--- a/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/HistoryService.java
+++ b/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/HistoryService.java
@@ -3,7 +3,7 @@ package rocks.theodolite.benchmarks.uc1.kstreams;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.KafkaStreams;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
/**
* A microservice that manages the history and, therefore, stores and aggregates incoming
diff --git a/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/TopologyBuilder.java b/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/TopologyBuilder.java
index 7bf354df9b91028f8e0dac9f77b5d02d3ad9886b..efbf774066773cd6a17d830cf07b629231fe06ef 100644
--- a/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/TopologyBuilder.java
+++ b/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/TopologyBuilder.java
@@ -5,10 +5,10 @@ import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.streams.StreamsBuilder;
import org.apache.kafka.streams.Topology;
import org.apache.kafka.streams.kstream.Consumed;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc1.commons.DatabaseAdapter;
import rocks.theodolite.benchmarks.uc1.commons.logger.LogWriterFactory;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* Builds Kafka Stream Topology for the History microservice.
diff --git a/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/Uc1KafkaStreamsBuilder.java b/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/Uc1KafkaStreamsBuilder.java
index 5370de258f78e300bd8a925dfbdce6beb9ba215e..05d6a5845a9eb79998d7c4fc1940357559d0936d 100644
--- a/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/Uc1KafkaStreamsBuilder.java
+++ b/theodolite-benchmarks/uc1-kstreams/src/main/java/rocks/theodolite/benchmarks/uc1/kstreams/Uc1KafkaStreamsBuilder.java
@@ -4,8 +4,8 @@ import java.util.Objects;
import java.util.Properties;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.Topology;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
import rocks.theodolite.benchmarks.commons.kstreams.KafkaStreamsBuilder;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
/**
* Builder for the Kafka Streams configuration.
diff --git a/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/PipelineFactory.java b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/PipelineFactory.java
index 868ebfa79770d4d19217b5821b77e85fcd8ea8b5..decbcae1c4b524f9f39295ecd49275a3c1b09951 100644
--- a/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/PipelineFactory.java
+++ b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/PipelineFactory.java
@@ -22,7 +22,7 @@ import rocks.theodolite.benchmarks.commons.beam.AbstractPipelineFactory;
import rocks.theodolite.benchmarks.commons.beam.ConfigurationKeys;
import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaWriterTransformation;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* {@link AbstractPipelineFactory} for UC2.
diff --git a/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsAggregation.java b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsAggregation.java
index aeb614fd0f973628f1e052ee50ed0d7e92a8feac..cf320bf18b37f25b787c1baea1109892f2aa83fa 100644
--- a/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsAggregation.java
+++ b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsAggregation.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
import org.apache.beam.sdk.coders.AvroCoder;
import org.apache.beam.sdk.coders.DefaultCoder;
import org.apache.beam.sdk.transforms.Combine.CombineFn;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Aggregation Class for ActivePowerRecords. Creates a StatsAccumulator based on the ValueInW.
diff --git a/theodolite-benchmarks/uc2-flink/src/main/java/rocks/theodolite/benchmarks/uc2/flink/HistoryServiceFlinkJob.java b/theodolite-benchmarks/uc2-flink/src/main/java/rocks/theodolite/benchmarks/uc2/flink/HistoryServiceFlinkJob.java
index ace81d5e36d67694628b874ca34501e7a4e61402..30d6081534b04be6e33af96d42f5c783111e1e3e 100644
--- a/theodolite-benchmarks/uc2-flink/src/main/java/rocks/theodolite/benchmarks/uc2/flink/HistoryServiceFlinkJob.java
+++ b/theodolite-benchmarks/uc2-flink/src/main/java/rocks/theodolite/benchmarks/uc2/flink/HistoryServiceFlinkJob.java
@@ -13,11 +13,11 @@ import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
import org.apache.kafka.common.serialization.Serdes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
import rocks.theodolite.benchmarks.commons.flink.KafkaConnectorFactory;
import rocks.theodolite.benchmarks.commons.flink.StateBackends;
import rocks.theodolite.benchmarks.commons.flink.serialization.StatsSerializer;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
diff --git a/theodolite-benchmarks/uc2-flink/src/main/java/rocks/theodolite/benchmarks/uc2/flink/StatsAggregateFunction.java b/theodolite-benchmarks/uc2-flink/src/main/java/rocks/theodolite/benchmarks/uc2/flink/StatsAggregateFunction.java
index a43d9b4efb35b7d4178d82b2e3bb6e0c5ed000ee..ca5c9b2aee2285f5e8415d853fd9fe09f2d51b49 100644
--- a/theodolite-benchmarks/uc2-flink/src/main/java/rocks/theodolite/benchmarks/uc2/flink/StatsAggregateFunction.java
+++ b/theodolite-benchmarks/uc2-flink/src/main/java/rocks/theodolite/benchmarks/uc2/flink/StatsAggregateFunction.java
@@ -3,8 +3,8 @@ package rocks.theodolite.benchmarks.uc2.flink;
import com.google.common.math.Stats;
import com.google.common.math.StatsAccumulator;
import org.apache.flink.api.common.functions.AggregateFunction;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc2.flink.util.StatsFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* Statistical aggregation of {@link ActivePowerRecord}s using {@link Stats}.
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineBuilder.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineBuilder.java
index 73377de6122d4a723c5dbbcb8198fa814c4bed1e..dbbcae0a52f43bd14fa15bde112ad203b79fc826 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineBuilder.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineBuilder.java
@@ -14,8 +14,10 @@ import com.hazelcast.jet.pipeline.WindowDefinition;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc2.hazelcastjet.uc2specifics.StatsAccumulatorSupplier;
-import titan.ccp.model.records.ActivePowerRecord;
+
+
/**
* Builder to build a HazelcastJet Pipeline for UC2 which can be used for stream processing using
@@ -108,8 +110,7 @@ public class Uc2PipelineBuilder {
* @return An AggregateOperation used by Hazelcast Jet in a streaming stage which aggregates
* ActivePowerRecord Objects into Stats Objects.
*/
- public AggregateOperation1<Entry<String, ActivePowerRecord>,
- StatsAccumulator, Stats> uc2AggregateOperation() {
+ public AggregateOperation1<Entry<String, ActivePowerRecord>, StatsAccumulator, Stats> uc2AggregateOperation() {
// Aggregate Operation to Create a Stats Object from Entry<String,ActivePowerRecord> items using
// the Statsaccumulator.
return AggregateOperation
@@ -129,7 +130,7 @@ public class Uc2PipelineBuilder {
.andExportFinish(
(accumulator) -> {
return accumulator.snapshot();
- });
+ });
}
}
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineTest.java b/theodolite-benchmarks/uc2-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineTest.java
index ff72b9558f43334feb8846d50bef2c6714d9404a..0a579c8d4ad2c872f7c90b1d6456de78b3a20f91 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineTest.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc2/hazelcastjet/Uc2PipelineTest.java
@@ -19,7 +19,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import titan.ccp.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Test methods for the Hazelcast Jet Implementation of UC2.
@@ -39,10 +39,10 @@ public class Uc2PipelineTest extends JetTestSupport {
public void buildUc2Pipeline() {
// Setup Configuration
- int testItemsPerSecond = 1;
- String testSensorName = "TEST-SENSOR";
- Double testValueInW = 10.0;
- int testWindowInMs = 5000;
+ final int testItemsPerSecond = 1;
+ final String testSensorName = "TEST-SENSOR";
+ final Double testValueInW = 10.0;
+ final int testWindowInMs = 5000;
// Create mock jet instance with configuration
final String testClusterName = randomName();
@@ -61,7 +61,7 @@ public class Uc2PipelineTest extends JetTestSupport {
});
// Create pipeline to test
- Uc2PipelineBuilder pipelineBuilder = new Uc2PipelineBuilder();
+ final Uc2PipelineBuilder pipelineBuilder = new Uc2PipelineBuilder();
this.testPipeline = Pipeline.create();
this.uc2Topology =
pipelineBuilder.extendUc2Topology(this.testPipeline, testSource, testWindowInMs);
@@ -75,14 +75,15 @@ public class Uc2PipelineTest extends JetTestSupport {
public void testOutput() {
// Assertion Configuration
- int timeout = 14;
- String expectedOutput = "Stats{count=5, mean=10.0, populationStandardDeviation=0.0, min=10.0, max=10.0}";
+ final int timeout = 14;
+ final String expectedOutput =
+ "Stats{count=5, mean=10.0, populationStandardDeviation=0.0, min=10.0, max=10.0}";
// Assertion
this.uc2Topology.apply(Assertions.assertCollectedEventually(timeout,
collection -> Assert.assertTrue(
"Not the right amount items in Stats Object!",
- collection.get(collection.size()-1).getValue().equals(expectedOutput))));
+ collection.get(collection.size() - 1).getValue().equals(expectedOutput))));
// Run the test!
try {
diff --git a/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/HistoryService.java b/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/HistoryService.java
index 4121c11a7af0fd719186ed1c025147dd5294bd00..4afc2d91eaaf98226f262f072cfd7e5aed6f847e 100644
--- a/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/HistoryService.java
+++ b/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/HistoryService.java
@@ -5,8 +5,8 @@ import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.KafkaStreams;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
import rocks.theodolite.benchmarks.commons.kstreams.ConfigurationKeys;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
/**
* A microservice that manages the history and, therefore, stores and aggregates incoming
diff --git a/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/TopologyBuilder.java b/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/TopologyBuilder.java
index 9bff1359502c742be9c34bc7312564adf68e7469..cd1d8cd92149d368a27452fa7689f5549a9c2bc7 100644
--- a/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/TopologyBuilder.java
+++ b/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/TopologyBuilder.java
@@ -13,10 +13,10 @@ import org.apache.kafka.streams.kstream.Produced;
import org.apache.kafka.streams.kstream.TimeWindows;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
import rocks.theodolite.benchmarks.commons.kstreams.GenericSerde;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc2.kstreams.util.StatsFactory;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* Builds Kafka Stream Topology for the History microservice.
diff --git a/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/Uc2KafkaStreamsBuilder.java b/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/Uc2KafkaStreamsBuilder.java
index e76ef3e26144c844ddd6a7ab212cb3f89bf4b9eb..d9d4a23ec512ce4f7799648a4ea4f629e7b369ad 100644
--- a/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/Uc2KafkaStreamsBuilder.java
+++ b/theodolite-benchmarks/uc2-kstreams/src/main/java/rocks/theodolite/benchmarks/uc2/kstreams/Uc2KafkaStreamsBuilder.java
@@ -5,8 +5,8 @@ import java.util.Objects;
import java.util.Properties;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.Topology;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
import rocks.theodolite.benchmarks.commons.kstreams.KafkaStreamsBuilder;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
/**
* Builder for the Kafka Streams configuration.
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeySerde.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeySerde.java
index 8632572f0b1f84dedd76fee744d6001c366a7f38..8bc32ccc2146f6467f6fcf374f95e8b87c2c351c 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeySerde.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeySerde.java
@@ -1,10 +1,10 @@
package rocks.theodolite.benchmarks.uc3.beam;
import org.apache.kafka.common.serialization.Serde;
-import rocks.theodolite.commons.kafka.simpleserdes.BufferSerde;
-import rocks.theodolite.commons.kafka.simpleserdes.ReadBuffer;
-import rocks.theodolite.commons.kafka.simpleserdes.SimpleSerdes;
-import rocks.theodolite.commons.kafka.simpleserdes.WriteBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.BufferSerde;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.ReadBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.SimpleSerdes;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.WriteBuffer;
/**
* {@link BufferSerde} for a {@link HourOfDayKey}. Use the {@link #create()} method to create a new
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
index f183878a0422461a661fa7d8186459e7825feab3..0cad038141bd7b30d765520403529e9184bbcb86 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
@@ -5,7 +5,7 @@ import java.time.LocalDateTime;
import java.time.ZoneId;
import org.apache.beam.sdk.transforms.SimpleFunction;
import org.apache.beam.sdk.values.KV;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Changes the time format to us Europe/Paris time.
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
index c8b0220bf10e66c2c077c7f5dad9625552dfb93b..f6587be4c4660a2e34f34efdaa417a7080073d0e 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
@@ -23,7 +23,7 @@ import rocks.theodolite.benchmarks.commons.beam.AbstractPipelineFactory;
import rocks.theodolite.benchmarks.commons.beam.ConfigurationKeys;
import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaWriterTransformation;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* {@link AbstractPipelineFactory} for UC3.
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsAggregation.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsAggregation.java
index 1e2130846fdfd97e40bae160065ce56d7dd3461a..4fca536baf6db33e57700263cefb837ca8eb5b8b 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsAggregation.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsAggregation.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
import org.apache.beam.sdk.coders.AvroCoder;
import org.apache.beam.sdk.coders.DefaultCoder;
import org.apache.beam.sdk.transforms.Combine.CombineFn;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
diff --git a/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/HistoryServiceFlinkJob.java b/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/HistoryServiceFlinkJob.java
index f630b44285de9c084434bf13f3b90848fa9cbb37..4554d505c7a8c90dbf7fbc075d5877b1fa49412b 100644
--- a/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/HistoryServiceFlinkJob.java
+++ b/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/HistoryServiceFlinkJob.java
@@ -17,15 +17,15 @@ import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
import org.apache.kafka.common.serialization.Serdes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
import rocks.theodolite.benchmarks.commons.flink.KafkaConnectorFactory;
import rocks.theodolite.benchmarks.commons.flink.StateBackends;
import rocks.theodolite.benchmarks.commons.flink.serialization.StatsSerializer;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc3.flink.util.HourOfDayKey;
import rocks.theodolite.benchmarks.uc3.flink.util.HourOfDayKeyFactory;
import rocks.theodolite.benchmarks.uc3.flink.util.HourOfDayKeySerde;
import rocks.theodolite.benchmarks.uc3.flink.util.StatsKeyFactory;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* The History microservice implemented as a Flink job.
diff --git a/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/StatsAggregateFunction.java b/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/StatsAggregateFunction.java
index f58bda804f95482bfe53792dbc1fa6753153178e..83951a4228fe0b73a4330bfae5177f508b9c1b0e 100644
--- a/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/StatsAggregateFunction.java
+++ b/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/StatsAggregateFunction.java
@@ -3,8 +3,8 @@ package rocks.theodolite.benchmarks.uc3.flink;
import com.google.common.math.Stats;
import com.google.common.math.StatsAccumulator;
import org.apache.flink.api.common.functions.AggregateFunction;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc3.flink.util.StatsFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* Statistical aggregation of {@link ActivePowerRecord}s using {@link Stats}.
diff --git a/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/util/HourOfDayKeySerde.java b/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/util/HourOfDayKeySerde.java
index f9756bdaa75e429b175a23dc121f6cb299cb1397..5b08fcad2ff744e3d0e14e51d35fad88d2900470 100644
--- a/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/util/HourOfDayKeySerde.java
+++ b/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/util/HourOfDayKeySerde.java
@@ -6,10 +6,10 @@ import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
import java.io.Serializable;
import org.apache.kafka.common.serialization.Serde;
-import rocks.theodolite.commons.kafka.simpleserdes.BufferSerde;
-import rocks.theodolite.commons.kafka.simpleserdes.ReadBuffer;
-import rocks.theodolite.commons.kafka.simpleserdes.SimpleSerdes;
-import rocks.theodolite.commons.kafka.simpleserdes.WriteBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.BufferSerde;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.ReadBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.SimpleSerdes;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.WriteBuffer;
/**
* {@link BufferSerde} for a {@link HourOfDayKey}. Use the {@link #create()} method to create a new
diff --git a/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/util/HourOfDayRecordFactory.java b/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/util/HourOfDayRecordFactory.java
index 69aaa25f011186a74fbd845eba6c124685cf7282..420179a0825d5b897f6927040eb57c43d27837ef 100644
--- a/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/util/HourOfDayRecordFactory.java
+++ b/theodolite-benchmarks/uc3-flink/src/main/java/rocks/theodolite/benchmarks/uc3/flink/util/HourOfDayRecordFactory.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc3.flink.util;
import com.google.common.math.Stats;
import org.apache.kafka.streams.kstream.Windowed;
-import rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord;
/**
* {@link StatsRecordFactory} to create an {@link HourOfDayActivePowerRecord}.
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineBuilder.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineBuilder.java
index c8427de60742c2923d4ec17703592f5b8310de0c..e651d44fd2d099ae41296cc08487c787501d9b46 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineBuilder.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineBuilder.java
@@ -15,10 +15,10 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
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;
/**
* Builder to build a HazelcastJet Pipeline for UC3 which can be used for stream processing using
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineTest.java b/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineTest.java
index 3df4f4642f1bc6c8637f90bcae3f352f5c298e51..969ff27d1154a0bd52cb3a048eca2f12ca901138 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineTest.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineTest.java
@@ -14,20 +14,18 @@ import com.hazelcast.jet.pipeline.test.TestSources;
import com.hazelcast.jet.test.SerialTest;
import java.time.Instant;
import java.time.LocalDateTime;
-import java.util.ArrayList;
import java.util.Map;
-import java.util.TimeZone;
import java.util.Map.Entry;
+import java.util.TimeZone;
import java.util.concurrent.CompletionException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import rocks.theodolite.benchmarks.uc3.hazelcastjet.Uc3PipelineBuilder;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.HourOfDayKey;
import rocks.theodolite.benchmarks.uc3.hazelcastjet.uc3specifics.HourOfDayKeySerializer;
-import titan.ccp.model.records.ActivePowerRecord;
/**
* Test methods for the Hazelcast Jet Implementation of UC3.
@@ -49,13 +47,13 @@ public class Uc3PipelineTest extends JetTestSupport {
public void buildUc3Pipeline() {
// Setup Configuration
- int testItemsPerSecond = 1;
- String testSensorName = "TEST-SENSOR";
- Double testValueInW = 10.0;
- int testHopSizeInSec = 1;
- int testWindowSizeInSec = 50;
+ final int testItemsPerSecond = 1;
+ final String testSensorName = "TEST-SENSOR";
+ final Double testValueInW = 10.0;
+ final int testHopSizeInSec = 1;
+ final int testWindowSizeInSec = 50;
// Used to check hourOfDay
- long mockTimestamp = 1632741651;
+ final long mockTimestamp = 1632741651;
// Create mock jet instance with configuration
@@ -75,9 +73,9 @@ public class Uc3PipelineTest extends JetTestSupport {
});
// Create pipeline to test
- Uc3PipelineBuilder pipelineBuilder = new Uc3PipelineBuilder();
+ final Uc3PipelineBuilder pipelineBuilder = new Uc3PipelineBuilder();
this.testPipeline = Pipeline.create();
- this.uc3Topology = pipelineBuilder.extendUc3Topology(testPipeline, testSource,
+ this.uc3Topology = pipelineBuilder.extendUc3Topology(this.testPipeline, testSource,
testHopSizeInSec, testWindowSizeInSec);
}
@@ -88,11 +86,11 @@ public class Uc3PipelineTest extends JetTestSupport {
public void testOutput() {
// Assertion Configuration
- int timeout = 10;
- String testSensorName = "TEST-SENSOR";
- Double testValueInW = 10.0;
+ final int timeout = 10;
+ final String testSensorName = "TEST-SENSOR";
+ final Double testValueInW = 10.0;
// Used to check hourOfDay
- long mockTimestamp = 1632741651;
+ final long mockTimestamp = 1632741651;
// Assertion
this.uc3Topology.apply(Assertions.assertCollectedEventually(timeout,
@@ -105,17 +103,15 @@ public class Uc3PipelineTest extends JetTestSupport {
boolean allOkay = true;
if (collection != null) {
System.out.println("DEBUG: CHECK 2 || Collection Size: " + collection.size());
- for (int i = 0; i < collection.size(); i++) {
+ for (final Entry<String, String> currentEntry : collection) {
// Build hour of day
- long timestamp = mockTimestamp;
- int expectedHour = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp),
+ final long timestamp = mockTimestamp;
+ final int expectedHour = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp),
TimeZone.getDefault().toZoneId()).getHour();
- // Compare expected output with generated output
- Entry<String, String> currentEntry = collection.get(i);
- String expectedKey = testSensorName + ";" + expectedHour;
- String expectedValue = testValueInW.toString();
+ final String expectedKey = testSensorName + ";" + expectedHour;
+ final String expectedValue = testValueInW.toString();
// DEBUG
System.out.println(
diff --git a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HistoryService.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HistoryService.java
index be42b0a228c5e970c1421676d5376dd61d8dd74d..8776fcda3092d8282f6ab85f69c734bf834a2bcc 100644
--- a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HistoryService.java
+++ b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HistoryService.java
@@ -4,8 +4,8 @@ import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.KafkaStreams;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
import rocks.theodolite.benchmarks.commons.kstreams.ConfigurationKeys;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
/**
* A microservice that manages the history and, therefore, stores and aggregates incoming
diff --git a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HourOfDayKeySerde.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HourOfDayKeySerde.java
index d8319a45255c4bfe407c5fef6e26dc2f084fd959..e2a3b03e1e51df2756299b66d24e89d9cf0403b9 100644
--- a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HourOfDayKeySerde.java
+++ b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HourOfDayKeySerde.java
@@ -1,10 +1,10 @@
package rocks.theodolite.benchmarks.uc3.kstreams;
import org.apache.kafka.common.serialization.Serde;
-import rocks.theodolite.commons.kafka.simpleserdes.BufferSerde;
-import rocks.theodolite.commons.kafka.simpleserdes.ReadBuffer;
-import rocks.theodolite.commons.kafka.simpleserdes.SimpleSerdes;
-import rocks.theodolite.commons.kafka.simpleserdes.WriteBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.BufferSerde;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.ReadBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.SimpleSerdes;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.WriteBuffer;
/**
* {@link BufferSerde} for a {@link HourOfDayKey}. Use the {@link #create()} method to create a new
diff --git a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HourOfDayRecordFactory.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HourOfDayRecordFactory.java
index 6ceaf55c4339e15e85141b2862210e8e94924c0e..4d2e2d5b5014dda3604085972fdcf56e8f8aa011 100644
--- a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HourOfDayRecordFactory.java
+++ b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/HourOfDayRecordFactory.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc3.kstreams;
import com.google.common.math.Stats;
import org.apache.kafka.streams.kstream.Windowed;
-import rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.HourOfDayActivePowerRecord;
/**
* {@link StatsRecordFactory} to create an {@link HourOfDayActivePowerRecord}.
diff --git a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/TopologyBuilder.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/TopologyBuilder.java
index 99e6ecf72d870237542b419d74be42c9e62aeb75..f2825ca81f69b5a70e883dcf034c51093745221d 100644
--- a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/TopologyBuilder.java
+++ b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/TopologyBuilder.java
@@ -16,10 +16,10 @@ import org.apache.kafka.streams.kstream.Grouped;
import org.apache.kafka.streams.kstream.Materialized;
import org.apache.kafka.streams.kstream.Produced;
import org.apache.kafka.streams.kstream.TimeWindows;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
import rocks.theodolite.benchmarks.commons.kstreams.GenericSerde;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc3.kstreams.util.StatsFactory;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* Builds Kafka Stream Topology for the History microservice.
diff --git a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/Uc3KafkaStreamsBuilder.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/Uc3KafkaStreamsBuilder.java
index 015bafd6c220f5b1a1bd73c022ec682681b35861..e05b30f75a3a1e01f132e56595e50297160c5c66 100644
--- a/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/Uc3KafkaStreamsBuilder.java
+++ b/theodolite-benchmarks/uc3-kstreams/src/main/java/rocks/theodolite/benchmarks/uc3/kstreams/Uc3KafkaStreamsBuilder.java
@@ -5,8 +5,8 @@ import java.util.Objects;
import java.util.Properties;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.Topology;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
import rocks.theodolite.benchmarks.commons.kstreams.KafkaStreamsBuilder;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
/**
* Builder for the Kafka Streams configuration.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedActivePowerRecordEventTimePolicy.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedActivePowerRecordEventTimePolicy.java
index d55c3c78ba5369a3b19bfee9096553d9ee535a9c..1a2f99cd82a9f8b4af7b3b5a13ad8610036cbc72 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedActivePowerRecordEventTimePolicy.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedActivePowerRecordEventTimePolicy.java
@@ -5,7 +5,7 @@ import org.apache.beam.sdk.io.kafka.KafkaRecord;
import org.apache.beam.sdk.io.kafka.TimestampPolicy;
import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.joda.time.Instant;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
/**
* TimeStampPolicy to use event time based on the timestamp of the record value.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedToActive.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedToActive.java
index cf34ce816dbac36d1ceb52fee06fb6fea79aacc0..4d1c2241eefa8706c29d08256304ecec8313e478 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedToActive.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedToActive.java
@@ -2,8 +2,8 @@ package rocks.theodolite.benchmarks.uc4.beam;
import org.apache.beam.sdk.transforms.SimpleFunction;
import org.apache.beam.sdk.values.KV;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
/**
* Converts AggregatedActivePowerRecord to ActivePowerRecord.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/DuplicateAsFlatMap.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/DuplicateAsFlatMap.java
index bc3fbdc02bec6e5236796e397844c16fce0a17b8..1c4071f4a3bbe78683c9e4854f62d428fc8a07ad 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/DuplicateAsFlatMap.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/DuplicateAsFlatMap.java
@@ -10,7 +10,7 @@ import org.apache.beam.sdk.state.ValueState;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollectionView;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterEvents.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterEvents.java
index 1325f9f4527568e009387231eb0ffc2bed29f8aa..59818e18b7e86c53b80b2a6230087957870d2f47 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterEvents.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterEvents.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc4.beam;
import org.apache.beam.sdk.transforms.SerializableFunction;
import org.apache.beam.sdk.values.KV;
-import rocks.theodolite.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
/**
* Filters for {@code Event.SENSOR_REGISTRY_CHANGED} and {@code Event.SENSOR_REGISTRY_STATUS}
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterNullValues.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterNullValues.java
index 858262bf49f4122c5ba642ce6a2f6d6154d3dbde..903204363ace1f19439c3686dfd278fc89da2be9 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterNullValues.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterNullValues.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc4.beam;
import org.apache.beam.sdk.transforms.SerializableFunction;
import org.apache.beam.sdk.values.KV;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Filters {@code null} Values.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/GenerateParentsFn.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/GenerateParentsFn.java
index 226f0fdb7512819e6d26bf8b88e406d0c37fbc52..a020d32735893c4dd0851d902dcf62304223199d 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/GenerateParentsFn.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/GenerateParentsFn.java
@@ -8,10 +8,10 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.values.KV;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.Sensor;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.Sensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
/**
* DoFn class to generate a child-parent pair for every sensor in the hierarchy.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
index 69ab5c5bdf01b641659b03afc07eda7b0640d61d..955f7101515c9467edc2e4900aa5464437f0e904 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
@@ -40,15 +40,15 @@ import rocks.theodolite.benchmarks.commons.beam.ConfigurationKeys;
import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaGenericReader;
import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaWriterTransformation;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
import rocks.theodolite.benchmarks.uc4.beam.serialization.AggregatedActivePowerRecordCoder;
import rocks.theodolite.benchmarks.uc4.beam.serialization.AggregatedActivePowerRecordDeserializer;
import rocks.theodolite.benchmarks.uc4.beam.serialization.AggregatedActivePowerRecordSerializer;
import rocks.theodolite.benchmarks.uc4.beam.serialization.EventCoder;
import rocks.theodolite.benchmarks.uc4.beam.serialization.EventDeserializer;
import rocks.theodolite.benchmarks.uc4.beam.serialization.SensorParentKeyCoder;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
/**
* {@link AbstractPipelineFactory} for UC4.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/RecordAggregation.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/RecordAggregation.java
index 2e36901cf7ef166d9e046cdf7e69bd8ff71a83a1..e853e0b6e5a22d68f9b315799f86f1b6dfa1947a 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/RecordAggregation.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/RecordAggregation.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
import org.apache.beam.sdk.coders.AvroCoder;
import org.apache.beam.sdk.coders.DefaultCoder;
import org.apache.beam.sdk.transforms.Combine.CombineFn;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetIdForAggregated.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetIdForAggregated.java
index 2fb648e0512a3bc0c7f36f8dd484ede1440df971..a616a966733e2dd3ead7d2c126efaa7c37577ff6 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetIdForAggregated.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetIdForAggregated.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc4.beam;
import org.apache.beam.sdk.transforms.SimpleFunction;
import org.apache.beam.sdk.values.KV;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
/**
* Sets the identifier for new {@link AggregatedActivePowerRecord}.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetKeyToGroup.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetKeyToGroup.java
index ea90ae32d93679b89528b5856e66468ceb0e8d46..8477e987cad81625d373ee7d1155eaf701a53087 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetKeyToGroup.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetKeyToGroup.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc4.beam;
import org.apache.beam.sdk.transforms.SimpleFunction;
import org.apache.beam.sdk.values.KV;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Set the Key for a group of {@code ActivePowerRecords} to their Parent.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordCoder.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordCoder.java
index d44e4740717a45854ab6323e43f55d7eacfd753f..759b8baab70b73ad2a32c50768b7911059c68aab 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordCoder.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordCoder.java
@@ -8,7 +8,7 @@ import java.util.List;
import org.apache.beam.sdk.coders.AvroCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
/**
* {@link Coder} for an {@link AggregatedActivePowerRecord}.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordDeserializer.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordDeserializer.java
index 2f345328a5f8c622702526d95a77c0baa004e10e..1083103f7394e88c5d59ccd97aaa0885ff6b634b 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordDeserializer.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordDeserializer.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc4.beam.serialization;
import io.confluent.kafka.streams.serdes.avro.SpecificAvroDeserializer;
import org.apache.kafka.common.serialization.Deserializer;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
/**
* {@link Deserializer} for an {@link AggregatedActivePowerRecord}.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordSerializer.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordSerializer.java
index 5dff392cdc22af3b43f6500abaa76f261aceb1e1..2c742ca65d288e2ee04bfb860fb89cf7ecbb8bbf 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordSerializer.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordSerializer.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc4.beam.serialization;
import io.confluent.kafka.streams.serdes.avro.SpecificAvroSerializer;
import org.apache.kafka.common.serialization.Serializer;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
/**
* {@link Serializer} for an {@link AggregatedActivePowerRecord}.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventCoder.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventCoder.java
index a8d7b37d9eb1c3aaafb092ef7c8eac6b4e4c67e5..2d555ef12db49b76fa3d8c4a9398ce562eaa6453 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventCoder.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventCoder.java
@@ -10,8 +10,8 @@ import java.util.List;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
import org.apache.kafka.common.serialization.Serde;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.configuration.events.EventSerde;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.configuration.events.EventSerde;
/**
* Wrapper Class that encapsulates a Event Serde in a org.apache.beam.sdk.coders.Coder.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventDeserializer.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventDeserializer.java
index b57177d2e1794b50ecc716bfd3e0599cfa228a8f..9399a42606d6e8e7f3f58bf4a515e5f83041a88d 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventDeserializer.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventDeserializer.java
@@ -3,7 +3,7 @@ package rocks.theodolite.benchmarks.uc4.beam.serialization;
import java.util.Map;
import org.apache.kafka.common.serialization.ByteBufferDeserializer;
import org.apache.kafka.common.serialization.Deserializer;
-import rocks.theodolite.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
/**
* Deserializer for Events(SensorRegistry changes).
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeySerde.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeySerde.java
index b5c197c9ba4de3fad3f45073e8e99029ee400579..9c8d1eff664c72fcb31e6dcfddff5f53b97ff055 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeySerde.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeySerde.java
@@ -1,11 +1,11 @@
package rocks.theodolite.benchmarks.uc4.beam.serialization;
import org.apache.kafka.common.serialization.Serde;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.BufferSerde;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.ReadBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.SimpleSerdes;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.WriteBuffer;
import rocks.theodolite.benchmarks.uc4.beam.SensorParentKey;
-import rocks.theodolite.commons.kafka.simpleserdes.BufferSerde;
-import rocks.theodolite.commons.kafka.simpleserdes.ReadBuffer;
-import rocks.theodolite.commons.kafka.simpleserdes.SimpleSerdes;
-import rocks.theodolite.commons.kafka.simpleserdes.WriteBuffer;
/**
* {@link Serde} factory for {@link SensorParentKey}.
diff --git a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/AggregationServiceFlinkJob.java b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/AggregationServiceFlinkJob.java
index 76ac8b3a0f0466b49507195defc9bfbc23c50c65..fd6d073bb5a4f7948e06e081a94eaa027be036b5 100644
--- a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/AggregationServiceFlinkJob.java
+++ b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/AggregationServiceFlinkJob.java
@@ -19,21 +19,21 @@ import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
import org.apache.kafka.common.serialization.Serdes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.configuration.events.EventSerde;
import rocks.theodolite.benchmarks.commons.flink.KafkaConnectorFactory;
import rocks.theodolite.benchmarks.commons.flink.StateBackends;
import rocks.theodolite.benchmarks.commons.flink.TupleType;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
import rocks.theodolite.benchmarks.uc4.flink.util.ImmutableSensorRegistrySerializer;
import rocks.theodolite.benchmarks.uc4.flink.util.ImmutableSetSerializer;
import rocks.theodolite.benchmarks.uc4.flink.util.SensorParentKey;
import rocks.theodolite.benchmarks.uc4.flink.util.SensorParentKeySerializer;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.configuration.events.EventSerde;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
-import rocks.theodolite.commons.model.sensorregistry.ImmutableSensorRegistry;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
/**
* The Aggregation microservice implemented as a Flink job.
diff --git a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/ChildParentsFlatMapFunction.java b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/ChildParentsFlatMapFunction.java
index d1ef7258ac9e9b8e817ad5b8158f885a23836b34..77391393d2977218ff15972f0329393388d24453 100644
--- a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/ChildParentsFlatMapFunction.java
+++ b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/ChildParentsFlatMapFunction.java
@@ -13,9 +13,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.util.Collector;
-import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.Sensor;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.Sensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
/**
* Transforms a {@link SensorRegistry} into key value pairs of Sensor identifiers and their parents'
diff --git a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/JoinAndDuplicateCoFlatMapFunction.java b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/JoinAndDuplicateCoFlatMapFunction.java
index f5edbd8a3f52542182965bec0d9990e9480604b1..0171e4b0b0c876242834edc76e8117615dc6b3b2 100644
--- a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/JoinAndDuplicateCoFlatMapFunction.java
+++ b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/JoinAndDuplicateCoFlatMapFunction.java
@@ -9,8 +9,8 @@ import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.co.RichCoFlatMapFunction;
import org.apache.flink.util.Collector;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
import rocks.theodolite.benchmarks.uc4.flink.util.SensorParentKey;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
/**
* A {@link RichCoFlatMapFunction} which joins each incoming {@link ActivePowerRecord} with its
diff --git a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/RecordAggregationProcessWindowFunction.java b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/RecordAggregationProcessWindowFunction.java
index 7c42d8f545d89737d53ca60b4ef0d1cb5d8b5972..6dff6edaf5fb6343f0c6c4b12cbff4a9175751eb 100644
--- a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/RecordAggregationProcessWindowFunction.java
+++ b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/RecordAggregationProcessWindowFunction.java
@@ -11,9 +11,9 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction;
import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
import org.apache.flink.util.Collector;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
import rocks.theodolite.benchmarks.uc4.flink.util.SensorParentKey;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
/**
* A {@link ProcessWindowFunction} which performs the windowed aggregation of all
diff --git a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/util/ImmutableSensorRegistrySerializer.java b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/util/ImmutableSensorRegistrySerializer.java
index e235e91855f1c442e37dacf9bde5ddc70871143f..c491adc47d31211e809a00ad283266511e96c534 100644
--- a/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/util/ImmutableSensorRegistrySerializer.java
+++ b/theodolite-benchmarks/uc4-flink/src/main/java/rocks/theodolite/benchmarks/uc4/flink/util/ImmutableSensorRegistrySerializer.java
@@ -5,7 +5,7 @@ import com.esotericsoftware.kryo.Serializer;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
import java.io.Serializable;
-import rocks.theodolite.commons.model.sensorregistry.ImmutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorRegistry;
/**
* A {@link Serializer} for {@link ImmutableSensorRegistry}s.
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java
index 9b6aa71267150296d8b65268b1922925b7ada796..693f36bb2b4cd4d208496dfe804d635311f6eea5 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java
@@ -13,13 +13,13 @@ import org.slf4j.Logger;
import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
import rocks.theodolite.benchmarks.commons.hazelcastjet.KafkaPropertiesBuilder;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorRegistry;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.EventDeserializer;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ImmutableSensorRegistryUc4Serializer;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKeySerializer;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroupSerializer;
-import titan.ccp.model.sensorregistry.ImmutableSensorRegistry;
/**
* A Hazelcast Jet factory which can build a Hazelcast Jet Instance and Pipeline for the UC4
@@ -197,9 +197,9 @@ public class Uc4HazelcastJetFactory {
* @return The Uc4HazelcastJetBuilder factory with set kafkaReadPropertiesForPipeline.
*/
public Uc4HazelcastJetFactory setReadPropertiesFromEnv(// NOPMD
- final String bootstrapServersDefault,
- final String schemaRegistryUrlDefault,
- final String jobName) {
+ final String bootstrapServersDefault,
+ final String schemaRegistryUrlDefault,
+ final String jobName) {
// Use KafkaPropertiesBuilder to build a properties object used for kafka
final KafkaPropertiesBuilder propsBuilder = new KafkaPropertiesBuilder();
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java
index 2efb8250c0e1136b34412e4553b2d216c5e24b43..a3dd654b4cd10e672e9af16cb684f07314863975 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java
@@ -25,14 +25,14 @@ import java.util.Properties;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.AggregatedActivePowerRecordAccumulator;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ChildParentsTransformer;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
-import titan.ccp.configuration.events.Event;
-import titan.ccp.model.records.ActivePowerRecord;
-import titan.ccp.model.records.AggregatedActivePowerRecord;
-import titan.ccp.model.sensorregistry.SensorRegistry;
/**
* Builder to build a HazelcastJet Pipeline for UC4 which can be used for stream processing using
@@ -117,9 +117,9 @@ public class Uc4PipelineBuilder {
*
* <p>
* UC4 takes {@code ActivePowerRecord} events from sensors and a {@code SensorRegistry} with maps
- * from keys to groups to map values to their according groups. A feedback stream allows for
- * group keys to be mapped to values and eventually to be mapped to other top level groups defines
- * by the {@code SensorRegistry}.
+ * from keys to groups to map values to their according groups. A feedback stream allows for group
+ * keys to be mapped to values and eventually to be mapped to other top level groups defines by
+ * the {@code SensorRegistry}.
* </p>
*
* <p>
@@ -180,10 +180,10 @@ public class Uc4PipelineBuilder {
//////////////////////////////////
// (2) UC4 Merge Input with aggregation stream
- final StreamStageWithKey<Entry<String, ActivePowerRecord>, String>
- mergedInputAndAggregations = inputStream
- .merge(aggregations)
- .groupingKey(Entry::getKey);
+ final StreamStageWithKey<Entry<String, ActivePowerRecord>, String> mergedInputAndAggregations =
+ inputStream
+ .merge(aggregations)
+ .groupingKey(Entry::getKey);
//////////////////////////////////
// (3) UC4 Join Configuration and Merges Input/Aggregation Stream
@@ -235,28 +235,25 @@ public class Uc4PipelineBuilder {
//////////////////////////////////
// (5) UC4 Last Value Map
// Table with tumbling window differentiation [ (sensorKey,Group) , value ],Time
- final StageWithWindow<Entry<SensorGroupKey, ActivePowerRecord>>
- windowedLastValues = dupliAsFlatmappedStage
- .window(WindowDefinition.tumbling(windowSize));
+ final StageWithWindow<Entry<SensorGroupKey, ActivePowerRecord>> windowedLastValues =
+ dupliAsFlatmappedStage
+ .window(WindowDefinition.tumbling(windowSize));
- final AggregateOperation1<Entry<SensorGroupKey, ActivePowerRecord>,
- AggregatedActivePowerRecordAccumulator, AggregatedActivePowerRecord> aggrOp =
+ final AggregateOperation1<Entry<SensorGroupKey, ActivePowerRecord>, AggregatedActivePowerRecordAccumulator, AggregatedActivePowerRecord> aggrOp =
AggregateOperation
- .withCreate(AggregatedActivePowerRecordAccumulator::new)
- .<Entry<SensorGroupKey, ActivePowerRecord>>andAccumulate((acc, rec) -> {
- acc.setId(rec.getKey().getGroup());
- acc.addInputs(rec.getValue());
- })
- .andCombine((acc, acc2) ->
- acc.addInputs(acc2.getId(), acc2.getSumInW(), acc2.getCount(), acc.getTimestamp()))
- .andDeduct((acc, acc2) -> acc.removeInputs(acc2.getSumInW(), acc2.getCount()))
- .andExportFinish(acc ->
- new AggregatedActivePowerRecord(acc.getId(),
+ .withCreate(AggregatedActivePowerRecordAccumulator::new)
+ .<Entry<SensorGroupKey, ActivePowerRecord>>andAccumulate((acc, rec) -> {
+ acc.setId(rec.getKey().getGroup());
+ acc.addInputs(rec.getValue());
+ })
+ .andCombine((acc, acc2) -> acc.addInputs(acc2.getId(), acc2.getSumInW(),
+ acc2.getCount(), acc.getTimestamp()))
+ .andDeduct((acc, acc2) -> acc.removeInputs(acc2.getSumInW(), acc2.getCount()))
+ .andExportFinish(acc -> new AggregatedActivePowerRecord(acc.getId(),
acc.getTimestamp(),
acc.getCount(),
acc.getSumInW(),
- acc.getAverageInW())
- );
+ acc.getAverageInW()));
// write aggregation back to kafka
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java
index 3166f16cd31bf0e6d4dff6548468791e7a5e5c5c..14934fbe3ceec6e01836958c1f7686e225ea40fd 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java
@@ -1,6 +1,6 @@
package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
-import titan.ccp.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Accumulator class for AggregatedActivePowerRecords.
@@ -25,10 +25,10 @@ public class AggregatedActivePowerRecordAccumulator {
* Creates an AggregationObject.
*/
public AggregatedActivePowerRecordAccumulator(final String id,
- final long timestamp,
- final long count,
- final double sumInW,
- final double averageInW) {
+ final long timestamp,
+ final long count,
+ final double sumInW,
+ final double averageInW) {
this.id = id;
this.timestamp = timestamp;
this.count = count;
@@ -50,16 +50,16 @@ public class AggregatedActivePowerRecordAccumulator {
this.count += 1;
this.sumInW += record.getValueInW();
this.timestamp = record.getTimestamp();
- this.averageInW = sumInW / count;
+ this.averageInW = this.sumInW / this.count;
}
/**
* Adds the records from another aggregator.
*/
public void addInputs(final String id,
- final double sumInW,
- final long count,
- final long timestamp) {
+ final double sumInW,
+ final long count,
+ final long timestamp) {
this.id = this.id == null ? id : this.id;
this.sumInW += sumInW;
this.count += count;
@@ -68,8 +68,8 @@ public class AggregatedActivePowerRecordAccumulator {
}
/**
- * Removes the values of another aggreagator.
- * Not a complete reset since the old timestamp is lost.
+ * Removes the values of another aggreagator. Not a complete reset since the old timestamp is
+ * lost.
*/
public void removeInputs(final double sumInW, final long count) {
this.sumInW -= sumInW;
@@ -79,22 +79,22 @@ public class AggregatedActivePowerRecordAccumulator {
}
public long getCount() {
- return count;
+ return this.count;
}
public double getSumInW() {
- return sumInW;
+ return this.sumInW;
}
public double getAverageInW() {
- return averageInW;
+ return this.averageInW;
}
public String getId() {
- return id;
+ return this.id;
}
public long getTimestamp() {
- return timestamp;
+ return this.timestamp;
}
}
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java
index ad3b2294cb934ba04b07df2e2b2d3dbdd6e1a905..3ba604270e37d746c2e98bc4eef5c80d2526b446 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java
@@ -10,10 +10,11 @@ import org.apache.kafka.streams.kstream.Transformer;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
-import titan.ccp.configuration.events.Event;
-import titan.ccp.model.sensorregistry.AggregatedSensor;
-import titan.ccp.model.sensorregistry.Sensor;
-import titan.ccp.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.Sensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
+
/**
* Transforms a {@link SensorRegistry} into key value pairs of Sensor identifiers and their parents'
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java
index c8d06b497009944b9a9a0fda4ab224e5fe992e3d..ebdc9de86e82a9c8c16a71830190d26e6f0e34fa 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java
@@ -2,8 +2,8 @@ package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
import java.util.Map;
import org.apache.kafka.common.serialization.Deserializer;
-import titan.ccp.configuration.events.Event;
-import titan.ccp.configuration.events.EventSerde;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.configuration.events.EventSerde;
/**
* Deserializer for Event Objects.
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
index 53d22f7f156891cf11e5b8915eed17b74c3d57fb..84e007dde7fb3a075a605bacfbbda05f206c2ee4 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
@@ -4,7 +4,7 @@ import com.hazelcast.nio.ObjectDataInput;
import com.hazelcast.nio.ObjectDataOutput;
import com.hazelcast.nio.serialization.StreamSerializer;
import java.io.IOException;
-import titan.ccp.model.sensorregistry.ImmutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorRegistry;
/**
* {@link StreamSerializer} for Hazelcast Jet to serialize and deserialize an
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java
index 893efcf74fe8a16202d795fca5cc43b63190dc50..b5f5fc7cb2822667dcaa26560fa83b2da3a513d9 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java
@@ -2,7 +2,8 @@ package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
import java.util.Objects;
import java.util.Set;
-import titan.ccp.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+
/**
* Structure: (valueInW, Set(Groups)).
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineTest.java b/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineTest.java
index b74c2874b92a51b138ffe8b44b1cf750dfce5880..569f06105dbdb2b99c10d89b5f72585fe011fe19 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineTest.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineTest.java
@@ -22,19 +22,19 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import rocks.theodolite.benchmarks.uc4.hazelcastjet.Uc4PipelineBuilder;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MachineSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableAggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableSensorRegistry;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ImmutableSensorRegistryUc4Serializer;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKeySerializer;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroupSerializer;
-import titan.ccp.configuration.events.Event;
-import titan.ccp.model.records.ActivePowerRecord;
-import titan.ccp.model.records.AggregatedActivePowerRecord;
-import titan.ccp.model.sensorregistry.ImmutableSensorRegistry;
-import titan.ccp.model.sensorregistry.MachineSensor;
-import titan.ccp.model.sensorregistry.MutableAggregatedSensor;
-import titan.ccp.model.sensorregistry.MutableSensorRegistry;
+
@Category(SerialTest.class)
public class Uc4PipelineTest extends JetTestSupport {
@@ -75,7 +75,7 @@ public class Uc4PipelineTest extends JetTestSupport {
final StreamSource<Entry<String, AggregatedActivePowerRecord>> testAggregationSource =
TestSources.itemStream(testItemsPerSecond, (timestamp, item) -> {
- AggregatedActivePowerRecord test =
+ final AggregatedActivePowerRecord test =
new AggregatedActivePowerRecord(testSensorName,
System.currentTimeMillis(),
1L,
@@ -100,7 +100,7 @@ public class Uc4PipelineTest extends JetTestSupport {
// Topology:
// level2Group -> level1Group -> testSensor
-
+
// Create Registry
final MutableSensorRegistry testRegistry = new MutableSensorRegistry(testLevel2GroupName);
// Add Sensors
@@ -118,7 +118,7 @@ public class Uc4PipelineTest extends JetTestSupport {
// Create pipeline to test
final Uc4PipelineBuilder pipelineBuilder = new Uc4PipelineBuilder();
this.testPipeline = Pipeline.create();
- this.uc4Topology = pipelineBuilder.extendUc4Topology(testPipeline,
+ this.uc4Topology = pipelineBuilder.extendUc4Topology(this.testPipeline,
testInputSource, testAggregationSource, testConfigSource, testWindowSize);
this.uc4Topology.writeTo(Sinks.logger());
@@ -130,8 +130,8 @@ public class Uc4PipelineTest extends JetTestSupport {
@Test
public void testOutput() {
-// System.out.println("DEBUG DEBUG DEBUG || ENTERED TEST 1");
-
+ // System.out.println("DEBUG DEBUG DEBUG || ENTERED TEST 1");
+
// Assertion Configuration
final int timeout = 20;
final String testSensorName = "TEST-SENSOR";
@@ -141,7 +141,7 @@ public class Uc4PipelineTest extends JetTestSupport {
// Assertion
- this.uc4Topology.apply(Assertions.assertCollectedEventually(timeout,
+ this.uc4Topology.apply(Assertions.assertCollectedEventually(timeout,
collection -> {
System.out.println("DEBUG || ENTERED ASSERTION COLLECTED EVENTUALLY");
@@ -168,11 +168,11 @@ public class Uc4PipelineTest extends JetTestSupport {
testLevel1contained = true;
}
- if(Objects.equals(key, testLevel2GroupName)){
+ if (Objects.equals(key, testLevel2GroupName)) {
testLevel2contained = true;
}
- if (testValueInW != agg.getAverageInW()){
+ if (testValueInW != agg.getAverageInW()) {
averageEqTest = false;
}
@@ -191,10 +191,10 @@ public class Uc4PipelineTest extends JetTestSupport {
System.out.println("avOk: " + avOk);
Assert.assertTrue("Assertion did not complete!", allOkay);
-
+
}));
- try{
+ try {
final JobConfig jobConfig = new JobConfig()
.registerSerializer(ValueGroup.class, ValueGroupSerializer.class)
@@ -209,7 +209,7 @@ public class Uc4PipelineTest extends JetTestSupport {
"Job was expected to complete with AssertionCompletedException, but completed with: "
+ e.getCause(),
errorMsg.contains(AssertionCompletedException.class.getName()));
- } catch (Exception e){
+ } catch (final Exception e) {
System.out.println("ERRORORORO TEST BROKEN !!!!");
System.out.println(e);
}
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/AggregationService.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/AggregationService.java
index eebeb9d39dce598343b8d0f3e46f6165ac6e007b..26ea02957fb013c61c4ee0c3e2f280b0b9b8c993 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/AggregationService.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/AggregationService.java
@@ -4,8 +4,8 @@ import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.KafkaStreams;
+import rocks.theodolite.benchmarks.commons.commons.configuration.ServiceConfigurations;
import rocks.theodolite.benchmarks.commons.kstreams.ConfigurationKeys;
-import rocks.theodolite.commons.commons.configuration.ServiceConfigurations;
/**
* A microservice that manages the history and, therefore, stores and aggregates incoming
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ChildParentsTransformer.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ChildParentsTransformer.java
index 74aabf80e9129b245fc86a914b8dd194c52520a2..d311ff009c138c6afe29cf9e95c323ea46a6bc0f 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ChildParentsTransformer.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ChildParentsTransformer.java
@@ -10,10 +10,10 @@ import org.apache.kafka.streams.kstream.Transformer;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.Sensor;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.Sensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
/**
* Transforms a {@link SensorRegistry} into key value pairs of Sensor identifiers and their parents'
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ChildParentsTransformerSupplier.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ChildParentsTransformerSupplier.java
index cdd4c5b4a7293eebbb87a69a1a1ab503be7393ad..734989af63b6b2a7fc97b368bb2651112c98fda5 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ChildParentsTransformerSupplier.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ChildParentsTransformerSupplier.java
@@ -10,8 +10,8 @@ import org.apache.kafka.streams.kstream.TransformerSupplier;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
/**
* Supplier class for a {@link ChildParentsTransformer}.
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointFlatTransformer.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointFlatTransformer.java
index 6459c23853763dc485a50cc2e080753697d9b890..06cbe1f40719fcbb6b9b8a22767ec415def3dc80 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointFlatTransformer.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointFlatTransformer.java
@@ -9,7 +9,7 @@ import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.Transformer;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.state.KeyValueStore;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Transforms the join result of an {@link ActivePowerRecord} and the corresponding sensor parents
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointFlatTransformerSupplier.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointFlatTransformerSupplier.java
index 91a298f73126e588e1c10e8150abe76a9d13a016..67efca0671ad347add9d5dcc1f255a9c8d9de09b 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointFlatTransformerSupplier.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointFlatTransformerSupplier.java
@@ -9,7 +9,7 @@ import org.apache.kafka.streams.kstream.TransformerSupplier;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* Supplier class for {@link JointFlatTransformerSupplier}.
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointRecordParents.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointRecordParents.java
index 4399f57fde9a53cb0bc532074c2c4c49bc4d009d..85b3a817564367098996196694994497b9db8793 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointRecordParents.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/JointRecordParents.java
@@ -2,7 +2,7 @@ package rocks.theodolite.benchmarks.uc4.kstreams;
import java.util.Objects;
import java.util.Set;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
/**
* A joined pair of an {@link ActivePowerRecord} and its associated parents. Both the record and the
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/OptionalParentsSerde.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/OptionalParentsSerde.java
index 5c2b4dad2955a62978086afa0226db1072c88303..e5ff9c676b4ea539fb9605fc51c93920c3757fc8 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/OptionalParentsSerde.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/OptionalParentsSerde.java
@@ -4,10 +4,10 @@ import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import org.apache.kafka.common.serialization.Serde;
-import rocks.theodolite.commons.kafka.simpleserdes.BufferSerde;
-import rocks.theodolite.commons.kafka.simpleserdes.ReadBuffer;
-import rocks.theodolite.commons.kafka.simpleserdes.SimpleSerdes;
-import rocks.theodolite.commons.kafka.simpleserdes.WriteBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.BufferSerde;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.ReadBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.SimpleSerdes;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.WriteBuffer;
/**
* {@link Serde} factory for an optional {@link Set} of parent identifiers.
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ParentsSerde.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ParentsSerde.java
index 7a6745c9313114ce52b38c3d3ddf7bae743f3e5e..b70df46325f60c82a3759219827e9ab54b17b57a 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ParentsSerde.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/ParentsSerde.java
@@ -3,10 +3,10 @@ package rocks.theodolite.benchmarks.uc4.kstreams;
import java.util.HashSet;
import java.util.Set;
import org.apache.kafka.common.serialization.Serde;
-import rocks.theodolite.commons.kafka.simpleserdes.BufferSerde;
-import rocks.theodolite.commons.kafka.simpleserdes.ReadBuffer;
-import rocks.theodolite.commons.kafka.simpleserdes.SimpleSerdes;
-import rocks.theodolite.commons.kafka.simpleserdes.WriteBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.BufferSerde;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.ReadBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.SimpleSerdes;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.WriteBuffer;
/**
* {@link Serde} factory for {@link Set} of parent identifiers.
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/RecordAggregator.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/RecordAggregator.java
index 0267d3bcca0821faff5542fb38508e1b9ec4b53c..bbc6079521d38b75ae35ea49fda26e7504746b23 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/RecordAggregator.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/RecordAggregator.java
@@ -1,8 +1,8 @@
package rocks.theodolite.benchmarks.uc4.kstreams;
import org.apache.kafka.streams.kstream.Windowed;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
/**
* Updates an {@link AggregatedActivePowerRecord} by a new {@link ActivePowerRecord}.
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/SensorParentKeySerde.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/SensorParentKeySerde.java
index 9b1a8c62fc0926e32296a29ca411a230b3f64108..1beab6094bcc87bed0bbbedbc449edadf3523c19 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/SensorParentKeySerde.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/SensorParentKeySerde.java
@@ -1,10 +1,10 @@
package rocks.theodolite.benchmarks.uc4.kstreams;
import org.apache.kafka.common.serialization.Serde;
-import rocks.theodolite.commons.kafka.simpleserdes.BufferSerde;
-import rocks.theodolite.commons.kafka.simpleserdes.ReadBuffer;
-import rocks.theodolite.commons.kafka.simpleserdes.SimpleSerdes;
-import rocks.theodolite.commons.kafka.simpleserdes.WriteBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.BufferSerde;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.ReadBuffer;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.SimpleSerdes;
+import rocks.theodolite.benchmarks.commons.kafka.simpleserdes.WriteBuffer;
/**
* {@link Serde} factory for {@link SensorParentKey}.
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/TopologyBuilder.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/TopologyBuilder.java
index b95fb7439230ec2e5bbfc3247e6bf29d6be290ec..341372b209d0839d441041b2a77666f00fa74b17 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/TopologyBuilder.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/TopologyBuilder.java
@@ -15,15 +15,15 @@ import org.apache.kafka.streams.kstream.Materialized;
import org.apache.kafka.streams.kstream.Produced;
import org.apache.kafka.streams.kstream.Suppressed;
import org.apache.kafka.streams.kstream.Suppressed.BufferConfig;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.configuration.events.EventSerde;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
+import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.records.AggregatedActivePowerRecord;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
import org.apache.kafka.streams.kstream.TimeWindows;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.kstream.WindowedSerdes;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.configuration.events.EventSerde;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
-import rocks.theodolite.commons.model.records.ActivePowerRecord;
-import rocks.theodolite.commons.model.records.AggregatedActivePowerRecord;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
/**
* Builds Kafka Stream Topology for the History microservice.
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/Uc4KafkaStreamsBuilder.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/Uc4KafkaStreamsBuilder.java
index 33594e5a486e3d5b9a48d33c2aa743ee9018fbdf..209eb519f9e61b2aaa684686e391ccc11aa808e7 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/Uc4KafkaStreamsBuilder.java
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/java/rocks/theodolite/benchmarks/uc4/kstreams/Uc4KafkaStreamsBuilder.java
@@ -5,8 +5,8 @@ import java.util.Objects;
import java.util.Properties;
import org.apache.commons.configuration2.Configuration;
import org.apache.kafka.streams.Topology;
+import rocks.theodolite.benchmarks.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
import rocks.theodolite.benchmarks.commons.kstreams.KafkaStreamsBuilder;
-import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory;
/**
* Builder for the Kafka Streams configuration.
diff --git a/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/ConfigPublisher.java b/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/ConfigPublisher.java
index c7601ef3b389b38316a1e54735a091cf0e60c37d..60c95321f05edff35681d8984baa03ca711f48da 100644
--- a/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/ConfigPublisher.java
+++ b/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/ConfigPublisher.java
@@ -7,8 +7,8 @@ import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.StringSerializer;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.configuration.events.EventSerde;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.configuration.events.EventSerde;
/**
* Class to publish a configuration to Kafka.
diff --git a/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/LoadGenerator.java
index 79f4f21b069cdac618529f59355c8a688c557373..3f02a4b5ebf232e4dcb3ff236f656cf6fb485989 100644
--- a/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/LoadGenerator.java
+++ b/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/LoadGenerator.java
@@ -3,9 +3,9 @@ package rocks.theodolite.benchmarks.uc4.loadgenerator;
import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import rocks.theodolite.benchmarks.commons.configuration.events.Event;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
import rocks.theodolite.benchmarks.loadgenerator.KeySpace;
-import rocks.theodolite.commons.configuration.events.Event;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
/**
* Load generator for Theodolite use case UC4.
diff --git a/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/SensorRegistryBuilder.java b/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/SensorRegistryBuilder.java
index b8b89a71a47a0a7cf5bc19f018643248aa2e88a5..c9dcfa0af8676460c5cc59ed2f4f6b4641911525 100644
--- a/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/SensorRegistryBuilder.java
+++ b/theodolite-benchmarks/uc4-load-generator/src/main/java/rocks/theodolite/benchmarks/uc4/loadgenerator/SensorRegistryBuilder.java
@@ -1,8 +1,8 @@
package rocks.theodolite.benchmarks.uc4.loadgenerator;
-import rocks.theodolite.commons.model.sensorregistry.MutableAggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.MutableSensorRegistry;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableAggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MutableSensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
/**
* Builder for creating a nested {@link SensorRegistry} with {@code numNestedGroups} levels and
diff --git a/theodolite-benchmarks/uc4-load-generator/src/test/java/rocks/theodolite/benchmarks/uc4/loadgenerator/SensorRegistryBuilderTest.java b/theodolite-benchmarks/uc4-load-generator/src/test/java/rocks/theodolite/benchmarks/uc4/loadgenerator/SensorRegistryBuilderTest.java
index 8c695f6e5ad1755e31034d3ce19ae05e16f1065d..037bd8119ef1ea93ed3dae346282538ff5399f25 100644
--- a/theodolite-benchmarks/uc4-load-generator/src/test/java/rocks/theodolite/benchmarks/uc4/loadgenerator/SensorRegistryBuilderTest.java
+++ b/theodolite-benchmarks/uc4-load-generator/src/test/java/rocks/theodolite/benchmarks/uc4/loadgenerator/SensorRegistryBuilderTest.java
@@ -5,10 +5,10 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.junit.Assert;
import org.junit.Test;
-import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
-import rocks.theodolite.commons.model.sensorregistry.MachineSensor;
-import rocks.theodolite.commons.model.sensorregistry.Sensor;
-import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.MachineSensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.Sensor;
+import rocks.theodolite.benchmarks.commons.model.sensorregistry.SensorRegistry;
public class SensorRegistryBuilderTest {