Removed Benchmark, Execution, K8s and ResourceSet subpackages

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/benchmark/Action.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/Action.kt

-package rocks.theodolite.kubernetes.benchmark
+package rocks.theodolite.kubernetes
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import io.quarkus.runtime.annotations.RegisterForReflection
-import rocks.theodolite.kubernetes.util.Configuration
-import rocks.theodolite.kubernetes.util.exception.ActionCommandFailedException
 
 
 @JsonDeserialize

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/benchmark/ActionCommand.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ActionCommand.kt

-package rocks.theodolite.kubernetes.benchmark
+package rocks.theodolite.kubernetes
 
 import io.fabric8.kubernetes.api.model.Status
 import io.fabric8.kubernetes.client.KubernetesClientException
@@ -7,8 +7,6 @@ import io.fabric8.kubernetes.client.dsl.ExecListener
 import io.fabric8.kubernetes.client.dsl.ExecWatch
 import io.fabric8.kubernetes.client.utils.Serialization
 import mu.KotlinLogging
-import rocks.theodolite.kubernetes.util.Configuration
-import rocks.theodolite.kubernetes.util.exception.ActionCommandFailedException
 import java.io.ByteArrayOutputStream
 import java.time.Duration
 import java.util.concurrent.CountDownLatch

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/util/exception/ActionCommandFailedException.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ActionCommandFailedException.kt

-package rocks.theodolite.kubernetes.util.exception
+package rocks.theodolite.kubernetes
 
 class ActionCommandFailedException(message: String, e: Exception? = null) : DeploymentFailedException(message,e) {
 }
\ No newline at end of file

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/benchmark/BenchmarkDeployment.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/BenchmarkDeployment.kt

