Use DynamicConfigValidator instead of ElideConfigParser

Author: rishi-aga

elide-contrib/elide-dynamic-config-helpers/src/main/java/com/yahoo/elide/contrib/dynamicconfighelpers/compile/ElideDynamicEntityCompiler.java

@@ -5,11 +5,11 @@
  */
 package com.yahoo.elide.contrib.dynamicconfighelpers.compile;
 
+import com.yahoo.elide.contrib.dynamicconfighelpers.DynamicConfigHelpers;
 import com.yahoo.elide.contrib.dynamicconfighelpers.model.ElideSecurityConfig;
 import com.yahoo.elide.contrib.dynamicconfighelpers.model.ElideTableConfig;
-import com.yahoo.elide.contrib.dynamicconfighelpers.parser.ElideConfigParser;
 import com.yahoo.elide.contrib.dynamicconfighelpers.parser.handlebars.HandlebarsHydrator;
-
+import com.yahoo.elide.contrib.dynamicconfighelpers.validator.DynamicConfigValidator;
 import com.google.common.collect.Sets;
 
 import org.mdkt.compiler.InMemoryJavaCompiler;
@@ -49,13 +49,17 @@ public class ElideDynamicEntityCompiler {
      */
     public ElideDynamicEntityCompiler(String path) throws Exception {
 
-        ElideTableConfig tableConfig = new ElideTableConfig();
-        ElideSecurityConfig securityConfig = new ElideSecurityConfig();
-        ElideConfigParser elideConfigParser = new ElideConfigParser(path);
+        if (DynamicConfigHelpers.isNullOrEmpty(path)) {
+            throw new IllegalArgumentException("Config path is null");
+        }
         HandlebarsHydrator hydrator = new HandlebarsHydrator();
 
-        tableConfig = elideConfigParser.getElideTableConfig();
-        securityConfig = elideConfigParser.getElideSecurityConfig();
+        DynamicConfigValidator dynamicConfigValidator = new DynamicConfigValidator();
+        dynamicConfigValidator.readAndValidateConfigs(path);
+
+        ElideTableConfig tableConfig = dynamicConfigValidator.getElideTableConfig();
+        ElideSecurityConfig securityConfig = dynamicConfigValidator.getElideSecurityConfig();
+
         tableClasses = hydrator.hydrateTableTemplate(tableConfig);
         securityClasses = hydrator.hydrateSecurityTemplate(securityConfig);
 

elide-contrib/elide-dynamic-config-helpers/src/main/java/com/yahoo/elide/contrib/dynamicconfighelpers/parser/ElideConfigParser.java

@@ -42,7 +42,7 @@
 @Slf4j
 @Data
 /**
- * Util class to validate the model config files in local before deployment.
+ * Util class to validate and parse the model config files.
  */
 public class DynamicConfigValidator {
 
@@ -74,7 +74,7 @@ public static void main(String[] args) throws IOException, ParseException {
         }
         String configDir = cli.getOptionValue("configDir");
         File file = new File(configDir);
-        String absoluteBasePath = DynamicConfigHelpers.formatFilePath(file.getAbsolutePath());
+        String absoluteBasePath = file.getAbsolutePath();
         log.info("Absolute Path for Model Configs Directory: " + absoluteBasePath);
 
         if (!file.isDirectory()) {
@@ -89,12 +89,12 @@ public static void main(String[] args) throws IOException, ParseException {
 
     /**
      * Read and validate config files under config directory
-     * @param absoluteBasePath Absolute base path for config directory
+     * @param filePath path for config directory
      * @throws IOException IOException
      */
-    public void readAndValidateConfigs(String absoluteBasePath) throws IOException {
+    public void readAndValidateConfigs(String filePath) throws IOException {
 
-        this.setConfigDir(absoluteBasePath);
+        this.setConfigDir(DynamicConfigHelpers.formatFilePath(filePath));
         this.readVariableConfig();
         if (this.readSecurityConfig()) {
             validateRoleInSecurityConfig(this.getElideSecurityConfig());

elide-contrib/elide-dynamic-config-helpers/src/main/java/com/yahoo/elide/contrib/dynamicconfighelpers/validator/DynamicConfigValidator.java

@@ -7,7 +7,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import com.yahoo.elide.contrib.dynamicconfighelpers.parser.ElideConfigParser;
+import com.yahoo.elide.contrib.dynamicconfighelpers.validator.DynamicConfigValidator;
 
 import org.junit.jupiter.api.Test;
 
@@ -242,7 +242,8 @@ public void testConfigHydration() throws IOException {
         String absolutePath = file.getAbsolutePath();
         String hjsonPath = absolutePath + "/tables/table1.hjson";
 
-        ElideConfigParser testClass = new ElideConfigParser(absolutePath);
+        DynamicConfigValidator testClass = new DynamicConfigValidator();
+        testClass.readAndValidateConfigs(path);
 
         Map<String, Object> map = testClass.getVariables();
 
@@ -256,10 +257,9 @@ public void testTableHydration() throws IOException {
 
         HandlebarsHydrator obj = new HandlebarsHydrator();
         String path = "src/test/resources/models";
-        File file = new File(path);
-        String absolutePath = file.getAbsolutePath();
 
-        ElideConfigParser testClass = new ElideConfigParser(absolutePath);
+        DynamicConfigValidator testClass = new DynamicConfigValidator();
+        testClass.readAndValidateConfigs(path);
 
         Map<String, String> tableClasses = obj.hydrateTableTemplate(testClass.getElideTableConfig());
 
@@ -271,10 +271,9 @@ public void testTableHydration() throws IOException {
     public void testSecurityHydration() throws IOException {
         HandlebarsHydrator obj = new HandlebarsHydrator();
         String path = "src/test/resources/models";
-        File file = new File(path);
-        String absolutePath = file.getAbsolutePath();
 
-        ElideConfigParser testClass = new ElideConfigParser(absolutePath);
+        DynamicConfigValidator testClass = new DynamicConfigValidator();
+        testClass.readAndValidateConfigs(path);
 
         Map<String, String> securityClasses = obj.hydrateSecurityTemplate(testClass.getElideSecurityConfig());