modified: Source DBT Yaml reading to be more lenient

cli/src/main/java/com/adaptivescale/rosetta/cli/services/DbtModelService.java

@@ -11,10 +11,16 @@
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.representer.Representer;
+import org.yaml.snakeyaml.constructor.Constructor;
 import queryhelper.pojo.GenericResponse;
 import queryhelper.service.DbtAIService;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -324,8 +330,14 @@ public List<DbtModel> readDbtModels(Path directory) throws IOException {
 
     public List<DbtModel> readDbtModels(List<String> filePaths) throws IOException {
         List<DbtModel> result = new ArrayList<>();
+
+        LoaderOptions loaderOptions = new LoaderOptions();
+        loaderOptions.setMaxAliasesForCollections(Integer.MAX_VALUE);
+
+        Yaml yaml = new Yaml(loaderOptions);
         for (String filePath : filePaths) {
-            result.add(yamlMapper.readValue(new File(filePath), DbtModel.class));
+            Object temp = yaml.load(new FileInputStream(filePath));
+            result.add(yamlMapper.convertValue(temp, DbtModel.class));
         }
         return result;
     }

common/src/main/java/com/adaptivescale/rosetta/common/models/dbt/AbstractDbtModel.java

@@ -0,0 +1,37 @@
+package com.adaptivescale.rosetta.common.models.dbt;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class AbstractDbtModel {
+    private Map<Object, Object> additionalProperties = new HashMap<>();
+
+    @JsonAnyGetter
+    public Map<Object, Object> getAdditionalProperties() {
+        return additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperties(Map<Object, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+    public void addProperty(Object name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public Object getProperty(Object name) {
+        if (additionalProperties.containsKey(name))
+            return this.additionalProperties.get(name);
+        return null;
+    }
+
+    public String getPropertyAsString(Object name) {
+        return (String) getProperty(name);
+    }
+}

common/src/main/java/com/adaptivescale/rosetta/common/models/dbt/DbtColumn.java

@@ -8,7 +8,7 @@
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class DbtColumn {
+public class DbtColumn extends AbstractDbtModel{
   private String name;
   private String description;
 

common/src/main/java/com/adaptivescale/rosetta/common/models/dbt/DbtModel.java

@@ -7,7 +7,7 @@
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class DbtModel {
+public class DbtModel extends AbstractDbtModel{
   private Integer version;
   private Collection<DbtSource> sources;  //sources -> tables
   private Collection<DbtTable> models;    //models (direct list)

common/src/main/java/com/adaptivescale/rosetta/common/models/dbt/DbtSource.java

@@ -7,7 +7,7 @@
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class DbtSource {
+public class DbtSource extends AbstractDbtModel{
   private String name;
   private String description;
   private Collection<DbtTable> tables;

common/src/main/java/com/adaptivescale/rosetta/common/models/dbt/DbtTable.java

@@ -7,7 +7,7 @@
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class DbtTable {
+public class DbtTable extends AbstractDbtModel{
   private String name;
   private String description;
   private Collection<DbtColumn> columns;