Fix: fixed errorHandling usages in PropertyTermParser and ClassTermParser

amf-aml/shared/src/main/scala/amf/aml/internal/parse/vocabularies/ClassTermParser.scala

@@ -8,8 +8,11 @@ import amf.core.client.scala.model.domain.{AmfArray, AmfScalar}
 import amf.core.internal.parser.domain.{Annotations, ValueNode}
 import org.yaml.model.{YMap, YMapEntry, YScalar, YType}
 
-object ClassTermParser extends SingleOrMultipleItems with IriReferenceParsing {
-  def parse(entry: YMapEntry, vocabulary: Vocabulary)(implicit ctx: VocabularyContext): ClassTerm = {
+case class ClassTermParser()(implicit val ctx: VocabularyContext)
+    extends SingleOrMultipleItems
+    with IriReferenceParsing {
+
+  def parse(entry: YMapEntry, vocabulary: Vocabulary): ClassTerm = {
     val classTerm      = ClassTerm(Annotations(entry))
     val classTermAlias = entry.key.as[YScalar].text
     classTerm.withName(classTermAlias)

amf-aml/shared/src/main/scala/amf/aml/internal/parse/vocabularies/PropertyTermParser.scala

@@ -10,9 +10,11 @@ import amf.core.client.scala.vocabulary.Namespace
 import amf.core.internal.parser.domain.{Annotations, DefaultArrayNode, ValueNode}
 import org.yaml.model.{YMap, YMapEntry, YScalar, YType}
 
-object PropertyTermParser extends SingleOrMultipleItems with IriReferenceParsing {
+case class PropertyTermParser()(implicit val ctx: VocabularyContext)
+    extends SingleOrMultipleItems
+    with IriReferenceParsing {
 
-  def parse(entry: YMapEntry, vocabulary: Vocabulary)(implicit ctx: VocabularyContext): PropertyTerm = {
+  def parse(entry: YMapEntry, vocabulary: Vocabulary): PropertyTerm = {
     val propertyTerm      = createPropertyTerm(entry)
     val propertyTermAlias = entry.key.as[YScalar].text
     propertyTerm.withName(propertyTermAlias)

amf-aml/shared/src/main/scala/amf/aml/internal/parse/vocabularies/SingleOrMultipleItems.scala

@@ -1,10 +1,13 @@
 package amf.aml.internal.parse.vocabularies
 
+import amf.core.client.scala.parse.document.SyamlBasedParserErrorHandler
 import amf.core.internal.parser.domain.{DefaultArrayNode, ValueNode}
 import org.yaml.model.{YMapEntry, YSequence, YType}
 
 trait SingleOrMultipleItems {
 
+  implicit val ctx: SyamlBasedParserErrorHandler
+
   protected def singleOrMultipleItemsAsString(entry: YMapEntry) = {
     entry.value.tagType match {
       case YType.Str  => Seq(ValueNode(entry.value).text().toString)

amf-aml/shared/src/main/scala/amf/aml/internal/parse/vocabularies/VocabulariesParser.scala

@@ -104,7 +104,7 @@ class VocabulariesParser(root: Root)(implicit override val ctx: VocabularyContex
           addDeclarationKey(DeclarationKey(entry))
           val classDeclarations = entry.value.as[YMap]
           classDeclarations.entries.foreach { classTermDeclaration =>
-            ClassTermParser.parse(classTermDeclaration, vocabulary)
+            ClassTermParser().parse(classTermDeclaration, vocabulary)
           }
         }
     )
@@ -117,7 +117,7 @@ class VocabulariesParser(root: Root)(implicit override val ctx: VocabularyContex
           addDeclarationKey(DeclarationKey(entry))
           val classDeclarations = entry.value.as[YMap]
           classDeclarations.entries.foreach { propertyTermDeclaration =>
-            PropertyTermParser.parse(propertyTermDeclaration, vocabulary)
+            PropertyTermParser().parse(propertyTermDeclaration, vocabulary)
           }
         }
     )

amf-aml/shared/src/test/resources/vocabularies2/validations/vocabularies/parser-errors/class-term-with-null-entries.jsonld

@@ -0,0 +1,32 @@
+{
+  "@type": "http://www.w3.org/ns/shacl#ValidationReport",
+  "http://www.w3.org/ns/shacl#conforms": false,
+  "http://www.w3.org/ns/shacl#result": [
+    {
+      "@type": "http://www.w3.org/ns/shacl#ValidationResult",
+      "http://www.w3.org/ns/shacl#resultSeverity": {
+        "@id": "http://www.w3.org/ns/shacl#Violation"
+      },
+      "http://www.w3.org/ns/shacl#focusNode": {
+        "@id": ""
+      },
+      "http://www.w3.org/ns/shacl#resultMessage": "Expecting !!str, !!null provided",
+      "http://www.w3.org/ns/shacl#sourceShape": {
+        "@id": "http://a.ml/vocabularies/amf/core#syaml-error"
+      },
+      "http://a.ml/vocabularies/amf/parser#lexicalPosition": {
+        "@type": "http://a.ml/vocabularies/amf/parser#Position",
+        "http://a.ml/vocabularies/amf/parser#start": {
+          "@type": "http://a.ml/vocabularies/amf/parser#Location",
+          "http://a.ml/vocabularies/amf/parser#line": 6,
+          "http://a.ml/vocabularies/amf/parser#column": 16
+        },
+        "http://a.ml/vocabularies/amf/parser#end": {
+          "@type": "http://a.ml/vocabularies/amf/parser#Location",
+          "http://a.ml/vocabularies/amf/parser#line": 6,
+          "http://a.ml/vocabularies/amf/parser#column": 16
+        }
+      }
+    }
+  ]
+}

amf-aml/shared/src/test/resources/vocabularies2/validations/vocabularies/parser-errors/class-term-with-null-entries.yaml

@@ -0,0 +1,6 @@
+#%Vocabulary 1.0
+vocabulary: Test Vocab
+base: ftp://some-url
+classTerms:
+  t:
+    description:

amf-aml/shared/src/test/resources/vocabularies2/validations/vocabularies/parser-errors/property-term-with-null-entries.jsonld

@@ -0,0 +1,32 @@
+{
+  "@type": "http://www.w3.org/ns/shacl#ValidationReport",
+  "http://www.w3.org/ns/shacl#conforms": false,
+  "http://www.w3.org/ns/shacl#result": [
+    {
+      "@type": "http://www.w3.org/ns/shacl#ValidationResult",
+      "http://www.w3.org/ns/shacl#resultSeverity": {
+        "@id": "http://www.w3.org/ns/shacl#Violation"
+      },
+      "http://www.w3.org/ns/shacl#focusNode": {
+        "@id": ""
+      },
+      "http://www.w3.org/ns/shacl#resultMessage": "Expecting !!str, !!null provided",
+      "http://www.w3.org/ns/shacl#sourceShape": {
+        "@id": "http://a.ml/vocabularies/amf/core#syaml-error"
+      },
+      "http://a.ml/vocabularies/amf/parser#lexicalPosition": {
+        "@type": "http://a.ml/vocabularies/amf/parser#Position",
+        "http://a.ml/vocabularies/amf/parser#start": {
+          "@type": "http://a.ml/vocabularies/amf/parser#Location",
+          "http://a.ml/vocabularies/amf/parser#line": 6,
+          "http://a.ml/vocabularies/amf/parser#column": 16
+        },
+        "http://a.ml/vocabularies/amf/parser#end": {
+          "@type": "http://a.ml/vocabularies/amf/parser#Location",
+          "http://a.ml/vocabularies/amf/parser#line": 6,
+          "http://a.ml/vocabularies/amf/parser#column": 16
+        }
+      }
+    }
+  ]
+}

amf-aml/shared/src/test/resources/vocabularies2/validations/vocabularies/parser-errors/property-term-with-null-entries.yaml

@@ -0,0 +1,6 @@
+#%Vocabulary 1.0
+vocabulary: Test Vocab
+base: ftp://some-url
+propertyTerms:
+  prop1:
+    displayName:

amf-aml/shared/src/test/scala/amf/testing/validation/VocabularyDefinitionValidationTest.scala

@@ -45,6 +45,14 @@ class VocabularyDefinitionValidationTest
     validate("vocabulary.json", None, "../../dialects/json/with-vocabulary")
   }
 
+  test("Property term parsing with null entries uses errorHandler") {
+    validate("property-term-with-null-entries.yaml", Some("property-term-with-null-entries.jsonld"), "parser-errors")
+  }
+
+  test("Class term parsing with null entries uses errorHandler") {
+    validate("class-term-with-null-entries.yaml", Some("class-term-with-null-entries.jsonld"), "parser-errors")
+  }
+
   protected def validate(vocabulary: String,
                          goldenReport: Option[String] = None,
                          path: String): Future[scalatest.Assertion] = {