chore: Patch dependency updates (#3077)

Co-authored-by: Christian Kleinbölting <christian.kleinboelting@dasch.swiss>

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",

project/Dependencies.scala

@@ -15,15 +15,15 @@ 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"
   val JenaVersion       = "4.10.0"
   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,21 +109,21 @@ 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,
     "com.softwaremill.sttp.tapir" %% "tapir-zio-http-server"   % tapirVersion,
     "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,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.9.9

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")

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.

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")
 }

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")
 }

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,15 +938,15 @@ trait PermissionsADMJsonProtocol
   implicit val createAdministrativePermissionAPIRequestADMFormat
     : RootJsonFormat[CreateAdministrativePermissionAPIRequestADM] = rootFormat(
     lazyFormat(
-      jsonFormat(CreateAdministrativePermissionAPIRequestADM, "id", "forProject", "forGroup", "hasPermissions"),
+      jsonFormat(CreateAdministrativePermissionAPIRequestADM.apply, "id", "forProject", "forGroup", "hasPermissions"),
     ),
   )
 
   implicit val createDefaultObjectAccessPermissionAPIRequestADMFormat
     : 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")
 
 }

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")),
   )
 }

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)
 }

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)
 }