From 151f6a789e5635b95e9403c5ae95918f967a44c3 Mon Sep 17 00:00:00 2001
From: sankriti mishra <sankriti080btece21@igdtuw.ac.in>
Date: Thu, 1 Feb 2024 16:26:37 +0530
Subject: [PATCH] SecretEnricher getSecretsFromXmlConfig should return
 Collections.emptyList() instead of null #2530

---
 .../jkube/enricher/generic/SecretEnricher.java     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
index 29045a06f9..e473ffc146 100644
--- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
+++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/SecretEnricher.java
@@ -27,10 +27,9 @@
 import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;
 import org.eclipse.jkube.kit.enricher.api.util.SecretConstants;
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jkube.kit.enricher.api.model.Configuration;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public abstract class SecretEnricher extends BaseEnricher {
 
@@ -128,11 +127,10 @@ private void addSecretsFromXmlConfiguration(KubernetesListBuilder builder) {
     }
 
     private List<SecretConfig> getSecretsFromXmlConfig() {
-        ResourceConfig resourceConfig = getConfiguration().getResource();
-        if(resourceConfig != null && resourceConfig.getSecrets() != null) {
-            return resourceConfig.getSecrets();
-        }
-        return null;
+        return Optional.ofNullable(getConfiguration())
+                .map(Configuration::getResource)
+                .map(ResourceConfig::getSecrets)
+                .orElse(Collections.emptyList());
     }
 
     private String getDockerIdFromAnnotation(Map<String, String> annotation) {