refactor: Replace Settings with AppConfig (DEV-1312)

.codecov.yml

@@ -0,0 +1,8 @@
+coverage:
+  status:
+    project:
+      default:
+        informational: true
+    patch:
+      default:
+        informational: true

Makefile

@@ -86,7 +86,7 @@ env-file: ## write the env file used by knora-stack.
 #################################
 
 .PHONY: stack-up
-stack-up: docker-build env-file ## starts the knora-stack: fuseki, sipi, redis, api.
+stack-up: docker-build env-file ## starts the knora-stack: fuseki, sipi, api.
 	@docker compose -f docker-compose.yml up -d db
 	$(CURRENT_DIR)/webapi/scripts/wait-for-db.sh
 	@docker compose -f docker-compose.yml up -d
@@ -98,12 +98,16 @@ stack-up-fast: docker-build-knora-api-image env-file ## starts the knora-stack b
 
 .PHONY: stack-up-ci
 stack-up-ci: KNORA_DB_REPOSITORY_NAME := knora-test-unit
-stack-up-ci: docker-build env-file print-env-file ## starts the knora-stack using 'knora-test-unit' repository: fuseki, sipi, redis, api.
+stack-up-ci: docker-build env-file print-env-file ## starts the knora-stack using 'knora-test-unit' repository: fuseki, sipi, api.
 	docker-compose -f docker-compose.yml up -d
 
 .PHONY: stack-restart
-stack-restart: stack-up ## re-starts the knora-stack: fuseki, sipi, redis, api.
-	@docker compose -f docker-compose.yml restart
+stack-restart: ## re-starts the knora-stack: fuseki, sipi, api.
+	@docker compose -f docker-compose.yml down
+	@docker compose -f docker-compose.yml up -d db
+	$(CURRENT_DIR)/webapi/scripts/wait-for-db.sh
+	@docker compose -f docker-compose.yml up -d
+	$(CURRENT_DIR)/webapi/scripts/wait-for-knora.sh
 
 .PHONY: stack-restart-api
 stack-restart-api: ## re-starts the api. Usually used after loading data into fuseki.
@@ -130,10 +134,6 @@ stack-logs-sipi: ## prints out and follows the logs of the 'sipi' container runn
 stack-logs-sipi-no-follow: ## prints out the logs of the 'sipi' container running in knora-stack.
 	@docker compose -f docker-compose.yml logs sipi
 
-.PHONY: stack-logs-redis
-stack-logs-redis: ## prints out and follows the logs of the 'redis' container running in knora-stack.
-	@docker compose -f docker-compose.yml logs -f redis
-
 .PHONY: stack-logs-api
 stack-logs-api: ## prints out and follows the logs of the 'api' container running in knora-stack.
 	@docker compose -f docker-compose.yml logs -f api
@@ -164,11 +164,11 @@ stack-config: env-file
 
 ## stack without api
 .PHONY: stack-without-api
-stack-without-api: stack-up ## starts the knora-stack without knora-api: fuseki, sipi, redis.
+stack-without-api: stack-up ## starts the knora-stack without knora-api: fuseki and sipi only.
 	@docker compose -f docker-compose.yml stop api
 
 .PHONY: stack-without-api-and-sipi
-stack-without-api-and-sipi: stack-up ## starts the knora-stack without knora-api and sipi: fuseki, redis.
+stack-without-api-and-sipi: stack-up ## starts the knora-stack without knora-api and sipi: fuseki only.
 	@docker compose -f docker-compose.yml stop api
 	@docker compose -f docker-compose.yml stop sipi
 
@@ -348,11 +348,11 @@ clean-sipi-projects: ## deletes all files uploaded within a project
 	@rm -rf sipi/images/originals/[0-9A-F][0-9A-F][0-9A-F][0-9A-F]
 
 .PHONY: check
-check: # Run code formating check 
+check: ## Run code formating check 
 	@sbt "check"
 
 .PHONY: fmt
-fmt: # Run code formating fix
+fmt: ## Run code formating fix
 	@sbt "fmt"
 
 

dsp-project/interface/src/main/scala/dsp/project/listener/external/ProjectListenerExternal.scala

@@ -4,3 +4,5 @@
  */
 
 package dsp.project.listener.external
+
+object placeholder

dsp-project/interface/src/main/scala/dsp/project/listener/internal/ProjectListenerInternal.scala

@@ -4,3 +4,5 @@
  */
 
 package dsp.project.listener.internal
+
+object placeholder

dsp-project/interface/src/main/scala/dsp/project/route/ProjectRoute.scala

@@ -4,3 +4,5 @@
  */
 
 package dsp.project.route
+
+object placeholder

dsp-project/interface/src/test/scala/dsp/project/listener/external/ProjectListenerExternalSpec.scala

