finos#1167 remove check for missing column in fields map for SchemaMa…

…pper validation
junaidzm13 · Feb 13, 2024 · a1fc13d · a1fc13d
1 parent 86f73dd
commit a1fc13d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/plugin/ignite-plugin/src/main/scala/org/finos/vuu/feature/ignite/schema/SchemaMapper.scala b/plugin/ignite-plugin/src/main/scala/org/finos/vuu/feature/ignite/schema/SchemaMapper.scala
@@ -27,7 +27,7 @@ object SchemaMapper {
     Iterator(
       () => hasUniqueColumnNames(fieldsMap.values.toList),
       () => externalFieldsInMapConformsToExternalSchema(externalSchema, fieldsMap.keys),
-      () => internalFieldsInMapMatchTableColumns(internalColumns, fieldsMap.values)
+      () => internalFieldsInMapConformsToTableColumns(internalColumns, fieldsMap.values)
     ).map(_()).find(_.nonEmpty).flatten
   }
 
@@ -42,12 +42,11 @@ object SchemaMapper {
       .map(f => s"Field `$f` not found in external schema")
   }
 
-  private def internalFieldsInMapMatchTableColumns(columns: Array[Column],
-                                                   internalFields: Iterable[String]): ValidationError = {
+  private def internalFieldsInMapConformsToTableColumns(columns: Array[Column],
+                                                        internalFields: Iterable[String]): ValidationError = {
     internalFields
       .find(columnName => columns.forall(_.name != columnName))
       .map(columnName => s"Column `$columnName` not found in internal columns")
-      .orElse(Option.when(columns.length > internalFields.size)(s"More internal columns passed than mapped fields"))
   }
 
   final case class InvalidSchemaMapException(message: String) extends RuntimeException(message)

diff --git a/...n/ignite-plugin/src/test/scala/org/finos/vuu/feature/ignite/schema/SchemaMapperTest.scala b/...n/ignite-plugin/src/test/scala/org/finos/vuu/feature/ignite/schema/SchemaMapperTest.scala
@@ -56,15 +56,7 @@ class SchemaMapperTest extends AnyFeatureSpec with Matchers {
       exception.getMessage should include regex "[Cc]olumn `absent-col` not found"
     }
 
-    Scenario("fails when a passed internal column is not present in mapped fields") {
-      val exception = intercept[InvalidSchemaMapException](
-        SchemaMapper(testExternalSchema, tableColumns.slice(0, 2), fieldsMap.slice(0, 1))
-      )
-      exception shouldBe a[RuntimeException]
-      exception.getMessage should include regex "[Mm]ore .* columns .* than mapped fields"
-    }
-
-    Scenario("fails when a external->internal map contains duplicated internal field") {
+    Scenario("fails when external->internal map contains duplicated internal field") {
       val exception = intercept[InvalidSchemaMapException](SchemaMapper(
         testExternalSchema,
         Columns.fromNames("id".int(), "ric".string()),