Refactor improvements

Author: aureamunoz

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

@@ -35,10 +35,12 @@ public MicroProfileConfigProvider() {
         for (String propertyName : config.getPropertyNames()) {
             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));
+                                () -> log.debug("Ignoring empty stork config property: {}", propertyName));
             }
         }
 

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

@@ -239,6 +239,7 @@ void shouldFilterNonStorkPropertiesAndIgnoreEmptyValues() {
         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");

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

@@ -5,6 +5,8 @@
 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;
@@ -18,6 +20,8 @@
 
 public class SpringBootConfigProvider implements ConfigProvider {
 
+    private static final Logger log = LoggerFactory.getLogger(SpringBootConfigProvider.class);
+
     private final List<ServiceConfig> serviceConfigs = new ArrayList<>();
 
     public SpringBootConfigProvider() {
@@ -29,8 +33,10 @@ public SpringBootConfigProvider() {
         for (String propertyName : getPropertyNames(environment)) {
             if (propertyName.startsWith(Stork.STORK + ".")) {
                 String value = environment.getProperty(propertyName);
-                if (value != null && !value.isEmpty()) {
-                    StorkConfigUtils.computeServiceProperty(propertiesByServiceName, propertyName, value);
+                if (value != null && !value.trim().isEmpty()) {
+                    StorkConfigUtils.computeServiceProperty(propertiesByServiceName, propertyName, value.trim());
+                } else {
+                    log.debug("Ignoring empty stork config property: {}", propertyName);
                 }
             }
         }

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

@@ -243,6 +243,7 @@ void shouldFilterNonStorkPropertiesAndIgnoreEmptyValues() {
         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");