Merge branch 'master' of git.se.informatik.uni-kiel.de:she/theodolite into...

Merge branch 'master' of git.se.informatik.uni-kiel.de:she/theodolite into 249-make-analysis-flexible

helm/README.md

@@ -47,7 +47,7 @@ helm install theodolite . -f preconfigs/one-broker-values.yaml
 To uninstall/delete the `theodolite` deployment:
 
 ```sh
-helm delete theodolite
+helm uninstall theodolite
 ```
 
 This command does not remove the CRDs which are created by this chart. Remove them manually with:

theodolite/src/main/kotlin/theodolite/patcher/PatcherFactory.kt

@@ -32,7 +32,7 @@ class PatcherFactory {
             k8sResources.filter { it.first == patcherDefinition.resource }
                 .map { resource -> resource.second }
                 .firstOrNull()
-                ?: throw DeploymentFailedException("Could not find resource ${patcherDefinition.resource}")
+                ?: throw InvalidPatcherConfigurationException("Could not find resource ${patcherDefinition.resource}")
 
         return try {
             when (patcherDefinition.type) {
@@ -86,10 +86,10 @@ class PatcherFactory {
                 )
                 else -> throw InvalidPatcherConfigurationException("Patcher type ${patcherDefinition.type} not found.")
             }
-        } catch (e: Exception) {
+        } catch (e: NullPointerException) {
             throw InvalidPatcherConfigurationException(
                 "Could not create patcher with type ${patcherDefinition.type}" +
-                        " Probably a required patcher argument was not specified."
+                        " Probably a required patcher argument was not specified.", e
             )
         }
     }

theodolite/src/main/kotlin/theodolite/util/InvalidPatcherConfigurationException.kt

 package theodolite.util
 
-class InvalidPatcherConfigurationException(message: String) : Exception(message)
+class InvalidPatcherConfigurationException(message: String, e: Exception? = null) : Exception(message, e)