From 21ee42e16361fd0e70405d30ab7a4d8de1ae94ad Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Fri, 26 Feb 2021 22:47:48 +0100
Subject: [PATCH] enhance naming
---
.../{BenchmarkContext.kt => BenchmarkExecution.kt} | 2 +-
.../theodolite/execution/TheodoliteExecutor.kt | 12 ++++++------
.../theodolite/execution/TheodoliteYamlExecutor.kt | 7 +++----
.../{StrategiesManager.kt => StrategyFactory.kt} | 2 +-
...{testContext.yaml => testBenchmarkExecution.yaml} | 0
5 files changed, 11 insertions(+), 12 deletions(-)
rename theodolite-quarkus/src/main/kotlin/theodolite/benchmark/{BenchmarkContext.kt => BenchmarkExecution.kt} (97%)
rename theodolite-quarkus/src/main/kotlin/theodolite/strategies/{StrategiesManager.kt => StrategyFactory.kt} (97%)
rename theodolite-quarkus/src/main/resources/yaml/{testContext.yaml => testBenchmarkExecution.yaml} (100%)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/BenchmarkContext.kt b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/BenchmarkExecution.kt
similarity index 97%
rename from theodolite-quarkus/src/main/kotlin/theodolite/benchmark/BenchmarkContext.kt
rename to theodolite-quarkus/src/main/kotlin/theodolite/benchmark/BenchmarkExecution.kt
index c734c22a9..4fba0d362 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/BenchmarkContext.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/BenchmarkExecution.kt
@@ -4,7 +4,7 @@ import theodolite.util.ConfigurationOverride
import kotlin.properties.Delegates
-class BenchmarkContext() {
+class BenchmarkExecution() {
lateinit var name: String
lateinit var benchmark: String
lateinit var load: LoadDefinition
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
index c94beee06..9189baf16 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
@@ -1,8 +1,8 @@
package theodolite.execution
-import theodolite.benchmark.BenchmarkContext
+import theodolite.benchmark.BenchmarkExecution
import theodolite.benchmark.KubernetesBenchmark
-import theodolite.strategies.StrategiesManager
+import theodolite.strategies.StrategyFactory
import theodolite.strategies.searchstrategy.CompositeStrategy
import theodolite.util.Config
import theodolite.util.LoadDimension
@@ -11,14 +11,14 @@ import theodolite.util.Results
import java.time.Duration
class TheodoliteExecutor(
- private val config: BenchmarkContext,
+ private val config: BenchmarkExecution,
private val kubernetesBenchmark: KubernetesBenchmark
)
{
private fun buildConfig(): Config{
val results = Results()
- val strategyManager = StrategiesManager()
+ val strategyFactory = StrategyFactory()
val executionDuration = Duration.ofSeconds(config.execution.duration)
val executor = BenchmarkExecutorImpl(kubernetesBenchmark, results, executionDuration, config.configOverrides)
@@ -28,8 +28,8 @@ class TheodoliteExecutor(
resources = config.resources.resourceValues.map { resource -> Resource(resource, config.load.loadType) },
compositeStrategy = CompositeStrategy(
benchmarkExecutor = executor,
- searchStrategy = strategyManager.createSearchStrategy(executor, config.execution.strategy),
- restrictionStrategies = strategyManager.createRestrictionStrategy(results, config.execution.restrictions)),
+ searchStrategy = strategyFactory.createSearchStrategy(executor, config.execution.strategy),
+ restrictionStrategies = strategyFactory.createRestrictionStrategy(results, config.execution.restrictions)),
executionDuration = executionDuration)
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
index 80eb2eee1..c0b4e5bac 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt
@@ -1,6 +1,6 @@
package theodolite.execution
-import theodolite.benchmark.BenchmarkContext
+import theodolite.benchmark.BenchmarkExecution
import theodolite.util.YamlParser
import theodolite.benchmark.KubernetesBenchmark
@@ -8,11 +8,10 @@ class TheodoliteYamlExecutor {
fun run() {
// load the Benchmark context and the benchmark type
var parser = YamlParser()
- val benchmarkContext = parser.parse("./../../../resources/main/yaml/testContext.yaml", BenchmarkContext::class.java) !!
+ val benchmarkExecution = parser.parse("./../../../resources/main/yaml/testBenchmarkExecution.yaml", BenchmarkExecution::class.java) !!
val benchmark = parser.parse("./../../../resources/main/yaml/testBenchmarkType.yaml", KubernetesBenchmark::class.java) !!
- // TheodoliteExecutor benchmarkContext, benchmark
- val executor = TheodoliteExecutor(benchmarkContext, benchmark)
+ val executor = TheodoliteExecutor(benchmarkExecution, benchmark)
executor.run()
}
}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/StrategiesManager.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/StrategyFactory.kt
similarity index 97%
rename from theodolite-quarkus/src/main/kotlin/theodolite/strategies/StrategiesManager.kt
rename to theodolite-quarkus/src/main/kotlin/theodolite/strategies/StrategyFactory.kt
index 280cca545..ccbe6fac4 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/StrategiesManager.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/StrategyFactory.kt
@@ -9,7 +9,7 @@ import theodolite.strategies.searchstrategy.SearchStrategy
import theodolite.util.Results
import java.lang.IllegalArgumentException
-class StrategiesManager {
+class StrategyFactory {
fun createSearchStrategy(executor: BenchmarkExecutor, searchStrategyString: String): SearchStrategy {
return when (searchStrategyString) {
diff --git a/theodolite-quarkus/src/main/resources/yaml/testContext.yaml b/theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml
similarity index 100%
rename from theodolite-quarkus/src/main/resources/yaml/testContext.yaml
rename to theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml
--
GitLab