diff --git a/theodolite-benchmarks/uc4-hazelcastjet/build.gradle b/theodolite-benchmarks/uc4-hazelcastjet/build.gradle index 4799d759ff7389eba5b186673bfacde1ff6deff6..01daa0b88ffea88ed52e1ca6afa682150ade1b50 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/build.gradle +++ b/theodolite-benchmarks/uc4-hazelcastjet/build.gradle @@ -2,4 +2,4 @@ plugins { id 'theodolite.hazelcastjet' } -mainClassName = "theodolite.uc4.application.HistoryService" \ No newline at end of file +mainClassName = "rocks.theodolite.benchmarks.uc4.hazelcastjet.HistoryService" \ No newline at end of file diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/HistoryService.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java similarity index 98% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/HistoryService.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java index c15ef7dce261a243fa3a2d68d34097eadf827a23..88dd311bb1c1cdb971bf8133f65a75362fcf2f55 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/HistoryService.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java similarity index 96% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java index b0cd0abec0b32b806ebb5a06a35003b6afe75568..a4dc2d823f55f93e8d2257d3df189786b75d746b 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import com.hazelcast.jet.JetInstance; import com.hazelcast.jet.config.JobConfig; @@ -8,13 +8,15 @@ import java.util.Properties; import org.slf4j.Logger; import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys; import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder; -import theodolite.uc4.application.uc4specifics.ImmutableSensorRegistryUc4Serializer; -import theodolite.uc4.application.uc4specifics.SensorGroupKey; -import theodolite.uc4.application.uc4specifics.SensorGroupKeySerializer; -import theodolite.uc4.application.uc4specifics.ValueGroup; -import theodolite.uc4.application.uc4specifics.ValueGroupSerializer; +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 * benchmark and lets you start the Hazelcast Jet job. The JetInstance can be built directly as the diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4KafkaPropertiesBuilder.java similarity index 97% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4KafkaPropertiesBuilder.java index e73e1ae11933c2208e39f26e3b8af689bfb1d516..eb0c250b64232d8013692bd4f786d9d640f140ba 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4KafkaPropertiesBuilder.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import io.confluent.kafka.serializers.KafkaAvroDeserializer; import io.confluent.kafka.serializers.KafkaAvroSerializer; @@ -9,7 +9,7 @@ import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys; -import theodolite.uc4.application.uc4specifics.EventDeserializer; +import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.EventDeserializer; /** * Builds a read and write Properties objects containing the needed kafka properties used for the diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4PipelineBuilder.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java similarity index 97% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4PipelineBuilder.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java index 2af2e111a0101af52d0e7a46acd9e9cc544d62d1..2efb8250c0e1136b34412e4553b2d216c5e24b43 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4PipelineBuilder.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application; +package rocks.theodolite.benchmarks.uc4.hazelcastjet; import com.hazelcast.function.BiFunctionEx; import com.hazelcast.jet.Traverser; @@ -25,10 +25,10 @@ import java.util.Properties; import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import theodolite.uc4.application.uc4specifics.AggregatedActivePowerRecordAccumulator; -import theodolite.uc4.application.uc4specifics.ChildParentsTransformer; -import theodolite.uc4.application.uc4specifics.SensorGroupKey; -import theodolite.uc4.application.uc4specifics.ValueGroup; +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; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/AggregatedActivePowerRecordAccumulator.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java similarity index 97% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/AggregatedActivePowerRecordAccumulator.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java index 19e0b49a6a9bb724a51def5bb5825dccac289c4c..3166f16cd31bf0e6d4dff6548468791e7a5e5c5c 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/AggregatedActivePowerRecordAccumulator.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import titan.ccp.model.records.ActivePowerRecord; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ChildParentsTransformer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java similarity index 98% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ChildParentsTransformer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java index f4ccdcbe361429c9a4caf709f96593d5c6b6bb57..ad3b2294cb934ba04b07df2e2b2d3dbdd6e1a905 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ChildParentsTransformer.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import java.util.Map; import java.util.Optional; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/EventDeserializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java similarity index 91% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/EventDeserializer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java index 79ae2508b1283825056fd5d0513a914e3afc5df2..c8d06b497009944b9a9a0fda4ab224e5fe992e3d 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/EventDeserializer.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import java.util.Map; import org.apache.kafka.common.serialization.Deserializer; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/HashMapSupplier.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java similarity index 88% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/HashMapSupplier.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java index e55278c1d5db4f197d86dcfbbdbe2d38e87c1b6c..ec240bf8cb925aa3a444b56457da5adc411212b2 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/HashMapSupplier.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import com.hazelcast.function.SupplierEx; import java.util.HashMap; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ImmutableSensorRegistryUc4Serializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java similarity index 93% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ImmutableSensorRegistryUc4Serializer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java index 54b3724ebb0c95f9478fe5213d1281baeb922011..53d22f7f156891cf11e5b8915eed17b74c3d57fb 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ImmutableSensorRegistryUc4Serializer.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKey.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java similarity index 93% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKey.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java index 3680062df788b57ba19bc003c53ee75420fe2f6e..24114cc90a709c99e74495714559c12324e07788 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKey.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import java.util.Objects; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKeySerializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java similarity index 91% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKeySerializer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java index 9bcc8098049c4601d07c94c9acce47b65dcc0cc8..12a46b9d8f91ea145f614654a6ce9813b9014290 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKeySerializer.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroup.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java similarity index 95% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroup.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java index 1af5d0d001984eca47b69aaa901f5c8e72633c53..893efcf74fe8a16202d795fca5cc43b63190dc50 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroup.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import java.util.Objects; import java.util.Set; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroupSerializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java similarity index 93% rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroupSerializer.java rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java index f32dffece8b80e010956054a9aa562546751bf39..e136d1da0cd8362fed4f76807e7f8725c2075b7f 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroupSerializer.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java @@ -1,4 +1,4 @@ -package theodolite.uc4.application.uc4specifics; +package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java b/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java index 925f8339e9d40be3e32acd2edcc99542ac8104bb..14d977952647e3afaf788a17172355fc653b6d3e 100644 --- a/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java +++ b/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java @@ -22,11 +22,12 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import theodolite.uc4.application.uc4specifics.ImmutableSensorRegistryUc4Serializer; -import theodolite.uc4.application.uc4specifics.SensorGroupKey; -import theodolite.uc4.application.uc4specifics.SensorGroupKeySerializer; -import theodolite.uc4.application.uc4specifics.ValueGroup; -import theodolite.uc4.application.uc4specifics.ValueGroupSerializer; +import rocks.theodolite.benchmarks.uc4.hazelcastjet.Uc4PipelineBuilder; +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;