refactor: ziofy SearchRouteV2 DEV-2088 (#2622)

Co-authored-by: irinaschubert <irina.schubert@dasch.swiss>
dasch-swiss · Apr 25, 2023 · 3105996 · 3105996
1 parent 666ddcf
commit 3105996
Show file tree

Hide file tree

Showing 42 changed files with 757 additions and 840 deletions.
diff --git a/webapi/src/it/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala
@@ -546,7 +546,7 @@ class OntologyV2R2RSpec extends R2RSpec {
         assert(ontologyIri == "http://0.0.0.0:3333/ontology/0001/bar/v2")
         assert(
           metadata.value(OntologyConstants.Rdfs.Comment) == JsonLDString(
-            stringFormatter.fromSparqlEncodedString(comment)
+            StringFormatter.fromSparqlEncodedString(comment)
           )
         )
         barIri.set(ontologyIri)
@@ -590,7 +590,7 @@ class OntologyV2R2RSpec extends R2RSpec {
         assert(ontologyIri == "http://0.0.0.0:3333/ontology/0001/test/v2")
         assert(
           metadata.value(OntologyConstants.Rdfs.Comment) == JsonLDString(
-            stringFormatter.fromSparqlEncodedString(comment)
+            StringFormatter.fromSparqlEncodedString(comment)
           )
         )
       }
@@ -668,7 +668,7 @@ class OntologyV2R2RSpec extends R2RSpec {
         assert(ontologyIri == barIri.get)
         assert(
           metadata.value(OntologyConstants.Rdfs.Comment) == JsonLDString(
-            stringFormatter.fromSparqlEncodedString(newComment)
+            StringFormatter.fromSparqlEncodedString(newComment)
           )
         )
 
@@ -3143,9 +3143,9 @@ class OntologyV2R2RSpec extends R2RSpec {
     ) ~> addCredentials(BasicHttpCredentials(anythingUsername, password)) ~> resourcesPath ~> check {
       val responseStr = responseAs[String]
       assert(status == StatusCodes.OK, responseStr)
-      val responseJsonDoc = JsonLDUtil.parseJsonLD(responseStr)
-      val resourceIri: IRI =
-        responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, stringFormatter.validateAndEscapeIri)
+      val responseJsonDoc                               = JsonLDUtil.parseJsonLD(responseStr)
+      val validationFun: (String, => Nothing) => String = (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
+      val resourceIri: IRI                              = responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
       assert(resourceIri.toSmartIri.isKnoraDataIri)
     }
 
@@ -3424,9 +3424,10 @@ class OntologyV2R2RSpec extends R2RSpec {
     ) ~> addCredentials(BasicHttpCredentials(anythingUsername, password)) ~> resourcesPath ~> check {
       val responseStr = responseAs[String]
       assert(status == StatusCodes.OK, responseStr)
-      val responseJsonDoc = JsonLDUtil.parseJsonLD(responseStr)
+      val responseJsonDoc                               = JsonLDUtil.parseJsonLD(responseStr)
+      val validationFun: (String, => Nothing) => String = (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
       val resourceIri: IRI =
-        responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, stringFormatter.validateAndEscapeIri)
+        responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
       assert(resourceIri.toSmartIri.isKnoraDataIri)
     }
 

diff --git a/webapi/src/it/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala
diff --git a/webapi/src/it/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala
@@ -51,7 +51,9 @@ class SearchRouteV2R2RSpec extends R2RSpec {
   private implicit val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance
 
   private val searchPath =
-    DSPApiDirectives.handleErrors(system, appConfig)(SearchRouteV2(routeData, runtime).makeRoute)
+    DSPApiDirectives.handleErrors(system, appConfig)(
+      SearchRouteV2(routeData.appConfig.v2.fulltextSearch.searchValueMinLength).makeRoute
+    )
   private val resourcePath =
     DSPApiDirectives.handleErrors(system, appConfig)(ResourcesRouteV2(routeData, runtime).makeRoute)
   private val standoffPath =
@@ -9171,11 +9173,10 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val resourceCreateResponseStr = responseAs[String]
         assert(status == StatusCodes.OK, resourceCreateResponseStr)
         val resourceCreateResponseAsJsonLD: JsonLDDocument = JsonLDUtil.parseJsonLD(resourceCreateResponseStr)
+        val validationFun: (String, => Nothing) => String =
+          (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
         val resourceIri: IRI =
-          resourceCreateResponseAsJsonLD.body.requireStringWithValidation(
-            JsonLDKeywords.ID,
-            stringFormatter.validateAndEscapeIri
-          )
+          resourceCreateResponseAsJsonLD.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
         assert(resourceIri.toSmartIri.isKnoraDataIri)
         hamletResourceIri.set(resourceIri)
       }
@@ -9243,7 +9244,9 @@ class SearchRouteV2R2RSpec extends R2RSpec {
           val createTargetResourceResponseStr = responseAs[String]
           assert(response.status == StatusCodes.OK, createTargetResourceResponseStr)
           val responseJsonDoc: JsonLDDocument = responseToJsonLDDocument(response)
-          responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, stringFormatter.validateAndEscapeIri)
+          val validationFun: (String, => Nothing) => String =
+            (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
+          responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
         }
 
       assert(targetResourceIri.toSmartIri.isKnoraDataIri)
@@ -9277,7 +9280,9 @@ class SearchRouteV2R2RSpec extends R2RSpec {
           val createSourceResource1ResponseStr = responseAs[String]
           assert(response.status == StatusCodes.OK, createSourceResource1ResponseStr)
           val responseJsonDoc: JsonLDDocument = responseToJsonLDDocument(response)
-          responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, stringFormatter.validateAndEscapeIri)
+          val validationFun: (String, => Nothing) => String =
+            (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
+          responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
         }
 
       assert(sourceResource1Iri.toSmartIri.isKnoraDataIri)
@@ -9311,7 +9316,9 @@ class SearchRouteV2R2RSpec extends R2RSpec {
           val createSourceResource2ResponseStr = responseAs[String]
           assert(response.status == StatusCodes.OK, createSourceResource2ResponseStr)
           val responseJsonDoc: JsonLDDocument = responseToJsonLDDocument(response)
-          responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, stringFormatter.validateAndEscapeIri)
+          val validationFun: (String, => Nothing) => String =
+            (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
+          responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
         }
 
       assert(sourceResource2Iri.toSmartIri.isKnoraDataIri)
@@ -9340,7 +9347,9 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val searchResponseStr = responseAs[String]
         assert(status == StatusCodes.OK, searchResponseStr)
         val responseJsonDoc: JsonLDDocument = responseToJsonLDDocument(response)
-        responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, stringFormatter.validateAndEscapeIri)
+        val validationFun: (String, => Nothing) => String =
+          (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
+        responseJsonDoc.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
       }
 
       assert(searchResultIri == targetResourceIri)
@@ -9594,11 +9603,10 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val responseStr = responseAs[String]
         assert(status == StatusCodes.OK, responseStr)
         val resourceCreateResponseAsJsonLD: JsonLDDocument = JsonLDUtil.parseJsonLD(responseStr)
+        val validationFun: (String, => Nothing) => String =
+          (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
         val resourceIri: IRI =
-          resourceCreateResponseAsJsonLD.body.requireStringWithValidation(
-            JsonLDKeywords.ID,
-            stringFormatter.validateAndEscapeIri
-          )
+          resourceCreateResponseAsJsonLD.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
         assert(resourceIri.toSmartIri.isKnoraDataIri)
         timeTagResourceIri.set(resourceIri)
       }
@@ -9631,8 +9639,9 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, responseStr)
 
         val responseAsJsonLD: JsonLDDocument = JsonLDUtil.parseJsonLD(responseStr)
-        val resourceIri: IRI =
-          responseAsJsonLD.body.requireStringWithValidation(JsonLDKeywords.ID, stringFormatter.validateAndEscapeIri)
+        val validationFun: (String, => Nothing) => String =
+          (s, e) => StringFormatter.validateAndEscapeIri(s).getOrElse(e)
+        val resourceIri: IRI = responseAsJsonLD.body.requireStringWithValidation(JsonLDKeywords.ID, validationFun)
         assert(resourceIri == timeTagResourceIri.get)
 
         val xmlFromResponse: String = responseAsJsonLD.body