Filter non stork configs and read them as optional values (#1204)

Refactor improvements

Co-authored-by: Clement Escoffier <clement@apache.org>

Author: aureamunoz

microprofile/src/main/java/io/smallrye/stork/microprofile/MicroProfileConfigProvider.java

@@ -9,6 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.smallrye.stork.Stork;
 import io.smallrye.stork.api.config.ServiceConfig;
 import io.smallrye.stork.spi.config.ConfigProvider;
 import io.smallrye.stork.spi.config.SimpleServiceConfig;
@@ -32,8 +33,15 @@ public MicroProfileConfigProvider() {
         Map<String, Map<String, String>> propertiesByServiceName = new HashMap<>();
 
         for (String propertyName : config.getPropertyNames()) {
-            StorkConfigUtils.computeServiceProperty(propertiesByServiceName, propertyName,
-                    config.getValue(propertyName, String.class));
+            if (propertyName.startsWith(Stork.STORK + ".")) {
+                config.getOptionalValue(propertyName, String.class)
+                        .map(String::trim)
+                        .filter(value -> !value.isEmpty())
+                        .ifPresentOrElse(
+                                value -> StorkConfigUtils.computeServiceProperty(propertiesByServiceName,
+                                        propertyName, value),
+                                () -> log.debug("Ignoring empty stork config property: {}", propertyName));
+            }
         }
 
         for (Map.Entry<String, Map<String, String>> serviceEntry : propertiesByServiceName.entrySet()) {

microprofile/src/test/java/io/smallrye/stork/microprofile/MicroProfileConfigProviderTest.java

@@ -233,6 +233,28 @@ void shouldHandleServiceNamesInQuotes() {
         assertThat(lb.getType()).isEqualTo("test-lb-2");
     }
 
+    @Test
+    void shouldFilterNonStorkPropertiesAndIgnoreEmptyValues() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("stork." + FIRST_SERVICE + ".service-discovery", "test-sd-1");
+        properties.put("stork." + FIRST_SERVICE + ".service-discovery.one", "http://localhost:8080");
+        properties.put("stork." + FIRST_SERVICE + ".service-discovery.two", "");
+        properties.put("stork." + FIRST_SERVICE + ".service-discovery.three", "   ");
+        properties.put("user.script", "");
+        properties.put("some.other.property", "");
+        properties.put("non.stork.property", "some-value");
+
+        Stork stork = storkForConfig(properties);
+
+        ServiceDiscovery serviceDiscovery = stork.getService(FIRST_SERVICE).getServiceDiscovery();
+        assertThat(serviceDiscovery).isNotNull().isInstanceOf(TestServiceDiscovery.class);
+
+        TestServiceDiscovery sd = (TestServiceDiscovery) serviceDiscovery;
+        assertThat(sd.getType()).isEqualTo("test-sd-1");
+        assertThat(sd.getConfig().getOne()).isEqualTo("http://localhost:8080");
+        assertThat(sd.getConfig().getTwo()).isNull();
+    }
+
     private Stork storkForConfig(Map<String, String> properties) {
         Map<String, ConfigValue> backend = new HashMap<>();
         for (Map.Entry<String, String> entry : properties.entrySet()) {

spring-boot/src/main/java/io/smallrye/stork/springboot/SpringBootConfigProvider.java

@@ -5,18 +5,23 @@
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
 
+import io.smallrye.stork.Stork;
 import io.smallrye.stork.api.config.ServiceConfig;
 import io.smallrye.stork.spi.config.ConfigProvider;
 import io.smallrye.stork.spi.config.SimpleServiceConfig;
 import io.smallrye.stork.utils.StorkConfigUtils;
 
 public class SpringBootConfigProvider implements ConfigProvider {
 
+    private static final Logger log = LoggerFactory.getLogger(SpringBootConfigProvider.class);
+
     private final List<ServiceConfig> serviceConfigs = new ArrayList<>();
 
     public SpringBootConfigProvider() {
@@ -26,10 +31,14 @@ public SpringBootConfigProvider() {
         Map<String, Map<String, String>> propertiesByServiceName = new HashMap<>();
 
         for (String propertyName : getPropertyNames(environment)) {
-
-            StorkConfigUtils.computeServiceProperty(propertiesByServiceName, propertyName,
-                    environment.getProperty(propertyName));
-
+            if (propertyName.startsWith(Stork.STORK + ".")) {
+                String value = environment.getProperty(propertyName);
+                if (value != null && !value.trim().isEmpty()) {
+                    StorkConfigUtils.computeServiceProperty(propertiesByServiceName, propertyName, value.trim());
+                } else {
+                    log.debug("Ignoring empty stork config property: {}", propertyName);
+                }
+            }
         }
 
         for (Map.Entry<String, Map<String, String>> serviceEntry : propertiesByServiceName.entrySet()) {

spring-boot/src/test/java/io/smallrye/stork/microprofile/SpringBootConfigProviderTest.java

@@ -237,6 +237,28 @@ void shouldHandleServiceNamesInQuotes() {
         assertThat(lb.getType()).isEqualTo("test-lb-2");
     }
 
+    @Test
+    void shouldFilterNonStorkPropertiesAndIgnoreEmptyValues() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("stork." + FIRST_SERVICE + ".service-discovery", "test-sd-1");
+        properties.put("stork." + FIRST_SERVICE + ".service-discovery.one", "http://localhost:8080");
+        properties.put("stork." + FIRST_SERVICE + ".service-discovery.two", "");
+        properties.put("stork." + FIRST_SERVICE + ".service-discovery.three", "   ");
+        properties.put("user.script", "");
+        properties.put("some.other.property", "");
+        properties.put("non.stork.property", "some-value");
+
+        Stork stork = storkForConfig(properties);
+
+        ServiceDiscovery serviceDiscovery = stork.getService(FIRST_SERVICE).getServiceDiscovery();
+        assertThat(serviceDiscovery).isNotNull().isInstanceOf(TestServiceDiscovery.class);
+
+        TestServiceDiscovery sd = (TestServiceDiscovery) serviceDiscovery;
+        assertThat(sd.getType()).isEqualTo("test-sd-1");
+        assertThat(sd.getConfig().getOne()).isEqualTo("http://localhost:8080");
+        assertThat(sd.getConfig().getTwo()).isNull();
+    }
+
     private Stork storkForConfig(Map<String, String> props) {
 
         Properties properties = new Properties();