@@ -4,3 +4,5 @@
  */
 
 package dsp.project.listener.external
+
+object placeholder

dsp-project/interface/src/test/scala/dsp/project/listener/internal/ProjectListenerInternalSpec.scala

@@ -4,3 +4,5 @@
  */
 
 package dsp.project.listener.internal
+
+object placeholder

dsp-project/interface/src/test/scala/dsp/project/route/ProjectRouteSpec.scala

@@ -4,3 +4,5 @@
  */
 
 package dsp.project.route
+
+object placeholder

dsp-role/core/src/test/scala/dsp/role/api/RoleApiSpec.scala

@@ -8,4 +8,4 @@ package dsp.role.api
 /**
  * To be implemented...
  */
-object placeholder {}
+object placeholder

dsp-role/interface/src/main/scala/dsp/role/listener/external/RoleListenerExternal.scala

@@ -8,4 +8,4 @@ package dsp.role.listener.external
 /**
  * To be implemented...
  */
-object placeholder {}
+object placeholder

dsp-role/interface/src/main/scala/dsp/role/listener/internal/RoleListenerInternal.scala

@@ -8,4 +8,4 @@ package dsp.role.listener.internal
 /**
  * To be implemented...
  */
-object placeholder {}
+object placeholder

dsp-role/interface/src/main/scala/dsp/role/route/RoleRoute.scala

@@ -8,4 +8,4 @@ package dsp.role.route
 /**
  * To be implemented...
  */
-object placeholder {}
+object placeholder

dsp-role/interface/src/test/scala/dsp/role/listener/external/RoleListenerExternalSpec.scala

@@ -8,4 +8,4 @@ package dsp.role.listener.external
 /**
  * To be implemented...
  */
-object placeholder {}
+object placeholder

dsp-role/interface/src/test/scala/dsp/role/listener/internal/RoleListenerInternalSpec.scala

@@ -8,4 +8,4 @@ package dsp.role.listener.internal
 /**
  * To be implemented...
  */
-object placeholder {}
+object placeholder

dsp-role/interface/src/test/scala/dsp/role/route/RoleRouteSpec.scala

@@ -8,4 +8,4 @@ package dsp.role.route
 /**
  * To be implemented...
  */
-object placeholder {}
+object placeholder

dsp-user/core/src/test/scala/dsp/user/api/UserApiSpec.scala

@@ -7,4 +7,4 @@ package dsp.user.api
 
 // this placeholder can be removed as soon as the code are there
 // without it there is a warning
-object placeholder {}
+object placeholder

dsp-user/interface/src/main/scala/dsp/user/listener/external/UserListenerExternal.scala

@@ -7,4 +7,4 @@ package dsp.user.listener.external
 
 // this placeholder can be removed as soon as the code are there
 // without it there is a warning
-object placeholder {}
+object placeholder

dsp-user/interface/src/main/scala/dsp/user/listener/internal/UserListenerInternal.scala

@@ -7,4 +7,4 @@ package dsp.user.listener.internal
 
 // this placeholder can be removed as soon as the code are there
 // without it there is a warning
-object placeholder {}
+object placeholder

dsp-user/interface/src/main/scala/dsp/user/route/UserRoute.scala

@@ -7,4 +7,4 @@ package dsp.user.route
 
 // this placeholder can be removed as soon as the code are there
 // without it there is a warning
-object placeholder {}
+object placeholder

dsp-user/interface/src/test/scala/dsp/user/listener/external/UserListenerExternalSpec.scala

@@ -7,4 +7,4 @@ package dsp.user.listener.external
 
 // this placeholder can be removed as soon as the code are there
 // without it there is a warning
-object placeholder {}
+object placeholder

dsp-user/interface/src/test/scala/dsp/user/listener/internal/UserListenerInternalSpec.scala

@@ -7,4 +7,4 @@ package dsp.user.listener.internal
 
 // this placeholder can be removed as soon as the code are there
 // without it there is a warning
-object placeholder {}
+object placeholder

dsp-user/interface/src/test/scala/dsp/user/route/UserRouteSpec.scala

@@ -7,4 +7,4 @@ package dsp.user.route
 
 // this placeholder can be removed as soon as the code are there
 // without it there is a warning
-object placeholder {}
+object placeholder

webapi/src/main/resources/application.conf

