chore: Spring cleaning the code base (#3155)

dasch-swiss · Apr 2, 2024 · 802ed0c · 802ed0c
1 parent e8f6060
commit 802ed0c
Show file tree

Hide file tree

Showing 41 changed files with 26 additions and 1,847 deletions.
diff --git a/docs/05-internals/design/principles/futures-with-pekko.md b/docs/05-internals/design/principles/futures-with-pekko.md
diff --git a/docs/05-internals/design/principles/http-module.md b/docs/05-internals/design/principles/http-module.md
diff --git a/docs/05-internals/design/principles/rdf-api.md b/docs/05-internals/design/principles/rdf-api.md
@@ -86,8 +86,3 @@ Turtle file containing the graph of shapes.
 - The Jena-based implementation, in package `org.knora.webapi.messages.util.rdf.jenaimpl`.
 
 - The RDF4J-based implementation, in package `org.knora.webapi.messages.util.rdf.rdf4jimpl`.
-
-
-## TODO
-
-- SHACL validation.
diff --git a/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala b/integration/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala
@@ -80,14 +80,10 @@ class HealthRouteE2ESpec extends E2ESpec {
           .getOrThrow()
       }
 
-      // appActor ! SetAppState(AppState.Stopped)
-
       val request                = Get(baseApiUrl + s"/health")
       val response: HttpResponse = singleAwaitingRequest(request)
       val responseStr: String    = responseToString(response)
 
-      logger.debug(response.toString())
-
       response.status should be(StatusCodes.ServiceUnavailable)
 
       clientTestDataCollector.addFile(
@@ -118,8 +114,6 @@ class HealthRouteE2ESpec extends E2ESpec {
       val response: HttpResponse = singleAwaitingRequest(request)
       val responseStr: String    = responseToString(response)
 
-      logger.debug(response.toString())
-
       response.status should be(StatusCodes.ServiceUnavailable)
 
       clientTestDataCollector.addFile(

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
@@ -50,7 +50,6 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol {
         val request =
           Get(baseApiUrl + s"/admin/groups") ~> addCredentials(BasicHttpCredentials(imagesUser01Email, testPass))
         val response: HttpResponse = singleAwaitingRequest(request)
-        // log.debug(s"response: {}", response)
         assert(response.status === StatusCodes.OK)
         clientTestDataCollector.addFile(
           TestDataFileContent(
@@ -69,7 +68,6 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol {
           BasicHttpCredentials(imagesUser01Email, testPass),
         )
         val response: HttpResponse = singleAwaitingRequest(request)
-        // log.debug(s"response: {}", response)
         assert(response.status === StatusCodes.OK)
         clientTestDataCollector.addFile(
           TestDataFileContent(
@@ -183,7 +181,6 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol {
           HttpEntity(ContentTypes.`application/json`, createGroupRequest),
         ) ~> addCredentials(BasicHttpCredentials(imagesUser01Email, testPass))
         val response: HttpResponse = singleAwaitingRequest(request)
-        // log.debug(s"response: {}", response)
         response.status should be(StatusCodes.OK)
 
         val groupInfo: Group = AkkaHttpUtils.httpResponseToJson(response).fields("group").convertTo[Group]
@@ -207,7 +204,6 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol {
 
         val iri = groupInfo.id
         newGroupIri.set(iri)
-        // log.debug("newGroupIri: {}", newGroupIri.get)
       }
 
       "UPDATE a group" in {
@@ -233,7 +229,6 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol {
           HttpEntity(ContentTypes.`application/json`, updateGroupRequest),
         ) ~> addCredentials(BasicHttpCredentials(imagesUser01Email, testPass))
         val response: HttpResponse = singleAwaitingRequest(request)
-        logger.debug(s"response: {}", response)
         response.status should be(StatusCodes.OK)
 
         val groupInfo: Group = AkkaHttpUtils.httpResponseToJson(response).fields("group").convertTo[Group]
@@ -262,7 +257,6 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol {
           BasicHttpCredentials(imagesUser01Email, testPass),
         )
         val response: HttpResponse = singleAwaitingRequest(request)
-        logger.debug(s"response: {}", response)
         response.status should be(StatusCodes.OK)
 
         val groupInfo: Group = AkkaHttpUtils.httpResponseToJson(response).fields("group").convertTo[Group]
@@ -309,7 +303,6 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol {
           HttpEntity(ContentTypes.`application/json`, changeGroupStatusRequest),
         ) ~> addCredentials(BasicHttpCredentials(imagesUser01Email, testPass))
         val response: HttpResponse = singleAwaitingRequest(request)
-        logger.debug(s"response: {}", response)
         response.status should be(StatusCodes.OK)
 
         val groupInfo: Group = AkkaHttpUtils.httpResponseToJson(response).fields("group").convertTo[Group]
@@ -339,8 +332,7 @@ class GroupsADME2ESpec extends E2ESpec with GroupsADMJsonProtocol {
           BasicHttpCredentials(imagesUser01Email, testPass),
         )
         val response: HttpResponse = singleAwaitingRequest(request)
-        // log.debug(s"response: {}", response)
-        assert(response.status === StatusCodes.OK)
+        assert(response.status === StatusCodes.OK, responseToString(response))
         clientTestDataCollector.addFile(
           TestDataFileContent(
             filePath = TestDataFilePath(