diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.kstreams.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.kstreams.gradle index bf533915a8fdf4a712754857702373264a30f80a..f43b9bafe3b8135cb4606f109648fc1acb4fe024 100644 --- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.kstreams.gradle +++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.kstreams.gradle @@ -20,8 +20,7 @@ repositories { dependencies { // These dependencies are used internally, and not exposed to consumers on their own compile classpath. - 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 'org.apache.kafka:kafka-streams:3.1.0' implementation 'com.google.guava:guava:24.1-jre' implementation 'org.slf4j:slf4j-simple:1.7.25' diff --git a/theodolite-benchmarks/commons/build.gradle b/theodolite-benchmarks/commons/build.gradle index 2d75e824bb97c656de6123cebf84befc90b5ae54..67860c1ac7f76d1fdbb383acd1aae09505e9ce01 100644 --- a/theodolite-benchmarks/commons/build.gradle +++ b/theodolite-benchmarks/commons/build.gradle @@ -1,7 +1,6 @@ plugins { // common java conventions - id 'theodolite.java-conventions' - + id 'theodolite.java-commons' // avro plugin id "com.github.davidmc24.gradle.plugin.avro-base" version "1.3.0" } @@ -21,9 +20,8 @@ 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' - implementation 'org.apache.commons:commons-configuration2:2.0' - - implementation "org.apache.avro:avro:1.11.0" + api 'org.apache.commons:commons-configuration2:2.0' + api "org.apache.avro:avro:1.11.0" // These dependencies are used internally, and not exposed to consumers on their own compile classpath. implementation 'commons-beanutils:commons-beanutils:1.9.2' // necessary for commons-configuration2 diff --git a/theodolite-benchmarks/kstreams-commons/src/main/java/rocks/theodolite/benchmarks/commons/kstreams/KafkaStreamsBuilder.java b/theodolite-benchmarks/kstreams-commons/src/main/java/rocks/theodolite/benchmarks/commons/kstreams/KafkaStreamsBuilder.java index 06e8591eebc538fcfaed2db394625d8a6dd8b033..5a2716c6ebcb2a857946908b500554d3de883174 100644 --- a/theodolite-benchmarks/kstreams-commons/src/main/java/rocks/theodolite/benchmarks/commons/kstreams/KafkaStreamsBuilder.java +++ b/theodolite-benchmarks/kstreams-commons/src/main/java/rocks/theodolite/benchmarks/commons/kstreams/KafkaStreamsBuilder.java @@ -7,7 +7,6 @@ import org.apache.commons.configuration2.Configuration; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.Topology; -import titan.ccp.common.kafka.streams.PropertiesBuilder; /** * Builder for the Kafka Streams configuration. diff --git a/theodolite-benchmarks/uc1-commons/build.gradle b/theodolite-benchmarks/uc1-commons/build.gradle index 0f7d31d1f557ecd214b3a57227851d0f70b61084..c500eb92ffaab6bd24a0c2591fd7b34e326db59a 100644 --- a/theodolite-benchmarks/uc1-commons/build.gradle +++ b/theodolite-benchmarks/uc1-commons/build.gradle @@ -15,10 +15,12 @@ repositories { dependencies { // Make this implementation once this is a local subproject. // Currently, Flink needs its own version of these dependencies. - compileOnly('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true } - compileOnly('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true } +// compileOnly('org.industrial-devops:titan-ccp-common:0.1.0-SNAPSHOT') { changing = true } +// compileOnly('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') { changing = true } implementation 'com.google.code.gson:gson:2.8.9' testImplementation 'junit:junit:4.12' + + implementation project(':commons') } 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 a1cb1ade0dc76b168cf9ee54f64d5ac88d6b3a98..ca981b40f8c1d02b91951f7065a4fdd72e6efa13 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 titan.ccp.model.records.ActivePowerRecord; +import rocks.theodolite.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 105f19e0e920e3516f7277cd7804dae210a7d0b1..d7979e80d24ea3d81d67461c1318d51768795d4a 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 titan.ccp.model.records.ActivePowerRecord; +import rocks.theodolite.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 f9974affb7bf57fc63e9bfe8ba92fd056da9a97b..11511d4f3d137a1753698c59ef8624e9cf4fdd56 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 @@ -3,7 +3,7 @@ package rocks.theodolite.benchmarks.uc1.commons.logger; import com.google.gson.Gson; import java.io.Serializable; import rocks.theodolite.benchmarks.uc1.commons.RecordConverter; -import titan.ccp.model.records.ActivePowerRecord; +import rocks.theodolite.commons.model.records.ActivePowerRecord; /** * {@link RecordConverter} that converts {@link ActivePowerRecord}s to JSON strings. 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 0a2a1bec7c3515f903905efeb07e717a46e329ea..a93e225c3038bb3364443588155bece76988e0fc 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 titan.ccp.common.configuration.ServiceConfigurations; +import rocks.theodolite.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 944e449c4693dc7c234844c97567d7f9f048cf3b..7bf354df9b91028f8e0dac9f77b5d02d3ad9886b 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 @@ -7,8 +7,8 @@ import org.apache.kafka.streams.Topology; import org.apache.kafka.streams.kstream.Consumed; import rocks.theodolite.benchmarks.uc1.commons.DatabaseAdapter; import rocks.theodolite.benchmarks.uc1.commons.logger.LogWriterFactory; -import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; -import titan.ccp.model.records.ActivePowerRecord; +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 a1e9c4d78d0f340273fb3db944ba96913c8d0b13..5370de258f78e300bd8a925dfbdce6beb9ba215e 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 @@ -5,7 +5,7 @@ import java.util.Properties; import org.apache.commons.configuration2.Configuration; import org.apache.kafka.streams.Topology; import rocks.theodolite.benchmarks.commons.kstreams.KafkaStreamsBuilder; -import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; +import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory; /** * Builder for the Kafka Streams configuration. 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 3b87053507a7739381482719acf317903fe2d361..4121c11a7af0fd719186ed1c025147dd5294bd00 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 @@ -6,7 +6,7 @@ import java.util.concurrent.CompletableFuture; import org.apache.commons.configuration2.Configuration; import org.apache.kafka.streams.KafkaStreams; import rocks.theodolite.benchmarks.commons.kstreams.ConfigurationKeys; -import titan.ccp.common.configuration.ServiceConfigurations; +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 ae17c83bc141ef6056d7f9f89738d1442ba4afed..9bff1359502c742be9c34bc7312564adf68e7469 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.kstreams.GenericSerde; import rocks.theodolite.benchmarks.uc2.kstreams.util.StatsFactory; -import titan.ccp.common.kafka.GenericSerde; -import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; -import titan.ccp.model.records.ActivePowerRecord; +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 9db55ef921e44ac6ebb8b31ca58c13862c33ddcb..e76ef3e26144c844ddd6a7ab212cb3f89bf4b9eb 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 @@ -6,7 +6,7 @@ import java.util.Properties; import org.apache.commons.configuration2.Configuration; import org.apache.kafka.streams.Topology; import rocks.theodolite.benchmarks.commons.kstreams.KafkaStreamsBuilder; -import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; +import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory; /** * Builder for the Kafka Streams configuration. 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 a327d2ecfa4c0727e7a29a69e7ab8910afdfd3d2..be42b0a228c5e970c1421676d5376dd61d8dd74d 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 @@ -5,7 +5,7 @@ import java.util.concurrent.CompletableFuture; import org.apache.commons.configuration2.Configuration; import org.apache.kafka.streams.KafkaStreams; import rocks.theodolite.benchmarks.commons.kstreams.ConfigurationKeys; -import titan.ccp.common.configuration.ServiceConfigurations; +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 4014e5e30dee36a737ab582e527fc8fb4b8a32a9..d8319a45255c4bfe407c5fef6e26dc2f084fd959 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 titan.ccp.common.kafka.simpleserdes.BufferSerde; -import titan.ccp.common.kafka.simpleserdes.ReadBuffer; -import titan.ccp.common.kafka.simpleserdes.SimpleSerdes; -import titan.ccp.common.kafka.simpleserdes.WriteBuffer; +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 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 3d67a6ebe86eb33378fe0711b6b8ca1ab1f5c6a9..6ceaf55c4339e15e85141b2862210e8e94924c0e 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 titan.ccp.model.records.HourOfDayActivePowerRecord; +import rocks.theodolite.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 b956959c5680c3c23eb35c0548004bb55de09a20..99e6ecf72d870237542b419d74be42c9e62aeb75 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.kstreams.GenericSerde; import rocks.theodolite.benchmarks.uc3.kstreams.util.StatsFactory; -import titan.ccp.common.kafka.GenericSerde; -import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; -import titan.ccp.model.records.ActivePowerRecord; +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 3c80e5eedef0c9dda8ac3c729f158d0872b5769b..015bafd6c220f5b1a1bd73c022ec682681b35861 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 @@ -6,7 +6,7 @@ import java.util.Properties; import org.apache.commons.configuration2.Configuration; import org.apache.kafka.streams.Topology; import rocks.theodolite.benchmarks.commons.kstreams.KafkaStreamsBuilder; -import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; +import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory; /** * Builder for the Kafka Streams configuration. 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 341c37bc086dabb3a93dcd3b0f221dd91007b8b3..eebeb9d39dce598343b8d0f3e46f6165ac6e007b 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 @@ -5,7 +5,7 @@ import java.util.concurrent.CompletableFuture; import org.apache.commons.configuration2.Configuration; import org.apache.kafka.streams.KafkaStreams; import rocks.theodolite.benchmarks.commons.kstreams.ConfigurationKeys; -import titan.ccp.common.configuration.ServiceConfigurations; +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 bdc8fc7d4267fbdb427d8dc217ef296c0553da1b..74aabf80e9129b245fc86a914b8dd194c52520a2 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 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.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; /** * 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 538643f0cdb119988e446f3eae793e2efcccadd6..cdd4c5b4a7293eebbb87a69a1a1ab503be7393ad 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 titan.ccp.configuration.events.Event; -import titan.ccp.model.sensorregistry.SensorRegistry; +import rocks.theodolite.commons.configuration.events.Event; +import rocks.theodolite.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 38cbca81d664ca72494525263d8a7ab3a7523bfc..6459c23853763dc485a50cc2e080753697d9b890 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 titan.ccp.model.records.ActivePowerRecord; +import rocks.theodolite.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 2e635ec368bca87bdb882580b51f763abba8f32a..91a298f73126e588e1c10e8150abe76a9d13a016 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 titan.ccp.model.records.ActivePowerRecord; +import rocks.theodolite.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 5892c6d3ac84c6d1ff56cfb440186e07fd9d9eb0..4399f57fde9a53cb0bc532074c2c4c49bc4d009d 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 titan.ccp.model.records.ActivePowerRecord; +import rocks.theodolite.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 3738fadd52b22abb8e13f20ae6066017112f0455..5c2b4dad2955a62978086afa0226db1072c88303 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 titan.ccp.common.kafka.simpleserdes.BufferSerde; -import titan.ccp.common.kafka.simpleserdes.ReadBuffer; -import titan.ccp.common.kafka.simpleserdes.SimpleSerdes; -import titan.ccp.common.kafka.simpleserdes.WriteBuffer; +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 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 dac58c84bc1914b4e54fe5eb6da0930204e34eb5..7a6745c9313114ce52b38c3d3ddf7bae743f3e5e 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 titan.ccp.common.kafka.simpleserdes.BufferSerde; -import titan.ccp.common.kafka.simpleserdes.ReadBuffer; -import titan.ccp.common.kafka.simpleserdes.SimpleSerdes; -import titan.ccp.common.kafka.simpleserdes.WriteBuffer; +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 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 d107dedbfdb58489a6f00e2baf248f15bb823db9..0267d3bcca0821faff5542fb38508e1b9ec4b53c 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 titan.ccp.model.records.ActivePowerRecord; -import titan.ccp.model.records.AggregatedActivePowerRecord; +import rocks.theodolite.commons.model.records.ActivePowerRecord; +import rocks.theodolite.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 80fd16f64c6f08e32a89bb3558b61d3f560be890..9b1a8c62fc0926e32296a29ca411a230b3f64108 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 titan.ccp.common.kafka.simpleserdes.BufferSerde; -import titan.ccp.common.kafka.simpleserdes.ReadBuffer; -import titan.ccp.common.kafka.simpleserdes.SimpleSerdes; -import titan.ccp.common.kafka.simpleserdes.WriteBuffer; +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-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 fbd3ed109965b103e4f1cdeb4324581bc6c82e8b..b95fb7439230ec2e5bbfc3247e6bf29d6be290ec 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 @@ -18,12 +18,12 @@ import org.apache.kafka.streams.kstream.Suppressed.BufferConfig; import org.apache.kafka.streams.kstream.TimeWindows; import org.apache.kafka.streams.kstream.Windowed; import org.apache.kafka.streams.kstream.WindowedSerdes; -import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; -import titan.ccp.configuration.events.Event; -import titan.ccp.configuration.events.EventSerde; -import titan.ccp.model.records.ActivePowerRecord; -import titan.ccp.model.records.AggregatedActivePowerRecord; -import titan.ccp.model.sensorregistry.SensorRegistry; +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 4d2b96ccb751dbb804eab0806303312a88702dc0..33594e5a486e3d5b9a48d33c2aa743ee9018fbdf 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 @@ -6,7 +6,7 @@ import java.util.Properties; import org.apache.commons.configuration2.Configuration; import org.apache.kafka.streams.Topology; import rocks.theodolite.benchmarks.commons.kstreams.KafkaStreamsBuilder; -import titan.ccp.common.kafka.avro.SchemaRegistryAvroSerdeFactory; +import rocks.theodolite.commons.kafka.avro.SchemaRegistryAvroSerdeFactory; /** * Builder for the Kafka Streams configuration.