Merge pull request #393 from aml-org/publish-aml-5.1.10-master

Publish amf-aml 5.1.10
aml-org · Sep 24, 2021 · ba33f9a · ba33f9a
2 parents c7745f5 + dabe55c
commit ba33f9a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/amf-validation/jvm/src/main/scala/amf/plugins/features/validation/JenaRdfModel.scala b/amf-validation/jvm/src/main/scala/amf/plugins/features/validation/JenaRdfModel.scala
@@ -20,11 +20,11 @@ class JenaRdfModel(val model: Model = ModelFactory.createDefaultModel()) extends
   override def addTriple(subject: String, predicate: String, objResource: String): RdfModel = {
     nodesCache = nodesCache - subject
     model.add(
-      model.createStatement(
-        checkAnon(subject),
-        model.createProperty(predicate),
-        checkAnon(objResource)
-      )
+        model.createStatement(
+            checkAnon(subject),
+            model.createProperty(predicate),
+            checkAnon(objResource)
+        )
     )
     this
   }
@@ -35,14 +35,14 @@ class JenaRdfModel(val model: Model = ModelFactory.createDefaultModel()) extends
                          objLiteralType: Option[String]): RdfModel = {
     nodesCache = nodesCache - subject
     model.add(
-      model.createStatement(
-        checkAnon(subject),
-        model.createProperty(predicate),
-        objLiteralType match {
-          case Some(typeId) => model.createTypedLiteral(objLiteralValue, typeId)
-          case None         => model.createLiteral(objLiteralValue)
-        }
-      )
+        model.createStatement(
+            checkAnon(subject),
+            model.createProperty(predicate),
+            objLiteralType match {
+              case Some(typeId) => model.createTypedLiteral(objLiteralValue, typeId)
+              case None         => model.createLiteral(objLiteralValue)
+            }
+        )
     )
     this
   }
@@ -98,19 +98,19 @@ class JenaRdfModel(val model: Model = ModelFactory.createDefaultModel()) extends
               val lit = statement.getObject.asLiteral()
               resourceProperties = resourceProperties.updated(predicate,
                                                               oldProps ++ Seq(
-                                                                Literal(
-                                                                  value = lit.getLexicalForm,
-                                                                  literalType = Some(lit.getDatatypeURI)
-                                                                )
+                                                                  Literal(
+                                                                      value = lit.getLexicalForm,
+                                                                      literalType = Some(lit.getDatatypeURI)
+                                                                  )
                                                               ))
             } else if (statement.getObject.isResource) {
               resourceProperties = resourceProperties.updated(
-                predicate,
-                oldProps ++ Seq(
-                  Uri(
-                    value = statement.getObject.asResource().getURI
+                  predicate,
+                  oldProps ++ Seq(
+                      Uri(
+                          value = statement.getObject.asResource().getURI
+                      )
                   )
-                )
               )
             }
           }
@@ -134,8 +134,6 @@ class JenaRdfModel(val model: Model = ModelFactory.createDefaultModel()) extends
         parser.lang(RDFLanguages.TURTLE)
       case "text/plain" =>
         parser.lang(RDFLanguages.NTRIPLES)
-      case "application/rdf+xml" =>
-        parser.lang(RDFLanguages.RDFXML)
       case _ =>
         throw new Exception(s"Unsupported RDF media type $mediaType")
     }

diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ val ivyLocal = Resolver.file("ivy", file(Path.userHome.absolutePath + "/.ivy2/lo
 
 name := "amf-aml"
 
-version in ThisBuild := "5.1.9"
+version in ThisBuild := "5.1.10"
 
 publish := {}