Skip to content
Snippets Groups Projects
Commit e7b4f252 authored by JustAnotherChristoph's avatar JustAnotherChristoph Committed by Christopher Konkel
Browse files

Now performing null check on fields appropriately

parent 08bde667
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !269. Comments created here will be created in the context of that merge request.
...@@ -11,7 +11,7 @@ import theodolite.util.DeploymentFailedException ...@@ -11,7 +11,7 @@ import theodolite.util.DeploymentFailedException
@JsonDeserialize @JsonDeserialize
@RegisterForReflection @RegisterForReflection
class ResourceSets: KubernetesResource { class ResourceSets : KubernetesResource {
@JsonProperty("configMap") @JsonProperty("configMap")
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
var configMap: ConfigMapResourceSet? = null var configMap: ConfigMapResourceSet? = null
...@@ -21,13 +21,13 @@ class ResourceSets: KubernetesResource { ...@@ -21,13 +21,13 @@ class ResourceSets: KubernetesResource {
var fileSystem: FileSystemResourceSet? = null var fileSystem: FileSystemResourceSet? = null
fun loadResourceSet(client: NamespacedKubernetesClient): Collection<Pair<String, HasMetadata>> { fun loadResourceSet(client: NamespacedKubernetesClient): Collection<Pair<String, HasMetadata>> {
// TODO Find out whether field access (::configMap) is really what we want to do here (see #362)
return if (::configMap != null) { return if (this.configMap != null) {
configMap?.getResourceSet(client= client) !! configMap?.getResourceSet(client = client)!!
} else if (::fileSystem != null) { } else if (this.fileSystem != null) {
fileSystem?.getResourceSet(client= client ) !! fileSystem?.getResourceSet(client = client)!!
} else { } else {
throw DeploymentFailedException("Could not load resourceSet.") throw DeploymentFailedException("Could not load resourceSet.")
} }
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment