Update 3 more Validators with verify_type, remove 'type' in validatio…

…n def
ucldc · Dec 1, 2023 · 0e03c4f · 0e03c4f
1 parent 01dd884
commit 0e03c4f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/metadata_mapper/mappers/flickr/sdasm_mapper.py b/metadata_mapper/mappers/flickr/sdasm_mapper.py
@@ -114,18 +114,18 @@ class SdasmValidator(FlickrValidator):
     def __init__(self, **options):
         super().__init__(**options)
         self.add_validatable_field(
-            field="identifier", type=Validator.list_of(str),
+            field="identifier",
             validations=[
                 SdasmValidator.content_match,
-                Validator.type_match
+                Validator.verify_type(Validator.list_of(str))
             ]
         )
         self.add_validatable_field(
-            field="type", type=Validator.list_of(str),
+            field="type",
             validations=[
                 Validator.required_field,
                 SdasmValidator.type_exception,
-                Validator.type_match
+                Validator.verify_type(Validator.list_of(str))
             ]
 
         )

diff --git a/metadata_mapper/mappers/flickr/sppl_mapper.py b/metadata_mapper/mappers/flickr/sppl_mapper.py
@@ -80,7 +80,7 @@ class SpplFlickrValidator(FlickrValidator):
     def __init__(self, **options):
         super().__init__(**options)
         self.add_validatable_field(
-            field="description", type=str,
+            field="description",
             validations=[
                 SpplFlickrValidator.content_match,
             ],

diff --git a/metadata_mapper/mappers/ucsd_blacklight/ucsd_blacklight_mapper.py b/metadata_mapper/mappers/ucsd_blacklight/ucsd_blacklight_mapper.py
@@ -336,10 +336,10 @@ def map_type(self) -> str:
 class UcsdBlacklightValidator(Validator):
     def setup(self, **options):
         self.add_validatable_field(
-            field="identifier", type=Validator.list_of(str),
+            field="identifier",
             validations=[
                 UcsdBlacklightValidator.identifier_content_match,
-                Validator.type_match
+                Validator.verify_type(Validator.list_of(str))
             ]
         )