cleanup

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java

@@ -84,13 +84,8 @@ public PropertySource<?> locate(Environment environment) {
 				LOG.debug("Config Map normalized sources : " + sources);
 				sources.forEach(s -> {
 					MapPropertySource propertySource = getMapPropertySource(s, env);
-					if (propertySource.getPropertyNames().length == 0) {
-						LOG.debug("Skipping empty config map property source source " + propertySource.getName());
-					}
-					else {
-						LOG.debug("Adding config map property source " + propertySource.getName());
-						composite.addPropertySource(propertySource);
-					}
+					LOG.debug("Adding config map property source " + propertySource.getName());
+					composite.addPropertySource(propertySource);
 				});
 			}
 

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NamedSourceData.java

@@ -42,7 +42,7 @@ public final SourceData compute(String sourceName, ConfigUtils.Prefix prefix, St
 		// first comes non-profile based source
 		sourceNames.add(sourceName);
 
-		MultipleSourcesContainer data;
+		MultipleSourcesContainer data = MultipleSourcesContainer.empty();;
 
 		try {
 			if (profileSources) {
@@ -70,7 +70,6 @@ public final SourceData compute(String sourceName, ConfigUtils.Prefix prefix, St
 		}
 		catch (Exception e) {
 			onException(failFast, e);
-			return SourceData.emptyRecord("generated-on-failure");
 		}
 
 		String names = data.names().stream().sorted().collect(Collectors.joining(PROPERTY_SOURCE_NAME_SEPARATOR));