added API support for uploading HOCON configuration directly

Erudika · May 26, 2024 · ef86963 · ef86963
1 parent 0de34bd
commit ef86963
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -224,7 +224,7 @@
 				<configuration>
 					<!--==============================================-->
 					<!-- ENABLE FORK MODE IF YOU WANT TO USE DEVTOOLS -->
-					<fork>false</fork>
+					<!--<fork>false</fork>-->
 					<!--==============================================-->
 				</configuration>
 				<executions>
@@ -274,7 +274,6 @@
 						<phase>validate</phase>
 						<configuration>
 							<configLocation>${basedir}/src/main/resources/checkstyle.xml</configLocation>
-							<encoding>UTF-8</encoding>
 							<consoleOutput>true</consoleOutput>
 							<failsOnError>true</failsOnError>
 							<linkXRef>false</linkXRef>

diff --git a/src/main/java/com/erudika/scoold/api/ApiController.java b/src/main/java/com/erudika/scoold/api/ApiController.java
@@ -54,6 +54,8 @@
 import com.erudika.scoold.core.UnapprovedReply;
 import com.erudika.scoold.utils.BadRequestException;
 import com.erudika.scoold.utils.ScooldUtils;
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigValue;
 import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -73,6 +75,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
@@ -1022,12 +1025,23 @@ public String config(HttpServletRequest req, HttpServletResponse res) {
 
 	@PutMapping("/config")
 	public String configSet(HttpServletRequest req, HttpServletResponse res) {
-		Map<String, Object> entity = readEntity(req);
-		if (entity.isEmpty()) {
-			badReq("Missing or invalid request body.");
-		}
-		for (Map.Entry<String, Object> entry : entity.entrySet()) {
-			System.setProperty(CONF.getConfigRootPrefix() + "." + entry.getKey(), entry.getValue().toString());
+		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()) {
+					System.setProperty(entry.getKey(), entry.getValue().unwrapped().toString());
+				}
+			} catch (IOException ex) {
+				badReq("Missing or invalid request body.");
+			}
+		} else {
+			Map<String, Object> entity = readEntity(req);
+			if (entity.isEmpty()) {
+				badReq("Missing or invalid request body.");
+			}
+			for (Map.Entry<String, Object> entry : entity.entrySet()) {
+				System.setProperty(CONF.getConfigRootPrefix() + "." + entry.getKey(), entry.getValue().toString());
+			}
 		}
 		CONF.store();
 		pc.setAppSettings(CONF.getParaAppSettings());
@@ -1161,7 +1175,7 @@ private Map<String, Object> readEntity(HttpServletRequest req) {
 			req.setAttribute(REST_ENTITY_ATTRIBUTE, entity);
 			return entity;
 		} catch (IOException ex) {
-			badReq("Missing or invalid request body.");
+			badReq("Expected 'application/json' body but got '" + req.getContentType() + "' in request body.");
 		} catch (Exception ex) {
 			logger.error(null, ex);
 		}

diff --git a/src/main/resources/templates/api.yaml b/src/main/resources/templates/api.yaml
@@ -1513,12 +1513,15 @@ paths:
       security:
       - scoold_auth: []
       requestBody:
-        description: All configuration properties and values inside a JSON object. Property keys **must not start with** the `scoold.` prefix.
+        description: All configuration properties and values inside a JSON object or HOCON string. Property keys **must not start with** the `scoold.` prefix.
         required: true
         content:
           application/json:
             schema:
               type: object
+          application/hocon:
+            schema:
+              type: string
       responses:
         '200':
           description: Returns the whole updated Scoold configuration as a JSON object