From 3decf23ff369ad6c5416578343fb0dbc31a17a95 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Thu, 7 Mar 2024 19:42:42 +0100 Subject: [PATCH] chore: Patch dependency updates (#3077) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christian Kleinbölting --- build.sbt | 2 +- project/Dependencies.scala | 12 ++--- project/build.properties | 2 +- project/plugins.sbt | 4 +- .../src/main/scala/dsp/valueobjects/Iri.scala | 9 ---- .../groupsmessages/GroupsMessagesADM.scala | 7 +-- .../listsmessages/ListsMessagesADM.scala | 22 +++++---- .../PermissionsMessagesADM.scala | 48 +++++++++---------- .../ProjectsMessagesADM.scala | 9 ++-- .../usersmessages/UsersMessagesADM.scala | 18 ++++--- .../store/sipimessages/SipiMessages.scala | 17 +++---- .../store/triplestoremessages/FusekiAPI.scala | 7 +-- .../TriplestoreMessages.scala | 4 +- .../ontologymessages/OntologyMessagesV2.scala | 2 +- .../AuthenticationMessagesV2.scala | 11 +++-- .../responders/admin/GroupsResponderADM.scala | 4 +- .../responders/v2/OntologyResponderV2.scala | 2 +- .../responders/v2/ResourcesResponderV2.scala | 2 +- .../knora/webapi/routing/Authenticator.scala | 2 +- .../webapi/routing/v2/StandoffRouteV2.scala | 2 +- .../admin/api/service/GroupsRestService.scala | 2 +- .../admin/api/service/UsersRestService.scala | 2 +- .../domain/service/MaintenanceService.scala | 2 +- .../slice/common/repo/rdf/RdfModel.scala | 20 ++++---- .../domain/service/CardinalityService.scala | 6 +-- .../impl/TriplestoreServiceLive.scala | 2 +- .../api/TriplestoreServiceInMemory.scala | 5 +- 27 files changed, 109 insertions(+), 116 deletions(-) diff --git a/build.sbt b/build.sbt index d3bfeae0a5..ee37492d6f 100644 --- a/build.sbt +++ b/build.sbt @@ -140,7 +140,7 @@ lazy val webApiCommonSettings = Seq( testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework") val customScalacOptions = Seq( - "-Xsource:3", + "-Xsource:3-cross", "-Wconf:msg=constructor modifiers are assumed:s", "-feature", "-unchecked", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 969a5ee241..96a30ca4ba 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { "daschswiss/apache-jena-fuseki:2.1.5" // should be the same version as in docker-compose.yml, also make sure to use the same version when deploying it (i.e. version in ops-deploy)! val sipiImage = "daschswiss/sipi:3.9.0" // base image the knora-sipi image is created from - val ScalaVersion = "2.13.12" + val ScalaVersion = "2.13.13" val PekkoActorVersion = "1.0.2" val PekkoHttpVersion = "1.0.1" @@ -23,7 +23,7 @@ object Dependencies { val Rdf4jVersion = "4.3.9" val ZioConfigVersion = "4.0.1" - val ZioLoggingVersion = "2.2.0" + val ZioLoggingVersion = "2.2.2" val ZioNioVersion = "2.0.2" val ZioMetricsConnectorsVersion = "2.3.1" val ZioPreludeVersion = "1.0.0-RC23" @@ -79,7 +79,7 @@ object Dependencies { val jwtSprayJson = "com.github.jwt-scala" %% "jwt-spray-json" % "9.0.2" // jwtSprayJson -> 9.0.2 is the latest version that's compatible with spray-json; if it wasn't for spray, this would be Scala 3 compatible val springSecurityCore = - "org.springframework.security" % "spring-security-core" % "6.2.1" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop") + "org.springframework.security" % "spring-security-core" % "6.2.2" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop") val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.77" // caching @@ -109,13 +109,13 @@ object Dependencies { // A needed class was not found. This could be due to an error in your runpath.Missing class: scoverage / Invoker$ // java.lang.NoClassDefFoundError: scoverage / Invoker$ val scoverage = "org.scoverage" %% "scalac-scoverage-runtime" % "2.1.0" - val testcontainers = "org.testcontainers" % "testcontainers" % "1.19.5" + val testcontainers = "org.testcontainers" % "testcontainers" % "1.19.7" val wiremock = "org.wiremock" % "wiremock" % "3.4.2" // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.14.0" - val tapirVersion = "1.9.9" + val tapirVersion = "1.9.11" val tapir = Seq( "com.softwaremill.sttp.tapir" %% "tapir-pekko-http-server" % tapirVersion, @@ -123,7 +123,7 @@ object Dependencies { "com.softwaremill.sttp.tapir" %% "tapir-json-zio" % tapirVersion, "com.softwaremill.sttp.tapir" %% "tapir-json-spray" % tapirVersion, "com.softwaremill.sttp.tapir" %% "tapir-swagger-ui-bundle" % tapirVersion, - "com.softwaremill.sttp.tapir" %% "tapir-refined" % "1.9.9", + "com.softwaremill.sttp.tapir" %% "tapir-refined" % tapirVersion, ) val metrics = Seq( "dev.zio" %% "zio-metrics-connectors" % ZioMetricsConnectorsVersion, diff --git a/project/build.properties b/project/build.properties index abbbce5da4..04267b14af 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 479cea6c74..cdb1d09f7b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,11 +7,11 @@ resolvers ++= Seq( addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2") -addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.3") +addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.4") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5") addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.8") // also update the scalac-scoverage-runtime version in build.sbt -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.10") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") diff --git a/webapi/src/main/scala/dsp/valueobjects/Iri.scala b/webapi/src/main/scala/dsp/valueobjects/Iri.scala index 5768fc27dc..34c6d5cdb4 100644 --- a/webapi/src/main/scala/dsp/valueobjects/Iri.scala +++ b/webapi/src/main/scala/dsp/valueobjects/Iri.scala @@ -123,15 +123,6 @@ object Iri { if (isProjectIri(iri)) toSparqlEncodedString(iri) else None - /** - */ - final case class SimpleIri private (value: String) extends Iri - object SimpleIri { - def from(value: String): Either[String, Iri] = - if (isIri(value)) Right(SimpleIri(value)) - else Left(s"Invalid IRI: $value") - } - /** * Base64Uuid value object. * This is base64 encoded UUID version without paddings. diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/groupsmessages/GroupsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/groupsmessages/GroupsMessagesADM.scala index 8da9dd55a2..0471982144 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/groupsmessages/GroupsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/groupsmessages/GroupsMessagesADM.scala @@ -69,8 +69,9 @@ case class GroupGetResponseADM(group: Group) extends AdminKnoraResponseADM with */ trait GroupsADMJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol with ProjectsADMJsonProtocol { - implicit val groupADMFormat: JsonFormat[Group] = jsonFormat6(Group) + implicit val groupADMFormat: JsonFormat[Group] = jsonFormat6(Group.apply) implicit val groupsGetResponseADMFormat: RootJsonFormat[GroupsGetResponseADM] = - jsonFormat(GroupsGetResponseADM, "groups") - implicit val groupResponseADMFormat: RootJsonFormat[GroupGetResponseADM] = jsonFormat(GroupGetResponseADM, "group") + jsonFormat(GroupsGetResponseADM.apply, "groups") + implicit val groupResponseADMFormat: RootJsonFormat[GroupGetResponseADM] = + jsonFormat(GroupGetResponseADM.apply, "group") } diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala index f6a680d1ed..3216544a5a 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADM.scala @@ -923,7 +923,8 @@ trait ListADMJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol with } } - implicit val listsGetResponseADMFormat: RootJsonFormat[ListsGetResponseADM] = jsonFormat(ListsGetResponseADM, "lists") + implicit val listsGetResponseADMFormat: RootJsonFormat[ListsGetResponseADM] = + jsonFormat(ListsGetResponseADM.apply, "lists") implicit val listItemGetResponseADMJsonFormat: RootJsonFormat[ListItemGetResponseADM] = new RootJsonFormat[ListItemGetResponseADM] { @@ -935,9 +936,10 @@ trait ListADMJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol with Try(listGetResponseADMFormat.read(json)) .getOrElse(listNodeGetResponseADMFormat.read(json)) } - implicit val listGetResponseADMFormat: RootJsonFormat[ListGetResponseADM] = jsonFormat(ListGetResponseADM, "list") + implicit val listGetResponseADMFormat: RootJsonFormat[ListGetResponseADM] = + jsonFormat(ListGetResponseADM.apply, "list") implicit val listNodeGetResponseADMFormat: RootJsonFormat[ListNodeGetResponseADM] = - jsonFormat(ListNodeGetResponseADM, "node") + jsonFormat(ListNodeGetResponseADM.apply, "node") implicit val nodeInfoGetResponseADMJsonFormat: RootJsonFormat[NodeInfoGetResponseADM] = new RootJsonFormat[NodeInfoGetResponseADM] { @@ -950,12 +952,12 @@ trait ListADMJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol with .getOrElse(listNodeInfoGetResponseADMFormat.read(json)) } implicit val listInfoGetResponseADMFormat: RootJsonFormat[RootNodeInfoGetResponseADM] = - jsonFormat(RootNodeInfoGetResponseADM, "listinfo") + jsonFormat(RootNodeInfoGetResponseADM.apply, "listinfo") implicit val listNodeInfoGetResponseADMFormat: RootJsonFormat[ChildNodeInfoGetResponseADM] = - jsonFormat(ChildNodeInfoGetResponseADM, "nodeinfo") + jsonFormat(ChildNodeInfoGetResponseADM.apply, "nodeinfo") implicit val changeNodePositionApiResponseADMFormat: RootJsonFormat[NodePositionChangeResponseADM] = - jsonFormat(NodePositionChangeResponseADM, "node") + jsonFormat(NodePositionChangeResponseADM.apply, "node") implicit val listItemDeleteResponseADMFormat: RootJsonFormat[ListItemDeleteResponseADM] = new RootJsonFormat[ListItemDeleteResponseADM] { @@ -968,12 +970,12 @@ trait ListADMJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol with .getOrElse(listNodeDeleteResponseADMFormat.read(json)) } implicit val listNodeDeleteResponseADMFormat: RootJsonFormat[ChildNodeDeleteResponseADM] = - jsonFormat(ChildNodeDeleteResponseADM, "node") + jsonFormat(ChildNodeDeleteResponseADM.apply, "node") implicit val listDeleteResponseADMFormat: RootJsonFormat[ListDeleteResponseADM] = - jsonFormat(ListDeleteResponseADM, "iri", "deleted") + jsonFormat(ListDeleteResponseADM.apply, "iri", "deleted") implicit val canDeleteListResponseADMFormat: RootJsonFormat[CanDeleteListResponseADM] = - jsonFormat(CanDeleteListResponseADM, "listIri", "canDeleteList") + jsonFormat(CanDeleteListResponseADM.apply, "listIri", "canDeleteList") implicit val ListNodeCommentsDeleteResponseADMFormat: RootJsonFormat[ListNodeCommentsDeleteResponseADM] = - jsonFormat(ListNodeCommentsDeleteResponseADM, "nodeIri", "commentsDeleted") + jsonFormat(ListNodeCommentsDeleteResponseADM.apply, "nodeIri", "commentsDeleted") } diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala index 125bc5e761..91c512b8e4 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADM.scala @@ -890,40 +890,38 @@ trait PermissionsADMJsonProtocol implicit val permissionADMFormat: JsonFormat[PermissionADM] = jsonFormat(PermissionADM.apply, "name", "additionalInformation", "permissionCode") - implicit val permissionInfoADMFormat: JsonFormat[PermissionInfoADM] = lazyFormat( - jsonFormat(PermissionInfoADM, "iri", "permissionType"), - ) + implicit val permissionInfoADMFormat: JsonFormat[PermissionInfoADM] = + lazyFormat(jsonFormat(PermissionInfoADM.apply, "iri", "permissionType")) - implicit val administrativePermissionADMFormat: JsonFormat[AdministrativePermissionADM] = lazyFormat( - jsonFormat(AdministrativePermissionADM, "iri", "forProject", "forGroup", "hasPermissions"), - ) + implicit val administrativePermissionADMFormat: JsonFormat[AdministrativePermissionADM] = + lazyFormat(jsonFormat(AdministrativePermissionADM.apply, "iri", "forProject", "forGroup", "hasPermissions")) implicit val objectAccessPermissionADMFormat: JsonFormat[ObjectAccessPermissionADM] = - jsonFormat(ObjectAccessPermissionADM, "forResource", "forValue", "hasPermissions") + jsonFormat(ObjectAccessPermissionADM.apply, "forResource", "forValue", "hasPermissions") - implicit val defaultObjectAccessPermissionADMFormat: JsonFormat[DefaultObjectAccessPermissionADM] = lazyFormat( - jsonFormat6(DefaultObjectAccessPermissionADM), - ) + implicit val defaultObjectAccessPermissionADMFormat: JsonFormat[DefaultObjectAccessPermissionADM] = + lazyFormat(jsonFormat6(DefaultObjectAccessPermissionADM.apply)) - implicit val permissionsDataADMFormat: JsonFormat[PermissionsDataADM] = jsonFormat2(PermissionsDataADM) + implicit val permissionsDataADMFormat: JsonFormat[PermissionsDataADM] = + jsonFormat2(PermissionsDataADM.apply) implicit val permissionsForProjectGetResponseADMFormat: RootJsonFormat[PermissionsForProjectGetResponseADM] = - jsonFormat(PermissionsForProjectGetResponseADM, "permissions") + jsonFormat(PermissionsForProjectGetResponseADM.apply, "permissions") implicit val administrativePermissionsForProjectGetResponseADMFormat : RootJsonFormat[AdministrativePermissionsForProjectGetResponseADM] = - jsonFormat(AdministrativePermissionsForProjectGetResponseADM, "administrative_permissions") + jsonFormat(AdministrativePermissionsForProjectGetResponseADM.apply, "administrative_permissions") implicit val defaultObjectAccessPermissionsForProjectGetResponseADMFormat : RootJsonFormat[DefaultObjectAccessPermissionsForProjectGetResponseADM] = - jsonFormat(DefaultObjectAccessPermissionsForProjectGetResponseADM, "default_object_access_permissions") + jsonFormat(DefaultObjectAccessPermissionsForProjectGetResponseADM.apply, "default_object_access_permissions") implicit val administrativePermissionGetResponseADMFormat: RootJsonFormat[AdministrativePermissionGetResponseADM] = - jsonFormat(AdministrativePermissionGetResponseADM, "administrative_permission") + jsonFormat(AdministrativePermissionGetResponseADM.apply, "administrative_permission") implicit val defaultObjectAccessPermissionGetResponseADMFormat : RootJsonFormat[DefaultObjectAccessPermissionGetResponseADM] = - jsonFormat(DefaultObjectAccessPermissionGetResponseADM, "default_object_access_permission") + jsonFormat(DefaultObjectAccessPermissionGetResponseADM.apply, "default_object_access_permission") implicit val permissionGetResponseADMFormat: RootJsonFormat[PermissionGetResponseADM] = new RootJsonFormat[PermissionGetResponseADM] { @@ -940,7 +938,7 @@ trait PermissionsADMJsonProtocol implicit val createAdministrativePermissionAPIRequestADMFormat : RootJsonFormat[CreateAdministrativePermissionAPIRequestADM] = rootFormat( lazyFormat( - jsonFormat(CreateAdministrativePermissionAPIRequestADM, "id", "forProject", "forGroup", "hasPermissions"), + jsonFormat(CreateAdministrativePermissionAPIRequestADM.apply, "id", "forProject", "forGroup", "hasPermissions"), ), ) @@ -948,7 +946,7 @@ trait PermissionsADMJsonProtocol : RootJsonFormat[CreateDefaultObjectAccessPermissionAPIRequestADM] = rootFormat( lazyFormat( jsonFormat( - CreateDefaultObjectAccessPermissionAPIRequestADM, + CreateDefaultObjectAccessPermissionAPIRequestADM.apply, "id", "forProject", "forGroup", @@ -961,28 +959,28 @@ trait PermissionsADMJsonProtocol implicit val administrativePermissionCreateResponseADMFormat : RootJsonFormat[AdministrativePermissionCreateResponseADM] = rootFormat( - lazyFormat(jsonFormat(AdministrativePermissionCreateResponseADM, "administrative_permission")), + lazyFormat(jsonFormat(AdministrativePermissionCreateResponseADM.apply, "administrative_permission")), ) implicit val defaultObjectAccessPermissionCreateResponseADMFormat : RootJsonFormat[DefaultObjectAccessPermissionCreateResponseADM] = - jsonFormat(DefaultObjectAccessPermissionCreateResponseADM, "default_object_access_permission") + jsonFormat(DefaultObjectAccessPermissionCreateResponseADM.apply, "default_object_access_permission") implicit val changePermissionGroupApiRequestADMFormat: RootJsonFormat[ChangePermissionGroupApiRequestADM] = - jsonFormat(ChangePermissionGroupApiRequestADM, "forGroup") + jsonFormat(ChangePermissionGroupApiRequestADM.apply, "forGroup") implicit val changePermissionHasPermissionsApiRequestADMFormat : RootJsonFormat[ChangePermissionHasPermissionsApiRequestADM] = - jsonFormat(ChangePermissionHasPermissionsApiRequestADM, "hasPermissions") + jsonFormat(ChangePermissionHasPermissionsApiRequestADM.apply, "hasPermissions") implicit val changePermissionResourceClassApiRequestADMFormat : RootJsonFormat[ChangePermissionResourceClassApiRequestADM] = - jsonFormat(ChangePermissionResourceClassApiRequestADM, "forResourceClass") + jsonFormat(ChangePermissionResourceClassApiRequestADM.apply, "forResourceClass") implicit val changePermissionPropertyApiRequestADMFormat: RootJsonFormat[ChangePermissionPropertyApiRequestADM] = - jsonFormat(ChangePermissionPropertyApiRequestADM, "forProperty") + jsonFormat(ChangePermissionPropertyApiRequestADM.apply, "forProperty") implicit val permissionDeleteResponseADMFormat: RootJsonFormat[PermissionDeleteResponseADM] = - jsonFormat(PermissionDeleteResponseADM, "permissionIri", "deleted") + jsonFormat(PermissionDeleteResponseADM.apply, "permissionIri", "deleted") } 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 7fdfe40588..287a0ddc7c 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 @@ -411,7 +411,7 @@ trait ProjectsADMJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol implicit val projectADMFormat: JsonFormat[ProjectADM] = lazyFormat( jsonFormat( - ProjectADM, + ProjectADM.apply, "id", "shortname", "shortcode", @@ -426,13 +426,12 @@ trait ProjectsADMJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol ) implicit val projectAdminMembersGetResponseADMFormat: RootJsonFormat[ProjectAdminMembersGetResponseADM] = rootFormat( - lazyFormat(jsonFormat(ProjectAdminMembersGetResponseADM, "members")), + lazyFormat(jsonFormat(ProjectAdminMembersGetResponseADM.apply, "members")), ) implicit val projectMembersGetResponseADMFormat: RootJsonFormat[ProjectMembersGetResponseADM] = rootFormat( - lazyFormat(jsonFormat(ProjectMembersGetResponseADM, "members")), + lazyFormat(jsonFormat(ProjectMembersGetResponseADM.apply, "members")), ) - implicit val projectOperationResponseADMFormat: RootJsonFormat[ProjectOperationResponseADM] = rootFormat( - lazyFormat(jsonFormat(ProjectOperationResponseADM, "project")), + lazyFormat(jsonFormat(ProjectOperationResponseADM.apply, "project")), ) } diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala index 067d39136b..d5c71bdc31 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala @@ -129,15 +129,19 @@ object UsersADMJsonProtocol with GroupsADMJsonProtocol with PermissionsADMJsonProtocol { - implicit val userADMFormat: JsonFormat[User] = jsonFormat11(User) + implicit val userADMFormat: JsonFormat[User] = + jsonFormat11(User.apply) implicit val groupMembersGetResponseADMFormat: RootJsonFormat[GroupMembersGetResponseADM] = - jsonFormat(GroupMembersGetResponseADM, "members") - implicit val usersGetResponseADMFormat: RootJsonFormat[UsersGetResponseADM] = jsonFormat1(UsersGetResponseADM) - implicit val userProfileResponseADMFormat: RootJsonFormat[UserResponseADM] = jsonFormat1(UserResponseADM) + jsonFormat(GroupMembersGetResponseADM.apply, "members") + implicit val usersGetResponseADMFormat: RootJsonFormat[UsersGetResponseADM] = + jsonFormat1(UsersGetResponseADM.apply) + implicit val userProfileResponseADMFormat: RootJsonFormat[UserResponseADM] = + jsonFormat1(UserResponseADM.apply) implicit val userProjectMembershipsGetResponseADMFormat: RootJsonFormat[UserProjectMembershipsGetResponseADM] = - jsonFormat1(UserProjectMembershipsGetResponseADM) + jsonFormat1(UserProjectMembershipsGetResponseADM.apply) implicit val userProjectAdminMembershipsGetResponseADMFormat - : RootJsonFormat[UserProjectAdminMembershipsGetResponseADM] = jsonFormat1(UserProjectAdminMembershipsGetResponseADM) + : RootJsonFormat[UserProjectAdminMembershipsGetResponseADM] = + jsonFormat1(UserProjectAdminMembershipsGetResponseADM.apply) implicit val userGroupMembershipsGetResponseADMFormat: RootJsonFormat[UserGroupMembershipsGetResponseADM] = - jsonFormat1(UserGroupMembershipsGetResponseADM) + jsonFormat1(UserGroupMembershipsGetResponseADM.apply) } diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala index fc2a404e4b..6dc69a590e 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala @@ -118,10 +118,10 @@ case class SipiUploadWithoutProcessingResponseEntry( case class SipiUploadResponse(uploadedFiles: Seq[SipiUploadResponseEntry]) object SipiUploadResponseJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol { - implicit val sipiUploadResponseEntryFormat: RootJsonFormat[SipiUploadResponseEntry] = jsonFormat4( - SipiUploadResponseEntry, - ) - implicit val sipiUploadResponseFormat: RootJsonFormat[SipiUploadResponse] = jsonFormat1(SipiUploadResponse) + implicit val sipiUploadResponseEntryFormat: RootJsonFormat[SipiUploadResponseEntry] = + jsonFormat4(SipiUploadResponseEntry.apply) + implicit val sipiUploadResponseFormat: RootJsonFormat[SipiUploadResponse] = + jsonFormat1(SipiUploadResponse.apply) } /** @@ -133,11 +133,8 @@ case class SipiUploadWithoutProcessingResponse(uploadedFiles: Seq[SipiUploadWith object SipiUploadWithoutProcessingResponseJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol { implicit val sipiUploadWithoutProcessingResponseEntryFormat - : RootJsonFormat[SipiUploadWithoutProcessingResponseEntry] = jsonFormat3( - SipiUploadWithoutProcessingResponseEntry, - ) + : RootJsonFormat[SipiUploadWithoutProcessingResponseEntry] = + jsonFormat3(SipiUploadWithoutProcessingResponseEntry.apply) implicit val sipiUploadWithoutProcessingResponseFormat: RootJsonFormat[SipiUploadWithoutProcessingResponse] = - jsonFormat1( - SipiUploadWithoutProcessingResponse, - ) + jsonFormat1(SipiUploadWithoutProcessingResponse.apply) } diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/FusekiAPI.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/FusekiAPI.scala index 73468a485b..de972f1479 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/FusekiAPI.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/FusekiAPI.scala @@ -51,8 +51,9 @@ case class FusekiService(srvType: String, srvDescription: String, srvEndpoints: */ object FusekiJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol { implicit val fusekiServiceFormat: JsonFormat[FusekiService] = - jsonFormat(FusekiService, "srv.type", "srv.description", "srv.endpoints") + jsonFormat(FusekiService.apply, "srv.type", "srv.description", "srv.endpoints") implicit val fusekiDatasetFormat: JsonFormat[FusekiDataset] = - jsonFormat(FusekiDataset, "ds.name", "ds.state", "ds.services") - implicit val fusekiServerFormat: RootJsonFormat[FusekiServer] = jsonFormat4(FusekiServer) + jsonFormat(FusekiDataset.apply, "ds.name", "ds.state", "ds.services") + implicit val fusekiServerFormat: RootJsonFormat[FusekiServer] = + jsonFormat4(FusekiServer.apply) } 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 1b3cab3ed3..ce9a218cdf 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 @@ -483,8 +483,8 @@ object SparqlResultProtocol extends DefaultJsonProtocol { def write(sparqlSelectResponseBody: SparqlSelectResultBody): JsValue = ??? } - implicit val headerFormat: JsonFormat[SparqlSelectResultHeader] = jsonFormat1(SparqlSelectResultHeader) - implicit val responseFormat: JsonFormat[SparqlSelectResult] = jsonFormat2(SparqlSelectResult) + implicit val headerFormat: JsonFormat[SparqlSelectResultHeader] = jsonFormat1(SparqlSelectResultHeader.apply) + implicit val responseFormat: JsonFormat[SparqlSelectResult] = jsonFormat2(SparqlSelectResult.apply) } /** 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 bcf50278f2..b17b6fb683 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 @@ -2715,7 +2715,7 @@ case class ReadPropertyInfoV2( case objs if objs.nonEmpty => Some( SalsahGui.External.GuiAttribute -> JsonLDArray( - objs.toArray.sorted.map(JsonLDString).toIndexedSeq, + objs.toArray.sorted.map(JsonLDString.apply).toIndexedSeq, ), ) diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala b/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala index 520080f1ad..4a2ec71cb0 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/v2/routing/authenticationmessages/AuthenticationMessagesV2.scala @@ -52,9 +52,9 @@ sealed trait CredentialsIdentifier object CredentialsIdentifier { def fromOptions(iri: Option[IRI], email: Option[IRI], username: Option[IRI]): Option[CredentialsIdentifier] = (iri, email, username) match { - case (Some(iri), _, _) => UserIri.from(iri).toOption.map(IriIdentifier) - case (_, Some(email), _) => Email.from(email).toOption.map(EmailIdentifier) - case (_, _, Some(username)) => Username.from(username).toOption.map(UsernameIdentifier) + case (Some(iri), _, _) => UserIri.from(iri).toOption.map(IriIdentifier.apply) + case (_, Some(email), _) => Email.from(email).toOption.map(EmailIdentifier.apply) + case (_, _, Some(username)) => Username.from(username).toOption.map(UsernameIdentifier.apply) case _ => None } @@ -111,8 +111,9 @@ final case class LoginResponse(token: String) */ trait AuthenticationV2JsonProtocol extends DefaultJsonProtocol with NullOptions with SprayJsonSupport { implicit val loginApiRequestPayloadV2Format: RootJsonFormat[LoginApiRequestPayloadV2] = - jsonFormat(LoginApiRequestPayloadV2, "iri", "email", "username", "password") - implicit val SessionResponseFormat: RootJsonFormat[LoginResponse] = jsonFormat1(LoginResponse.apply) + jsonFormat(LoginApiRequestPayloadV2.apply, "iri", "email", "username", "password") + implicit val SessionResponseFormat: RootJsonFormat[LoginResponse] = + jsonFormat1(LoginResponse.apply) } trait AuthenticationV2Serialization { diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala index db5de723fe..c131b6686e 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/admin/GroupsResponderADM.scala @@ -231,7 +231,7 @@ final case class GroupsResponderADMLive( ZioHelper.sequence(groupIris.map { iri => groupGetADM(iri) .flatMap(ZIO.fromOption(_)) - .mapBoth(_ => NotFoundException(s"Group <$iri> not found."), GroupGetResponseADM) + .mapBoth(_ => NotFoundException(s"Group <$iri> not found."), GroupGetResponseADM.apply) }) /** @@ -292,7 +292,7 @@ final case class GroupsResponderADMLive( * @return A [[GroupMembersGetResponseADM]] */ override def groupMembersGetRequest(iri: GroupIri, user: User): Task[GroupMembersGetResponseADM] = - groupMembersGetADM(iri.value, user).map(GroupMembersGetResponseADM) + groupMembersGetADM(iri.value, user).map(GroupMembersGetResponseADM.apply) /** * Create a new group. 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 f787682ba3..558939ac41 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 @@ -246,7 +246,7 @@ final case class OntologyResponderV2Live( ontologyCache.getCacheData.map { data => val ontologies: Iterable[ReadOntologyV2] = data.ontologies.values ontologies.flatMap(_.properties.view.filterKeys(data.standoffProperties)).toMap - }.map(StandoffAllPropertyEntitiesGetResponseV2) + }.map(StandoffAllPropertyEntitiesGetResponseV2.apply) /** * Checks whether a certain Knora resource or value class is a subclass of another class. diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala index e73147f3d7..b6ce849a21 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/ResourcesResponderV2.scala @@ -2376,7 +2376,7 @@ final case class ResourcesResponderV2Live( ), ) } - .map(JsonLDArray) + .map(JsonLDArray.apply) /** * Returns all events describing the history of a resource ordered by version date. diff --git a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala index d9d774f2bc..97b489af1f 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/Authenticator.scala @@ -535,7 +535,7 @@ final case class AuthenticatorLive( Email .from(email) .toOption - .map(CredentialsIdentifier.EmailIdentifier) + .map(CredentialsIdentifier.EmailIdentifier.apply) .map(KnoraPasswordCredentialsV2(_, password)) case _ => None } diff --git a/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala b/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala index af962d6785..90b46273f0 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/v2/StandoffRouteV2.scala @@ -97,7 +97,7 @@ final case class StandoffRouteV2()( .fromOption(allParts.get(xmlPartKey)) .mapBoth( _ => BadRequestException(s"MultiPart POST request was sent without required '$xmlPartKey' part!"), - CreateMappingRequestXMLV2, + CreateMappingRequestXMLV2.apply, ) } yield CreateMappingRequestV2(metadata, xml, requestingUser, apiRequestID) RouteUtilV2.runRdfRouteZ(requestMessageTask, requestContext) diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupsRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupsRestService.scala index c514fe44a1..ffe976e7d2 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupsRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/GroupsRestService.scala @@ -37,7 +37,7 @@ final case class GroupsRestServiceLive( format: KnoraResponseRenderer, ) extends GroupsRestService { override def getGroups: Task[GroupsGetResponseADM] = for { - internal <- responder.groupsGetADM.map(GroupsGetResponseADM) + internal <- responder.groupsGetADM.map(GroupsGetResponseADM.apply) external <- format.toExternalADM(internal) } yield external diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UsersRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UsersRestService.scala index 5fdf2a623e..8a8ae02b41 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UsersRestService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/UsersRestService.scala @@ -81,7 +81,7 @@ final case class UsersRestService( userService .findUserByIri(userIri) .map(_.map(_.groups).getOrElse(Seq.empty)) - .map(UserGroupMembershipsGetResponseADM) + .map(UserGroupMembershipsGetResponseADM.apply) .flatMap(format.toExternalADM) def createUser(requestingUser: User, userCreateRequest: Requests.UserCreateRequest): Task[UserResponseADM] = diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala index e226eb94ee..aac1c23c16 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/MaintenanceService.scala @@ -90,7 +90,7 @@ final case class MaintenanceServiceLive( for { result <- triplestoreService.query(checkDimensionsQuery(project, asset.id)).asSomeError rowMap <- ZIO.fromOption(result.results.bindings.headOption.map(_.rowMap)) - iri <- ZIO.fromOption(rowMap.get("valueIri")).map(InternalIri) + iri <- ZIO.fromOption(rowMap.get("valueIri")).map(InternalIri.apply) width <- ZIO.fromOption(rowMap.get("dimX").flatMap(_.toIntOption)) height <- ZIO.fromOption(rowMap.get("dimY").flatMap(_.toIntOption)) dim <- ZIO.fromOption(Dimensions.from(width, height).toOption) diff --git a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala index dc479ae36f..084cd1793d 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/common/repo/rdf/RdfModel.scala @@ -112,7 +112,7 @@ final case class RdfResource(private val res: Resource) { for { literal <- getLiteral(propertyIri).unsome string <- ZIO.foreach(literal)(stringFromLiteral) - domainObject <- ZIO.foreach(string)(str => ZIO.fromEither(mapper(str)).mapError(ConversionError)) + domainObject <- ZIO.foreach(string)(str => ZIO.fromEither(mapper(str)).mapError(ConversionError.apply)) } yield domainObject /** @@ -144,7 +144,7 @@ final case class RdfResource(private val res: Resource) { for { literals <- getLiterals(propertyIri) strings <- ZIO.foreach(literals)(stringFromLiteral) - domainObjects <- ZIO.foreach(strings)(str => ZIO.fromEither(mapper(str)).mapError(ConversionError)) + domainObjects <- ZIO.foreach(strings)(str => ZIO.fromEither(mapper(str)).mapError(ConversionError.apply)) } yield Chunk.fromIterable(domainObjects) /** @@ -183,7 +183,7 @@ final case class RdfResource(private val res: Resource) { for { literal <- getLiteral(propertyIri).unsome langString <- ZIO.foreach(literal)(langStringFromLiteral) - domainObject <- ZIO.foreach(langString)(it => ZIO.fromEither(mapper(it)).mapError(ConversionError)) + domainObject <- ZIO.foreach(langString)(it => ZIO.fromEither(mapper(it)).mapError(ConversionError.apply)) } yield domainObject /** @@ -219,7 +219,7 @@ final case class RdfResource(private val res: Resource) { for { literals <- getLiterals(propertyIri) langStrings <- ZIO.foreach(literals)(langStringFromLiteral) - domainObjects <- ZIO.foreach(langStrings)(it => ZIO.fromEither(mapper(it)).mapError(ConversionError)) + domainObjects <- ZIO.foreach(langStrings)(it => ZIO.fromEither(mapper(it)).mapError(ConversionError.apply)) } yield Chunk.fromIterable(domainObjects) /** @@ -258,7 +258,7 @@ final case class RdfResource(private val res: Resource) { for { literal <- getLiteral(propertyIri).unsome boolean <- ZIO.foreach(literal)(booleanFromLiteral) - domainObject <- ZIO.foreach(boolean)(it => ZIO.fromEither(mapper(it))).mapError(ConversionError) + domainObject <- ZIO.foreach(boolean)(it => ZIO.fromEither(mapper(it))).mapError(ConversionError.apply) } yield domainObject /** @@ -292,7 +292,7 @@ final case class RdfResource(private val res: Resource) { for { literals <- getLiterals(propertyIri) booleans <- ZIO.foreach(literals)(booleanFromLiteral) - domainObjects <- ZIO.foreach(booleans)(it => ZIO.fromEither(mapper(it)).mapError(ConversionError)) + domainObjects <- ZIO.foreach(booleans)(it => ZIO.fromEither(mapper(it)).mapError(ConversionError.apply)) } yield Chunk.fromIterable(domainObjects) /** @@ -320,7 +320,7 @@ final case class RdfResource(private val res: Resource) { * @return the [[InternalIri]] of the object or None if the object is not present. */ def getObjectIri(propertyIri: String): IO[RdfError, Option[InternalIri]] = - getObjectUri(propertyIri).map(InternalIri).unsome + getObjectUri(propertyIri).map(InternalIri.apply).unsome /** * Returns the IRI of the object of a given predicate IRI. @@ -339,7 +339,7 @@ final case class RdfResource(private val res: Resource) { * @return the [[InternalIri]]s of the objects or an [[RdfError]] if the objects are not present. */ def getObjectIris(propertyIri: String): IO[RdfError, Chunk[InternalIri]] = - getObjectUris(propertyIri).map(_.map(InternalIri)) + getObjectUris(propertyIri).map(_.map(InternalIri.apply)) def getObjectIrisConvert[A](prop: String)(implicit map: String => Either[String, A]) = getObjectIris(prop).flatMap { iris => @@ -422,10 +422,10 @@ final case class RdfModel private (private val model: Model) { def getResourcesRdfType(objectClass: String): IO[RdfError, Iterator[RdfResource]] = for { objClassProp <- ZIO.attempt(model.createProperty(objectClass)).orDie resourcesJIter = model.listResourcesWithProperty(RDF.`type`, objClassProp) - } yield resourcesJIter.asScala.map(RdfResource) + } yield resourcesJIter.asScala.map(RdfResource.apply) def getSubjectResources: UIO[Chunk[RdfResource]] = - ZIO.succeed(Chunk.fromIterator(model.listSubjects().asScala).map(RdfResource)) + ZIO.succeed(Chunk.fromIterator(model.listSubjects().asScala).map(RdfResource.apply)) } object RdfModel { diff --git a/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala b/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala index c3c9f0aba2..158265a3fd 100644 --- a/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala +++ b/webapi/src/main/scala/org/knora/webapi/slice/ontology/domain/service/CardinalityService.scala @@ -159,7 +159,7 @@ final case class CardinalityServiceLive( private val knoraAdminAndBaseOntologies = Seq( "http://www.knora.org/ontology/knora-base", "http://www.knora.org/ontology/knora-admin", - ).map(InternalIri) + ).map(InternalIri.apply) private def isPartOfKnoraOntology(classIri: InternalIri): Task[Boolean] = iriConverter.getOntologyIriFromClassIri(classIri).map(knoraAdminAndBaseOntologies.contains) @@ -183,7 +183,7 @@ final case class CardinalityServiceLive( private def superClassCheck(check: CheckCardinalitySubject) = { val superClasses = ontologyRepo.findAllSuperClassesBy(check.classIri) val newCardinalityIsNotIncluded = (other: Cardinality) => check.newCardinality.isNotIncludedIn(other) - canSetCheckFor(superClasses, check.propertyIri, newCardinalityIsNotIncluded, SuperClassCheckFailure) + canSetCheckFor(superClasses, check.propertyIri, newCardinalityIsNotIncluded, SuperClassCheckFailure.apply) } private def toClassIris(subclasses: List[ReadClassInfoV2]): List[InternalIri] = @@ -196,7 +196,7 @@ final case class CardinalityServiceLive( superClasses <- ontologyRepo.findAllSuperClassesBy(toClassIris(subclasses), upToClass = check.classIri) } yield subclasses ::: superClasses val subclassCardinalityIsNotIncluded = (other: Cardinality) => other.isNotIncludedIn(check.newCardinality) - canSetCheckFor(subclasses, check.propertyIri, subclassCardinalityIsNotIncluded, SubclassCheckFailure) + canSetCheckFor(subclasses, check.propertyIri, subclassCardinalityIsNotIncluded, SubclassCheckFailure.apply) } private def canSetCheckFor( diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala index 0b18caf66a..8e3d5b938f 100644 --- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala +++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala @@ -139,7 +139,7 @@ case class TriplestoreServiceLive( outputFormat: QuadFormat, ): Task[Unit] = executeSparqlQuery(query, acceptMimeType = mimeTypeTextTurtle) - .map(RdfStringSource) + .map(RdfStringSource.apply) .mapAttempt(RdfFormatUtil.turtleToQuadsFile(_, graphIri.value, outputFile.toFile.toPath, outputFormat)) /** diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala index 7844d8e847..1f3e062a1e 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala +++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/api/TriplestoreServiceInMemory.scala @@ -29,8 +29,7 @@ import java.io.InputStream import java.nio.charset.StandardCharsets import java.nio.file.Path import java.nio.file.Paths -import scala.jdk.CollectionConverters.IteratorHasAsScala -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* import org.knora.webapi.IRI import org.knora.webapi.messages.StringFormatter @@ -155,7 +154,7 @@ final case class TriplestoreServiceInMemory(datasetRef: Ref[Dataset], implicit v ): Task[Unit] = ZIO.scoped { for { model <- execConstruct(query.sparql) - source <- modelToTurtle(model).map(RdfStringSource) + source <- modelToTurtle(model).map(RdfStringSource.apply) _ <- ZIO.attempt(RdfFormatUtil.turtleToQuadsFile(source, graphIri.value, outputFile.toFile.toPath, outputFormat)) } yield () }