Fix issue when the configuration is present but empty

jpomykala · jpomykala · commit 3300afebabe0 · 2023-06-13T11:26:46.000+02:00
diff --git a/src/main/java/io/simplelocalize/cli/configuration/ConfigurationLoader.java b/src/main/java/io/simplelocalize/cli/configuration/ConfigurationLoader.java
@@ -13,6 +13,7 @@
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.Objects;
 
 public final class ConfigurationLoader
 {
@@ -30,7 +31,7 @@ public Configuration loadOrGetDefault(Path configurationFilePath)
       configurationFilePath = DEFAULT_CONFIG_FILE_NAME;
     }
 
-    return configurationLoader.load(configurationFilePath);
+    return Objects.requireNonNullElse(configurationLoader.load(configurationFilePath), new Configuration());
   }
 
   private Configuration load(Path configurationFilePath)

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import java.net.URLDecoder;`
`14`	`14`	`import java.nio.charset.StandardCharsets;`
`15`	`15`	`import java.nio.file.Path;`
	`16`	`+import java.util.Objects;`
`16`	`17`
`17`	`18`	`public final class ConfigurationLoader`
`18`	`19`	`{`
`@@ -30,7 +31,7 @@ public Configuration loadOrGetDefault(Path configurationFilePath)`
`30`	`31`	`configurationFilePath = DEFAULT_CONFIG_FILE_NAME;`
`31`	`32`	`}`
`32`	`33`
`33`		`- return configurationLoader.load(configurationFilePath);`
	`34`	`+ return Objects.requireNonNullElse(configurationLoader.load(configurationFilePath), new Configuration());`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`private Configuration load(Path configurationFilePath)`