-package rocks.theodolite.kubernetes.benchmark
+package rocks.theodolite.kubernetes
 
 /**
  *  A BenchmarkDeployment contains the necessary infrastructure to execute a benchmark.

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/benchmark/BenchmarkDeploymentBuilder.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/BenchmarkDeploymentBuilder.kt

-package rocks.theodolite.kubernetes.benchmark
+package rocks.theodolite.kubernetes
 
 import rocks.theodolite.kubernetes.patcher.PatcherDefinition
 import rocks.theodolite.kubernetes.util.ConfigurationOverride

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/resourceSet/ConfigMapResourceSet.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ConfigMapResourceSet.kt

-package rocks.theodolite.kubernetes.resourceSet
+package rocks.theodolite.kubernetes
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import io.fabric8.kubernetes.api.model.HasMetadata
@@ -6,7 +6,6 @@ import io.fabric8.kubernetes.api.model.KubernetesResource
 import io.fabric8.kubernetes.client.KubernetesClientException
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import io.quarkus.runtime.annotations.RegisterForReflection
-import rocks.theodolite.kubernetes.util.exception.DeploymentFailedException
 import java.lang.IllegalArgumentException
 
 @RegisterForReflection

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/util/Configuration.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/Configuration.kt

-package rocks.theodolite.kubernetes.util
-
-import rocks.theodolite.kubernetes.execution.ExecutionModes
+package rocks.theodolite.kubernetes
 
 // Defaults
 private const val DEFAULT_NAMESPACE = "default"

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/util/exception/DeploymentFailedException.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/DeploymentFailedException.kt

-package rocks.theodolite.kubernetes.util.exception
+package rocks.theodolite.kubernetes
 
 
 open class DeploymentFailedException(message: String, e: Exception? = null) : TheodoliteException(message,e)

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/util/exception/ExecutionFailedException.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ExecutionFailedException.kt

-package rocks.theodolite.kubernetes.util.exception
+package rocks.theodolite.kubernetes
 
 open class ExecutionFailedException(message: String, e: Exception? = null) : TheodoliteException(message,e)

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/execution/ExecutionModes.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ExecutionModes.kt

-package rocks.theodolite.kubernetes.execution
+package rocks.theodolite.kubernetes
 
 enum class ExecutionModes(val value: String) {
     OPERATOR("operator"),

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/execution/ExperimentRunnerImpl.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ExperimentRunnerImpl.kt

-package rocks.theodolite.kubernetes.execution
+package rocks.theodolite.kubernetes
 
 import io.quarkus.runtime.annotations.RegisterForReflection
 import mu.KotlinLogging
 import rocks.theodolite.core.ExperimentRunner
 import rocks.theodolite.core.Results
-import rocks.theodolite.kubernetes.benchmark.BenchmarkDeploymentBuilder
-import rocks.theodolite.kubernetes.benchmark.KubernetesBenchmarkDeploymentBuilder
 import rocks.theodolite.kubernetes.model.KubernetesBenchmark.Slo
 import rocks.theodolite.kubernetes.util.ConfigurationOverride
 import rocks.theodolite.kubernetes.operator.EventCreator
 import rocks.theodolite.kubernetes.slo.AnalysisExecutor
-import rocks.theodolite.kubernetes.util.Configuration
 import rocks.theodolite.kubernetes.patcher.PatcherDefinition
-import rocks.theodolite.kubernetes.util.exception.ExecutionFailedException
 import java.time.Duration
 import java.time.Instant
 

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/resourceSet/FileSystemResourceSet.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/FileSystemResourceSet.kt

-package rocks.theodolite.kubernetes.resourceSet
+package rocks.theodolite.kubernetes
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import io.fabric8.kubernetes.api.model.HasMetadata
 import io.fabric8.kubernetes.api.model.KubernetesResource
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import io.quarkus.runtime.annotations.RegisterForReflection
-import rocks.theodolite.kubernetes.util.exception.DeploymentFailedException
 import java.io.BufferedReader
 import java.io.FileInputStream
 import java.io.FileNotFoundException

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/k8s/K8sContextFactory.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/K8sContextFactory.kt

-package rocks.theodolite.kubernetes.k8s
+package rocks.theodolite.kubernetes
 
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext
 

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/k8s/K8sManager.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/K8sManager.kt

-package rocks.theodolite.kubernetes.k8s
+package rocks.theodolite.kubernetes
 
-import io.fabric8.kubernetes.api.model.ConfigMap
 import io.fabric8.kubernetes.api.model.HasMetadata
-import io.fabric8.kubernetes.api.model.KubernetesResource
-import io.fabric8.kubernetes.api.model.Service
 import io.fabric8.kubernetes.api.model.apps.Deployment
 import io.fabric8.kubernetes.api.model.apps.StatefulSet
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/benchmark/KubernetesBenchmarkDeployment.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/KubernetesBenchmarkDeployment.kt

-package rocks.theodolite.kubernetes.benchmark
+package rocks.theodolite.kubernetes
 
 import io.fabric8.kubernetes.api.model.HasMetadata
 import io.fabric8.kubernetes.api.model.KubernetesResource
@@ -6,8 +6,6 @@ import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import io.quarkus.runtime.annotations.RegisterForReflection
 import mu.KotlinLogging
 import org.apache.kafka.clients.admin.NewTopic
-import rocks.theodolite.kubernetes.k8s.K8sManager
-import rocks.theodolite.kubernetes.k8s.ResourceByLabelHandler
 import rocks.theodolite.kubernetes.kafka.TopicManager
 import rocks.theodolite.kubernetes.model.crd.KafkaConfig
 import java.time.Duration
@@ -24,17 +22,17 @@ private val logger = KotlinLogging.logger {}
  */
 @RegisterForReflection
 class KubernetesBenchmarkDeployment(
-    private val sutBeforeActions: List<Action>,
-    private val sutAfterActions: List<Action>,
-    private val loadGenBeforeActions: List<Action>,
-    private val loadGenAfterActions: List<Action>,
-    val appResources: List<HasMetadata>,
-    val loadGenResources: List<HasMetadata>,
-    private val loadGenerationDelay: Long,
-    private val afterTeardownDelay: Long,
-    private val kafkaConfig: Map<String, Any>,
-    private val topics: List<KafkaConfig.TopicWrapper>,
-    private val client: NamespacedKubernetesClient
+        private val sutBeforeActions: List<Action>,
+        private val sutAfterActions: List<Action>,
+        private val loadGenBeforeActions: List<Action>,
+        private val loadGenAfterActions: List<Action>,
+        val appResources: List<HasMetadata>,
+        val loadGenResources: List<HasMetadata>,
+        private val loadGenerationDelay: Long,
+        private val afterTeardownDelay: Long,
+        private val kafkaConfig: Map<String, Any>,
+        private val topics: List<KafkaConfig.TopicWrapper>,
+        private val client: NamespacedKubernetesClient
 ) : BenchmarkDeployment {
     private val kafkaController = TopicManager(this.kafkaConfig)
     private val kubernetesManager = K8sManager(client)

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/benchmark/KubernetesBenchmarkDeploymentBuilder.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/KubernetesBenchmarkDeploymentBuilder.kt

-package rocks.theodolite.kubernetes.benchmark
+package rocks.theodolite.kubernetes
 
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import mu.KotlinLogging
@@ -6,7 +6,6 @@ import rocks.theodolite.kubernetes.model.KubernetesBenchmark
 import rocks.theodolite.kubernetes.patcher.PatcherFactory
 import rocks.theodolite.kubernetes.util.ConfigurationOverride
 import rocks.theodolite.kubernetes.patcher.PatcherDefinition
-import rocks.theodolite.kubernetes.resourceSet.loadKubernetesResources
 
 private val logger = KotlinLogging.logger {}
 

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/Main.kt

@@ -4,10 +4,8 @@ import io.fabric8.kubernetes.client.DefaultKubernetesClient
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import io.quarkus.runtime.annotations.QuarkusMain
 import mu.KotlinLogging
-import rocks.theodolite.kubernetes.execution.ExecutionModes
 import rocks.theodolite.kubernetes.operator.TheodoliteOperator
 import rocks.theodolite.kubernetes.standalone.TheodoliteStandalone
-import rocks.theodolite.kubernetes.util.Configuration
 import kotlin.system.exitProcess
 
 private val logger = KotlinLogging.logger {}

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/k8s/ResourceByLabelHandler.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ResourceByLabelHandler.kt

-package rocks.theodolite.kubernetes.k8s
+package rocks.theodolite.kubernetes
 
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/resourceSet/ResourceSet.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ResourceSet.kt

-package rocks.theodolite.kubernetes.resourceSet
+package rocks.theodolite.kubernetes
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import io.fabric8.kubernetes.api.model.KubernetesResource

theodolite/src/main/kotlin/rocks/theodolite/kubernetes/resourceSet/ResourceSets.kt → theodolite/src/main/kotlin/rocks/theodolite/kubernetes/ResourceSets.kt

-package rocks.theodolite.kubernetes.resourceSet
+package rocks.theodolite.kubernetes
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
@@ -7,7 +7,6 @@ import io.fabric8.kubernetes.api.model.HasMetadata
 import io.fabric8.kubernetes.api.model.KubernetesResource
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import io.quarkus.runtime.annotations.RegisterForReflection
-import rocks.theodolite.kubernetes.util.exception.DeploymentFailedException
 
 /**
  * Loads [KubernetesResource]s.