From df7c4d115e2c43a10d129a7cd2d114faaf1748ab Mon Sep 17 00:00:00 2001
From: Martin Vogel <martin.vogel@sinc.de>
Date: Fri, 16 Sep 2022 11:07:55 +0200
Subject: [PATCH] refactor(config): add config loading via string path
---
.../client/factory/ApplicationConfigLoader.java | 16 ++++++++++++++--
.../factory/ApplicationConfigLoaderTest.java | 4 ++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/client/src/main/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoader.java b/client/src/main/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoader.java
index a579dc6d3..b7bbff4f4 100644
--- a/client/src/main/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoader.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoader.java
@@ -30,13 +30,25 @@ public final class ApplicationConfigLoader {
}
/**
- * Load ApplicationConfig from string.
+ * Load ApplicationConfig from path string.
+ *
+ * @param configPath string of path to config file
+ *
+ * @return ApplicationConfig
+ * @throws InitializationException if the config file could not be loaded
+ */
+ public static ApplicationConfig loadConfig(final String configPath) {
+ return loadConfig(Path.of(configPath));
+ }
+
+ /**
+ * Load ApplicationConfig from yaml string.
*
* @param configYaml string content of the yaml config file
*
* @return ApplicationConfig
*/
- public static ApplicationConfig loadConfig(final String configYaml) {
+ public static ApplicationConfig loadConfigFromYaml(final String configYaml) {
final Constructor constructor = new Constructor(ApplicationConfig.class);
final Yaml yaml = new Yaml(constructor);
return yaml.load(configYaml);
diff --git a/client/src/test/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java b/client/src/test/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java
index ec98d3baa..b8596d01c 100644
--- a/client/src/test/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java
+++ b/client/src/test/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java
@@ -25,7 +25,7 @@ class ApplicationConfigLoaderTest {
@Test
void testLoadMissingConfigFile() {
- Assertions.assertThrows(InitializationException.class, () -> ApplicationConfigLoader.loadConfig(Path.of("/no/path")));
+ Assertions.assertThrows(InitializationException.class, () -> ApplicationConfigLoader.loadConfig("/no/path"));
}
@Test
@@ -57,7 +57,7 @@ class ApplicationConfigLoaderTest {
final SenderConfig senderConfig = new SenderConfig("1", "123");
// When
- final ApplicationConfig testConfig = ApplicationConfigLoader.loadConfig(testConfigYaml);
+ final ApplicationConfig testConfig = ApplicationConfigLoader.loadConfigFromYaml(testConfigYaml);
// Then
assertNotNull(testConfig);
--
GitLab