refactored config parsing methods

Erudika · Oct 27, 2024 · 49b9681 · 49b9681
1 parent 2af94bb
commit 49b9681
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
 		<dependency>
 			<groupId>com.erudika</groupId>
 			<artifactId>para-client</artifactId>
-			<version>1.50.2</version>
+			<version>1.50.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- VELOCITY -->

diff --git a/src/main/java/com/erudika/scoold/ScooldServer.java b/src/main/java/com/erudika/scoold/ScooldServer.java
@@ -29,7 +29,6 @@
 import com.erudika.scoold.utils.ScooldUtils;
 import com.erudika.scoold.velocity.VelocityConfigurer;
 import com.erudika.scoold.velocity.VelocityViewResolver;
-import com.typesafe.config.ConfigFactory;
 import jakarta.inject.Named;
 import java.io.File;
 import java.nio.file.Files;
@@ -286,7 +285,8 @@ private void tryAutoInitParaApp() {
 		if (!CONF.autoInitWithRootAppSecretKey().isBlank()) {
 			rootSecret = CONF.autoInitWithRootAppSecretKey().trim();
 		} else if (!CONF.autoInitWithParaConfigFile().isBlank()) {
-			com.typesafe.config.Config paraConfig = ConfigFactory.parseFile(new File(CONF.autoInitWithParaConfigFile()));
+			com.typesafe.config.Config paraConfig =
+					Config.parseFileWithoutIncludes(new File(CONF.autoInitWithParaConfigFile()));
 			if (paraConfig.hasPath("para.root_secret_key")) {
 				rootSecret = paraConfig.getString("para.root_secret_key");
 			}

diff --git a/src/main/java/com/erudika/scoold/api/ApiController.java b/src/main/java/com/erudika/scoold/api/ApiController.java
@@ -55,7 +55,6 @@
 import com.erudika.scoold.utils.BadRequestException;
 import com.erudika.scoold.utils.ScooldUtils;
 import com.erudika.scoold.utils.Version;
-import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigValue;
 import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
@@ -1058,7 +1057,7 @@ public String configSet(HttpServletRequest req, HttpServletResponse res) {
 		if ("application/hocon".equals(req.getContentType())) {
 			try {
 				String config = IOUtils.toString(req.getInputStream(), "utf-8");
-				for (Map.Entry<String, ConfigValue> entry : ConfigFactory.parseString(config).entrySet()) {
+				for (Map.Entry<String, ConfigValue> entry : Config.parseStringWithoutIncludes(config).entrySet()) {
 					System.setProperty(entry.getKey(), entry.getValue().unwrapped().toString());
 				}
 			} catch (IOException ex) {