Merge pull request #591 from zinggAI/issue576

fromDDL instead of JSON for schema
zinggAI · May 16, 2023 · 351591c · 351591c
2 parents c90d1b8 + b630f20
commit 351591c
Show file tree

Hide file tree

Showing 35 changed files with 288 additions and 292 deletions.
diff --git a/common/client/src/test/resources/testArguments/configWithMultipleMatchTypes.json b/common/client/src/test/resources/testArguments/configWithMultipleMatchTypes.json
@@ -4,61 +4,61 @@
 			"fieldName" : "fname",
 			"matchType" : "fuzzy,null_or_blank",
 			"fields" : "fname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "lname",
 			"matchType" : "fuzzy",
 			"fields" : "lname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "stNo",
 			"matchType": "exact",
 			"fields" : "stNo",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add1",
 			"matchType": "fuzzy",
 			"fields" : "add1",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add2",
 			"matchType": "fuzzy",
 			"fields" : "add2",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "city",
 			"matchType": "fuzzy",
 			"fields" : "city",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "areacode",
 			"matchType": "exact",
 			"fields" : "areacode",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "state",
 			"matchType": "fuzzy",
 			"fields" : "state",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "dob",
 			"matchType": "fuzzy",
 			"fields" : "dob",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "ssn",
 			"matchType": "fuzzy",
 			"fields" : "ssn",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		}
 		],
 		"output" : [{

diff --git a/common/client/src/test/resources/testArguments/configWithMultipleMatchTypesUnsupported.json b/common/client/src/test/resources/testArguments/configWithMultipleMatchTypesUnsupported.json
@@ -4,61 +4,61 @@
 			"fieldName" : "fname",
 			"matchType" : "fuzzy,null_wrong_blank",
 			"fields" : "fname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "lname",
 			"matchType" : "fuzzy",
 			"fields" : "lname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "stNo",
 			"matchType": "exact",
 			"fields" : "stNo",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add1",
 			"matchType": "fuzzy",
 			"fields" : "add1",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add2",
 			"matchType": "fuzzy",
 			"fields" : "add2",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "city",
 			"matchType": "fuzzy",
 			"fields" : "city",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "areacode",
 			"matchType": "exact",
 			"fields" : "areacode",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "state",
 			"matchType": "fuzzy",
 			"fields" : "state",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "dob",
 			"matchType": "fuzzy",
 			"fields" : "dob",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "ssn",
 			"matchType": "fuzzy",
 			"fields" : "ssn",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		}
 		],
 		"output" : [{

diff --git a/common/core/src/test/resources/documenter/config.json b/common/core/src/test/resources/documenter/config.json
@@ -4,67 +4,67 @@
 			"fieldName" : "recId",
 			"matchType" : "dont_use",
 			"fields" : "recId",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "fname",
 			"matchType" : "fuzzy",
 			"fields" : "fname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "lname",
 			"matchType" : "fuzzy",
 			"fields" : "lname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "stNo",
 			"matchType": "exact",
 			"fields" : "stNo",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add1",
 			"matchType": "fuzzy",
 			"fields" : "add1",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add2",
 			"matchType": "fuzzy",
 			"fields" : "add2",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "city",
 			"matchType": "fuzzy",
 			"fields" : "city",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "areacode",
 			"matchType": "exact",
 			"fields" : "areacode",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "state",
 			"matchType": "fuzzy",
 			"fields" : "state",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "dob",
 			"matchType": "fuzzy",
 			"fields" : "dob",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "ssn",
 			"matchType": "fuzzy",
 			"fields" : "ssn",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		}
 		],
 		"output" : [{

diff --git a/common/core/src/test/resources/testDocumenter/config.json b/common/core/src/test/resources/testDocumenter/config.json
@@ -4,55 +4,55 @@
 			"fieldName" : "fname",
 			"matchType" : "fuzzy",
 			"fields" : "fname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "lname",
 			"matchType" : "fuzzy",
 			"fields" : "lname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "stNo",
 			"matchType": "fuzzy",
 			"fields" : "stNo",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add1",
 			"matchType": "fuzzy",
 			"fields" : "add1",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add2",
 			"matchType": "fuzzy",
 			"fields" : "add2",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "city",
 			"matchType": "fuzzy",
 			"fields" : "city",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "state",
 			"matchType": "fuzzy",
 			"fields" : "state",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "dob",
 			"matchType": "fuzzy",
 			"fields" : "dob",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "ssn",
 			"matchType": "fuzzy",
 			"fields" : "ssn",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		}
 		],
 		"output" : [{

diff --git a/common/core/src/test/resources/testFebrl/config.json b/common/core/src/test/resources/testFebrl/config.json
@@ -4,67 +4,67 @@
 			"fieldName" : "id",
 			"matchType" : "dont_use",
 			"fields" : "fname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "fname",
 			"matchType" : "fuzzy",
 			"fields" : "fname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "lname",
 			"matchType" : "fuzzy",
 			"fields" : "lname",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "stNo",
 			"matchType": "exact",
 			"fields" : "stNo",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add1",
 			"matchType": "fuzzy",
 			"fields" : "add1",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "add2",
 			"matchType": "fuzzy",
 			"fields" : "add2",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "city",
 			"matchType": "fuzzy",
 			"fields" : "city",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "areacode",
 			"matchType": "exact",
 			"fields" : "areacode",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "state",
 			"matchType": "exact",
 			"fields" : "state",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "dob",
 			"matchType": "exact",
 			"fields" : "dob",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		},
 		{
 			"fieldName" : "ssn",
 			"matchType": "exact",
 			"fields" : "ssn",
-			"dataType": "\"string\"" 
+			"dataType": "string" 
 		}
 		],
 		"output" : [{