diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala index 53cd74bd1f..c1476ae921 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala @@ -189,7 +189,7 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol { val groupInfo: Group = AkkaHttpUtils.httpResponseToJson(response).fields("group").convertTo[Group] groupInfo.name should be("NewGroup") - groupInfo.descriptions should be(Seq(StringLiteralV2("NewGroupDescription", Some("en")))) + groupInfo.descriptions should be(Seq(StringLiteralV2.from("NewGroupDescription", Some("en")))) groupInfo.project should be(SharedTestDataADM.imagesProjectExternal) groupInfo.status should be(true) groupInfo.selfjoin should be(false) @@ -239,7 +239,7 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol { val groupInfo: Group = AkkaHttpUtils.httpResponseToJson(response).fields("group").convertTo[Group] groupInfo.name should be("UpdatedGroupName") - groupInfo.descriptions should be(Seq(StringLiteralV2("UpdatedGroupDescription", Some("en")))) + groupInfo.descriptions should be(Seq(StringLiteralV2.from("UpdatedGroupDescription", Some("en")))) groupInfo.project should be(SharedTestDataADM.imagesProjectExternal) groupInfo.status should be(true) groupInfo.selfjoin should be(false) @@ -268,7 +268,7 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol { val groupInfo: Group = AkkaHttpUtils.httpResponseToJson(response).fields("group").convertTo[Group] groupInfo.name should be("UpdatedGroupName") - groupInfo.descriptions should be(Seq(StringLiteralV2("UpdatedGroupDescription", Some("en")))) + groupInfo.descriptions should be(Seq(StringLiteralV2.from("UpdatedGroupDescription", Some("en")))) groupInfo.project should be(SharedTestDataADM.imagesProjectExternal) groupInfo.status should be(false) groupInfo.selfjoin should be(false) @@ -315,7 +315,7 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol { val groupInfo: Group = AkkaHttpUtils.httpResponseToJson(response).fields("group").convertTo[Group] groupInfo.name should be("UpdatedGroupName") - groupInfo.descriptions should be(Seq(StringLiteralV2("UpdatedGroupDescription", Some("en")))) + groupInfo.descriptions should be(Seq(StringLiteralV2.from("UpdatedGroupDescription", Some("en")))) groupInfo.project should be(SharedTestDataADM.imagesProjectExternal) groupInfo.status should be(true) groupInfo.selfjoin should be(false) diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala index 17c0fdc664..9f10c6cd79 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala @@ -18,7 +18,6 @@ import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration.* -import dsp.valueobjects.V2 import org.knora.webapi.E2ESpec import org.knora.webapi.IRI import org.knora.webapi.e2e.ClientTestDataCollector @@ -27,6 +26,7 @@ import org.knora.webapi.e2e.TestDataFilePath import org.knora.webapi.messages.admin.responder.projectsmessages.* import org.knora.webapi.messages.admin.responder.usersmessages.UsersADMJsonProtocol.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.util.rdf.RdfModel import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.domain.model.User @@ -222,7 +222,7 @@ class ProjectsADME2ESpec extends E2ESpec with ProjectsADMJsonProtocol { result.shortname should be("newprojectWithIri") result.longname should be(Some("new project with a custom IRI")) result.keywords should be(Seq("projectIRI")) - result.description should be(Seq(V2.StringLiteralV2("a project created with a custom IRI", Some("en")))) + result.description should be(Seq(StringLiteralV2.from("a project created with a custom IRI", Some("en")))) clientTestDataCollector.addFile( TestDataFileContent( @@ -303,7 +303,7 @@ class ProjectsADME2ESpec extends E2ESpec with ProjectsADMJsonProtocol { result.shortname should be("newproject") result.shortcode should be("1111") result.longname should be(Some("project longname")) - result.description should be(Seq(V2.StringLiteralV2(value = "project description", language = Some("en")))) + result.description should be(Seq(StringLiteralV2.from(value = "project description", language = Some("en")))) result.keywords should be(Seq("keywords")) result.logo should be(Some("/fu/bar/baz.jpg")) result.status should be(true) @@ -450,7 +450,7 @@ class ProjectsADME2ESpec extends E2ESpec with ProjectsADMJsonProtocol { result.shortcode should be("1111") result.longname should be(Some("updated project longname")) result.description should be( - Seq(V2.StringLiteralV2(value = "updated project description", language = Some("en"))), + Seq(StringLiteralV2.from(value = "updated project description", language = Some("en"))), ) result.keywords.sorted should be(Seq("updated", "keywords").sorted) result.logo should be(Some("/fu/bar/baz-updated.jpg")) @@ -498,8 +498,8 @@ class ProjectsADME2ESpec extends E2ESpec with ProjectsADMJsonProtocol { val result: Project = AkkaHttpUtils.httpResponseToJson(response).fields("project").convertTo[Project] result.description.size should be(2) - result.description should contain(V2.StringLiteralV2(value = "Test Project", language = Some("en"))) - result.description should contain(V2.StringLiteralV2(value = "Test Project", language = Some("se"))) + result.description should contain(StringLiteralV2.from(value = "Test Project", language = Some("en"))) + result.description should contain(StringLiteralV2.from(value = "Test Project", language = Some("se"))) clientTestDataCollector.addFile( TestDataFileContent( diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala index 09fd2aaa39..bbad01ccae 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala @@ -100,7 +100,7 @@ class CreateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco val labels: Seq[StringLiteralV2] = listInfo.labels.stringLiterals labels.size should be(1) - labels.head should be(StringLiteralV2(value = "New list with a custom IRI", language = Some("en"))) + labels.head should be(StringLiteralV2.from(value = "New list with a custom IRI", language = Some("en"))) clientTestDataCollector.addFile( TestDataFileContent( @@ -232,7 +232,7 @@ class CreateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco val labels: Seq[StringLiteralV2] = listInfo.labels.stringLiterals labels.size should be(1) - labels.head should be(StringLiteralV2(value = "Neue Liste", language = Some("de"))) + labels.head should be(StringLiteralV2.from(value = "Neue Liste", language = Some("de"))) val comments = receivedList.listinfo.comments.stringLiterals comments.isEmpty should be(false) @@ -394,12 +394,12 @@ class CreateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco // check labels val labels: Seq[StringLiteralV2] = childNodeInfo.labels.stringLiterals labels.size should be(1) - labels.sorted should be(Seq(StringLiteralV2(value = label, language = Some("en")))) + labels.sorted should be(Seq(StringLiteralV2.from(value = label, language = Some("en")))) // check comments val comments = childNodeInfo.comments.stringLiterals comments.size should be(1) - comments.sorted should be(Seq(StringLiteralV2(value = comment, language = Some("en")))) + comments.sorted should be(Seq(StringLiteralV2.from(value = comment, language = Some("en")))) // check position val position = childNodeInfo.position @@ -463,12 +463,12 @@ class CreateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco // check labels val labels: Seq[StringLiteralV2] = childNodeInfo.labels.stringLiterals labels.size should be(1) - labels.sorted should be(Seq(StringLiteralV2(value = label, language = Some("en")))) + labels.sorted should be(Seq(StringLiteralV2.from(value = label, language = Some("en")))) // check comments val comments = childNodeInfo.comments.stringLiterals comments.size should be(1) - comments.sorted should be(Seq(StringLiteralV2(value = comment, language = Some("en")))) + comments.sorted should be(Seq(StringLiteralV2.from(value = comment, language = Some("en")))) // check position val position = childNodeInfo.position @@ -538,12 +538,12 @@ class CreateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco // check labels val labels: Seq[StringLiteralV2] = childNodeInfo.labels.stringLiterals labels.size should be(1) - labels.sorted should be(Seq(StringLiteralV2(value = label, language = Some("en")))) + labels.sorted should be(Seq(StringLiteralV2.from(value = label, language = Some("en")))) // check comments val comments = childNodeInfo.comments.stringLiterals comments.size should be(1) - comments.sorted should be(Seq(StringLiteralV2(value = comment, language = Some("en")))) + comments.sorted should be(Seq(StringLiteralV2.from(value = comment, language = Some("en")))) // check position val position = childNodeInfo.position @@ -609,12 +609,12 @@ class CreateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco // check labels val labels: Seq[StringLiteralV2] = childNodeInfo.labels.stringLiterals labels.size should be(1) - labels.sorted should be(Seq(StringLiteralV2(value = label, language = Some("en")))) + labels.sorted should be(Seq(StringLiteralV2.from(value = label, language = Some("en")))) // check comments val comments = childNodeInfo.comments.stringLiterals comments.size should be(1) - comments.sorted should be(Seq(StringLiteralV2(value = comment, language = Some("en")))) + comments.sorted should be(Seq(StringLiteralV2.from(value = comment, language = Some("en")))) // check position val position = childNodeInfo.position diff --git a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala index a607cc955d..98513443c1 100644 --- a/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala +++ b/integration/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala @@ -148,7 +148,7 @@ class UpdateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco val labels: Seq[StringLiteralV2] = receivedListInfo.labels.stringLiterals labels.size should be(1) - labels should contain(StringLiteralV2(value = "nya märkningen", language = Some("se"))) + labels should contain(StringLiteralV2.from(value = "nya märkningen", language = Some("se"))) clientTestDataCollector.addFile( TestDataFileContent( @@ -193,7 +193,7 @@ class UpdateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco val comments: Seq[StringLiteralV2] = receivedListInfo.comments.stringLiterals comments.size should be(1) - comments should contain(StringLiteralV2(value = "nya kommentarer", language = Some("se"))) + comments should contain(StringLiteralV2.from(value = "nya kommentarer", language = Some("se"))) clientTestDataCollector.addFile( TestDataFileContent( @@ -299,7 +299,7 @@ class UpdateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco AkkaHttpUtils.httpResponseToJson(response).fields("nodeinfo").convertTo[ListChildNodeInfoADM] val labels: Seq[StringLiteralV2] = receivedNodeInfo.labels.stringLiterals labels.size should be(1) - labels should contain(StringLiteralV2(value = "nya märkningen för nod", language = Some("se"))) + labels should contain(StringLiteralV2.from(value = "nya märkningen för nod", language = Some("se"))) clientTestDataCollector.addFile( TestDataFileContent( @@ -344,7 +344,7 @@ class UpdateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtoco AkkaHttpUtils.httpResponseToJson(response).fields("nodeinfo").convertTo[ListChildNodeInfoADM] val comments: Seq[StringLiteralV2] = receivedNodeInfo.comments.stringLiterals comments.size should be(1) - comments should contain(StringLiteralV2(value = "nya kommentarer för nod", language = Some("se"))) + comments should contain(StringLiteralV2.from(value = "nya kommentarer för nod", language = Some("se"))) clientTestDataCollector.addFile( TestDataFileContent( diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala index 8dba8e16c9..db7b43df60 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala @@ -26,13 +26,13 @@ class ListsMessagesADMSpec extends CoreSpec with ListADMJsonProtocol { projectIri = "http://rdfh.ch/projects/00FF", labels = StringLiteralSequenceV2( Vector( - StringLiteralV2("Title", Some("en")), - StringLiteralV2("Titel", Some("de")), - StringLiteralV2("Titre", Some("fr")), + StringLiteralV2.from("Title", Some("en")), + StringLiteralV2.from("Titel", Some("de")), + StringLiteralV2.from("Titre", Some("fr")), ), ), comments = StringLiteralSequenceV2( - Vector(StringLiteralV2("Hierarchisches Stichwortverzeichnis / Signatur der Bilder", Some("de"))), + Vector(StringLiteralV2.from("Hierarchisches Stichwortverzeichnis / Signatur der Bilder", Some("de"))), ), ) @@ -49,7 +49,7 @@ class ListsMessagesADMSpec extends CoreSpec with ListADMJsonProtocol { val listNodeInfo = ListChildNodeInfoADM( id = "http://rdfh.ch/lists/00FF/526f26ed04", name = Some("sommer"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("Sommer"))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("Sommer", None))), comments = StringLiteralSequenceV2.empty, position = 0, hasRootNode = "http://rdfh.ch/lists/00FF/d19af9ab", @@ -68,7 +68,7 @@ class ListsMessagesADMSpec extends CoreSpec with ListADMJsonProtocol { val listNode: ListNodeADM = ListChildNodeADM( id = "http://rdfh.ch/lists/00FF/526f26ed04", name = Some("sommer"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("Sommer"))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("Sommer", None))), comments = StringLiteralSequenceV2.empty, children = Seq.empty[ListChildNodeADM], position = 0, diff --git a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala index f3cb50847b..2c44c9d640 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala @@ -7,9 +7,9 @@ package org.knora.webapi.messages.admin.responder.projectsmessages import dsp.errors.BadRequestException import dsp.errors.OntologyConstraintException -import dsp.valueobjects.V2 import org.knora.webapi.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.sharedtestdata.SharedTestDataADM /** @@ -24,7 +24,7 @@ class ProjectsMessagesADMSpec extends CoreSpec { shortcode = "1111", shortname = "shortname", longname = None, - description = Seq.empty[V2.StringLiteralV2], + description = Seq.empty[StringLiteralV2], keywords = Seq.empty[String], logo = None, ontologies = Seq.empty[IRI], diff --git a/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala b/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala index 6aa4c717ee..8f15661055 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala @@ -19,9 +19,9 @@ class TriplestoreMessagesSpec extends AnyWordSpecLike with Matchers with ListADM "Conversion from case class to JSON and back" should { - "work for a 'StringLiteralV2' without language tag" in { + "work for a 'StringLiteralV2' without language iso" in { - val string = StringLiteralV2("stringwithoutlang", None) + val string = StringLiteralV2.from("stringwithoutlang", None) val json = string.toJson.compactPrint json should be("{\"value\":\"stringwithoutlang\"}") @@ -31,9 +31,9 @@ class TriplestoreMessagesSpec extends AnyWordSpecLike with Matchers with ListADM converted should be(string) } - "work for a 'StringLiteralV2' with language tag" in { + "work for a 'StringLiteralV2' with language iso" in { - val string = StringLiteralV2("stringwithlang", Some("de")) + val string = StringLiteralV2.from("stringwithlang", Some("de")) val json = string.toJson.compactPrint json should be("{\"value\":\"stringwithlang\",\"language\":\"de\"}") @@ -45,9 +45,9 @@ class TriplestoreMessagesSpec extends AnyWordSpecLike with Matchers with ListADM } "Creating a `StringLiteralV2`" should { - "fail when language tag is given but value is missing" in { + "fail when language iso is given but value is missing" in { val caught = intercept[BadRequestException]( - StringLiteralV2("", Some("de")), + StringLiteralV2.from("", Some("de")), ) assert(caught.getMessage === "String value is missing.") } diff --git a/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala b/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala index 3e6719aef5..f20d513585 100644 --- a/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala @@ -203,15 +203,15 @@ object InputOntologyV2Spec { "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, objects = Seq( - StringLiteralV2("has name", Some("en")), - StringLiteralV2("hat Namen", Some("de")), + StringLiteralV2.from("has name", Some("en")), + StringLiteralV2.from("hat Namen", Some("de")), ), ), "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, objects = Seq( - StringLiteralV2("The name of a 'Thing'", Some("en")), - StringLiteralV2("Der Name eines Dinges", Some("de")), + StringLiteralV2.from("The name of a 'Thing'", Some("en")), + StringLiteralV2.from("Der Name eines Dinges", Some("de")), ), ), ), @@ -234,11 +234,11 @@ object InputOntologyV2Spec { ), "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, - objects = Seq(StringLiteralV2("wild thing", Some("en"))), + objects = Seq(StringLiteralV2.from("wild thing", Some("en"))), ), "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, - objects = Seq(StringLiteralV2("A thing that is wild", Some("en"))), + objects = Seq(StringLiteralV2.from("A thing that is wild", Some("en"))), ), ), classIri = "http://0.0.0.0:3333/ontology/0001/anything/v2#WildThing".toSmartIri, diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala index 8a7ab066b4..fc4dfab2e6 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala @@ -10,7 +10,6 @@ import zio.* import java.util.UUID import dsp.errors.* -import dsp.valueobjects.V2 import org.knora.webapi.* import org.knora.webapi.messages.admin.responder.usersmessages.* import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @@ -69,7 +68,7 @@ class GroupsResponderADMSpec extends CoreSpec { descriptions = GroupDescriptions .unsafeFrom( Seq( - V2.StringLiteralV2( + StringLiteralV2.from( value = """NewGroupDescription with "quotes" and """, language = Some("en"), ), @@ -87,7 +86,7 @@ class GroupsResponderADMSpec extends CoreSpec { val newGroupInfo = response.group newGroupInfo.name should equal("NewGroup") newGroupInfo.descriptions should equal( - Seq(StringLiteralV2("""NewGroupDescription with "quotes" and """, Some("en"))), + Seq(StringLiteralV2.from("""NewGroupDescription with "quotes" and """, Some("en"))), ) newGroupInfo.project should equal(imagesProject) newGroupInfo.status should equal(true) @@ -106,7 +105,7 @@ class GroupsResponderADMSpec extends CoreSpec { id = Some(GroupIri.unsafeFrom(imagesReviewerGroup.id)), name = groupName, descriptions = GroupDescriptions - .unsafeFrom(Seq(V2.StringLiteralV2(value = "NewGroupDescription", language = Some("en")))), + .unsafeFrom(Seq(StringLiteralV2.from(value = "NewGroupDescription", language = Some("en")))), project = ProjectIri.unsafeFrom(imagesProjectIri), status = GroupStatus.active, selfjoin = GroupSelfJoin.disabled, @@ -130,7 +129,7 @@ class GroupsResponderADMSpec extends CoreSpec { name = Some(GroupName.unsafeFrom("UpdatedGroupName")), descriptions = Some( GroupDescriptions.unsafeFrom( - Seq(V2.StringLiteralV2("""UpdatedDescription with "quotes" and """, Some("en"))), + Seq(StringLiteralV2.from("""UpdatedDescription with "quotes" and """, Some("en"))), ), ), status = Some(GroupStatus.active), @@ -143,7 +142,7 @@ class GroupsResponderADMSpec extends CoreSpec { val updatedGroupInfo = response.group updatedGroupInfo.name should equal("UpdatedGroupName") updatedGroupInfo.descriptions should equal( - Seq(StringLiteralV2("""UpdatedDescription with "quotes" and """, Some("en"))), + Seq(StringLiteralV2.from("""UpdatedDescription with "quotes" and """, Some("en"))), ) updatedGroupInfo.project should equal(imagesProject) updatedGroupInfo.status should equal(true) @@ -160,7 +159,7 @@ class GroupsResponderADMSpec extends CoreSpec { name = Some(GroupName.unsafeFrom("UpdatedGroupName")), descriptions = Some( GroupDescriptions - .unsafeFrom(Seq(V2.StringLiteralV2(value = "UpdatedDescription", language = Some("en")))), + .unsafeFrom(Seq(StringLiteralV2.from(value = "UpdatedDescription", language = Some("en")))), ), status = Some(GroupStatus.active), selfjoin = Some(GroupSelfJoin.disabled), @@ -185,7 +184,7 @@ class GroupsResponderADMSpec extends CoreSpec { name = Some(groupName), descriptions = Some( GroupDescriptions - .unsafeFrom(Seq(V2.StringLiteralV2(value = "UpdatedDescription", language = Some("en")))), + .unsafeFrom(Seq(StringLiteralV2.from(value = "UpdatedDescription", language = Some("en")))), ), status = Some(GroupStatus.active), selfjoin = Some(GroupSelfJoin.disabled), diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala index 4936b8b67b..f552bf74e8 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/ListsResponderSpec.scala @@ -13,7 +13,6 @@ import dsp.errors.BadRequestException import dsp.errors.DuplicateValueException import dsp.errors.UpdateNotPerformedException import dsp.valueobjects.Iri -import dsp.valueobjects.V2 import org.knora.webapi.* import org.knora.webapi.messages.admin.responder.listsmessages.* import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject @@ -125,8 +124,8 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { ListsResponder.listCreateRootNode( ListCreateRootNodeRequest( id = None, - Comments.unsafeFrom(Seq(V2.StringLiteralV2(value = "Neuer Kommentar", language = Some("de")))), - Labels.unsafeFrom(Seq(V2.StringLiteralV2(value = "Neue Liste", language = Some("de")))), + Comments.unsafeFrom(Seq(StringLiteralV2.from(value = "Neuer Kommentar", language = Some("de")))), + Labels.unsafeFrom(Seq(StringLiteralV2.from(value = "Neue Liste", language = Some("de")))), Some(ListName.unsafeFrom("neuelistename")), ProjectIri.unsafeFrom(imagesProjectIri), ), @@ -141,7 +140,7 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { val labels: Seq[StringLiteralV2] = listInfo.labels.stringLiterals labels.size should be(1) - labels.head should be(StringLiteralV2(value = "Neue Liste", language = Some("de"))) + labels.head should be(StringLiteralV2.from(value = "Neue Liste", language = Some("de"))) val comments: Seq[StringLiteralV2] = listInfo.comments.stringLiterals comments.isEmpty should be(false) @@ -161,8 +160,8 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { ListsResponder.listCreateRootNode( ListCreateRootNodeRequest( id = None, - Comments.unsafeFrom(Seq(V2.StringLiteralV2(commentWithSpecialCharacter, language = Some("de")))), - Labels.unsafeFrom(Seq(V2.StringLiteralV2(labelWithSpecialCharacter, language = Some("de")))), + Comments.unsafeFrom(Seq(StringLiteralV2.from(commentWithSpecialCharacter, language = Some("de")))), + Labels.unsafeFrom(Seq(StringLiteralV2.from(labelWithSpecialCharacter, language = Some("de")))), Some(ListName.unsafeFrom(nameWithSpecialCharacter)), ProjectIri.unsafeFrom(imagesProjectIri), ), @@ -198,8 +197,8 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { labels = Some( Labels.unsafeFrom( Seq( - V2.StringLiteralV2(value = "Neue geänderte Liste", language = Some("de")), - V2.StringLiteralV2(value = "Changed List", language = Some("en")), + StringLiteralV2.from(value = "Neue geänderte Liste", language = Some("de")), + StringLiteralV2.from(value = "Changed List", language = Some("en")), ), ), ), @@ -207,8 +206,8 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { Comments .unsafeFrom( Seq( - V2.StringLiteralV2(value = "Neuer Kommentar", language = Some("de")), - V2.StringLiteralV2(value = "New Comment", language = Some("en")), + StringLiteralV2.from(value = "Neuer Kommentar", language = Some("de")), + StringLiteralV2.from(value = "New Comment", language = Some("en")), ), ), ), @@ -226,8 +225,8 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { labels.size should be(2) labels.sorted should be( Seq( - StringLiteralV2(value = "Neue geänderte Liste", language = Some("de")), - StringLiteralV2(value = "Changed List", language = Some("en")), + StringLiteralV2.from(value = "Neue geänderte Liste", language = Some("de")), + StringLiteralV2.from(value = "Changed List", language = Some("en")), ).sorted, ) @@ -235,8 +234,8 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { comments.size should be(2) comments.sorted should be( Seq( - StringLiteralV2(value = "Neuer Kommentar", language = Some("de")), - StringLiteralV2(value = "New Comment", language = Some("en")), + StringLiteralV2.from(value = "Neuer Kommentar", language = Some("de")), + StringLiteralV2.from(value = "New Comment", language = Some("en")), ).sorted, ) } @@ -263,11 +262,11 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { id = None, Some( Comments.unsafeFrom( - Seq(V2.StringLiteralV2(value = "New First Child List Node Comment", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New First Child List Node Comment", language = Some("en"))), ), ), Labels.unsafeFrom( - Seq(V2.StringLiteralV2(value = "New First Child List Node Value", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New First Child List Node Value", language = Some("en"))), ), Some(ListName.unsafeFrom("first")), ListIri.unsafeFrom(newListIri.get), @@ -289,14 +288,14 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { val labels: Seq[StringLiteralV2] = childNodeInfo.labels.stringLiterals labels.size should be(1) labels.sorted should be( - Seq(StringLiteralV2(value = "New First Child List Node Value", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New First Child List Node Value", language = Some("en"))), ) // check comments val comments = childNodeInfo.comments.stringLiterals comments.size should be(1) comments.sorted should be( - Seq(StringLiteralV2(value = "New First Child List Node Comment", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New First Child List Node Comment", language = Some("en"))), ) // check position @@ -317,11 +316,11 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { id = None, Some( Comments.unsafeFrom( - Seq(V2.StringLiteralV2(value = "New Second Child List Node Comment", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Second Child List Node Comment", language = Some("en"))), ), ), Labels.unsafeFrom( - Seq(V2.StringLiteralV2(value = "New Second Child List Node Value", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Second Child List Node Value", language = Some("en"))), ), Some(ListName.unsafeFrom("second")), ListIri.unsafeFrom(newListIri.get), @@ -344,14 +343,14 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { val labels: Seq[StringLiteralV2] = childNodeInfo.labels.stringLiterals labels.size should be(1) labels.sorted should be( - Seq(StringLiteralV2(value = "New Second Child List Node Value", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Second Child List Node Value", language = Some("en"))), ) // check comments val comments = childNodeInfo.comments.stringLiterals comments.size should be(1) comments.sorted should be( - Seq(StringLiteralV2(value = "New Second Child List Node Comment", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Second Child List Node Comment", language = Some("en"))), ) // check position @@ -372,11 +371,11 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { id = None, Some( Comments.unsafeFrom( - Seq(V2.StringLiteralV2(value = "New Third Child List Node Comment", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Third Child List Node Comment", language = Some("en"))), ), ), Labels.unsafeFrom( - Seq(V2.StringLiteralV2(value = "New Third Child List Node Value", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Third Child List Node Value", language = Some("en"))), ), Some(ListName.unsafeFrom("third")), ListIri.unsafeFrom(secondChildIri.get), @@ -399,14 +398,14 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { val labels: Seq[StringLiteralV2] = childNodeInfo.labels.stringLiterals labels.size should be(1) labels.sorted should be( - Seq(StringLiteralV2(value = "New Third Child List Node Value", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Third Child List Node Value", language = Some("en"))), ) // check comments val comments = childNodeInfo.comments.stringLiterals comments.size should be(1) comments.sorted should be( - Seq(StringLiteralV2(value = "New Third Child List Node Comment", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Third Child List Node Comment", language = Some("en"))), ) // check position @@ -429,11 +428,11 @@ class ListsResponderSpec extends CoreSpec with ImplicitSender { id = None, Some( Comments.unsafeFrom( - Seq(V2.StringLiteralV2(value = "New Fourth Child List Node Comment", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Fourth Child List Node Comment", language = Some("en"))), ), ), Labels.unsafeFrom( - Seq(V2.StringLiteralV2(value = "New Fourth Child List Node Value", language = Some("en"))), + Seq(StringLiteralV2.from(value = "New Fourth Child List Node Value", language = Some("en"))), ), Some(ListName.unsafeFrom("fourth")), ListIri.unsafeFrom(newListIri.get), diff --git a/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala index 67cd052179..2d9053f587 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala @@ -19,12 +19,12 @@ import dsp.errors.BadRequestException import dsp.errors.DuplicateValueException import dsp.errors.NotFoundException import dsp.valueobjects.Iri -import dsp.valueobjects.V2 import org.knora.webapi.* import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.permissionsmessages.* import org.knora.webapi.messages.admin.responder.projectsmessages.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.routing.UnsafeZioRun import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectCreateRequest @@ -175,7 +175,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { shortcode = Shortcode.unsafeFrom(shortcode), longname = Some(Longname.unsafeFrom("project longname")), description = - List(Description.unsafeFrom(V2.StringLiteralV2(value = "project description", language = Some("en")))), + List(Description.unsafeFrom(StringLiteralV2.from(value = "project description", language = Some("en")))), keywords = List("keywords").map(Keyword.unsafeFrom), logo = Some(Logo.unsafeFrom("/fu/bar/baz.jpg")), status = Status.Active, @@ -190,7 +190,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { received.project.shortcode should be(shortcode.toUpperCase) // upper case received.project.longname should contain("project longname") received.project.description should be( - Seq(V2.StringLiteralV2(value = "project description", language = Some("en"))), + Seq(StringLiteralV2.from(value = "project description", language = Some("en"))), ) newProjectIri.set(received.project.id) @@ -264,7 +264,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { shortcode = Shortcode.unsafeFrom("1112"), longname = Some(Longname.unsafeFrom("project longname")), description = - List(Description.unsafeFrom(V2.StringLiteralV2(value = "project description", language = Some("en")))), + List(Description.unsafeFrom(StringLiteralV2.from(value = "project description", language = Some("en")))), keywords = List("keywords").map(Keyword.unsafeFrom), logo = Some(Logo.unsafeFrom("/fu/bar/baz.jpg")), status = Status.Active, @@ -279,7 +279,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { received.project.shortcode should be("1112") received.project.longname should contain("project longname") received.project.description should be( - Seq(V2.StringLiteralV2(value = "project description", language = Some("en"))), + Seq(StringLiteralV2.from(value = "project description", language = Some("en"))), ) } @@ -295,7 +295,9 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { shortcode = Shortcode.unsafeFrom("1312"), longname = Some(Longname.unsafeFrom(longnameWithSpecialCharacter)), description = List( - Description.unsafeFrom(V2.StringLiteralV2(value = descriptionWithSpecialCharacter, language = Some("en"))), + Description.unsafeFrom( + StringLiteralV2.from(value = descriptionWithSpecialCharacter, language = Some("en")), + ), ), keywords = List(keywordWithSpecialCharacter).map(Keyword.unsafeFrom), logo = Some(Logo.unsafeFrom("/fu/bar/baz.jpg")), @@ -310,7 +312,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { received.project.longname should contain(Iri.fromSparqlEncodedString(longnameWithSpecialCharacter)) received.project.description should be( Seq( - V2.StringLiteralV2( + StringLiteralV2.from( value = Iri.fromSparqlEncodedString(descriptionWithSpecialCharacter), language = Some("en"), ), @@ -326,7 +328,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { shortcode = Shortcode.unsafeFrom("111C"), longname = Some(Longname.unsafeFrom("project longname")), description = - List(Description.unsafeFrom(V2.StringLiteralV2(value = "description", language = Some("en")))), + List(Description.unsafeFrom(StringLiteralV2.from(value = "description", language = Some("en")))), keywords = List("keywords").map(Keyword.unsafeFrom), logo = Some(Logo.unsafeFrom("/fu/bar/baz.jpg")), status = Status.Active, @@ -345,7 +347,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { shortcode = Shortcode.unsafeFrom("111C"), longname = Some(Longname.unsafeFrom("project longname")), description = - List(Description.unsafeFrom(V2.StringLiteralV2(value = "description", language = Some("en")))), + List(Description.unsafeFrom(StringLiteralV2.from(value = "description", language = Some("en")))), keywords = List("keywords").map(Keyword.unsafeFrom), logo = Some(Logo.unsafeFrom("/fu/bar/baz.jpg")), status = Status.Active, @@ -362,7 +364,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { val updatedLongname = Longname.unsafeFrom("updated project longname") val updatedDescription = List( Description.unsafeFrom( - V2.StringLiteralV2("""updated project description with "quotes" and """, Some("en")), + StringLiteralV2.from("""updated project description with "quotes" and """, Some("en")), ), ) val updatedKeywords = List("updated", "keywords").map(Keyword.unsafeFrom) @@ -390,7 +392,7 @@ class ProjectsResponderADMSpec extends CoreSpec with ImplicitSender { received.project.longname should be(Some("updated project longname")) received.project.description should be( Seq( - V2.StringLiteralV2( + StringLiteralV2.from( value = """updated project description with "quotes" and """, language = Some("en"), ), diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala index f130e92c1e..7c03242a07 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala @@ -30,7 +30,7 @@ class ListsResponderV2SpecFullData { id = "http://rdfh.ch/lists/0001/treeList11", labels = StringLiteralSequenceV2( stringLiterals = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "Tree list node 11", language = Some("en"), ), diff --git a/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala b/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala index 2431ce8a32..9640f54a4f 100644 --- a/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala @@ -689,15 +689,15 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("has name", Some("en")), - StringLiteralV2("hat Namen", Some("de")), + StringLiteralV2.from("has name", Some("en")), + StringLiteralV2.from("hat Namen", Some("de")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("The name of a Thing", Some("en")), - StringLiteralV2("Der Name eines Dinges", Some("de")), + StringLiteralV2.from("The name of a Thing", Some("en")), + StringLiteralV2.from("Der Name eines Dinges", Some("de")), ), ), ), @@ -756,15 +756,15 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("has name", Some("en")), - StringLiteralV2("hat Namen", Some("de")), + StringLiteralV2.from("has name", Some("en")), + StringLiteralV2.from("hat Namen", Some("de")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("The name of a Thing", Some("en")), - StringLiteralV2("Der Name eines Dinges", Some("de")), + StringLiteralV2.from("The name of a Thing", Some("en")), + StringLiteralV2.from("Der Name eines Dinges", Some("de")), ), ), ), @@ -846,13 +846,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("has interesting thing", Some("en")), + StringLiteralV2.from("has interesting thing", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("an interesting Thing", Some("en")), + StringLiteralV2.from("an interesting Thing", Some("en")), ), ), ), @@ -965,11 +965,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("Comic Book", Some("en"))), + objects = Seq(StringLiteralV2.from("Comic Book", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A comic book", Some("en"))), + objects = Seq(StringLiteralV2.from("A comic book", Some("en"))), ), ), directCardinalities = Map(), @@ -1007,11 +1007,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("Comic Author", Some("en"))), + objects = Seq(StringLiteralV2.from("Comic Author", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A comic author", Some("en"))), + objects = Seq(StringLiteralV2.from("A comic author", Some("en"))), ), ), directCardinalities = Map(), @@ -1058,13 +1058,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("Comic author", Some("en")), + StringLiteralV2.from("Comic author", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("A comic author of a comic book", Some("en")), + StringLiteralV2.from("A comic author of a comic book", Some("en")), ), ), ), @@ -1169,13 +1169,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1218,13 +1218,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1267,13 +1267,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1316,13 +1316,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1365,13 +1365,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1414,13 +1414,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1466,13 +1466,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1519,13 +1519,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1568,13 +1568,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1617,13 +1617,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1666,13 +1666,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1715,13 +1715,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1764,13 +1764,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1813,13 +1813,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1862,13 +1862,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1911,13 +1911,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -1960,13 +1960,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -2010,13 +2010,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -2043,9 +2043,9 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val propertyIri = AnythingOntologyIri.makeEntityIri("hasName") val newObjects = Seq( - StringLiteralV2("has name", Some("en")), - StringLiteralV2("a nom", Some("fr")), - StringLiteralV2("hat Namen", Some("de")), + StringLiteralV2.from("has name", Some("en")), + StringLiteralV2.from("a nom", Some("fr")), + StringLiteralV2.from("hat Namen", Some("de")), ) appActor ! ChangePropertyLabelsOrCommentsRequestV2( @@ -2068,9 +2068,9 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val propertyIri = AnythingOntologyIri.makeEntityIri("hasName") val newObjects = Seq( - StringLiteralV2("has name", Some("en")), - StringLiteralV2("a nom", Some("fr")), - StringLiteralV2("hat Namen", Some("de")), + StringLiteralV2.from("has name", Some("en")), + StringLiteralV2.from("a nom", Some("fr")), + StringLiteralV2.from("hat Namen", Some("de")), ) appActor ! ChangePropertyLabelsOrCommentsRequestV2( @@ -2103,9 +2103,9 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val propertyIri = AnythingOntologyIri.makeEntityIri("hasName") val newObjects = Seq( - StringLiteralV2("has name", Some("en")), - StringLiteralV2("a nom", Some("fr")), - StringLiteralV2("hat Namen", Some("de")), + StringLiteralV2.from("has name", Some("en")), + StringLiteralV2.from("a nom", Some("fr")), + StringLiteralV2.from("hat Namen", Some("de")), ) appActor ! ChangePropertyLabelsOrCommentsRequestV2( @@ -2139,12 +2139,12 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val propertyIri = AnythingOntologyIri.makeEntityIri("hasName") val newObjects = Seq( - StringLiteralV2("The name of a Thing", Some("en")), - StringLiteralV2( + StringLiteralV2.from("The name of a Thing", Some("en")), + StringLiteralV2.from( "Le nom d\\'une chose", Some("fr"), ), // This is SPARQL-escaped as it would be if taken from a JSON-LD request. - StringLiteralV2("Der Name eines Dinges", Some("de")), + StringLiteralV2.from("Der Name eines Dinges", Some("de")), ) appActor ! ChangePropertyLabelsOrCommentsRequestV2( @@ -2167,17 +2167,17 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val propertyIri = AnythingOntologyIri.makeEntityIri("hasName") val newObjects = Seq( - StringLiteralV2("The name of a Thing", Some("en")), - StringLiteralV2( + StringLiteralV2.from("The name of a Thing", Some("en")), + StringLiteralV2.from( "Le nom d\\'une chose", Some("fr"), ), // This is SPARQL-escaped as it would be if taken from a JSON-LD request. - StringLiteralV2("Der Name eines Dinges", Some("de")), + StringLiteralV2.from("Der Name eines Dinges", Some("de")), ) // Make an unescaped copy of the new comments, because this is how we will receive them in the API response. val newObjectsUnescaped = newObjects.map { case StringLiteralV2(text, lang) => - StringLiteralV2(Iri.fromSparqlEncodedString(text), lang) + StringLiteralV2.from(Iri.fromSparqlEncodedString(text), lang) } appActor ! ChangePropertyLabelsOrCommentsRequestV2( @@ -2210,17 +2210,17 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val propertyIri = AnythingOntologyIri.makeEntityIri("hasName") val newObjects = Seq( - StringLiteralV2("The name of a Thing", Some("en")), - StringLiteralV2( + StringLiteralV2.from("The name of a Thing", Some("en")), + StringLiteralV2.from( "Le nom d\\'une chose", Some("fr"), ), // This is SPARQL-escaped as it would be if taken from a JSON-LD request. - StringLiteralV2("Der Name eines Dinges", Some("de")), + StringLiteralV2.from("Der Name eines Dinges", Some("de")), ) // Make an unescaped copy of the new comments, because this is how we will receive them in the API response. val newObjectsUnescaped = newObjects.map { case StringLiteralV2(text, lang) => - StringLiteralV2(Iri.fromSparqlEncodedString(text), lang) + StringLiteralV2.from(Iri.fromSparqlEncodedString(text), lang) } appActor ! ChangePropertyLabelsOrCommentsRequestV2( @@ -2410,11 +2410,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("wild thing", Some("en"))), + objects = Seq(StringLiteralV2.from("wild thing", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A thing that is wild", Some("en"))), + objects = Seq(StringLiteralV2.from("A thing that is wild", Some("en"))), ), ), directCardinalities = Map( @@ -2454,11 +2454,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("invalid thing", Some("en"))), + objects = Seq(StringLiteralV2.from("invalid thing", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A thing that is invalid", Some("en"))), + objects = Seq(StringLiteralV2.from("A thing that is invalid", Some("en"))), ), ), directCardinalities = Map( @@ -2497,11 +2497,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("wild thing", Some("en"))), + objects = Seq(StringLiteralV2.from("wild thing", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A thing that is wild", Some("en"))), + objects = Seq(StringLiteralV2.from("A thing that is wild", Some("en"))), ), ), directCardinalities = Map( @@ -2536,11 +2536,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("thing with cardinalities", Some("en"))), + objects = Seq(StringLiteralV2.from("thing with cardinalities", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A thing that has cardinalities", Some("en"))), + objects = Seq(StringLiteralV2.from("A thing that has cardinalities", Some("en"))), ), ), directCardinalities = Map( @@ -2591,11 +2591,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("Thing as part", Some("en"))), + objects = Seq(StringLiteralV2.from("Thing as part", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Thing that is part of something else", Some("en"))), + objects = Seq(StringLiteralV2.from("Thing that is part of something else", Some("en"))), ), ), subClassOf = Set(OntologyConstants.KnoraApiV2Complex.Resource.toSmartIri), @@ -2631,11 +2631,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("Thing as a whole", Some("en"))), + objects = Seq(StringLiteralV2.from("Thing as a whole", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A thing that has multiple parts", Some("en"))), + objects = Seq(StringLiteralV2.from("A thing that has multiple parts", Some("en"))), ), ), subClassOf = Set(OntologyConstants.KnoraApiV2Complex.Resource.toSmartIri), @@ -2680,15 +2680,15 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("is part of", Some("en")), - StringLiteralV2("ist Teil von", Some("de")), + StringLiteralV2.from("is part of", Some("en")), + StringLiteralV2.from("ist Teil von", Some("de")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("Represents a part of a whole relation", Some("en")), - StringLiteralV2("Repräsentiert eine Teil-Ganzes-Beziehung", Some("de")), + StringLiteralV2.from("Represents a part of a whole relation", Some("en")), + StringLiteralV2.from("Repräsentiert eine Teil-Ganzes-Beziehung", Some("de")), ), ), SalsahGui.External.GuiElementProp.toSmartIri -> PredicateInfoV2( @@ -2806,11 +2806,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("wild thing", Some("en"))), + objects = Seq(StringLiteralV2.from("wild thing", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A thing that is wild", Some("en"))), + objects = Seq(StringLiteralV2.from("A thing that is wild", Some("en"))), ), ), directCardinalities = Map( @@ -2896,11 +2896,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("sub thing", Some("en"))), + objects = Seq(StringLiteralV2.from("sub thing", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A subclass thing of thing", Some("en"))), + objects = Seq(StringLiteralV2.from("A subclass thing of thing", Some("en"))), ), ), directCardinalities = Map( @@ -2977,11 +2977,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("sub thing", Some("en"))), + objects = Seq(StringLiteralV2.from("sub thing", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("A subclass thing of thing", Some("en"))), + objects = Seq(StringLiteralV2.from("A subclass thing of thing", Some("en"))), ), ), directCardinalities = Map( @@ -3015,11 +3015,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("other sub thing", Some("en"))), + objects = Seq(StringLiteralV2.from("other sub thing", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Another subclass thing of thing", Some("en"))), + objects = Seq(StringLiteralV2.from("Another subclass thing of thing", Some("en"))), ), ), directCardinalities = Map( @@ -3096,11 +3096,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("other sub thing", Some("en"))), + objects = Seq(StringLiteralV2.from("other sub thing", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Another subclass thing of thing", Some("en"))), + objects = Seq(StringLiteralV2.from("Another subclass thing of thing", Some("en"))), ), ), directCardinalities = Map( @@ -3135,15 +3135,15 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("nothing", Some("en")), - StringLiteralV2("Nichts", Some("de")), + StringLiteralV2.from("nothing", Some("en")), + StringLiteralV2.from("Nichts", Some("de")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("Represents nothing", Some("en")), - StringLiteralV2("Stellt nichts dar", Some("de")), + StringLiteralV2.from("Represents nothing", Some("en")), + StringLiteralV2.from("Stellt nichts dar", Some("de")), ), ), ), @@ -3184,8 +3184,8 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val classIri = AnythingOntologyIri.makeEntityIri("Nothing") val newObjects = Seq( - StringLiteralV2("nothing", Some("en")), - StringLiteralV2("rien", Some("fr")), + StringLiteralV2.from("nothing", Some("en")), + StringLiteralV2.from("rien", Some("fr")), ) appActor ! ChangeClassLabelsOrCommentsRequestV2( @@ -3207,8 +3207,8 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val classIri = AnythingOntologyIri.makeEntityIri("Nothing") val newObjects = Seq( - StringLiteralV2("nothing", Some("en")), - StringLiteralV2("rien", Some("fr")), + StringLiteralV2.from("nothing", Some("en")), + StringLiteralV2.from("rien", Some("fr")), ) appActor ! ChangeClassLabelsOrCommentsRequestV2( @@ -3241,8 +3241,8 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val classIri = AnythingOntologyIri.makeEntityIri("Nothing") val newObjects = Seq( - StringLiteralV2("nothing", Some("en")), - StringLiteralV2("rien", Some("fr")), + StringLiteralV2.from("nothing", Some("en")), + StringLiteralV2.from("rien", Some("fr")), ) appActor ! ChangeClassLabelsOrCommentsRequestV2( @@ -3276,8 +3276,8 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val classIri = AnythingOntologyIri.makeEntityIri("Nothing") val newObjects = Seq( - StringLiteralV2("Represents nothing", Some("en")), - StringLiteralV2("ne représente rien", Some("fr")), + StringLiteralV2.from("Represents nothing", Some("en")), + StringLiteralV2.from("ne représente rien", Some("fr")), ) appActor ! ChangeClassLabelsOrCommentsRequestV2( @@ -3299,13 +3299,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val classIri = AnythingOntologyIri.makeEntityIri("Nothing") val newObjects = Seq( - StringLiteralV2("Represents nothing", Some("en")), - StringLiteralV2("ne représente rien", Some("fr")), + StringLiteralV2.from("Represents nothing", Some("en")), + StringLiteralV2.from("ne représente rien", Some("fr")), ) // Make an unescaped copy of the new comments, because this is how we will receive them in the API response. val newObjectsUnescaped = newObjects.map { case StringLiteralV2(text, lang) => - StringLiteralV2(Iri.fromSparqlEncodedString(text), lang) + StringLiteralV2.from(Iri.fromSparqlEncodedString(text), lang) } appActor ! ChangeClassLabelsOrCommentsRequestV2( @@ -3338,13 +3338,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val classIri = AnythingOntologyIri.makeEntityIri("Nothing") val newObjects = Seq( - StringLiteralV2("Represents nothing", Some("en")), - StringLiteralV2("ne représente rien", Some("fr")), + StringLiteralV2.from("Represents nothing", Some("en")), + StringLiteralV2.from("ne représente rien", Some("fr")), ) // Make an unescaped copy of the new comments, because this is how we will receive them in the API response. val newObjectsUnescaped = newObjects.map { case StringLiteralV2(text, lang) => - StringLiteralV2(Iri.fromSparqlEncodedString(text), lang) + StringLiteralV2.from(Iri.fromSparqlEncodedString(text), lang) } appActor ! ChangeClassLabelsOrCommentsRequestV2( @@ -3386,13 +3386,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong class", Some("en")), + StringLiteralV2.from("wrong class", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid class definition", Some("en")), + StringLiteralV2.from("An invalid class definition", Some("en")), ), ), ), @@ -3426,13 +3426,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong class", Some("en")), + StringLiteralV2.from("wrong class", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid class definition", Some("en")), + StringLiteralV2.from("An invalid class definition", Some("en")), ), ), ), @@ -3466,13 +3466,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong class", Some("en")), + StringLiteralV2.from("wrong class", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid class definition", Some("en")), + StringLiteralV2.from("An invalid class definition", Some("en")), ), ), ), @@ -3506,13 +3506,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong class", Some("en")), + StringLiteralV2.from("wrong class", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid class definition", Some("en")), + StringLiteralV2.from("An invalid class definition", Some("en")), ), ), ), @@ -3546,13 +3546,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong class", Some("en")), + StringLiteralV2.from("wrong class", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid class definition", Some("en")), + StringLiteralV2.from("An invalid class definition", Some("en")), ), ), ), @@ -3588,13 +3588,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong class", Some("en")), + StringLiteralV2.from("wrong class", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid class definition", Some("en")), + StringLiteralV2.from("An invalid class definition", Some("en")), ), ), ), @@ -3629,13 +3629,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("restrictive thing", Some("en")), + StringLiteralV2.from("restrictive thing", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("A more restrictive Thing", Some("en")), + StringLiteralV2.from("A more restrictive Thing", Some("en")), ), ), ), @@ -3682,13 +3682,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong class", Some("en")), + StringLiteralV2.from("wrong class", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid class definition", Some("en")), + StringLiteralV2.from("An invalid class definition", Some("en")), ), ), ), @@ -3819,15 +3819,15 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("has nothingness", Some("en")), - StringLiteralV2("hat Nichtsein", Some("de")), + StringLiteralV2.from("has nothingness", Some("en")), + StringLiteralV2.from("hat Nichtsein", Some("de")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("Indicates whether a Nothing has nothingness", Some("en")), - StringLiteralV2("Anzeigt, ob ein Nichts Nichtsein hat", Some("de")), + StringLiteralV2.from("Indicates whether a Nothing has nothingness", Some("en")), + StringLiteralV2.from("Anzeigt, ob ein Nichts Nichtsein hat", Some("de")), ), ), SalsahGui.External.GuiElementProp.toSmartIri -> PredicateInfoV2( @@ -3922,7 +3922,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { val guiAttributeComplexExpected = PredicateInfoV2( predicateIri = SalsahGui.External.GuiAttribute.toSmartIri, - objects = Seq(StringLiteralV2("size=80")), + objects = Seq(StringLiteralV2.from("size=80", None)), ) guiAttributeComplex should equal(guiAttributeComplexExpected) @@ -3997,13 +3997,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong property", Some("en")), + StringLiteralV2.from("wrong property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -4037,13 +4037,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("wrong class", Some("en")), + StringLiteralV2.from("wrong class", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid class definition", Some("en")), + StringLiteralV2.from("An invalid class definition", Some("en")), ), ), ), @@ -4076,11 +4076,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("void", Some("en"))), + objects = Seq(StringLiteralV2.from("void", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Represents a void", Some("en"))), + objects = Seq(StringLiteralV2.from("Represents a void", Some("en"))), ), ), subClassOf = Set(AnythingOntologyIri.makeEntityIri("Nothing")), @@ -4255,13 +4255,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("has other nothing", Some("en")), + StringLiteralV2.from("has other nothing", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("Indicates whether a Nothing has another Nothing", Some("en")), + StringLiteralV2.from("Indicates whether a Nothing has another Nothing", Some("en")), ), ), ), @@ -4530,15 +4530,15 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("has emptiness", Some("en")), - StringLiteralV2("hat Leerheit", Some("de")), + StringLiteralV2.from("has emptiness", Some("en")), + StringLiteralV2.from("hat Leerheit", Some("de")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("Indicates whether a Nothing has emptiness", Some("en")), - StringLiteralV2("Anzeigt, ob ein Nichts Leerheit hat", Some("de")), + StringLiteralV2.from("Indicates whether a Nothing has emptiness", Some("en")), + StringLiteralV2.from("Anzeigt, ob ein Nichts Leerheit hat", Some("de")), ), ), ), @@ -5025,11 +5025,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("invalid class", Some("en"))), + objects = Seq(StringLiteralV2.from("invalid class", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Represents an invalid class", Some("en"))), + objects = Seq(StringLiteralV2.from("Represents an invalid class", Some("en"))), ), ), subClassOf = Set(IncunabulaOntologyIri.makeEntityIri("book")), @@ -5061,11 +5061,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("invalid class", Some("en"))), + objects = Seq(StringLiteralV2.from("invalid class", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Represents an invalid class", Some("en"))), + objects = Seq(StringLiteralV2.from("Represents an invalid class", Some("en"))), ), ), subClassOf = Set(OntologyConstants.KnoraApiV2Complex.Resource.toSmartIri), @@ -5105,13 +5105,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("invalid property", Some("en")), + StringLiteralV2.from("invalid property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -5154,13 +5154,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("invalid property", Some("en")), + StringLiteralV2.from("invalid property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -5199,13 +5199,13 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("invalid property", Some("en")), + StringLiteralV2.from("invalid property", Some("en")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("An invalid property definition", Some("en")), + StringLiteralV2.from("An invalid property definition", Some("en")), ), ), ), @@ -5238,11 +5238,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("any box", Some("en"))), + objects = Seq(StringLiteralV2.from("any box", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Represents any box", Some("en"))), + objects = Seq(StringLiteralV2.from("Represents any box", Some("en"))), ), ), subClassOf = Set(ExampleSharedOntologyIri.makeEntityIri("Box")), @@ -5304,11 +5304,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("any box", Some("en"))), + objects = Seq(StringLiteralV2.from("any box", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Represents any box", Some("en"))), + objects = Seq(StringLiteralV2.from("Represents any box", Some("en"))), ), ), subClassOf = Set(ExampleSharedOntologyIri.makeEntityIri("Box")), @@ -5375,11 +5375,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("has any shared name", Some("en"))), + objects = Seq(StringLiteralV2.from("has any shared name", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Represents a shared name", Some("en"))), + objects = Seq(StringLiteralV2.from("Represents a shared name", Some("en"))), ), ), subPropertyOf = Set(ExampleSharedOntologyIri.makeEntityIri("hasName")), @@ -5449,11 +5449,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("has boolean", Some("en"))), + objects = Seq(StringLiteralV2.from("has boolean", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Represents a boolean", Some("en"))), + objects = Seq(StringLiteralV2.from("Represents a boolean", Some("en"))), ), ), subPropertyOf = Set(OntologyConstants.KnoraApiV2Complex.HasValue.toSmartIri), @@ -5519,11 +5519,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("has box", Some("en"))), + objects = Seq(StringLiteralV2.from("has box", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("Has a box", Some("en"))), + objects = Seq(StringLiteralV2.from("Has a box", Some("en"))), ), ), subPropertyOf = Set(OntologyConstants.KnoraApiV2Complex.HasLinkTo.toSmartIri), @@ -5582,7 +5582,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "test class", language = Some("en"), ), @@ -5591,7 +5591,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "A test class", language = Some("en"), ), @@ -5627,7 +5627,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "test text property", language = Some("en"), ), @@ -5640,7 +5640,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "A test text property", language = Some("en"), ), @@ -5680,7 +5680,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "test int property", language = Some("en"), ), @@ -5693,7 +5693,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "A test int property", language = Some("en"), ), @@ -5733,7 +5733,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "test link property", language = Some("en"), ), @@ -5746,7 +5746,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "A test link property", language = Some("en"), ), @@ -5880,7 +5880,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "A Blue Free Test class", language = Some("en"), ), @@ -5889,7 +5889,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "A Blue Free Test class used for testing cardinalities", language = Some("en"), ), @@ -5925,7 +5925,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "blue test text property", language = Some("en"), ), @@ -5940,7 +5940,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "A blue test text property", language = Some("en"), ), @@ -5980,7 +5980,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#label".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "blue test integer property", language = Some("en"), ), @@ -5995,7 +5995,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri -> PredicateInfoV2( predicateIri = "http://www.w3.org/2000/01/rdf-schema#comment".toSmartIri, objects = Vector( - StringLiteralV2( + StringLiteralV2.from( value = "A blue test integer property", language = Some("en"), ), @@ -6186,11 +6186,11 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("FOAF person", Some("en"))), + objects = Seq(StringLiteralV2.from("FOAF person", Some("en"))), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, - objects = Seq(StringLiteralV2("FOAF person with reference to foaf:Person", Some("en"))), + objects = Seq(StringLiteralV2.from("FOAF person with reference to foaf:Person", Some("en"))), ), ), subClassOf = Set( @@ -6265,15 +6265,15 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, objects = Seq( - StringLiteralV2("has foaf name", Some("en")), - StringLiteralV2("hat foaf Namen", Some("de")), + StringLiteralV2.from("has foaf name", Some("en")), + StringLiteralV2.from("hat foaf Namen", Some("de")), ), ), OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri, objects = Seq( - StringLiteralV2("The foaf name of something", Some("en")), - StringLiteralV2("Der foaf Name eines Dinges", Some("de")), + StringLiteralV2.from("The foaf name of something", Some("en")), + StringLiteralV2.from("Der foaf Name eines Dinges", Some("de")), ), ), ), @@ -6518,7 +6518,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("Different Video Sequence Thing", Some("en"))), + objects = Seq(StringLiteralV2.from("Different Video Sequence Thing", Some("en"))), ), ), subClassOf = Set(OntologyConstants.KnoraApiV2Complex.Resource.toSmartIri), @@ -6560,7 +6560,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("is sequence of", Some("en"))), + objects = Seq(StringLiteralV2.from("is sequence of", Some("en"))), ), SalsahGui.External.GuiElementProp.toSmartIri -> PredicateInfoV2( predicateIri = SalsahGui.External.GuiElementProp.toSmartIri, @@ -6637,7 +6637,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender { ), OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2( predicateIri = OntologyConstants.Rdfs.Label.toSmartIri, - objects = Seq(StringLiteralV2("has sequence bounds", Some("en"))), + objects = Seq(StringLiteralV2.from("has sequence bounds", Some("en"))), ), SalsahGui.External.GuiElementProp.toSmartIri -> PredicateInfoV2( predicateIri = SalsahGui.External.GuiElementProp.toSmartIri, diff --git a/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala b/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala index c3da3152cc..482927f4ee 100644 --- a/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala +++ b/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala @@ -18,14 +18,14 @@ object SharedListsTestDataADM { id = "http://rdfh.ch/lists/0001/otherTreeList", projectIri = "http://rdfh.ch/projects/0001", name = None, - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("Tree list root", Some("en")))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("Tree list root", Some("en")))), comments = StringLiteralSequenceV2.empty, ) val summerNodeInfo: ListChildNodeInfoADM = ListChildNodeInfoADM( id = "http://rdfh.ch/lists/00FF/526f26ed04", name = Some("sommer"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("Sommer"))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("Sommer", None))), comments = StringLiteralSequenceV2.empty, position = 0, hasRootNode = "http://rdfh.ch/lists/00FF/d19af9ab", @@ -35,7 +35,7 @@ object SharedListsTestDataADM { ListChildNodeADM( id = "http://rdfh.ch/lists/00FF/526f26ed04", name = Some("sommer"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("Sommer"))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("Sommer", None))), comments = StringLiteralSequenceV2.empty, children = Seq.empty[ListChildNodeADM], position = 0, @@ -44,7 +44,7 @@ object SharedListsTestDataADM { ListChildNodeADM( id = "http://rdfh.ch/lists/00FF/eda2792605", name = Some("winter"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("Winter"))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("Winter", None))), comments = StringLiteralSequenceV2.empty, children = Seq.empty[ListChildNodeADM], position = 1, @@ -56,19 +56,19 @@ object SharedListsTestDataADM { NodePathElementADM( id = "http://rdfh.ch/lists/00FF/691eee1cbe", name = Some("4KUN"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("KUNST"))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("KUNST", None))), comments = StringLiteralSequenceV2.empty, ), NodePathElementADM( id = "http://rdfh.ch/lists/00FF/2ebd2706c1", name = Some("7"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("FILM UND FOTO"))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("FILM UND FOTO", None))), comments = StringLiteralSequenceV2.empty, ), NodePathElementADM( id = "http://rdfh.ch/lists/00FF/c7f07a3fc1", name = Some("1"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2("Heidi Film"))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from("Heidi Film", None))), comments = StringLiteralSequenceV2.empty, ), ) @@ -79,17 +79,18 @@ object SharedListsTestDataADM { name = Some("treelistroot"), labels = StringLiteralSequenceV2( Vector( - StringLiteralV2(value = "Tree list root", language = Some("en")), - StringLiteralV2(value = "Listenwurzel", language = Some("de")), + StringLiteralV2.from(value = "Tree list root", language = Some("en")), + StringLiteralV2.from(value = "Listenwurzel", language = Some("de")), ), ), - comments = StringLiteralSequenceV2(Vector(StringLiteralV2(value = "Anything Tree List", language = Some("en")))), + comments = + StringLiteralSequenceV2(Vector(StringLiteralV2.from(value = "Anything Tree List", language = Some("en")))), ) val treeListNode01Info: ListChildNodeInfoADM = ListChildNodeInfoADM( id = "http://rdfh.ch/lists/0001/treeList01", name = Some("Tree list node 01"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2(value = "Tree list node 01", language = Some("en")))), + labels = StringLiteralSequenceV2(Vector(StringLiteralV2.from(value = "Tree list node 01", language = Some("en")))), comments = StringLiteralSequenceV2.empty, position = 0, hasRootNode = "http://rdfh.ch/lists/0001/treeList", @@ -98,7 +99,8 @@ object SharedListsTestDataADM { ListChildNodeADM( id = "http://rdfh.ch/lists/0001/treeList01", name = Some("Tree list node 01"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2(value = "Tree list node 01", language = Some("en")))), + labels = + StringLiteralSequenceV2(Vector(StringLiteralV2.from(value = "Tree list node 01", language = Some("en")))), comments = StringLiteralSequenceV2.empty, children = Seq.empty[ListChildNodeADM], position = 0, @@ -109,8 +111,8 @@ object SharedListsTestDataADM { name = Some("Tree list node 02"), labels = StringLiteralSequenceV2( Vector( - StringLiteralV2(value = "Baumlistenknoten 02", language = Some("de")), - StringLiteralV2(value = "Tree list node 02", language = Some("en")), + StringLiteralV2.from(value = "Baumlistenknoten 02", language = Some("de")), + StringLiteralV2.from(value = "Tree list node 02", language = Some("en")), ), ), comments = StringLiteralSequenceV2.empty, @@ -121,13 +123,15 @@ object SharedListsTestDataADM { ListChildNodeADM( id = "http://rdfh.ch/lists/0001/treeList03", name = Some("Tree list node 03"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2(value = "Tree list node 03", language = Some("en")))), + labels = + StringLiteralSequenceV2(Vector(StringLiteralV2.from(value = "Tree list node 03", language = Some("en")))), comments = StringLiteralSequenceV2.empty, children = Seq( ListChildNodeADM( id = "http://rdfh.ch/lists/0001/treeList10", name = Some("Tree list node 10"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2(value = "Tree list node 10", language = Some("en")))), + labels = + StringLiteralSequenceV2(Vector(StringLiteralV2.from(value = "Tree list node 10", language = Some("en")))), comments = StringLiteralSequenceV2.empty, children = Seq.empty[ListChildNodeADM], position = 0, @@ -136,7 +140,8 @@ object SharedListsTestDataADM { ListChildNodeADM( id = "http://rdfh.ch/lists/0001/treeList11", name = Some("Tree list node 11"), - labels = StringLiteralSequenceV2(Vector(StringLiteralV2(value = "Tree list node 11", language = Some("en")))), + labels = + StringLiteralSequenceV2(Vector(StringLiteralV2.from(value = "Tree list node 11", language = Some("en")))), comments = StringLiteralSequenceV2.empty, children = Seq.empty[ListChildNodeADM], position = 1, diff --git a/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala b/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala index f9e56af7bd..592e727475 100644 --- a/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala +++ b/integration/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala @@ -8,7 +8,6 @@ package org.knora.webapi.sharedtestdata import java.time.Instant import dsp.constants.SalsahGui -import dsp.valueobjects.V2 import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionADM @@ -156,7 +155,7 @@ object SharedTestDataADM { shortname = "SystemProject", shortcode = "FFFF", longname = Some("Knora System Project"), - description = Seq(V2.StringLiteralV2(value = "Knora System Project", language = Some("en"))), + description = Seq(StringLiteralV2.from(value = "Knora System Project", language = Some("en"))), keywords = Seq.empty[String], logo = None, ontologies = Seq( @@ -175,7 +174,7 @@ object SharedTestDataADM { shortname = "DefaultSharedOntologiesProject", shortcode = "0000", longname = Some("Default Knora Shared Ontologies Project"), - description = Seq(V2.StringLiteralV2(value = "Default Knora Shared Ontologies Project", language = Some("en"))), + description = Seq(StringLiteralV2.from(value = "Default Knora Shared Ontologies Project", language = Some("en"))), keywords = Seq.empty[String], logo = None, ontologies = Seq.empty[IRI], @@ -285,7 +284,7 @@ object SharedTestDataADM { shortname = "images", shortcode = "00FF", longname = Some("Image Collection Demo"), - description = Seq(V2.StringLiteralV2(value = "A demo project of a collection of images", language = Some("en"))), + description = Seq(StringLiteralV2.from(value = "A demo project of a collection of images", language = Some("en"))), keywords = Seq("images", "collection").sorted, logo = None, ontologies = Seq(SharedOntologyTestDataADM.IMAGES_ONTOLOGY_IRI), @@ -299,7 +298,7 @@ object SharedTestDataADM { shortname = "images", shortcode = "00FF", longname = Some("Image Collection Demo"), - description = Seq(V2.StringLiteralV2(value = "A demo project of a collection of images", language = Some("en"))), + description = Seq(StringLiteralV2.from(value = "A demo project of a collection of images", language = Some("en"))), keywords = Seq("images", "collection").sorted, logo = None, ontologies = Seq(SharedOntologyTestDataADM.IMAGES_ONTOLOGY_IRI_LocalHost), @@ -311,7 +310,7 @@ object SharedTestDataADM { def imagesProjectAdminGroup: Group = Group( id = "-", name = "ProjectAdmin", - descriptions = Seq(StringLiteralV2(value = "Default Project Admin Group", language = Some("en"))), + descriptions = Seq(StringLiteralV2.from(value = "Default Project Admin Group", language = Some("en"))), project = imagesProject, status = true, selfjoin = false, @@ -321,7 +320,7 @@ object SharedTestDataADM { def imagesProjectMemberGroup: Group = Group( id = "-", name = "ProjectMember", - descriptions = Seq(StringLiteralV2(value = "Default Project Member Group", language = Some("en"))), + descriptions = Seq(StringLiteralV2.from(value = "Default Project Member Group", language = Some("en"))), project = imagesProject, status = true, selfjoin = false, @@ -331,7 +330,7 @@ object SharedTestDataADM { def imagesReviewerGroup: Group = Group( id = "http://rdfh.ch/groups/00FF/images-reviewer", name = "Image reviewer", - descriptions = Seq(StringLiteralV2(value = "A group for image reviewers.", language = Some("en"))), + descriptions = Seq(StringLiteralV2.from(value = "A group for image reviewers.", language = Some("en"))), project = imagesProject, status = true, selfjoin = false, @@ -341,7 +340,7 @@ object SharedTestDataADM { def imagesReviewerGroupExternal: Group = Group( id = "http://rdfh.ch/groups/00FF/images-reviewer", name = "Image reviewer", - descriptions = Seq(StringLiteralV2(value = "A group for image reviewers.", language = Some("en"))), + descriptions = Seq(StringLiteralV2.from(value = "A group for image reviewers.", language = Some("en"))), project = imagesProjectExternal, status = true, selfjoin = false, @@ -442,7 +441,7 @@ object SharedTestDataADM { shortcode = "0803", longname = Some("Bilderfolgen Basler Frühdrucke"), description = Seq( - V2.StringLiteralV2( + StringLiteralV2.from( value = "

Das interdisziplinäre Forschungsprojekt \"Die Bilderfolgen der Basler Frühdrucke: Spätmittelalterliche Didaxe als Bild-Text-Lektüre\" verbindet eine umfassende kunstwissenschaftliche Analyse der Bezüge zwischen den Bildern und Texten in den illustrierten Basler Inkunabeln mit der Digitalisierung der Bestände der Universitätsbibliothek und der Entwicklung einer elektronischen Edition in der Form einer neuartigen Web-0.2-Applikation.\n

\n

Das Projekt wird durchgeführt vom Kunsthistorischen Seminar der Universität Basel (Prof. B. Schellewald) und dem Digital Humanities Lab der Universität Basel (PD Dr. L. Rosenthaler).\n

\n

\nDas Kernstück der digitalen Edition besteht aus rund zwanzig reich bebilderten Frühdrucken aus vier verschiedenen Basler Offizinen. Viele davon sind bereits vor 1500 in mehreren Ausgaben erschienen, einige fast gleichzeitig auf Deutsch und Lateinisch. Es handelt sich um eine ausserordentlich vielfältige Produktion; neben dem Heilsspiegel finden sich ein Roman, die Melusine, die Reisebeschreibungen des Jean de Mandeville, einige Gebets- und Erbauungsbüchlein, theologische Schriften, Fastenpredigten, die Leben der Heiligen Fridolin und Meinrad, das berühmte Narrenschiff sowie die Exempelsammlung des Ritters vom Thurn.\n

\nDie Internetpublikation macht das digitalisierte Korpus dieser Frühdrucke durch die Möglichkeiten nichtlinearer Verknüpfung und Kommentierung der Bilder und Texte, für die wissenschaftliche Edition sowie für die Erforschung der Bilder und Texte nutzbar machen. Auch können bereits bestehende und entstehende Online-Editionen damit verknüpft werden , wodurch die Nutzung von Datenbanken anderer Institutionen im Hinblick auf unser Corpus optimiert wird.\n

", language = None, @@ -477,7 +476,7 @@ object SharedTestDataADM { shortcode = "0803", longname = Some("Bilderfolgen Basler Frühdrucke"), description = Seq( - V2.StringLiteralV2( + StringLiteralV2.from( value = "

Das interdisziplinäre Forschungsprojekt \"Die Bilderfolgen der Basler Frühdrucke: Spätmittelalterliche Didaxe als Bild-Text-Lektüre\" verbindet eine umfassende kunstwissenschaftliche Analyse der Bezüge zwischen den Bildern und Texten in den illustrierten Basler Inkunabeln mit der Digitalisierung der Bestände der Universitätsbibliothek und der Entwicklung einer elektronischen Edition in der Form einer neuartigen Web-0.2-Applikation.\n

\n

Das Projekt wird durchgeführt vom Kunsthistorischen Seminar der Universität Basel (Prof. B. Schellewald) und dem Digital Humanities Lab der Universität Basel (PD Dr. L. Rosenthaler).\n

\n

\nDas Kernstück der digitalen Edition besteht aus rund zwanzig reich bebilderten Frühdrucken aus vier verschiedenen Basler Offizinen. Viele davon sind bereits vor 1500 in mehreren Ausgaben erschienen, einige fast gleichzeitig auf Deutsch und Lateinisch. Es handelt sich um eine ausserordentlich vielfältige Produktion; neben dem Heilsspiegel finden sich ein Roman, die Melusine, die Reisebeschreibungen des Jean de Mandeville, einige Gebets- und Erbauungsbüchlein, theologische Schriften, Fastenpredigten, die Leben der Heiligen Fridolin und Meinrad, das berühmte Narrenschiff sowie die Exempelsammlung des Ritters vom Thurn.\n

\nDie Internetpublikation macht das digitalisierte Korpus dieser Frühdrucke durch die Möglichkeiten nichtlinearer Verknüpfung und Kommentierung der Bilder und Texte, für die wissenschaftliche Edition sowie für die Erforschung der Bilder und Texte nutzbar machen. Auch können bereits bestehende und entstehende Online-Editionen damit verknüpft werden , wodurch die Nutzung von Datenbanken anderer Institutionen im Hinblick auf unser Corpus optimiert wird.\n

", language = None, @@ -609,7 +608,7 @@ object SharedTestDataADM { shortname = "anything", shortcode = "0001", longname = Some("Anything Project"), - description = Seq(V2.StringLiteralV2(value = "Anything Project", language = None)), + description = Seq(StringLiteralV2.from(value = "Anything Project", language = None)), keywords = Seq("things", "arbitrary test data").sorted, logo = None, ontologies = Seq(SharedOntologyTestDataADM.ANYTHING_ONTOLOGY_IRI, SharedOntologyTestDataADM.SomethingOntologyIri), @@ -622,7 +621,7 @@ object SharedTestDataADM { shortname = "anything", shortcode = "0001", longname = Some("Anything Project"), - description = Seq(V2.StringLiteralV2(value = "Anything Project", language = None)), + description = Seq(StringLiteralV2.from(value = "Anything Project", language = None)), keywords = Seq("things", "arbitrary test data").sorted, logo = None, ontologies = Seq( @@ -637,7 +636,7 @@ object SharedTestDataADM { def thingSearcherGroup: Group = Group( id = "http://rdfh.ch/groups/0001/thing-searcher", name = "Thing searcher", - descriptions = Seq(StringLiteralV2(value = "A group for thing searchers.", language = Some("en"))), + descriptions = Seq(StringLiteralV2.from(value = "A group for thing searchers.", language = Some("en"))), project = anythingProject, status = true, selfjoin = true, @@ -657,7 +656,7 @@ object SharedTestDataADM { shortname = "beol", shortcode = "0801", longname = Some("Bernoulli-Euler Online"), - description = Seq(V2.StringLiteralV2(value = "Bernoulli-Euler Online", language = None)), + description = Seq(StringLiteralV2.from(value = "Bernoulli-Euler Online", language = None)), keywords = Seq.empty[String], logo = None, ontologies = Seq( @@ -708,7 +707,7 @@ object SharedTestDataADM { shortname = "dokubib", shortcode = "0804", longname = Some("Dokubib"), - description = Seq(V2.StringLiteralV2(value = "Dokubib", language = None)), + description = Seq(StringLiteralV2.from(value = "Dokubib", language = None)), keywords = Seq.empty[String], logo = None, ontologies = Seq("http://www.knora.org/ontology/0804/dokubib"), diff --git a/integration/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCacheSpec.scala b/integration/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCacheSpec.scala index ab15d8e7e2..b4c57ea13f 100644 --- a/integration/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCacheSpec.scala +++ b/integration/src/test/scala/org/knora/webapi/slice/ontology/repo/service/OntologyCacheSpec.scala @@ -116,8 +116,8 @@ class OntologyCacheSpec extends CoreSpec { stringFormatter.toSmartIri(OntologyConstants.Rdfs.Label) -> PredicateInfoV2( predicateIri = stringFormatter.toSmartIri(OntologyConstants.Rdfs.Label), Seq( - StringLiteralV2("A Description", language = Some("en")), - StringLiteralV2("Eine Beschreibung", language = Some("de")), + StringLiteralV2.from("A Description", language = Some("en")), + StringLiteralV2.from("Eine Beschreibung", language = Some("de")), ), ), stringFormatter.toSmartIri(OntologyConstants.KnoraBase.SubjectClassConstraint) -> PredicateInfoV2( @@ -135,8 +135,8 @@ class OntologyCacheSpec extends CoreSpec { stringFormatter.toSmartIri(SalsahGui.GuiAttribute) -> PredicateInfoV2( predicateIri = stringFormatter.toSmartIri(SalsahGui.GuiAttribute), Seq( - StringLiteralV2("size=80"), - StringLiteralV2("maxlength=255"), + StringLiteralV2.from("size=80", None), + StringLiteralV2.from("maxlength=255", None), ), ), ), @@ -202,8 +202,8 @@ class OntologyCacheSpec extends CoreSpec { stringFormatter.toSmartIri(OntologyConstants.Rdfs.Label) -> PredicateInfoV2( predicateIri = stringFormatter.toSmartIri(OntologyConstants.Rdfs.Label), Seq( - StringLiteralV2("Seite im Buch", language = Some("de")), - StringLiteralV2("Page in the book", language = Some("en")), + StringLiteralV2.from("Seite im Buch", language = Some("de")), + StringLiteralV2.from("Page in the book", language = Some("en")), ), ), stringFormatter.toSmartIri(OntologyConstants.KnoraBase.SubjectClassConstraint) -> PredicateInfoV2( diff --git a/integration/src/test/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala b/integration/src/test/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala index baea66cd72..6fdef70339 100644 --- a/integration/src/test/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala +++ b/integration/src/test/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala @@ -16,15 +16,15 @@ class StringLiteralSequenceV2Spec extends CoreSpec { private val literalSeq: StringLiteralSequenceV2 = StringLiteralSequenceV2( Vector( - StringLiteralV2( + StringLiteralV2.from( value = "Film und Foto", language = Some("de"), ), - StringLiteralV2( + StringLiteralV2.from( value = "Film and Photo", language = Some("en"), ), - StringLiteralV2( + StringLiteralV2.from( value = "Film e Fotografia", language = Some("it"), ), diff --git a/webapi/src/main/scala/dsp/valueobjects/V2.scala b/webapi/src/main/scala/dsp/valueobjects/V2.scala deleted file mode 100644 index cbc63d177a..0000000000 --- a/webapi/src/main/scala/dsp/valueobjects/V2.scala +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright © 2021 - 2024 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors. - * SPDX-License-Identifier: Apache-2.0 - */ - -package dsp.valueobjects - -import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf -import org.eclipse.rdf4j.sparqlbuilder.rdf.RdfLiteral.StringLiteral -import zio.json.* - -object V2 { - - /** - * Represents a string with language iso. Allows sorting inside collections by value. - * - * @param value the string value. - * @param language the language iso. - */ - case class StringLiteralV2(value: String, language: Option[String]) { - def toRdfLiteral: StringLiteral = - language.map(Rdf.literalOfLanguage(value, _)).getOrElse(Rdf.literalOf(value)) - } - - object StringLiteralV2 { - implicit val codec: JsonCodec[StringLiteralV2] = DeriveJsonCodec.gen[StringLiteralV2] - } -} diff --git a/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala b/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala index 112cf69198..3a02a36427 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/StringFormatter.scala @@ -1676,7 +1676,7 @@ class StringFormatter private ( def unescapeStringLiteralSeq(stringLiteralSeq: StringLiteralSequenceV2): StringLiteralSequenceV2 = StringLiteralSequenceV2( stringLiterals = stringLiteralSeq.stringLiterals.map(stringLiteral => - StringLiteralV2(Iri.fromSparqlEncodedString(stringLiteral.value), stringLiteral.language), + StringLiteralV2.from(Iri.fromSparqlEncodedString(stringLiteral.value), stringLiteral.language), ), ) def unescapeOptionalString(optionalString: Option[String]): Option[String] = diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala index 95cb3da3ab..3cdf93afc7 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADM.scala @@ -24,13 +24,13 @@ import dsp.errors.BadRequestException import dsp.errors.OntologyConstraintException import dsp.errors.ValidationException import dsp.valueobjects.Iri -import dsp.valueobjects.V2 import org.knora.webapi.IRI import org.knora.webapi.core.RelayedMessage import org.knora.webapi.messages.ResponderRequest.KnoraRequestADM import org.knora.webapi.messages.StringFormatter import org.knora.webapi.messages.admin.responder.AdminKnoraResponseADM import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectCreateRequest import org.knora.webapi.slice.admin.api.model.ProjectsEndpointsRequestsAndResponses.ProjectUpdateRequest @@ -219,7 +219,7 @@ case class Project( shortname: String, shortcode: String, longname: Option[String], - description: Seq[V2.StringLiteralV2], + description: Seq[StringLiteralV2], keywords: Seq[String], logo: Option[String], ontologies: Seq[IRI], @@ -276,8 +276,8 @@ case class Project( def unescape: Project = { val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance - val unescapedDescriptions: Seq[V2.StringLiteralV2] = description.map(desc => - V2.StringLiteralV2(value = Iri.fromSparqlEncodedString(desc.value), language = desc.language), + val unescapedDescriptions: Seq[StringLiteralV2] = description.map(desc => + StringLiteralV2.from(value = Iri.fromSparqlEncodedString(desc.value), language = desc.language), ) val unescapedKeywords: Seq[String] = keywords.map(key => Iri.fromSparqlEncodedString(key)) copy( diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala index 72ccf37d37..73b53fc792 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala @@ -6,6 +6,8 @@ package org.knora.webapi.messages.store.triplestoremessages import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport +import org.eclipse.rdf4j.sparqlbuilder.rdf.Rdf +import org.eclipse.rdf4j.sparqlbuilder.rdf.RdfLiteral.StringLiteral import spray.json.* import zio.* import zio.json.DeriveJsonCodec @@ -15,7 +17,6 @@ import java.time.Instant import scala.collection.mutable import dsp.errors.* -import dsp.valueobjects.V2 import org.knora.webapi.* import org.knora.webapi.messages.* import org.knora.webapi.messages.IriConversions.* @@ -107,7 +108,8 @@ object SparqlExtendedConstructResponse { ), ) - case OntologyConstants.Xsd.String => StringLiteralV2(value = datatypeLiteral.value, language = None) + case OntologyConstants.Xsd.String => + StringLiteralV2.from(value = datatypeLiteral.value, language = None) case OntologyConstants.Xsd.Decimal => DecimalLiteralV2( @@ -122,7 +124,7 @@ object SparqlExtendedConstructResponse { } case stringWithLanguage: StringWithLanguage => - StringLiteralV2(value = stringWithLanguage.value, language = Some(stringWithLanguage.language)) + StringLiteralV2.from(value = stringWithLanguage.value, language = Some(stringWithLanguage.language)) } } @@ -305,22 +307,32 @@ case class BlankNodeLiteralV2(value: String) extends LiteralV2 { } /** - * Represents a string with an optional language tag. Allows sorting inside collections by value. + * Represents a string with language iso. Allows sorting inside collections by the value. * * @param value the string value. - * @param language the optional language tag. + * @param language the language iso. */ -case class StringLiteralV2(value: String, language: Option[String] = None) +case class StringLiteralV2 private (value: String, language: Option[String]) extends LiteralV2 with OntologyLiteralV2 with Ordered[StringLiteralV2] { - override def toString: String = value - if (language.isDefined && value.isEmpty) { - throw BadRequestException(s"String value is missing.") + override def compare(that: StringLiteralV2): Int = this.value.compareTo(that.value) + override def toString: String = value + + def toRdfLiteral: StringLiteral = + language.map(Rdf.literalOfLanguage(value, _)).getOrElse(Rdf.literalOf(value)) +} + +object StringLiteralV2 { + implicit val codec: JsonCodec[StringLiteralV2] = DeriveJsonCodec.gen[StringLiteralV2] + + def from(value: String, language: Option[String]): StringLiteralV2 = language match { + case Some(_) if value.isEmpty => throw BadRequestException("String value is missing.") + case _ => StringLiteralV2(value, language) } - def compare(that: StringLiteralV2): Int = this.value.compareTo(that.value) + def unsafeFrom(value: String, language: Option[String]): StringLiteralV2 = StringLiteralV2(value, language) } /** @@ -528,77 +540,20 @@ trait TriplestoreJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol case stringWithLang: JsObject => stringWithLang.getFields("value", "language") match { case Seq(JsString(value), JsString(language)) => - StringLiteralV2( + StringLiteralV2.from( value = value, language = Some(language), ) case Seq(JsString(value)) => - StringLiteralV2( + StringLiteralV2.from( value = value, language = None, ) case _ => throw DeserializationException("JSON object with 'value', or 'value' and 'language' fields expected.") } - case JsString(value) => StringLiteralV2(value, None) + case JsString(value) => StringLiteralV2.from(value, None) case _ => throw DeserializationException("JSON object with 'value', or 'value' and 'language' expected. ") } } - - // TODO-mpro: below object needs to be here because of moving value object to separate project which are also partially used in V2. - // Once dsp.valueobjects.V2.StringLiteralV2 is replaced by LangString value object, it can be removed. - // By then it is quick fix solution. - implicit object V2LiteralV2Format extends JsonFormat[V2.StringLiteralV2] { - - /** - * Converts a [[StringLiteralV2]] to a [[JsValue]]. - * - * @param string a [[StringLiteralV2]]. - * @return a [[JsValue]]. - */ - def write(string: V2.StringLiteralV2): JsValue = - if (string.language.isDefined) { - // have language tag - JsObject( - Map( - "value" -> string.value.toJson, - "language" -> string.language.toJson, - ), - ) - } else { - // no language tag - JsObject( - Map( - "value" -> string.value.toJson, - ), - ) - } - - /** - * Converts a [[JsValue]] to a [[StringLiteralV2]]. - * - * @param json a [[JsValue]]. - * @return a [[StringLiteralV2]]. - */ - def read(json: JsValue): V2.StringLiteralV2 = json match { - case stringWithLang: JsObject => - stringWithLang.getFields("value", "language") match { - case Seq(JsString(value), JsString(language)) => - V2.StringLiteralV2( - value = value, - language = Some(language), - ) - case Seq(JsString(value)) => - V2.StringLiteralV2( - value = value, - language = None, - ) - case _ => - throw DeserializationException("JSON object with 'value', or 'value' and 'language' fields expected.") - } - case JsString(value) => V2.StringLiteralV2(value, None) - case _ => throw DeserializationException("JSON object with 'value', or 'value' and 'language' expected. ") - } - } - } diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala index 71db9deb6a..5da7ca1f0e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/rdf/JsonLDUtil.scala @@ -901,7 +901,7 @@ case class JsonLDArray(value: Seq[JsonLDValue]) extends JsonLDValue { } val text = obj.requireStringWithValidation(JsonLDKeywords.VALUE, validationFun) - StringLiteralV2(text, Some(lang)) + StringLiteralV2.from(text, Some(lang)) case other => throw BadRequestException(s"Expected JSON-LD object: $other") } diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala index 5e5f43683f..b767d723d3 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala @@ -1681,7 +1681,7 @@ object KnoraBaseToApiV2ComplexTransformationRules extends OntologyTransformation PredicateInfoV2( predicateIri = predicateIri.toSmartIri, objects = objects ++ objectsWithLang.map { case (lang, str) => - StringLiteralV2(str, Some(lang)) + StringLiteralV2.from(str, Some(lang)) }, ) diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala index 71678794e4..b1d0f3f03d 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala @@ -602,7 +602,7 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR PredicateInfoV2( predicateIri = predicateIri.toSmartIri, objects = objects ++ objectsWithLang.map { case (lang, str) => - StringLiteralV2(str, Some(lang)) + StringLiteralV2.from(str, Some(lang)) }, ) diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala index b17b6fb683..4fe665a0ac 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala @@ -1863,7 +1863,7 @@ case class PredicateInfoV2(predicateIri: SmartIri, objects: Seq[OntologyLiteralV def unescape: PredicateInfoV2 = copy( objects = objects.map { - case StringLiteralV2(str, lang) => StringLiteralV2(Iri.fromSparqlEncodedString(str), lang) + case StringLiteralV2(str, lang) => StringLiteralV2.from(Iri.fromSparqlEncodedString(str), lang) case other => other }, ) @@ -2153,7 +2153,7 @@ object EntityInfoContentV2 { private def stringToLiteral(str: String): StringLiteralV2 = { val value = Iri.toSparqlEncodedString(str).getOrElse(throw BadRequestException(s"Invalid predicate object: $str")) - StringLiteralV2(value) + StringLiteralV2.from(value, None) } /** diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala index 47035a73d8..82e5e49cd0 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/ProjectsResponderADM.scala @@ -11,7 +11,6 @@ import java.util.UUID import dsp.errors.* import dsp.valueobjects.Iri -import dsp.valueobjects.V2 import org.knora.webapi.* import org.knora.webapi.core.MessageHandler import org.knora.webapi.core.MessageRelay @@ -21,6 +20,7 @@ import org.knora.webapi.messages.admin.responder.permissionsmessages.* import org.knora.webapi.messages.admin.responder.projectsmessages.* import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* import org.knora.webapi.messages.store.triplestoremessages.* +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.messages.twirl.queries.sparql import org.knora.webapi.responders.IriLocker import org.knora.webapi.responders.IriService @@ -535,7 +535,7 @@ final case class ProjectsResponderADMLive( if (projectUpdatePayload.description.nonEmpty) { projectUpdatePayload.description .map(_.map(_.value)) - .map(_.map(d => V2.StringLiteralV2(Iri.fromSparqlEncodedString(d.value), d.language))) + .map(_.map(d => StringLiteralV2.from(Iri.fromSparqlEncodedString(d.value), d.language))) .filter(updatedProject.description.diff(_).isEmpty) .getOrElse( throw UpdateNotPerformedException( diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala index 73efb3f94f..54b913ba8e 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala @@ -2276,7 +2276,7 @@ final case class OntologyResponderV2Live( Some( SalsahGui.GuiAttribute.toSmartIri -> PredicateInfoV2( predicateIri = SalsahGui.GuiAttribute.toSmartIri, - objects = newGuiAttributeIris.map(StringLiteralV2(_)).toSeq, + objects = newGuiAttributeIris.map(StringLiteralV2.from(_, None)).toSeq, ), ) } else { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala index 2017159fc2..db73f9becb 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Codecs.scala @@ -9,7 +9,7 @@ import sttp.tapir.Codec import sttp.tapir.CodecFormat import zio.json.JsonCodec -import dsp.valueobjects.V2 +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.api.model.MaintenanceRequests.AssetId import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.KnoraProject.* @@ -81,11 +81,11 @@ object Codecs { // list properties implicit val comments: StringCodec[Comments] = - JsonCodec[Seq[V2.StringLiteralV2]].transformOrFail(Comments.from, _.value) + JsonCodec[Seq[StringLiteralV2]].transformOrFail(Comments.from, _.value) implicit val description: StringCodec[Description] = - JsonCodec[V2.StringLiteralV2].transformOrFail(Description.from, _.value) + JsonCodec[StringLiteralV2].transformOrFail(Description.from, _.value) implicit val labels: StringCodec[Labels] = - JsonCodec[Seq[V2.StringLiteralV2]].transformOrFail(Labels.from, _.value) + JsonCodec[Seq[StringLiteralV2]].transformOrFail(Labels.from, _.value) implicit val listIri: StringCodec[ListIri] = stringCodec(ListIri.from) implicit val listName: StringCodec[ListName] = stringCodec(ListName.from) implicit val position: StringCodec[Position] = intCodec(Position.from) @@ -122,7 +122,7 @@ object Codecs { implicit val groupIri: StringCodec[GroupIri] = stringCodec(GroupIri.from) implicit val groupName: StringCodec[GroupName] = stringCodec(GroupName.from) implicit val groupDescriptions: StringCodec[GroupDescriptions] = - JsonCodec[Seq[V2.StringLiteralV2]].transformOrFail(GroupDescriptions.from, _.value) + JsonCodec[Seq[StringLiteralV2]].transformOrFail(GroupDescriptions.from, _.value) implicit val groupStatus: StringCodec[GroupStatus] = booleanCodec(GroupStatus.from) implicit val groupSelfJoin: StringCodec[GroupSelfJoin] = booleanCodec(GroupSelfJoin.from) } diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Examples.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Examples.scala index af83d3688e..01d193018e 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Examples.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/Examples.scala @@ -5,7 +5,6 @@ package org.knora.webapi.slice.admin.api -import dsp.valueobjects.V2 import org.knora.webapi.messages.admin.responder.groupsmessages.GroupGetResponseADM import org.knora.webapi.messages.admin.responder.groupsmessages.GroupsGetResponseADM import org.knora.webapi.messages.admin.responder.permissionsmessages.PermissionsDataADM @@ -43,8 +42,8 @@ object Examples { val groupDescriptions: GroupDescriptions = GroupDescriptions.unsafeFrom( Seq( - V2.StringLiteralV2(s"${groupName.value} description in English", Some("en")), - V2.StringLiteralV2(s"${groupName.value} Beschreibung auf Deutsch", Some("de")), + StringLiteralV2.from(s"${groupName.value} description in English", Some("en")), + StringLiteralV2.from(s"${groupName.value} Beschreibung auf Deutsch", Some("de")), ), ) } @@ -74,8 +73,8 @@ object Examples { descriptions = Option( GroupDescriptions.unsafeFrom( Seq( - V2.StringLiteralV2(s"${newGroupName.value} description in English", Some("en")), - V2.StringLiteralV2(s"${newGroupName.value} Beschreibung auf Deutsch", Some("de")), + StringLiteralV2.from(s"${newGroupName.value} description in English", Some("en")), + StringLiteralV2.from(s"${newGroupName.value} Beschreibung auf Deutsch", Some("de")), ), ), ), @@ -88,7 +87,7 @@ object Examples { shortname = "example", shortcode = "0001", longname = Some("Example Project"), - description = Seq(V2.StringLiteralV2("An example project", Some("en"))), + description = Seq(StringLiteralV2.from("An example project", Some("en"))), keywords = Seq("example", "project"), logo = None, status = true, @@ -100,8 +99,8 @@ object Examples { id = GroupExample.groupIri.value, name = groupName.value, descriptions = Seq( - StringLiteralV2(s"${groupName.value} description in English", Some("en")), - StringLiteralV2(s"${groupName.value} Beschreibung auf Deutsch", Some("de")), + StringLiteralV2.from(s"${groupName.value} description in English", Some("en")), + StringLiteralV2.from(s"${groupName.value} Beschreibung auf Deutsch", Some("de")), ), project = project, status = GroupStatus.active.value, diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroup.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroup.scala index 6852d009ac..937e8c5f95 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroup.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroup.scala @@ -11,7 +11,6 @@ import sttp.tapir.CodecFormat import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import dsp.valueobjects.V2 import org.knora.webapi.IRI import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.BuiltInGroups import org.knora.webapi.messages.admin.responder.projectsmessages.Project @@ -109,21 +108,21 @@ object GroupName extends StringValueCompanion[GroupName] { Right(GroupName(value)).filterOrElse(_.value.nonEmpty, GroupErrorMessages.GroupNameMissing) } -final case class GroupDescriptions private (value: Seq[V2.StringLiteralV2]) +final case class GroupDescriptions private (value: Seq[StringLiteralV2]) extends AnyVal - with Value[Seq[V2.StringLiteralV2]] { + with Value[Seq[StringLiteralV2]] { def toRdfLiterals: Seq[StringLiteral] = value.map(_.toRdfLiteral) } -object GroupDescriptions extends WithFrom[Seq[V2.StringLiteralV2], GroupDescriptions] { - def from(value: Seq[V2.StringLiteralV2]): Either[String, GroupDescriptions] = +object GroupDescriptions extends WithFrom[Seq[StringLiteralV2], GroupDescriptions] { + def from(value: Seq[StringLiteralV2]): Either[String, GroupDescriptions] = value.toList match { case descriptions @ (v2String :: _) if v2String.value.nonEmpty => Right(GroupDescriptions(descriptions)) case _ :: _ => Left(GroupErrorMessages.GroupDescriptionsInvalid) case _ => Left(GroupErrorMessages.GroupDescriptionsMissing) } - def fromOne(value: V2.StringLiteralV2): Either[String, V2.StringLiteralV2] = + def fromOne(value: StringLiteralV2): Either[String, StringLiteralV2] = Some(value).filter(_.value.nonEmpty).toRight(GroupErrorMessages.GroupDescriptionsInvalid) } @@ -150,8 +149,8 @@ object KnoraGroup { object Conversions { implicit val groupIriConverter: String => Either[String, GroupIri] = GroupIri.from implicit val groupNameConverter: String => Either[String, GroupName] = GroupName.from - implicit val groupDescriptionsConverter: LangString => Either[String, V2.StringLiteralV2] = langString => - GroupDescriptions.fromOne(V2.StringLiteralV2(langString.value, langString.lang)) + implicit val groupDescriptionsConverter: LangString => Either[String, StringLiteralV2] = langString => + GroupDescriptions.fromOne(StringLiteralV2.from(langString.value, langString.lang)) implicit val groupStatusConverter: Boolean => Either[String, GroupStatus] = value => Right(GroupStatus.from(value)) implicit val groupHasSelfJoinEnabledConverter: Boolean => Either[String, GroupSelfJoin] = value => Right(GroupSelfJoin.from(value)) diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala index b6f6ab383b..aaf0ab293c 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala @@ -13,7 +13,7 @@ import dsp.valueobjects.Iri.isProjectIri import dsp.valueobjects.Iri.validateAndEscapeProjectIri import dsp.valueobjects.IriErrorMessages import dsp.valueobjects.UuidUtil -import dsp.valueobjects.V2 +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.common.StringValueCompanion import org.knora.webapi.slice.common.Value @@ -92,16 +92,14 @@ object KnoraProject { else Left("Longname must be 3 to 256 characters long.") } - final case class Description private (override val value: V2.StringLiteralV2) - extends AnyVal - with Value[V2.StringLiteralV2] + final case class Description private (override val value: StringLiteralV2) extends AnyVal with Value[StringLiteralV2] - object Description extends WithFrom[V2.StringLiteralV2, Description] { + object Description extends WithFrom[StringLiteralV2, Description] { def unsafeFrom(text: String, lang: Option[String]): Description = - Description.from(V2.StringLiteralV2(text, lang)).fold(e => throw new IllegalArgumentException(e), identity) + Description.from(StringLiteralV2.from(text, lang)).fold(e => throw new IllegalArgumentException(e), identity) - def from(literal: V2.StringLiteralV2): Either[String, Description] = + def from(literal: StringLiteralV2): Either[String, Description] = if (literal.value.length >= 3 && literal.value.length <= 40960) Right(Description(literal)) else Left("Description must be 3 to 40960 characters long.") } diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/ListProperties.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/ListProperties.scala index 327ea54991..3dcda7485a 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/ListProperties.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/ListProperties.scala @@ -9,7 +9,7 @@ import zio.prelude.Validation import dsp.valueobjects.Iri import dsp.valueobjects.UuidUtil -import dsp.valueobjects.V2 +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.common.IntValueCompanion import org.knora.webapi.slice.common.StringValueCompanion import org.knora.webapi.slice.common.Value @@ -73,33 +73,33 @@ object ListProperties { else { Left("Invalid position value is given. Position should be either a positive value, 0 or -1.") } } - final case class Labels private (value: Seq[V2.StringLiteralV2]) extends Value[Seq[V2.StringLiteralV2]] + final case class Labels private (value: Seq[StringLiteralV2]) extends Value[Seq[StringLiteralV2]] - object Labels extends WithFrom[Seq[V2.StringLiteralV2], Labels] { - def from(value: Seq[V2.StringLiteralV2]): Either[String, Labels] = + object Labels extends WithFrom[Seq[StringLiteralV2], Labels] { + def from(value: Seq[StringLiteralV2]): Either[String, Labels] = if (value.isEmpty) Left("At least one label needs to be supplied.") else { val validatedLabels = value.map(l => Validation .fromOption(Iri.toSparqlEncodedString(l.value)) .mapError(_ => "Invalid label.") - .map(V2.StringLiteralV2(_, l.language)), + .map(StringLiteralV2.from(_, l.language)), ) Validation.validateAll(validatedLabels).map(Labels.apply).toEitherWith(_.head) } } - final case class Comments private (value: Seq[V2.StringLiteralV2]) extends Value[Seq[V2.StringLiteralV2]] + final case class Comments private (value: Seq[StringLiteralV2]) extends Value[Seq[StringLiteralV2]] - object Comments extends WithFrom[Seq[V2.StringLiteralV2], Comments] { - def from(value: Seq[V2.StringLiteralV2]): Either[String, Comments] = + object Comments extends WithFrom[Seq[StringLiteralV2], Comments] { + def from(value: Seq[StringLiteralV2]): Either[String, Comments] = if (value.isEmpty) Left("At least one comment needs to be supplied.") else { val validatedComments = value.map(c => Validation .fromOption(Iri.toSparqlEncodedString(c.value)) .mapError(_ => "Invalid comment.") - .map(s => V2.StringLiteralV2(s, c.language)), + .map(s => StringLiteralV2.from(s, c.language)), ) Validation.validateAll(validatedComments).map(Comments.apply).toEitherWith(_.head) } diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala index 4da07dd99c..52fc198604 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/RdfConversions.scala @@ -6,7 +6,7 @@ package org.knora.webapi.slice.admin.repo.rdf import dsp.valueobjects.LanguageCode -import dsp.valueobjects.V2 +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.domain.model.Email import org.knora.webapi.slice.admin.domain.model.FamilyName import org.knora.webapi.slice.admin.domain.model.GivenName @@ -32,7 +32,7 @@ object RdfConversions { implicit val statusConverter: Boolean => Either[String, Status] = value => Right(Status.from(value)) implicit val selfjoinConverter: Boolean => Either[String, SelfJoin] = value => Right(SelfJoin.from(value)) implicit val descriptionConverter: LangString => Either[String, Description] = langString => - Description.from(V2.StringLiteralV2(langString.value, langString.lang)) + Description.from(StringLiteralV2.from(langString.value, langString.lang)) // User properties implicit val usernameConverter: String => Either[String, Username] = Username.from diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala index 1bd3102189..f5f5cb80d7 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/service/KnoraGroupRepoLive.scala @@ -20,8 +20,8 @@ import zio.ZIO import zio.ZLayer import zio.stream.ZStream -import dsp.valueobjects.V2 import org.knora.webapi.messages.OntologyConstants.KnoraAdmin +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.GroupIri @@ -58,7 +58,7 @@ final case class KnoraGroupRepoLive(triplestore: TriplestoreService) extends Kno for { id <- resource.iri.flatMap(it => ZIO.fromEither(GroupIri.from(it.value))) groupName <- resource.getStringLiteralOrFail[GroupName](KnoraAdmin.GroupName) - groupDescriptions <- resource.getLangStringLiteralsOrFail[V2.StringLiteralV2](KnoraAdmin.GroupDescriptions) + groupDescriptions <- resource.getLangStringLiteralsOrFail[StringLiteralV2](KnoraAdmin.GroupDescriptions) groupDescriptions <- ZIO.fromEither(GroupDescriptions.from(groupDescriptions)) groupStatus <- resource.getBooleanLiteralOrFail[GroupStatus](KnoraAdmin.StatusProp) belongsToProject <- resource.getObjectIrisConvert[ProjectIri](KnoraAdmin.BelongsToProject).map(_.headOption) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt index 7a50d737c6..11538ac8ac 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import dsp.valueobjects.V2 +@import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @* * Creates a new group. @@ -22,7 +22,7 @@ groupIri: IRI, groupClassIri: IRI, name: String, - descriptions: Seq[V2.StringLiteralV2], + descriptions: Seq[StringLiteralV2], projectIri: IRI, status: Boolean, hasSelfJoinEnabled: Boolean) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt index d75ed93ff4..ffa00e898a 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import dsp.valueobjects.V2 +@import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @* * Creates a new root list node. @@ -29,8 +29,8 @@ rootNodeIri: Option[IRI], position: Option[Int], maybeName: Option[String], - maybeLabels: Seq[V2.StringLiteralV2], - maybeComments: Option[Seq[V2.StringLiteralV2]] + maybeLabels: Seq[StringLiteralV2], + maybeComments: Option[Seq[StringLiteralV2]] ) PREFIX xsd: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt index 297ccb9fc7..1ac82ffb10 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import dsp.valueobjects.V2 +@import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @* * Creates a new project. @@ -28,7 +28,7 @@ shortname: String, shortcode: String, maybeLongname: Option[String], - descriptions: Seq[V2.StringLiteralV2], + descriptions: Seq[StringLiteralV2], maybeKeywords: Option[Seq[String]], maybeLogo: Option[String], status: Boolean, diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt index 09b8740cc4..31caae658b 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import dsp.valueobjects.V2 +@import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @** * Updates an existing group with the provided values. @@ -20,7 +20,7 @@ @(adminNamedGraphIri: IRI, groupIri: IRI, maybeName: Option[String], - maybeDescriptions: Option[Seq[V2.StringLiteralV2]], + maybeDescriptions: Option[Seq[StringLiteralV2]], maybeProject: Option[IRI], maybeStatus: Option[Boolean], maybeSelfjoin: Option[Boolean]) diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt index ffc2262b00..f2b5da20ea 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import dsp.valueobjects.V2 +@import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @** * Updates an existing list with the provided values. @@ -26,8 +26,8 @@ hasOldName: Boolean, isRootNode: Boolean, maybeName : Option[String], - maybeLabels: Option[Seq[V2.StringLiteralV2]], - maybeComments: Option[Seq[V2.StringLiteralV2]]) + maybeLabels: Option[Seq[StringLiteralV2]], + maybeComments: Option[Seq[StringLiteralV2]]) PREFIX rdf: PREFIX rdfs: diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt index 6217fb016a..fbca6613ab 100644 --- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt +++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt @@ -4,7 +4,7 @@ *@ @import org.knora.webapi.IRI -@import dsp.valueobjects.V2.StringLiteralV2 +@import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 @** * Updates an existing project with the provided values. diff --git a/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala b/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala index 846b1ff960..28b54cd7bc 100644 --- a/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala +++ b/webapi/src/test/scala/org/knora/webapi/TestDataFactory.scala @@ -9,8 +9,8 @@ import zio.Chunk import zio.NonEmptyChunk import dsp.valueobjects.LanguageCode -import dsp.valueobjects.V2 import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.* +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.domain.model.* import org.knora.webapi.slice.admin.domain.model.Email import org.knora.webapi.slice.admin.domain.model.FamilyName @@ -68,7 +68,7 @@ object TestDataFactory { val testUserGroup: KnoraGroup = KnoraGroup( GroupIri.unsafeFrom("http://rdfh.ch/groups/0001/1234"), GroupName.unsafeFrom("User Group"), - GroupDescriptions.unsafeFrom(List(V2.StringLiteralV2("one user group to rule them all", None))), + GroupDescriptions.unsafeFrom(List(StringLiteralV2.from("one user group to rule them all", None))), GroupStatus.from(true), Some(ProjectIri.unsafeFrom("http://rdfh.ch/projects/0001")), GroupSelfJoin.from(false), @@ -80,7 +80,7 @@ object TestDataFactory { Shortname.unsafeFrom("shortname"), Shortcode.unsafeFrom("0001"), None, - NonEmptyChunk(Description.unsafeFrom(V2.StringLiteralV2("Some description", None))), + NonEmptyChunk(Description.unsafeFrom(StringLiteralV2.from("Some description", None))), List.empty, None, Status.Active, diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala index 8525acedf6..1ef7490671 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraGroupSpec.scala @@ -7,16 +7,15 @@ package dsp.valueobjects import zio.test.* +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.domain.model.* /** * This spec is used to test the [[Group]] value objects creation. */ object KnoraGroupSpec extends ZIOSpecDefault { - private val validDescription = Seq(V2.StringLiteralV2(value = "Valid group description", language = Some("en"))) - private val invalidDescription = Seq( - V2.StringLiteralV2(value = "", language = Some("en")), - ) + private val validDescription = Seq(StringLiteralV2.from(value = "Valid group description", language = Some("en"))) + private val invalidDescription = Seq(StringLiteralV2.unsafeFrom(value = "", language = Some("en"))) def spec: Spec[Any, Any] = groupNameTest + groupDescriptionsTest + groupStatusTest + groupSelfJoinTest @@ -31,7 +30,7 @@ object KnoraGroupSpec extends ZIOSpecDefault { private val groupDescriptionsTest = suite("GroupDescriptions should")( test("not be created from an empty value") { - val emptyDescription = Seq.empty[V2.StringLiteralV2] + val emptyDescription = Seq.empty[StringLiteralV2] assertTrue(GroupDescriptions.from(emptyDescription) == Left(GroupErrorMessages.GroupDescriptionsMissing)) }, test("not be created from an invalid value") { diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala index 41d32f2f88..d5d1153a5d 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/KnoraProjectSpec.scala @@ -10,7 +10,7 @@ import zio.test.* import scala.util.Random -import dsp.valueobjects.V2 +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.domain.model.KnoraProject.* /** @@ -133,20 +133,22 @@ object KnoraProjectSpec extends ZIOSpecDefault { private val descriptionTest = suite("Description")( test("pass an object containing too short Description and expect an error to be returned") { assertTrue( - Description.from(V2.StringLiteralV2("Ab", Some("en"))) == + Description.from(StringLiteralV2.from("Ab", Some("en"))) == Left("Description must be 3 to 40960 characters long."), ) }, test("pass an object containing too long Description and expect an error to be returned") { assertTrue( - Description.from(V2.StringLiteralV2(new Random().nextString(40961), Some("en"))) == + Description.from(StringLiteralV2.from(new Random().nextString(40961), Some("en"))) == Left("Description must be 3 to 40960 characters long."), ) }, test("pass a valid object and successfully create value object") { assertTrue( - Description.from(V2.StringLiteralV2(value = "Valid project description", language = Some("en"))).map(_.value) == - Right(V2.StringLiteralV2(value = "Valid project description", language = Some("en"))), + Description + .from(StringLiteralV2.from(value = "Valid project description", language = Some("en"))) + .map(_.value) == + Right(StringLiteralV2.from(value = "Valid project description", language = Some("en"))), ) }, ) diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala index bc85a1edc7..822ebb75fa 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/model/ListPropertiesSpec.scala @@ -11,7 +11,7 @@ import zio.test.ZIOSpecDefault import zio.test.assertTrue import zio.test.check -import dsp.valueobjects.V2 +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.domain.model.ListProperties.* /** @@ -82,11 +82,11 @@ object ListPropertiesSpec extends ZIOSpecDefault { assertTrue(Labels.from(Seq.empty) == Left("At least one label needs to be supplied.")) }, test("pass an invalid object and return an error") { - val invalid = Seq(V2.StringLiteralV2(value = "Invalid list label \r", language = Some("en"))) + val invalid = Seq(StringLiteralV2.from(value = "Invalid list label \r", language = Some("en"))) assertTrue(Labels.from(invalid) == Left("Invalid label.")) }, test("pass a valid object and successfully create value object") { - val valid = Seq(V2.StringLiteralV2(value = "Valid list label", language = Some("en"))) + val valid = Seq(StringLiteralV2.from(value = "Valid list label", language = Some("en"))) assertTrue(Labels.from(valid).map(_.value) == Right(valid)) }, ) @@ -96,11 +96,11 @@ object ListPropertiesSpec extends ZIOSpecDefault { assertTrue(Comments.from(Seq.empty) == Left("At least one comment needs to be supplied.")) }, test("pass an invalid object and return an error") { - val invalid = Seq(V2.StringLiteralV2(value = "Invalid list comment \r", language = Some("en"))) + val invalid = Seq(StringLiteralV2.from(value = "Invalid list comment \r", language = Some("en"))) assertTrue(Comments.from(invalid) == Left("Invalid comment.")) }, test("pass a valid object and successfully create value object") { - val valid = Seq(V2.StringLiteralV2(value = "Valid list comment", language = Some("en"))) + val valid = Seq(StringLiteralV2.from(value = "Valid list comment", language = Some("en"))) assertTrue(Comments.from(valid).map(_.value) == Right(valid)) }, ) diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala index 4a62d1f874..4928dc8cc3 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/ProjectServiceSpec.scala @@ -10,8 +10,8 @@ import zio.test.Spec import zio.test.ZIOSpecDefault import zio.test.assertTrue -import dsp.valueobjects.V2.StringLiteralV2 import org.knora.webapi.messages.admin.responder.projectsmessages.Project +import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2 import org.knora.webapi.slice.admin.domain.model.KnoraProject import org.knora.webapi.slice.admin.domain.model.KnoraProject.* import org.knora.webapi.slice.admin.domain.model.RestrictedView @@ -29,7 +29,7 @@ object ProjectServiceSpec extends ZIOSpecDefault { shortname = shortname, shortcode = shortcode, longname = None, - description = List(StringLiteralV2("description not used in test", None)), + description = List(StringLiteralV2.from("description not used in test", None)), keywords = List.empty, logo = None, ontologies = List.empty, @@ -48,7 +48,8 @@ object ProjectServiceSpec extends ZIOSpecDefault { shortname = Shortname.unsafeFrom(shortname), shortcode = Shortcode.unsafeFrom(shortcode), longname = None, - description = NonEmptyChunk(Description.unsafeFrom(StringLiteralV2("description not used in test", None))), + description = + NonEmptyChunk(Description.unsafeFrom(StringLiteralV2.from("description not used in test", None))), keywords = List.empty, logo = None, status = Status.Active,