1. explicit return added to more clearly show that empty list has spe…

…cial treatment 2. reformatted code
zeldigas · Jun 28, 2020 · 5c57b27 · 5c57b27
1 parent c6ff8fb
commit 5c57b27
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/hocon-property-example/src/main/java/com/github/zeldigas/example/hocon/Application.java b/hocon-property-example/src/main/java/com/github/zeldigas/example/hocon/Application.java
@@ -3,7 +3,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,7 +15,7 @@ public class Application {
     private AppConfig appConfig;
 
     @RequestMapping("/config")
-    AppConfig config(){
+    AppConfig config() {
         return appConfig;
     }
 

diff --git a/hocon-property-example/src/main/java/com/github/zeldigas/example/hocon/SubConfiguration.java b/hocon-property-example/src/main/java/com/github/zeldigas/example/hocon/SubConfiguration.java
@@ -7,7 +7,7 @@ public class SubConfiguration {
 
     private List<String> endpoints;
 
-    private Map<String,Object> connectionSettings;
+    private Map<String, Object> connectionSettings;
 
     public List<String> getEndpoints() {
         return endpoints;

diff --git a/...perty-source/src/main/java/com/github/zeldigas/spring/env/HoconPropertySourceFactory.java b/...perty-source/src/main/java/com/github/zeldigas/spring/env/HoconPropertySourceFactory.java
@@ -75,6 +75,7 @@ private void addConfigValuePropertyTo(Map<String, Object> properties, String key
     private void processListValue(Map<String, Object> properties, String key, Resource resource, ConfigList value) {
         if (value.isEmpty()) {
             addConfigValuePropertyTo(properties, key, resource, ConfigValueFactory.fromAnyRef(""));
+            return;
         }
 
         for (int i = 0; i < value.size(); i++) {

diff --git a/...operty-source/src/main/java/com/github/zeldigas/spring/env/HoconPropertySourceLoader.java b/...operty-source/src/main/java/com/github/zeldigas/spring/env/HoconPropertySourceLoader.java
@@ -21,7 +21,7 @@ public class HoconPropertySourceLoader implements PropertySourceLoader {
 
     @Override
     public String[] getFileExtensions() {
-        return new String[] {"conf"};
+        return new String[]{"conf"};
     }
 
     @Override

diff --git a/...ty-source/src/test/java/com/github/zeldigas/spring/env/HoconPropertySourceLoaderTest.java b/...ty-source/src/test/java/com/github/zeldigas/spring/env/HoconPropertySourceLoaderTest.java
@@ -44,7 +44,7 @@ private void verifyPropertyValuesAreSame(EnumerablePropertySource<?> hoconParse,
         }
     }
 
-    @SuppressWarnings("unchecked") 
+    @SuppressWarnings("unchecked")
     private <T extends PropertySource<?>> T loadProperties(PropertySourceLoader propertySourceLoader, String path) throws IOException {
         List<PropertySource<?>> source = propertySourceLoader.load("hocon", new ClassPathResource(path));
         assertThat("One property source expected", source.size(), is(1));
@@ -54,7 +54,7 @@ private <T extends PropertySource<?>> T loadProperties(PropertySourceLoader prop
     @Test
     public void propertyOriginIsCorrectlyDetermined() throws IOException {
         OriginTrackedMapPropertySource hoconParse = loadProperties(new HoconPropertySourceLoader(), "/application.conf");
-        
+
         verifyPropertyHasOriginOnLine(hoconParse, "spring.datasource.url", 3);
         verifyPropertyHasOriginOnLine(hoconParse, "server.port", 9);
         verifyPropertyHasOriginOnLine(hoconParse, "myApp.configuration.connectionSettings.two.two_sub", 20);