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/AggregatedActivePowerRecordAccumulator.java similarity index 97% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/AggregatedActivePowerRecordAccumulator.java index 14934fbe3ceec6e01836958c1f7686e225ea40fd..9e25b4df7bff1380cb34cc58f5f16b2d7c7e6a26 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/AggregatedActivePowerRecordAccumulator.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import rocks.theodolite.benchmarks.commons.model.records.ActivePowerRecord; 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/ChildParentsTransformer.java similarity index 98% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/ChildParentsTransformer.java index 3ba604270e37d746c2e98bc4eef5c80d2526b446..b9b599ed89b243d9a1f6c84e765751e4ebe21ecd 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/ChildParentsTransformer.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import java.util.Map; import java.util.Optional; 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/EventDeserializer.java similarity index 92% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/EventDeserializer.java index ebdc9de86e82a9c8c16a71830190d26e6f0e34fa..7b0118ba56e5e9d8d2c81dbc1a41400f0a4850c5 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/EventDeserializer.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import java.util.Map; import org.apache.kafka.common.serialization.Deserializer; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HashMapSupplier.java similarity index 88% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HashMapSupplier.java index ec240bf8cb925aa3a444b56457da5adc411212b2..ebf5e464772fa6c5f468e4fed2cc859ffb5ff1f8 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HashMapSupplier.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import com.hazelcast.function.SupplierEx; import java.util.HashMap; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java index 298529b7e81d1adbd47146aa20364e1bc8bfe6d1..36ab0995e46483b2cee8d9253b96039291a5b2a9 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java @@ -10,12 +10,6 @@ import org.slf4j.LoggerFactory; import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys; import rocks.theodolite.benchmarks.commons.hazelcastjet.HazelcastJetService; 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; /** 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/ImmutableSensorRegistryUc4Serializer.java similarity index 94% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/ImmutableSensorRegistryUc4Serializer.java index 84e007dde7fb3a075a605bacfbbda05f206c2ee4..5b55162e5c026e0ca4dc69e51c5a0332a00aae6d 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/ImmutableSensorRegistryUc4Serializer.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/SensorGroupKey.java similarity index 93% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/SensorGroupKey.java index 24114cc90a709c99e74495714559c12324e07788..33fca91e70c0cb826fe79f700264ab3733f5ca82 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/SensorGroupKey.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import java.util.Objects; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/SensorGroupKeySerializer.java similarity index 91% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/SensorGroupKeySerializer.java index 12a46b9d8f91ea145f614654a6ce9813b9014290..28d427a4527f1777335ffb3ebfc7eb0781a2c15f 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/SensorGroupKeySerializer.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineFactory.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineFactory.java index bb3046e01363727188e0d9d9a39858a9a2ac60c8..568e095e361c823a692756e54e58211a6f80a177 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineFactory.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineFactory.java @@ -27,10 +27,6 @@ import rocks.theodolite.benchmarks.commons.hazelcastjet.PipelineFactory; 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; /** 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/ValueGroup.java similarity index 95% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/ValueGroup.java index b5f5fc7cb2822667dcaa26560fa83b2da3a513d9..1d6cb0b948007f0d03ea8e7515e0535521735020 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/ValueGroup.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import java.util.Objects; import java.util.Set; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/ValueGroupSerializer.java similarity index 93% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/ValueGroupSerializer.java index e136d1da0cd8362fed4f76807e7f8725c2075b7f..3e3bd69277a0c6becb02f9213a93bec0bd25972f 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/ValueGroupSerializer.java @@ -1,4 +1,4 @@ -package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-hazelcastjet/src/main/resources/META-INF/application.properties index 04e8e7a4c1aea0f33f4883a32a00d868bddbbf03..5b175ab6a9379f767d4b462aa25fd989de01d9a4 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/resources/META-INF/application.properties +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/resources/META-INF/application.properties @@ -10,3 +10,5 @@ kafka.feedback.topic=aggregation-feedback schema.registry.url=http://localhost:8081 window.size=5000 +#emit.period.ms=5000 +#grace.period.ms=0 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 29535ddb1bce6daf8a972a208b4393f224063d89..5c06a2c3cdacdf5d23d2a2559c150987f4add07e 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 @@ -32,11 +32,6 @@ import rocks.theodolite.benchmarks.commons.model.sensorregistry.ImmutableSensorR 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; @Category(SerialTest.class)