From e38329749a8de0a3b2d49f1b0a8bf27ed04c3fc5 Mon Sep 17 00:00:00 2001 From: Eric Zimanyi Date: Tue, 29 Oct 2019 13:42:31 -0400 Subject: [PATCH] fix(kubernetes): Fix Optional ofNullable (#3265) The usages of Optional.of should be Optional.ofNullable. --- .../orca/bakery/tasks/manifests/BakeManifestContext.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java index cee5cec544..719f629968 100644 --- a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java +++ b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java @@ -51,12 +51,12 @@ public BakeManifestContext( @Nullable @JsonProperty("inputArtifact") CreateBakeManifestTask.InputArtifact inputArtifact, @Nullable @JsonProperty("kustomizeFilePath") String kustomizeFilePath, @JsonProperty("rawOverrides") Boolean rawOverrides) { - this.inputArtifacts = Optional.of(inputArtifacts).orElse(new ArrayList<>()); + this.inputArtifacts = Optional.ofNullable(inputArtifacts).orElse(new ArrayList<>()); // Kustomize stage configs provide a single input artifact if (this.inputArtifacts.isEmpty() && inputArtifact != null) { this.inputArtifacts.add(inputArtifact); } - this.expectedArtifacts = Optional.of(expectedArtifacts).orElse(new ArrayList<>()); + this.expectedArtifacts = Optional.ofNullable(expectedArtifacts).orElse(new ArrayList<>()); this.overrides = overrides; this.evaluateOverrideExpressions = evaluateOverrideExpressions; this.templateRenderer = templateRenderer;