@@ -267,6 +267,8 @@ app {
     allow-reload-over-http = false
     allow-reload-over-http = ${?KNORA_WEBAPI_ALLOW_RELOAD_OVER_HTTP}
 
+    fallback-language = "en"
+
     knora-api {
         // relevant for direct communication inside the knora stack
         internal-host = "0.0.0.0"
@@ -304,11 +306,8 @@ app {
 
         file-server-path = "server"
 
-        v2 {
-            file-metadata-route = "knora.json"
-            move-file-route = "store"
-            delete-temp-file-route = "delete_temp_file"
-        }
+        move-file-route = "store"
+        delete-temp-file-route = "delete_temp_file"
 
         image-mime-types = ["image/tiff", "image/jpeg", "image/png", "image/jp2", "image/jpx"]
         document-mime-types = [
@@ -430,8 +429,8 @@ app {
     gui {
         // The default size of resource type icons. TODO: put icon sizes in the triplestore instead.
         default-icon-size {
-            dimX = 32
-            dimY = 32
+            dim-x = 32
+            dim-y = 32
         }
     }
 
@@ -442,7 +441,6 @@ app {
     triplestore {
         dbtype = "fuseki"
         dbtype = ${?KNORA_WEBAPI_TRIPLESTORE_DBTYPE}
-        // dbtype = "fake-triplestore"
 
         use-https = false
         use-https = ${?KNORA_WEBAPI_TRIPLESTORE_USE_HTTPS}
@@ -471,8 +469,6 @@ app {
             password = ${?KNORA_WEBAPI_TRIPLESTORE_FUSEKI_PASSWORD}
         }
 
-        reload-on-start = false // ignored if "memory" as it will always reload
-
         // If true, the time taken by each SPARQL query is logged at DEBUG level. To see these messages,
         // set loglevel = "DEBUG" above, and
         // <logger name="org.knora.webapi.store.triplestore.http.HttpTriplestoreConnector" level="DEBUG"/>
@@ -499,16 +495,16 @@ app {
         }
     }
 
+    client-test-data-service {
+        collect-client-test-data = false
+    }
+
     monitoring {
         prometheus-endpoint: false
         prometheus-endpoint: ${?KNORA_WEBAPI_PROMETHEUS_ENDPOINT}
     }
 }
 
-user {
-    default-language: "en"
-}
-
 kamon.prometheus.embedded-server {
 
     # Hostname and port used by the embedded web server to publish the

webapi/src/main/scala/org/knora/webapi/Main.scala

@@ -2,7 +2,6 @@
  * Copyright © 2021 - 2022 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 package org.knora.webapi
 
 import zio._
@@ -12,6 +11,8 @@ import org.knora.webapi.core.AppServer
 
 object Main extends ZIOApp {
 
+  override def environmentTag: EnvironmentTag[Environment] = EnvironmentTag[Environment]
+
   /**
    * The `Environment` that we require to exist at startup.
    */
@@ -21,19 +22,13 @@ object Main extends ZIOApp {
    * `Bootstrap` will ensure that everything is instantiated when the Runtime is created
    * and cleaned up when the Runtime is shutdown.
    */
-  override val bootstrap: ZLayer[
+  override def bootstrap: ZLayer[
     ZIOAppArgs with Scope,
     Any,
     Environment
   ] = ZLayer.empty ++ Runtime.removeDefaultLoggers ++ SLF4J.slf4j ++ core.LayersLive.dspLayersLive
 
-  /* Needed for ZIO type magic */
-  override val environmentTag: EnvironmentTag[Environment] = EnvironmentTag[Environment]
-
   /* Here we start our Application */
-  override val run =
-    (for {
-      never <- ZIO.never
-    } yield never).provideLayer(AppServer.live)
+  override def run = AppServer.live.launch
 
 }

webapi/src/main/scala/org/knora/webapi/auth/JWTService.scala

@@ -3,11 +3,13 @@ package org.knora.webapi.auth
 import spray.json.JsValue
 import zio._
 
+import scala.concurrent.duration
+
 import org.knora.webapi._
 import org.knora.webapi.config._
 import org.knora.webapi.routing.JWTHelper
 
-final case class JWTService(config: AppConfig) {
+final case class JWTService(secret: String, longevity: duration.Duration, issuer: String) {
 
   /**
    * Creates a new JWT token for a specific user and holds some additional
@@ -20,9 +22,9 @@ final case class JWTService(config: AppConfig) {
     ZIO.succeed {
       JWTHelper.createToken(
         userIri = id,
-        secret = config.jwtSecretKey,
-        longevity = config.jwtLongevityAsDuration,
-        issuer = config.knoraApi.externalKnoraApiHostPort,
+        secret = secret,
+        longevity = longevity,
+        issuer = issuer,
         content = content
       )
     }
@@ -33,6 +35,6 @@ object JWTService {
     ZLayer {
       for {
         config <- ZIO.service[AppConfig]
-      } yield JWTService(config)
+      } yield JWTService(config.jwtSecretKey, config.jwtLongevityAsDuration, config.knoraApi.externalKnoraApiHostPort)
     }
 }