From 074e8394c0b0e551281211cc9d102271d3cb57a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Thu, 18 Mar 2021 11:23:39 +0100
Subject: [PATCH] Rename Gradle subprojects
---
.gitlab-ci.yml | 29 ++++++++++---------
...c-flink.gradle => theodolite.flink.gradle} | 0
...eams.gradle => theodolite.kstreams.gradle} | 2 +-
...radle => theodolite.load-generator.gradle} | 2 +-
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../build.gradle | 0
.../kafkastreams/ConfigurationKeys.java | 0
.../kafkastreams/KafkaStreamsBuilder.java | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../build.gradle | 0
.../workloadgeneration/BeforeAction.java | 0
.../workloadgeneration/ClusterConfig.java | 0
.../workloadgeneration/ConfigurationKeys.java | 0
.../workloadgeneration/HazelcastRunner.java | 0
.../HazelcastRunnerStateInstance.java | 0
.../workloadgeneration/KafkaRecordSender.java | 0
.../commons/workloadgeneration/KeySpace.java | 0
.../workloadgeneration/LoadGenerator.java | 0
.../LoadGeneratorConfig.java | 0
.../LoadGeneratorExecution.java | 0
.../workloadgeneration/MessageGenerator.java | 0
.../workloadgeneration/RecordGenerator.java | 0
.../workloadgeneration/RecordSender.java | 0
.../TitanMessageGeneratorFactory.java | 0
.../WorkloadDefinition.java | 0
.../workloadgeneration/KeySpaceTest.java | 0
.../WorkloadDefinitionTest.java | 0
theodolite-benchmarks/settings.gradle | 28 +++++++++---------
.../uc1-application-flink/Dockerfile | 3 --
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
theodolite-benchmarks/uc1-flink/Dockerfile | 3 ++
.../build.gradle | 2 +-
.../uc1/application/ConfigurationKeys.java | 0
.../uc1/application/GsonMapper.java | 0
.../application/HistoryServiceFlinkJob.java | 0
.../resources/META-INF/application.properties | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../Dockerfile | 4 +--
.../build.gradle | 2 +-
.../uc1/application/HistoryService.java | 0
.../uc1/streamprocessing/TopologyBuilder.java | 0
.../Uc1KafkaStreamsBuilder.java | 0
.../resources/META-INF/application.properties | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../Dockerfile | 2 +-
.../build.gradle | 2 +-
.../uc1/workloadgenerator/LoadGenerator.java | 0
.../uc2-application-flink/Dockerfile | 3 --
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
theodolite-benchmarks/uc2-flink/Dockerfile | 3 ++
.../build.gradle | 2 +-
.../uc2/application/ConfigurationKeys.java | 0
.../application/HistoryServiceFlinkJob.java | 0
.../application/StatsAggregateFunction.java | 0
.../StatsProcessWindowFunction.java | 0
.../uc2/application/util/StatsFactory.java | 0
.../resources/META-INF/application.properties | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../Dockerfile | 4 +--
.../build.gradle | 2 +-
.../uc2/application/HistoryService.java | 0
.../uc2/streamprocessing/TopologyBuilder.java | 0
.../Uc2KafkaStreamsBuilder.java | 0
.../streamprocessing/util/StatsFactory.java | 0
.../resources/META-INF/application.properties | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../uc2-load-generator/Dockerfile | 6 ++++
.../build.gradle | 2 +-
.../uc2/workloadgenerator/LoadGenerator.java | 0
.../uc2-workload-generator/Dockerfile | 6 ----
.../uc3-application-flink/Dockerfile | 3 --
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
theodolite-benchmarks/uc3-flink/Dockerfile | 3 ++
.../build.gradle | 2 +-
.../uc3/application/ConfigurationKeys.java | 0
.../application/HistoryServiceFlinkJob.java | 0
.../HourOfDayProcessWindowFunction.java | 0
.../application/StatsAggregateFunction.java | 0
.../uc3/application/util/HourOfDayKey.java | 0
.../application/util/HourOfDayKeyFactory.java | 0
.../application/util/HourOfDayKeySerde.java | 0
.../util/HourOfDayRecordFactory.java | 0
.../uc3/application/util/StatsFactory.java | 0
.../uc3/application/util/StatsKeyFactory.java | 0
.../application/util/StatsRecordFactory.java | 0
.../resources/META-INF/application.properties | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../Dockerfile | 4 +--
.../build.gradle | 2 +-
.../uc3/application/HistoryService.java | 0
.../uc3/streamprocessing/HourOfDayKey.java | 0
.../streamprocessing/HourOfDayKeyFactory.java | 0
.../streamprocessing/HourOfDayKeySerde.java | 0
.../HourOfDayRecordFactory.java | 0
.../RecordDatabaseAdapter.java | 0
.../uc3/streamprocessing/StatsKeyFactory.java | 0
.../streamprocessing/StatsRecordFactory.java | 0
.../uc3/streamprocessing/TopologyBuilder.java | 0
.../Uc3KafkaStreamsBuilder.java | 0
.../streamprocessing/util/StatsFactory.java | 0
.../resources/META-INF/application.properties | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../uc3-load-generator/Dockerfile | 6 ++++
.../build.gradle | 2 +-
.../uc3/workloadgenerator/LoadGenerator.java | 0
.../uc3-workload-generator/Dockerfile | 6 ----
.../uc4-application-flink/Dockerfile | 3 --
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
theodolite-benchmarks/uc4-flink/Dockerfile | 3 ++
.../build.gradle | 2 +-
.../AggregationServiceFlinkJob.java | 0
.../ChildParentsFlatMapFunction.java | 0
.../uc4/application/ConfigurationKeys.java | 0
.../JoinAndDuplicateCoFlatMapFunction.java | 0
...ecordAggregationProcessWindowFunction.java | 0
.../ImmutableSensorRegistrySerializer.java | 0
.../util/ImmutableSetSerializer.java | 0
.../uc4/application/util/SensorParentKey.java | 0
.../util/SensorParentKeySerializer.java | 0
.../resources/META-INF/application.properties | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../Dockerfile | 4 +--
.../README.md | 0
.../build.gradle | 2 +-
.../uc4/application/AggregationService.java | 0
.../ChildParentsTransformer.java | 0
.../ChildParentsTransformerSupplier.java | 0
.../JointFlatTransformer.java | 0
.../JointFlatTransformerSupplier.java | 0
.../streamprocessing/JointRecordParents.java | 0
.../OptionalParentsSerde.java | 0
.../uc4/streamprocessing/ParentsSerde.java | 0
.../streamprocessing/RecordAggregator.java | 0
.../uc4/streamprocessing/SensorParentKey.java | 0
.../SensorParentKeySerde.java | 0
.../uc4/streamprocessing/TopologyBuilder.java | 0
.../Uc4KafkaStreamsBuilder.java | 0
.../resources/META-INF/application.properties | 0
.../OptionalParentsSerdeTest.java | 0
.../streamprocessing/ParentsSerdeTest.java | 0
.../SensorParentKeySerdeTest.java | 0
.../uc4/streamprocessing/SerdeTester.java | 0
.../streamprocessing/SerdeTesterFactory.java | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../qa.eclipse.plugin.checkstyle.prefs | 0
.../.settings/qa.eclipse.plugin.pmd.prefs | 0
.../uc4-load-generator/Dockerfile | 6 ++++
.../build.gradle | 2 +-
.../workloadgenerator/ConfigPublisher.java | 0
.../uc4/workloadgenerator/LoadGenerator.java | 0
.../SensorRegistryBuilder.java | 0
.../resources/META-INF/application.properties | 0
.../SensorRegistryBuilderTest.java | 0
.../uc4-workload-generator/Dockerfile | 6 ----
180 files changed, 82 insertions(+), 81 deletions(-)
rename theodolite-benchmarks/buildSrc/src/main/groovy/{theodolite.uc-flink.gradle => theodolite.flink.gradle} (100%)
rename theodolite-benchmarks/buildSrc/src/main/groovy/{theodolite.uc-kafka-streams.gradle => theodolite.kstreams.gradle} (93%)
rename theodolite-benchmarks/buildSrc/src/main/groovy/{theodolite.uc-workload.gradle => theodolite.load-generator.gradle} (93%)
rename theodolite-benchmarks/{application-kafkastreams-commons => kstreams-commons}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{application-kafkastreams-commons => kstreams-commons}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{application-kafkastreams-commons => kstreams-commons}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
rename theodolite-benchmarks/{application-kafkastreams-commons => kstreams-commons}/build.gradle (100%)
rename theodolite-benchmarks/{application-kafkastreams-commons => kstreams-commons}/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java (100%)
rename theodolite-benchmarks/{application-kafkastreams-commons => kstreams-commons}/src/main/java/theodolite/commons/kafkastreams/KafkaStreamsBuilder.java (100%)
rename theodolite-benchmarks/{uc1-application-flink => load-generator-commons}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc1-application-flink => load-generator-commons}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc1-application-flink => load-generator-commons}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/build.gradle (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/BeforeAction.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/ClusterConfig.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/ConfigurationKeys.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunner.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunnerStateInstance.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/KafkaRecordSender.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/KeySpace.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorConfig.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorExecution.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/MessageGenerator.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/RecordGenerator.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/RecordSender.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/TitanMessageGeneratorFactory.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/main/java/theodolite/commons/workloadgeneration/WorkloadDefinition.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/test/java/theodolite/commons/workloadgeneration/KeySpaceTest.java (100%)
rename theodolite-benchmarks/{workload-generator-commons => load-generator-commons}/src/test/java/theodolite/commons/workloadgeneration/WorkloadDefinitionTest.java (100%)
delete mode 100644 theodolite-benchmarks/uc1-application-flink/Dockerfile
rename theodolite-benchmarks/{uc1-application => uc1-flink}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc1-application => uc1-flink}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc1-application => uc1-flink}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
create mode 100644 theodolite-benchmarks/uc1-flink/Dockerfile
rename theodolite-benchmarks/{uc1-application-flink => uc1-flink}/build.gradle (71%)
rename theodolite-benchmarks/{uc1-application-flink => uc1-flink}/src/main/java/theodolite/uc1/application/ConfigurationKeys.java (100%)
rename theodolite-benchmarks/{uc1-application-flink => uc1-flink}/src/main/java/theodolite/uc1/application/GsonMapper.java (100%)
rename theodolite-benchmarks/{uc1-application-flink => uc1-flink}/src/main/java/theodolite/uc1/application/HistoryServiceFlinkJob.java (100%)
rename theodolite-benchmarks/{uc1-application-flink => uc1-flink}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{uc3-application => uc1-kstreams}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc1-workload-generator => uc1-kstreams}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc1-workload-generator => uc1-kstreams}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
rename theodolite-benchmarks/{uc1-application => uc1-kstreams}/Dockerfile (53%)
rename theodolite-benchmarks/{uc1-application => uc1-kstreams}/build.gradle (64%)
rename theodolite-benchmarks/{uc1-application => uc1-kstreams}/src/main/java/theodolite/uc1/application/HistoryService.java (100%)
rename theodolite-benchmarks/{uc1-application => uc1-kstreams}/src/main/java/theodolite/uc1/streamprocessing/TopologyBuilder.java (100%)
rename theodolite-benchmarks/{uc1-application => uc1-kstreams}/src/main/java/theodolite/uc1/streamprocessing/Uc1KafkaStreamsBuilder.java (100%)
rename theodolite-benchmarks/{uc1-application => uc1-kstreams}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{uc1-workload-generator => uc1-load-generator}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc2-application-flink => uc1-load-generator}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc2-application-flink => uc1-load-generator}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
rename theodolite-benchmarks/{uc1-workload-generator => uc1-load-generator}/Dockerfile (72%)
rename theodolite-benchmarks/{uc1-workload-generator => uc1-load-generator}/build.gradle (67%)
rename theodolite-benchmarks/{uc1-workload-generator => uc1-load-generator}/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java (100%)
delete mode 100644 theodolite-benchmarks/uc2-application-flink/Dockerfile
rename theodolite-benchmarks/{uc2-application-flink => uc2-flink}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc2-application => uc2-flink}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc2-application => uc2-flink}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
create mode 100644 theodolite-benchmarks/uc2-flink/Dockerfile
rename theodolite-benchmarks/{uc2-application-flink => uc2-flink}/build.gradle (86%)
rename theodolite-benchmarks/{uc2-application-flink => uc2-flink}/src/main/java/theodolite/uc2/application/ConfigurationKeys.java (100%)
rename theodolite-benchmarks/{uc2-application-flink => uc2-flink}/src/main/java/theodolite/uc2/application/HistoryServiceFlinkJob.java (100%)
rename theodolite-benchmarks/{uc2-application-flink => uc2-flink}/src/main/java/theodolite/uc2/application/StatsAggregateFunction.java (100%)
rename theodolite-benchmarks/{uc2-application-flink => uc2-flink}/src/main/java/theodolite/uc2/application/StatsProcessWindowFunction.java (100%)
rename theodolite-benchmarks/{uc2-application-flink => uc2-flink}/src/main/java/theodolite/uc2/application/util/StatsFactory.java (100%)
rename theodolite-benchmarks/{uc2-application-flink => uc2-flink}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{uc2-application => uc2-kstreams}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc2-workload-generator => uc2-kstreams}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc2-workload-generator => uc2-kstreams}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
rename theodolite-benchmarks/{uc2-application => uc2-kstreams}/Dockerfile (53%)
rename theodolite-benchmarks/{uc2-application => uc2-kstreams}/build.gradle (64%)
rename theodolite-benchmarks/{uc2-application => uc2-kstreams}/src/main/java/theodolite/uc2/application/HistoryService.java (100%)
rename theodolite-benchmarks/{uc2-application => uc2-kstreams}/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java (100%)
rename theodolite-benchmarks/{uc2-application => uc2-kstreams}/src/main/java/theodolite/uc2/streamprocessing/Uc2KafkaStreamsBuilder.java (100%)
rename theodolite-benchmarks/{uc2-application => uc2-kstreams}/src/main/java/theodolite/uc2/streamprocessing/util/StatsFactory.java (100%)
rename theodolite-benchmarks/{uc2-application => uc2-kstreams}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{uc2-workload-generator => uc2-load-generator}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc2-load-generator}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc2-load-generator}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
create mode 100644 theodolite-benchmarks/uc2-load-generator/Dockerfile
rename theodolite-benchmarks/{uc2-workload-generator => uc2-load-generator}/build.gradle (67%)
rename theodolite-benchmarks/{uc2-workload-generator => uc2-load-generator}/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java (100%)
delete mode 100644 theodolite-benchmarks/uc2-workload-generator/Dockerfile
delete mode 100644 theodolite-benchmarks/uc3-application-flink/Dockerfile
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc3-application => uc3-flink}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc3-application => uc3-flink}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
create mode 100644 theodolite-benchmarks/uc3-flink/Dockerfile
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/build.gradle (86%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/ConfigurationKeys.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/HistoryServiceFlinkJob.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/HourOfDayProcessWindowFunction.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/StatsAggregateFunction.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/util/HourOfDayKey.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/util/HourOfDayKeyFactory.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/util/HourOfDayKeySerde.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/util/HourOfDayRecordFactory.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/util/StatsFactory.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/util/StatsKeyFactory.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/java/theodolite/uc3/application/util/StatsRecordFactory.java (100%)
rename theodolite-benchmarks/{uc3-application-flink => uc3-flink}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{uc3-workload-generator => uc3-kstreams}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc3-workload-generator => uc3-kstreams}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc3-workload-generator => uc3-kstreams}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/Dockerfile (52%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/build.gradle (64%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/application/HistoryService.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKey.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeyFactory.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeySerde.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/HourOfDayRecordFactory.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/RecordDatabaseAdapter.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/StatsKeyFactory.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/StatsRecordFactory.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/TopologyBuilder.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/Uc3KafkaStreamsBuilder.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/java/theodolite/uc3/streamprocessing/util/StatsFactory.java (100%)
rename theodolite-benchmarks/{uc3-application => uc3-kstreams}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{uc4-application => uc3-load-generator}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc3-load-generator}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc3-load-generator}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
create mode 100644 theodolite-benchmarks/uc3-load-generator/Dockerfile
rename theodolite-benchmarks/{uc3-workload-generator => uc3-load-generator}/build.gradle (67%)
rename theodolite-benchmarks/{uc3-workload-generator => uc3-load-generator}/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java (100%)
delete mode 100644 theodolite-benchmarks/uc3-workload-generator/Dockerfile
delete mode 100644 theodolite-benchmarks/uc4-application-flink/Dockerfile
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc4-application => uc4-flink}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc4-application => uc4-flink}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
create mode 100644 theodolite-benchmarks/uc4-flink/Dockerfile
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/build.gradle (72%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/AggregationServiceFlinkJob.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/ChildParentsFlatMapFunction.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/ConfigurationKeys.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/JoinAndDuplicateCoFlatMapFunction.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/RecordAggregationProcessWindowFunction.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/util/ImmutableSensorRegistrySerializer.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/util/ImmutableSetSerializer.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/util/SensorParentKey.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/java/theodolite/uc4/application/util/SensorParentKeySerializer.java (100%)
rename theodolite-benchmarks/{uc4-application-flink => uc4-flink}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{workload-generator-commons => uc4-kstreams}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{uc4-workload-generator => uc4-kstreams}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{uc4-workload-generator => uc4-kstreams}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/Dockerfile (52%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/README.md (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/build.gradle (65%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/application/AggregationService.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformer.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformerSupplier.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformer.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformerSupplier.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/JointRecordParents.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/OptionalParentsSerde.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/ParentsSerde.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/RecordAggregator.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/SensorParentKey.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/SensorParentKeySerde.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/TopologyBuilder.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/java/theodolite/uc4/streamprocessing/Uc4KafkaStreamsBuilder.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/test/java/theodolite/uc4/streamprocessing/OptionalParentsSerdeTest.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/test/java/theodolite/uc4/streamprocessing/ParentsSerdeTest.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/test/java/theodolite/uc4/streamprocessing/SensorParentKeySerdeTest.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/test/java/theodolite/uc4/streamprocessing/SerdeTester.java (100%)
rename theodolite-benchmarks/{uc4-application => uc4-kstreams}/src/test/java/theodolite/uc4/streamprocessing/SerdeTesterFactory.java (100%)
rename theodolite-benchmarks/{uc4-workload-generator => uc4-load-generator}/.settings/org.eclipse.jdt.ui.prefs (100%)
rename theodolite-benchmarks/{workload-generator-commons => uc4-load-generator}/.settings/qa.eclipse.plugin.checkstyle.prefs (100%)
rename theodolite-benchmarks/{workload-generator-commons => uc4-load-generator}/.settings/qa.eclipse.plugin.pmd.prefs (100%)
create mode 100644 theodolite-benchmarks/uc4-load-generator/Dockerfile
rename theodolite-benchmarks/{uc4-workload-generator => uc4-load-generator}/build.gradle (70%)
rename theodolite-benchmarks/{uc4-workload-generator => uc4-load-generator}/src/main/java/theodolite/uc4/workloadgenerator/ConfigPublisher.java (100%)
rename theodolite-benchmarks/{uc4-workload-generator => uc4-load-generator}/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java (100%)
rename theodolite-benchmarks/{uc4-workload-generator => uc4-load-generator}/src/main/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilder.java (100%)
rename theodolite-benchmarks/{uc4-workload-generator => uc4-load-generator}/src/main/resources/META-INF/application.properties (100%)
rename theodolite-benchmarks/{uc4-workload-generator => uc4-load-generator}/src/test/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilderTest.java (100%)
delete mode 100644 theodolite-benchmarks/uc4-workload-generator/Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cf1347be..4ee62b4c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,8 +117,9 @@ spotbugs-benchmarks:
- changes:
- theodolite-benchmarks/*
- theodolite-benchmarks/$JAVA_PROJECT_NAME/**/*
- - theodolite-benchmarks/application-kafkastreams-commons/**/*
- - theodolite-benchmarks/workload-generator-commons/**/*
+ - theodolite-benchmarks/kstreams-commons/**/*
+ - theodolite-benchmarks/flink-commons/**/*
+ - theodolite-benchmarks/load-generator-commons/**/*
if: "$CR_HOST && $CR_ORG && $CR_USER && $CR_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
when: always
- if: "$CR_HOST && $CR_ORG && $CR_USER && $CR_PW && $IMAGE_NAME && $JAVA_PROJECT_NAME"
@@ -129,73 +130,73 @@ deploy-uc1-kstreams:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc1-kstreams-app"
- JAVA_PROJECT_NAME: "uc1-application"
+ JAVA_PROJECT_NAME: "uc1-kstreams"
deploy-uc2-kstreams:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc2-kstreams-app"
- JAVA_PROJECT_NAME: "uc2-application"
+ JAVA_PROJECT_NAME: "uc2-kstreams"
deploy-uc3-kstreams:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc3-kstreams-app"
- JAVA_PROJECT_NAME: "uc3-application"
+ JAVA_PROJECT_NAME: "uc3-kstreams"
deploy-uc4-kstreams:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc4-kstreams-app"
- JAVA_PROJECT_NAME: "uc4-application"
+ JAVA_PROJECT_NAME: "uc4-kstreams"
deploy-uc1-flink:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc1-flink"
- JAVA_PROJECT_NAME: "uc1-application-flink"
+ JAVA_PROJECT_NAME: "uc1-flink"
deploy-uc2-flink:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc2-flink"
- JAVA_PROJECT_NAME: "uc2-application-flink"
+ JAVA_PROJECT_NAME: "uc2-flink"
deploy-uc3-flink:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc3-flink"
- JAVA_PROJECT_NAME: "uc3-application-flink"
+ JAVA_PROJECT_NAME: "uc3-flink"
deploy-uc4-flink:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc4-flink"
- JAVA_PROJECT_NAME: "uc4-application-flink"
+ JAVA_PROJECT_NAME: "uc4-flink"
deploy-uc1-load-generator:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc1-workload-generator"
- JAVA_PROJECT_NAME: "uc1-workload-generator"
+ JAVA_PROJECT_NAME: "uc1-load-generator"
deploy-uc2-load-generator:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc2-workload-generator"
- JAVA_PROJECT_NAME: "uc2-workload-generator"
+ JAVA_PROJECT_NAME: "uc2-load-generator"
deploy-uc3-load-generator:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc3-workload-generator"
- JAVA_PROJECT_NAME: "uc3-workload-generator"
+ JAVA_PROJECT_NAME: "uc3-load-generator"
deploy-uc4-load-generator:
extends: .deploy-benchmarks
variables:
IMAGE_NAME: "theodolite-uc4-workload-generator"
- JAVA_PROJECT_NAME: "uc4-workload-generator"
+ JAVA_PROJECT_NAME: "uc4-load-generator"
# Theodolite Framework
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.uc-flink.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.flink.gradle
similarity index 100%
rename from theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.uc-flink.gradle
rename to theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.flink.gradle
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.uc-kafka-streams.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.kstreams.gradle
similarity index 93%
rename from theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.uc-kafka-streams.gradle
rename to theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.kstreams.gradle
index c664038cf..c6779fbc4 100644
--- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.uc-kafka-streams.gradle
+++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.kstreams.gradle
@@ -24,7 +24,7 @@ dependencies {
implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.google.guava:guava:24.1-jre'
implementation 'org.slf4j:slf4j-simple:1.7.25'
- implementation project(':application-kafkastreams-commons')
+ implementation project(':kstreams-commons')
// Use JUnit test framework
testImplementation 'junit:junit:4.12'
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.uc-workload.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.load-generator.gradle
similarity index 93%
rename from theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.uc-workload.gradle
rename to theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.load-generator.gradle
index 2c1f9509a..13b7ea191 100644
--- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.uc-workload.gradle
+++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.load-generator.gradle
@@ -23,7 +23,7 @@ dependencies {
implementation 'org.slf4j:slf4j-simple:1.7.25'
// These dependencies are used for the workload-generator-commmon
- implementation project(':workload-generator-commons')
+ implementation project(':load-generator-commons')
// Use JUnit test framework
testImplementation 'junit:junit:4.12'
diff --git a/theodolite-benchmarks/application-kafkastreams-commons/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/kstreams-commons/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/application-kafkastreams-commons/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/kstreams-commons/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/application-kafkastreams-commons/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/kstreams-commons/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/application-kafkastreams-commons/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/kstreams-commons/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/application-kafkastreams-commons/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/kstreams-commons/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/application-kafkastreams-commons/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/kstreams-commons/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/application-kafkastreams-commons/build.gradle b/theodolite-benchmarks/kstreams-commons/build.gradle
similarity index 100%
rename from theodolite-benchmarks/application-kafkastreams-commons/build.gradle
rename to theodolite-benchmarks/kstreams-commons/build.gradle
diff --git a/theodolite-benchmarks/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java b/theodolite-benchmarks/kstreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
similarity index 100%
rename from theodolite-benchmarks/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
rename to theodolite-benchmarks/kstreams-commons/src/main/java/theodolite/commons/kafkastreams/ConfigurationKeys.java
diff --git a/theodolite-benchmarks/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/KafkaStreamsBuilder.java b/theodolite-benchmarks/kstreams-commons/src/main/java/theodolite/commons/kafkastreams/KafkaStreamsBuilder.java
similarity index 100%
rename from theodolite-benchmarks/application-kafkastreams-commons/src/main/java/theodolite/commons/kafkastreams/KafkaStreamsBuilder.java
rename to theodolite-benchmarks/kstreams-commons/src/main/java/theodolite/commons/kafkastreams/KafkaStreamsBuilder.java
diff --git a/theodolite-benchmarks/uc1-application-flink/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/load-generator-commons/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-application-flink/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/load-generator-commons/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc1-application-flink/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/load-generator-commons/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-application-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/load-generator-commons/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc1-application-flink/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/load-generator-commons/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-application-flink/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/load-generator-commons/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/workload-generator-commons/build.gradle b/theodolite-benchmarks/load-generator-commons/build.gradle
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/build.gradle
rename to theodolite-benchmarks/load-generator-commons/build.gradle
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/BeforeAction.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/BeforeAction.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/BeforeAction.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/BeforeAction.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ClusterConfig.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ClusterConfig.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ClusterConfig.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ClusterConfig.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ConfigurationKeys.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ConfigurationKeys.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ConfigurationKeys.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/ConfigurationKeys.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunner.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunner.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunner.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunner.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunnerStateInstance.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunnerStateInstance.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunnerStateInstance.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/HazelcastRunnerStateInstance.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KafkaRecordSender.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KafkaRecordSender.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KafkaRecordSender.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KafkaRecordSender.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KeySpace.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KeySpace.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KeySpace.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/KeySpace.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGenerator.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorConfig.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorConfig.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorConfig.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorConfig.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorExecution.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorExecution.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorExecution.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/LoadGeneratorExecution.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/MessageGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/MessageGenerator.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/MessageGenerator.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/MessageGenerator.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordGenerator.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordGenerator.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordGenerator.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordGenerator.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordSender.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordSender.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordSender.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/RecordSender.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanMessageGeneratorFactory.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanMessageGeneratorFactory.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanMessageGeneratorFactory.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/TitanMessageGeneratorFactory.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/WorkloadDefinition.java b/theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/WorkloadDefinition.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/WorkloadDefinition.java
rename to theodolite-benchmarks/load-generator-commons/src/main/java/theodolite/commons/workloadgeneration/WorkloadDefinition.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/test/java/theodolite/commons/workloadgeneration/KeySpaceTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/KeySpaceTest.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/test/java/theodolite/commons/workloadgeneration/KeySpaceTest.java
rename to theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/KeySpaceTest.java
diff --git a/theodolite-benchmarks/workload-generator-commons/src/test/java/theodolite/commons/workloadgeneration/WorkloadDefinitionTest.java b/theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/WorkloadDefinitionTest.java
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/src/test/java/theodolite/commons/workloadgeneration/WorkloadDefinitionTest.java
rename to theodolite-benchmarks/load-generator-commons/src/test/java/theodolite/commons/workloadgeneration/WorkloadDefinitionTest.java
diff --git a/theodolite-benchmarks/settings.gradle b/theodolite-benchmarks/settings.gradle
index 6d499616f..5602e816b 100644
--- a/theodolite-benchmarks/settings.gradle
+++ b/theodolite-benchmarks/settings.gradle
@@ -1,21 +1,21 @@
rootProject.name = 'theodolite-benchmarks'
-include 'workload-generator-commons' // TODO Rename to load-generator-commons
-include 'application-kafkastreams-commons' // TODO Rename to kstreams-commons
+include 'load-generator-commons'
+include 'kstreams-commons'
include 'flink-commons'
-include 'uc1-workload-generator' // TODO Rename to uc1-load-generator
-include 'uc1-application' // TODO Rename to uc1-kstreams
-include 'uc1-application-flink' // TODO Rename to uc1-flink
+include 'uc1-load-generator'
+include 'uc1-kstreams'
+include 'uc1-flink'
-include 'uc2-workload-generator' // TODO Rename to uc2-load-generator
-include 'uc2-application' // TODO Rename to uc1-kstreams
-include 'uc2-application-flink' // TODO Rename to uc2-flink
+include 'uc2-load-generator'
+include 'uc2-kstreams'
+include 'uc2-flink'
-include 'uc3-workload-generator' // TODO Rename to uc3-load-generator
-include 'uc3-application' // TODO Rename to uc1-kstreams
-include 'uc3-application-flink' // TODO Rename to uc3-flink
+include 'uc3-load-generator'
+include 'uc3-kstreams'
+include 'uc3-flink'
-include 'uc4-workload-generator' // TODO Rename to uc4-load-generator
-include 'uc4-application' // TODO Rename to uc4-kstreams
-include 'uc4-application-flink' // TODO Rename to uc4-flink
+include 'uc4-load-generator'
+include 'uc4-kstreams'
+include 'uc4-flink'
diff --git a/theodolite-benchmarks/uc1-application-flink/Dockerfile b/theodolite-benchmarks/uc1-application-flink/Dockerfile
deleted file mode 100644
index b66d5bc05..000000000
--- a/theodolite-benchmarks/uc1-application-flink/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM flink:1.12-scala_2.12-java11
-
-ADD build/libs/uc1-application-flink-all.jar /opt/flink/usrlib/artifacts/uc1-application-flink-all.jar
diff --git a/theodolite-benchmarks/uc1-application/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc1-flink/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-application/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc1-flink/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc1-application/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc1-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-application/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc1-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc1-application/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc1-flink/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-application/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc1-flink/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc1-flink/Dockerfile b/theodolite-benchmarks/uc1-flink/Dockerfile
new file mode 100644
index 000000000..795b9e343
--- /dev/null
+++ b/theodolite-benchmarks/uc1-flink/Dockerfile
@@ -0,0 +1,3 @@
+FROM flink:1.12-scala_2.12-java11
+
+ADD build/libs/uc1-flink-all.jar /opt/flink/usrlib/artifacts/uc1-flink-all.jar
diff --git a/theodolite-benchmarks/uc1-application-flink/build.gradle b/theodolite-benchmarks/uc1-flink/build.gradle
similarity index 71%
rename from theodolite-benchmarks/uc1-application-flink/build.gradle
rename to theodolite-benchmarks/uc1-flink/build.gradle
index 8a57c61ba..8a2a359c4 100644
--- a/theodolite-benchmarks/uc1-application-flink/build.gradle
+++ b/theodolite-benchmarks/uc1-flink/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-flink'
+ id 'theodolite.flink'
}
mainClassName = "theodolite.uc1.application.HistoryServiceFlinkJob"
diff --git a/theodolite-benchmarks/uc1-application-flink/src/main/java/theodolite/uc1/application/ConfigurationKeys.java b/theodolite-benchmarks/uc1-flink/src/main/java/theodolite/uc1/application/ConfigurationKeys.java
similarity index 100%
rename from theodolite-benchmarks/uc1-application-flink/src/main/java/theodolite/uc1/application/ConfigurationKeys.java
rename to theodolite-benchmarks/uc1-flink/src/main/java/theodolite/uc1/application/ConfigurationKeys.java
diff --git a/theodolite-benchmarks/uc1-application-flink/src/main/java/theodolite/uc1/application/GsonMapper.java b/theodolite-benchmarks/uc1-flink/src/main/java/theodolite/uc1/application/GsonMapper.java
similarity index 100%
rename from theodolite-benchmarks/uc1-application-flink/src/main/java/theodolite/uc1/application/GsonMapper.java
rename to theodolite-benchmarks/uc1-flink/src/main/java/theodolite/uc1/application/GsonMapper.java
diff --git a/theodolite-benchmarks/uc1-application-flink/src/main/java/theodolite/uc1/application/HistoryServiceFlinkJob.java b/theodolite-benchmarks/uc1-flink/src/main/java/theodolite/uc1/application/HistoryServiceFlinkJob.java
similarity index 100%
rename from theodolite-benchmarks/uc1-application-flink/src/main/java/theodolite/uc1/application/HistoryServiceFlinkJob.java
rename to theodolite-benchmarks/uc1-flink/src/main/java/theodolite/uc1/application/HistoryServiceFlinkJob.java
diff --git a/theodolite-benchmarks/uc1-application-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc1-flink/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc1-application-flink/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc1-flink/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc3-application/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc1-kstreams/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-application/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc1-kstreams/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc1-workload-generator/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc1-kstreams/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-workload-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc1-kstreams/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc1-workload-generator/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc1-kstreams/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-workload-generator/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc1-kstreams/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc1-application/Dockerfile b/theodolite-benchmarks/uc1-kstreams/Dockerfile
similarity index 53%
rename from theodolite-benchmarks/uc1-application/Dockerfile
rename to theodolite-benchmarks/uc1-kstreams/Dockerfile
index 09c36f42a..bfabd8ff2 100644
--- a/theodolite-benchmarks/uc1-application/Dockerfile
+++ b/theodolite-benchmarks/uc1-kstreams/Dockerfile
@@ -1,7 +1,7 @@
FROM openjdk:11-slim
-ADD build/distributions/uc1-application.tar /
+ADD build/distributions/uc1-kstreams.tar /
CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
- /uc1-application/bin/uc1-application
\ No newline at end of file
+ /uc1-kstreams/bin/uc1-kstreams
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc1-application/build.gradle b/theodolite-benchmarks/uc1-kstreams/build.gradle
similarity index 64%
rename from theodolite-benchmarks/uc1-application/build.gradle
rename to theodolite-benchmarks/uc1-kstreams/build.gradle
index 3c4f6cda2..74cfb450e 100644
--- a/theodolite-benchmarks/uc1-application/build.gradle
+++ b/theodolite-benchmarks/uc1-kstreams/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-kafka-streams'
+ id 'theodolite.kstreams'
}
mainClassName = "theodolite.uc1.application.HistoryService"
diff --git a/theodolite-benchmarks/uc1-application/src/main/java/theodolite/uc1/application/HistoryService.java b/theodolite-benchmarks/uc1-kstreams/src/main/java/theodolite/uc1/application/HistoryService.java
similarity index 100%
rename from theodolite-benchmarks/uc1-application/src/main/java/theodolite/uc1/application/HistoryService.java
rename to theodolite-benchmarks/uc1-kstreams/src/main/java/theodolite/uc1/application/HistoryService.java
diff --git a/theodolite-benchmarks/uc1-application/src/main/java/theodolite/uc1/streamprocessing/TopologyBuilder.java b/theodolite-benchmarks/uc1-kstreams/src/main/java/theodolite/uc1/streamprocessing/TopologyBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc1-application/src/main/java/theodolite/uc1/streamprocessing/TopologyBuilder.java
rename to theodolite-benchmarks/uc1-kstreams/src/main/java/theodolite/uc1/streamprocessing/TopologyBuilder.java
diff --git a/theodolite-benchmarks/uc1-application/src/main/java/theodolite/uc1/streamprocessing/Uc1KafkaStreamsBuilder.java b/theodolite-benchmarks/uc1-kstreams/src/main/java/theodolite/uc1/streamprocessing/Uc1KafkaStreamsBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc1-application/src/main/java/theodolite/uc1/streamprocessing/Uc1KafkaStreamsBuilder.java
rename to theodolite-benchmarks/uc1-kstreams/src/main/java/theodolite/uc1/streamprocessing/Uc1KafkaStreamsBuilder.java
diff --git a/theodolite-benchmarks/uc1-application/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc1-kstreams/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc1-application/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc1-kstreams/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc1-workload-generator/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc1-load-generator/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc1-workload-generator/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc1-load-generator/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc2-application-flink/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc1-load-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc1-load-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc2-application-flink/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc1-load-generator/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc1-load-generator/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc1-workload-generator/Dockerfile b/theodolite-benchmarks/uc1-load-generator/Dockerfile
similarity index 72%
rename from theodolite-benchmarks/uc1-workload-generator/Dockerfile
rename to theodolite-benchmarks/uc1-load-generator/Dockerfile
index 91f18d740..a1872ab52 100644
--- a/theodolite-benchmarks/uc1-workload-generator/Dockerfile
+++ b/theodolite-benchmarks/uc1-load-generator/Dockerfile
@@ -3,4 +3,4 @@ FROM openjdk:11-slim
ADD build/distributions/uc1-workload-generator.tar /
CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
- /uc1-workload-generator/bin/uc1-workload-generator
\ No newline at end of file
+ /uc1-load-generator/bin/uc1-load-generator
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc1-workload-generator/build.gradle b/theodolite-benchmarks/uc1-load-generator/build.gradle
similarity index 67%
rename from theodolite-benchmarks/uc1-workload-generator/build.gradle
rename to theodolite-benchmarks/uc1-load-generator/build.gradle
index cec494c8e..aadd4796d 100644
--- a/theodolite-benchmarks/uc1-workload-generator/build.gradle
+++ b/theodolite-benchmarks/uc1-load-generator/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-workload'
+ id 'theodolite.load-generator'
}
mainClassName = "theodolite.uc1.workloadgenerator.LoadGenerator"
diff --git a/theodolite-benchmarks/uc1-workload-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc1-load-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java
similarity index 100%
rename from theodolite-benchmarks/uc1-workload-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java
rename to theodolite-benchmarks/uc1-load-generator/src/main/java/theodolite/uc1/workloadgenerator/LoadGenerator.java
diff --git a/theodolite-benchmarks/uc2-application-flink/Dockerfile b/theodolite-benchmarks/uc2-application-flink/Dockerfile
deleted file mode 100644
index fe7e7b75d..000000000
--- a/theodolite-benchmarks/uc2-application-flink/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM flink:1.12-scala_2.12-java11
-
-ADD build/libs/uc2-application-flink-all.jar /opt/flink/usrlib/artifacts/uc2-application-flink-all.jar
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc2-application-flink/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc2-flink/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc2-flink/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc2-application/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc2-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-application/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc2-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc2-application/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc2-flink/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-application/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc2-flink/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc2-flink/Dockerfile b/theodolite-benchmarks/uc2-flink/Dockerfile
new file mode 100644
index 000000000..537ab28e2
--- /dev/null
+++ b/theodolite-benchmarks/uc2-flink/Dockerfile
@@ -0,0 +1,3 @@
+FROM flink:1.12-scala_2.12-java11
+
+ADD build/libs/uc2-flink-all.jar /opt/flink/usrlib/artifacts/uc2-flink-all.jar
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc2-application-flink/build.gradle b/theodolite-benchmarks/uc2-flink/build.gradle
similarity index 86%
rename from theodolite-benchmarks/uc2-application-flink/build.gradle
rename to theodolite-benchmarks/uc2-flink/build.gradle
index ee30302ac..680b802ce 100644
--- a/theodolite-benchmarks/uc2-application-flink/build.gradle
+++ b/theodolite-benchmarks/uc2-flink/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-flink'
+ id 'theodolite.flink'
}
allprojects {
diff --git a/theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/ConfigurationKeys.java b/theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/ConfigurationKeys.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/ConfigurationKeys.java
rename to theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/ConfigurationKeys.java
diff --git a/theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/HistoryServiceFlinkJob.java b/theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/HistoryServiceFlinkJob.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/HistoryServiceFlinkJob.java
rename to theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/HistoryServiceFlinkJob.java
diff --git a/theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/StatsAggregateFunction.java b/theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/StatsAggregateFunction.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/StatsAggregateFunction.java
rename to theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/StatsAggregateFunction.java
diff --git a/theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/StatsProcessWindowFunction.java b/theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/StatsProcessWindowFunction.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/StatsProcessWindowFunction.java
rename to theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/StatsProcessWindowFunction.java
diff --git a/theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/util/StatsFactory.java b/theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/util/StatsFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/src/main/java/theodolite/uc2/application/util/StatsFactory.java
rename to theodolite-benchmarks/uc2-flink/src/main/java/theodolite/uc2/application/util/StatsFactory.java
diff --git a/theodolite-benchmarks/uc2-application-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc2-flink/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc2-application-flink/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc2-flink/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc2-application/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc2-kstreams/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-application/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc2-kstreams/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc2-workload-generator/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc2-kstreams/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-workload-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc2-kstreams/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc2-workload-generator/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc2-kstreams/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-workload-generator/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc2-kstreams/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc2-application/Dockerfile b/theodolite-benchmarks/uc2-kstreams/Dockerfile
similarity index 53%
rename from theodolite-benchmarks/uc2-application/Dockerfile
rename to theodolite-benchmarks/uc2-kstreams/Dockerfile
index 5177dcede..0c888bb54 100644
--- a/theodolite-benchmarks/uc2-application/Dockerfile
+++ b/theodolite-benchmarks/uc2-kstreams/Dockerfile
@@ -1,6 +1,6 @@
FROM openjdk:11-slim
-ADD build/distributions/uc2-application.tar /
+ADD build/distributions/uc2-kstreams.tar /
CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
- /uc2-application/bin/uc2-application
\ No newline at end of file
+ /uc2-kstreams/bin/uc2-kstreams
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc2-application/build.gradle b/theodolite-benchmarks/uc2-kstreams/build.gradle
similarity index 64%
rename from theodolite-benchmarks/uc2-application/build.gradle
rename to theodolite-benchmarks/uc2-kstreams/build.gradle
index da9ea85fa..6688f229b 100644
--- a/theodolite-benchmarks/uc2-application/build.gradle
+++ b/theodolite-benchmarks/uc2-kstreams/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-kafka-streams'
+ id 'theodolite.kstreams'
}
mainClassName = "theodolite.uc2.application.HistoryService"
diff --git a/theodolite-benchmarks/uc2-application/src/main/java/theodolite/uc2/application/HistoryService.java b/theodolite-benchmarks/uc2-kstreams/src/main/java/theodolite/uc2/application/HistoryService.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application/src/main/java/theodolite/uc2/application/HistoryService.java
rename to theodolite-benchmarks/uc2-kstreams/src/main/java/theodolite/uc2/application/HistoryService.java
diff --git a/theodolite-benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java b/theodolite-benchmarks/uc2-kstreams/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java
rename to theodolite-benchmarks/uc2-kstreams/src/main/java/theodolite/uc2/streamprocessing/TopologyBuilder.java
diff --git a/theodolite-benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/Uc2KafkaStreamsBuilder.java b/theodolite-benchmarks/uc2-kstreams/src/main/java/theodolite/uc2/streamprocessing/Uc2KafkaStreamsBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/Uc2KafkaStreamsBuilder.java
rename to theodolite-benchmarks/uc2-kstreams/src/main/java/theodolite/uc2/streamprocessing/Uc2KafkaStreamsBuilder.java
diff --git a/theodolite-benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/util/StatsFactory.java b/theodolite-benchmarks/uc2-kstreams/src/main/java/theodolite/uc2/streamprocessing/util/StatsFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc2-application/src/main/java/theodolite/uc2/streamprocessing/util/StatsFactory.java
rename to theodolite-benchmarks/uc2-kstreams/src/main/java/theodolite/uc2/streamprocessing/util/StatsFactory.java
diff --git a/theodolite-benchmarks/uc2-application/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc2-kstreams/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc2-application/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc2-kstreams/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc2-workload-generator/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc2-load-generator/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc2-workload-generator/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc2-load-generator/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc3-application-flink/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc2-load-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc2-load-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc3-application-flink/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc2-load-generator/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc2-load-generator/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc2-load-generator/Dockerfile b/theodolite-benchmarks/uc2-load-generator/Dockerfile
new file mode 100644
index 000000000..e9ee95af7
--- /dev/null
+++ b/theodolite-benchmarks/uc2-load-generator/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:11-slim
+
+ADD build/distributions/uc2-load-generator.tar /
+
+CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+ /uc2-load-generator/bin/uc2-load-generator
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc2-workload-generator/build.gradle b/theodolite-benchmarks/uc2-load-generator/build.gradle
similarity index 67%
rename from theodolite-benchmarks/uc2-workload-generator/build.gradle
rename to theodolite-benchmarks/uc2-load-generator/build.gradle
index e949b625b..1954fe5cb 100644
--- a/theodolite-benchmarks/uc2-workload-generator/build.gradle
+++ b/theodolite-benchmarks/uc2-load-generator/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-workload'
+ id 'theodolite.load-generator'
}
mainClassName = "theodolite.uc2.workloadgenerator.LoadGenerator"
diff --git a/theodolite-benchmarks/uc2-workload-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc2-load-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java
similarity index 100%
rename from theodolite-benchmarks/uc2-workload-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java
rename to theodolite-benchmarks/uc2-load-generator/src/main/java/theodolite/uc2/workloadgenerator/LoadGenerator.java
diff --git a/theodolite-benchmarks/uc2-workload-generator/Dockerfile b/theodolite-benchmarks/uc2-workload-generator/Dockerfile
deleted file mode 100644
index 55593e029..000000000
--- a/theodolite-benchmarks/uc2-workload-generator/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM openjdk:11-slim
-
-ADD build/distributions/uc2-workload-generator.tar /
-
-CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
- /uc2-workload-generator/bin/uc2-workload-generator
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc3-application-flink/Dockerfile b/theodolite-benchmarks/uc3-application-flink/Dockerfile
deleted file mode 100644
index d582cd63f..000000000
--- a/theodolite-benchmarks/uc3-application-flink/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM flink:1.12-scala_2.12-java11
-
-ADD build/libs/uc3-application-flink-all.jar /opt/flink/usrlib/artifacts/uc3-application-flink-all.jar
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc3-application-flink/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc3-flink/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc3-flink/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc3-application/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc3-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-application/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc3-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc3-application/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc3-flink/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-application/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc3-flink/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc3-flink/Dockerfile b/theodolite-benchmarks/uc3-flink/Dockerfile
new file mode 100644
index 000000000..34c6da692
--- /dev/null
+++ b/theodolite-benchmarks/uc3-flink/Dockerfile
@@ -0,0 +1,3 @@
+FROM flink:1.12-scala_2.12-java11
+
+ADD build/libs/uc3-flink-all.jar /opt/flink/usrlib/artifacts/uc3-flink-all.jar
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc3-application-flink/build.gradle b/theodolite-benchmarks/uc3-flink/build.gradle
similarity index 86%
rename from theodolite-benchmarks/uc3-application-flink/build.gradle
rename to theodolite-benchmarks/uc3-flink/build.gradle
index 20801fa5f..7f74b4b6f 100644
--- a/theodolite-benchmarks/uc3-application-flink/build.gradle
+++ b/theodolite-benchmarks/uc3-flink/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-flink'
+ id 'theodolite.flink'
}
allprojects {
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/ConfigurationKeys.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/ConfigurationKeys.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/ConfigurationKeys.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/ConfigurationKeys.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/HistoryServiceFlinkJob.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/HistoryServiceFlinkJob.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/HistoryServiceFlinkJob.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/HistoryServiceFlinkJob.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/HourOfDayProcessWindowFunction.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/HourOfDayProcessWindowFunction.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/HourOfDayProcessWindowFunction.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/HourOfDayProcessWindowFunction.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/StatsAggregateFunction.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/StatsAggregateFunction.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/StatsAggregateFunction.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/StatsAggregateFunction.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKey.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKey.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKey.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKey.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKeyFactory.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKeyFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKeyFactory.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKeyFactory.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKeySerde.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKeySerde.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKeySerde.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/HourOfDayKeySerde.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/HourOfDayRecordFactory.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/HourOfDayRecordFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/HourOfDayRecordFactory.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/HourOfDayRecordFactory.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/StatsFactory.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/StatsFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/StatsFactory.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/StatsFactory.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/StatsKeyFactory.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/StatsKeyFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/StatsKeyFactory.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/StatsKeyFactory.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/StatsRecordFactory.java b/theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/StatsRecordFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/java/theodolite/uc3/application/util/StatsRecordFactory.java
rename to theodolite-benchmarks/uc3-flink/src/main/java/theodolite/uc3/application/util/StatsRecordFactory.java
diff --git a/theodolite-benchmarks/uc3-application-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc3-application-flink/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc3-workload-generator/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc3-kstreams/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-workload-generator/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc3-kstreams/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc3-workload-generator/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc3-kstreams/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-workload-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc3-kstreams/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc3-workload-generator/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc3-kstreams/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc3-workload-generator/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc3-kstreams/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc3-application/Dockerfile b/theodolite-benchmarks/uc3-kstreams/Dockerfile
similarity index 52%
rename from theodolite-benchmarks/uc3-application/Dockerfile
rename to theodolite-benchmarks/uc3-kstreams/Dockerfile
index 61141baaf..30d6994b0 100644
--- a/theodolite-benchmarks/uc3-application/Dockerfile
+++ b/theodolite-benchmarks/uc3-kstreams/Dockerfile
@@ -1,6 +1,6 @@
FROM openjdk:11-slim
-ADD build/distributions/uc3-application.tar /
+ADD build/distributions/uc3-kstreams.tar /
CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
- /uc3-application/bin/uc3-application
+ /uc3-kstreams/bin/uc3-kstreams
diff --git a/theodolite-benchmarks/uc3-application/build.gradle b/theodolite-benchmarks/uc3-kstreams/build.gradle
similarity index 64%
rename from theodolite-benchmarks/uc3-application/build.gradle
rename to theodolite-benchmarks/uc3-kstreams/build.gradle
index ac6bd76b5..d588d85ae 100644
--- a/theodolite-benchmarks/uc3-application/build.gradle
+++ b/theodolite-benchmarks/uc3-kstreams/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-kafka-streams'
+ id 'theodolite.kstreams'
}
mainClassName = "theodolite.uc3.application.HistoryService"
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/application/HistoryService.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/application/HistoryService.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKey.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKey.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKey.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKey.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeyFactory.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeyFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeyFactory.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeyFactory.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeySerde.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeySerde.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeySerde.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/HourOfDayKeySerde.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/HourOfDayRecordFactory.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/HourOfDayRecordFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/HourOfDayRecordFactory.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/HourOfDayRecordFactory.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/RecordDatabaseAdapter.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/RecordDatabaseAdapter.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/RecordDatabaseAdapter.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/RecordDatabaseAdapter.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/StatsKeyFactory.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/StatsKeyFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/StatsKeyFactory.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/StatsKeyFactory.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/StatsRecordFactory.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/StatsRecordFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/StatsRecordFactory.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/StatsRecordFactory.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/TopologyBuilder.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/TopologyBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/TopologyBuilder.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/TopologyBuilder.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/Uc3KafkaStreamsBuilder.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/Uc3KafkaStreamsBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/Uc3KafkaStreamsBuilder.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/Uc3KafkaStreamsBuilder.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/util/StatsFactory.java b/theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/util/StatsFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/java/theodolite/uc3/streamprocessing/util/StatsFactory.java
rename to theodolite-benchmarks/uc3-kstreams/src/main/java/theodolite/uc3/streamprocessing/util/StatsFactory.java
diff --git a/theodolite-benchmarks/uc3-application/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-kstreams/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc3-application/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc3-kstreams/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc4-application/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc3-load-generator/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-application/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc3-load-generator/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc4-application-flink/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc3-load-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc3-load-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc4-application-flink/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc3-load-generator/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc3-load-generator/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc3-load-generator/Dockerfile b/theodolite-benchmarks/uc3-load-generator/Dockerfile
new file mode 100644
index 000000000..a2ab45d35
--- /dev/null
+++ b/theodolite-benchmarks/uc3-load-generator/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:11-slim
+
+ADD build/distributions/uc3-load-generator.tar /
+
+CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+ /uc3-load-generator/bin/uc3-load-generator
diff --git a/theodolite-benchmarks/uc3-workload-generator/build.gradle b/theodolite-benchmarks/uc3-load-generator/build.gradle
similarity index 67%
rename from theodolite-benchmarks/uc3-workload-generator/build.gradle
rename to theodolite-benchmarks/uc3-load-generator/build.gradle
index d536e6e5a..fddc53ae8 100644
--- a/theodolite-benchmarks/uc3-workload-generator/build.gradle
+++ b/theodolite-benchmarks/uc3-load-generator/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-workload'
+ id 'theodolite.load-generator'
}
mainClassName = "theodolite.uc3.workloadgenerator.LoadGenerator"
diff --git a/theodolite-benchmarks/uc3-workload-generator/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc3-load-generator/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java
similarity index 100%
rename from theodolite-benchmarks/uc3-workload-generator/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java
rename to theodolite-benchmarks/uc3-load-generator/src/main/java/theodolite/uc3/workloadgenerator/LoadGenerator.java
diff --git a/theodolite-benchmarks/uc3-workload-generator/Dockerfile b/theodolite-benchmarks/uc3-workload-generator/Dockerfile
deleted file mode 100644
index 8422c9d53..000000000
--- a/theodolite-benchmarks/uc3-workload-generator/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM openjdk:11-slim
-
-ADD build/distributions/uc3-workload-generator.tar /
-
-CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
- /uc3-workload-generator/bin/uc3-workload-generator
diff --git a/theodolite-benchmarks/uc4-application-flink/Dockerfile b/theodolite-benchmarks/uc4-application-flink/Dockerfile
deleted file mode 100644
index 49521e7d1..000000000
--- a/theodolite-benchmarks/uc4-application-flink/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM flink:1.12-scala_2.12-java11
-
-ADD build/libs/uc4-application-flink-all.jar /opt/flink/usrlib/artifacts/uc4-application-flink-all.jar
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc4-application-flink/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc4-flink/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc4-flink/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc4-application/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc4-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-application/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc4-flink/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc4-application/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc4-flink/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-application/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc4-flink/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc4-flink/Dockerfile b/theodolite-benchmarks/uc4-flink/Dockerfile
new file mode 100644
index 000000000..4f51f379e
--- /dev/null
+++ b/theodolite-benchmarks/uc4-flink/Dockerfile
@@ -0,0 +1,3 @@
+FROM flink:1.12-scala_2.12-java11
+
+ADD build/libs/uc4-flink-all.jar /opt/flink/usrlib/artifacts/uc4-flink-all.jar
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc4-application-flink/build.gradle b/theodolite-benchmarks/uc4-flink/build.gradle
similarity index 72%
rename from theodolite-benchmarks/uc4-application-flink/build.gradle
rename to theodolite-benchmarks/uc4-flink/build.gradle
index e5466514f..ebc7ca5f3 100644
--- a/theodolite-benchmarks/uc4-application-flink/build.gradle
+++ b/theodolite-benchmarks/uc4-flink/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-flink'
+ id 'theodolite.flink'
}
mainClassName = "theodolite.uc4.application.AggregationServiceFlinkJob"
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/AggregationServiceFlinkJob.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/AggregationServiceFlinkJob.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/AggregationServiceFlinkJob.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/AggregationServiceFlinkJob.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/ChildParentsFlatMapFunction.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/ChildParentsFlatMapFunction.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/ChildParentsFlatMapFunction.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/ChildParentsFlatMapFunction.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/ConfigurationKeys.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/ConfigurationKeys.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/ConfigurationKeys.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/ConfigurationKeys.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/JoinAndDuplicateCoFlatMapFunction.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/JoinAndDuplicateCoFlatMapFunction.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/JoinAndDuplicateCoFlatMapFunction.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/JoinAndDuplicateCoFlatMapFunction.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/RecordAggregationProcessWindowFunction.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/RecordAggregationProcessWindowFunction.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/RecordAggregationProcessWindowFunction.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/RecordAggregationProcessWindowFunction.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/util/ImmutableSensorRegistrySerializer.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/util/ImmutableSensorRegistrySerializer.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/util/ImmutableSensorRegistrySerializer.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/util/ImmutableSensorRegistrySerializer.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/util/ImmutableSetSerializer.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/util/ImmutableSetSerializer.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/util/ImmutableSetSerializer.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/util/ImmutableSetSerializer.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/util/SensorParentKey.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/util/SensorParentKey.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/util/SensorParentKey.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/util/SensorParentKey.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/util/SensorParentKeySerializer.java b/theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/util/SensorParentKeySerializer.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/java/theodolite/uc4/application/util/SensorParentKeySerializer.java
rename to theodolite-benchmarks/uc4-flink/src/main/java/theodolite/uc4/application/util/SensorParentKeySerializer.java
diff --git a/theodolite-benchmarks/uc4-application-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc4-application-flink/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc4-flink/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/workload-generator-commons/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc4-kstreams/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc4-kstreams/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/uc4-workload-generator/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc4-kstreams/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-workload-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc4-kstreams/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/uc4-workload-generator/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc4-kstreams/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-workload-generator/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc4-kstreams/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc4-application/Dockerfile b/theodolite-benchmarks/uc4-kstreams/Dockerfile
similarity index 52%
rename from theodolite-benchmarks/uc4-application/Dockerfile
rename to theodolite-benchmarks/uc4-kstreams/Dockerfile
index add251c0e..f50f09995 100644
--- a/theodolite-benchmarks/uc4-application/Dockerfile
+++ b/theodolite-benchmarks/uc4-kstreams/Dockerfile
@@ -1,6 +1,6 @@
FROM openjdk:11-slim
-ADD build/distributions/uc4-application.tar /
+ADD build/distributions/uc4-kstreams.tar /
CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
- /uc4-application/bin/uc4-application
+ /uc4-kstreams/bin/uc4-kstreams
diff --git a/theodolite-benchmarks/uc4-application/README.md b/theodolite-benchmarks/uc4-kstreams/README.md
similarity index 100%
rename from theodolite-benchmarks/uc4-application/README.md
rename to theodolite-benchmarks/uc4-kstreams/README.md
diff --git a/theodolite-benchmarks/uc4-application/build.gradle b/theodolite-benchmarks/uc4-kstreams/build.gradle
similarity index 65%
rename from theodolite-benchmarks/uc4-application/build.gradle
rename to theodolite-benchmarks/uc4-kstreams/build.gradle
index 8486e9302..83212a499 100644
--- a/theodolite-benchmarks/uc4-application/build.gradle
+++ b/theodolite-benchmarks/uc4-kstreams/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-kafka-streams'
+ id 'theodolite.kstreams'
}
mainClassName = "theodolite.uc4.application.AggregationService"
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/application/AggregationService.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/application/AggregationService.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/application/AggregationService.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/application/AggregationService.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformer.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformer.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformer.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformer.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformerSupplier.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformerSupplier.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformerSupplier.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/ChildParentsTransformerSupplier.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformer.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformer.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformer.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformer.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformerSupplier.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformerSupplier.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformerSupplier.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/JointFlatTransformerSupplier.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/JointRecordParents.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/JointRecordParents.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/JointRecordParents.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/JointRecordParents.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/OptionalParentsSerde.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/OptionalParentsSerde.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/OptionalParentsSerde.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/OptionalParentsSerde.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/ParentsSerde.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/ParentsSerde.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/ParentsSerde.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/ParentsSerde.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/RecordAggregator.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/RecordAggregator.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/RecordAggregator.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/RecordAggregator.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/SensorParentKey.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/SensorParentKey.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/SensorParentKey.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/SensorParentKey.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/SensorParentKeySerde.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/SensorParentKeySerde.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/SensorParentKeySerde.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/SensorParentKeySerde.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/TopologyBuilder.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/TopologyBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/TopologyBuilder.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/TopologyBuilder.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/Uc4KafkaStreamsBuilder.java b/theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/Uc4KafkaStreamsBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/java/theodolite/uc4/streamprocessing/Uc4KafkaStreamsBuilder.java
rename to theodolite-benchmarks/uc4-kstreams/src/main/java/theodolite/uc4/streamprocessing/Uc4KafkaStreamsBuilder.java
diff --git a/theodolite-benchmarks/uc4-application/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/OptionalParentsSerdeTest.java b/theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/OptionalParentsSerdeTest.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/OptionalParentsSerdeTest.java
rename to theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/OptionalParentsSerdeTest.java
diff --git a/theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/ParentsSerdeTest.java b/theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/ParentsSerdeTest.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/ParentsSerdeTest.java
rename to theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/ParentsSerdeTest.java
diff --git a/theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/SensorParentKeySerdeTest.java b/theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/SensorParentKeySerdeTest.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/SensorParentKeySerdeTest.java
rename to theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/SensorParentKeySerdeTest.java
diff --git a/theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/SerdeTester.java b/theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/SerdeTester.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/SerdeTester.java
rename to theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/SerdeTester.java
diff --git a/theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/SerdeTesterFactory.java b/theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/SerdeTesterFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc4-application/src/test/java/theodolite/uc4/streamprocessing/SerdeTesterFactory.java
rename to theodolite-benchmarks/uc4-kstreams/src/test/java/theodolite/uc4/streamprocessing/SerdeTesterFactory.java
diff --git a/theodolite-benchmarks/uc4-workload-generator/.settings/org.eclipse.jdt.ui.prefs b/theodolite-benchmarks/uc4-load-generator/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from theodolite-benchmarks/uc4-workload-generator/.settings/org.eclipse.jdt.ui.prefs
rename to theodolite-benchmarks/uc4-load-generator/.settings/org.eclipse.jdt.ui.prefs
diff --git a/theodolite-benchmarks/workload-generator-commons/.settings/qa.eclipse.plugin.checkstyle.prefs b/theodolite-benchmarks/uc4-load-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/.settings/qa.eclipse.plugin.checkstyle.prefs
rename to theodolite-benchmarks/uc4-load-generator/.settings/qa.eclipse.plugin.checkstyle.prefs
diff --git a/theodolite-benchmarks/workload-generator-commons/.settings/qa.eclipse.plugin.pmd.prefs b/theodolite-benchmarks/uc4-load-generator/.settings/qa.eclipse.plugin.pmd.prefs
similarity index 100%
rename from theodolite-benchmarks/workload-generator-commons/.settings/qa.eclipse.plugin.pmd.prefs
rename to theodolite-benchmarks/uc4-load-generator/.settings/qa.eclipse.plugin.pmd.prefs
diff --git a/theodolite-benchmarks/uc4-load-generator/Dockerfile b/theodolite-benchmarks/uc4-load-generator/Dockerfile
new file mode 100644
index 000000000..7723121ed
--- /dev/null
+++ b/theodolite-benchmarks/uc4-load-generator/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:11-slim
+
+ADD build/distributions/uc4-load-generator.tar /
+
+CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+ /uc4-load-generator/bin/uc4-load-generator
diff --git a/theodolite-benchmarks/uc4-workload-generator/build.gradle b/theodolite-benchmarks/uc4-load-generator/build.gradle
similarity index 70%
rename from theodolite-benchmarks/uc4-workload-generator/build.gradle
rename to theodolite-benchmarks/uc4-load-generator/build.gradle
index 14b39ccd5..978571805 100644
--- a/theodolite-benchmarks/uc4-workload-generator/build.gradle
+++ b/theodolite-benchmarks/uc4-load-generator/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'theodolite.uc-workload'
+ id 'theodolite.load-generator'
}
mainClassName = "theodolite.uc4.workloadgenerator.LoadGenerator"
diff --git a/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/ConfigPublisher.java b/theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/ConfigPublisher.java
similarity index 100%
rename from theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/ConfigPublisher.java
rename to theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/ConfigPublisher.java
diff --git a/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java b/theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java
similarity index 100%
rename from theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java
rename to theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/LoadGenerator.java
diff --git a/theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilder.java b/theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilder.java
similarity index 100%
rename from theodolite-benchmarks/uc4-workload-generator/src/main/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilder.java
rename to theodolite-benchmarks/uc4-load-generator/src/main/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilder.java
diff --git a/theodolite-benchmarks/uc4-workload-generator/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-load-generator/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc4-workload-generator/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc4-load-generator/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc4-workload-generator/src/test/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilderTest.java b/theodolite-benchmarks/uc4-load-generator/src/test/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilderTest.java
similarity index 100%
rename from theodolite-benchmarks/uc4-workload-generator/src/test/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilderTest.java
rename to theodolite-benchmarks/uc4-load-generator/src/test/java/theodolite/uc4/workloadgenerator/SensorRegistryBuilderTest.java
diff --git a/theodolite-benchmarks/uc4-workload-generator/Dockerfile b/theodolite-benchmarks/uc4-workload-generator/Dockerfile
deleted file mode 100644
index f39923e59..000000000
--- a/theodolite-benchmarks/uc4-workload-generator/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM openjdk:11-slim
-
-ADD build/distributions/uc4-workload-generator.tar /
-
-CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
- /uc4-workload-generator/bin/uc4-workload-generator
--
GitLab