feat: Add resources/info endpoint (DEV-792)

webapi/src/it/scala/org/knora/webapi/core/LayersTest.scala

@@ -1,9 +1,10 @@
 package org.knora.webapi.core
 
-import zio.ZLayer
 import org.knora.webapi.auth.JWTService
 import org.knora.webapi.config.AppConfigForTestContainers
+import org.knora.webapi.messages.StringFormatter
 import org.knora.webapi.routing.ApiRoutes
+import org.knora.webapi.slice.resourceinfo.domain.IriConverter
 import org.knora.webapi.store.cache.CacheServiceManager
 import org.knora.webapi.store.cache.impl.CacheServiceInMemImpl
 import org.knora.webapi.store.iiif.IIIFServiceManager
@@ -15,6 +16,10 @@ import org.knora.webapi.store.triplestore.upgrade.RepositoryUpdater
 import org.knora.webapi.testcontainers.FusekiTestContainer
 import org.knora.webapi.testcontainers.SipiTestContainer
 import org.knora.webapi.testservices.TestClientService
+import zio.ZLayer
+
+import org.knora.webapi.slice.resourceinfo.api.RestResourceInfoService
+import org.knora.webapi.slice.resourceinfo.domain.ResourceInfoRepo
 
 object LayersTest {
 
@@ -33,21 +38,23 @@ object LayersTest {
       ApiRoutes.layer,
       AppConfigForTestContainers.testcontainers,
       AppRouter.layer,
-      CacheServiceManager.layer,
       CacheServiceInMemImpl.layer,
+      CacheServiceManager.layer,
+      FusekiTestContainer.layer,
       HttpServer.layer,
       IIIFServiceManager.layer,
       IIIFServiceSipiImpl.layer, // alternative: MockSipiImpl.layer
+      IriConverter.layer,
       JWTService.layer,
       RepositoryUpdater.layer,
+      ResourceInfoRepo.layer,
+      RestResourceInfoService.layer,
+      SipiTestContainer.layer,
       State.layer,
-      TriplestoreServiceManager.layer,
+      StringFormatter.test,
+      TestClientService.layer,
       TriplestoreServiceHttpConnectorImpl.layer,
-      // testcontainers
-      SipiTestContainer.layer,
-      FusekiTestContainer.layer,
-      // Test services
-      TestClientService.layer
+      TriplestoreServiceManager.layer
     )
 
   /**
@@ -59,20 +66,22 @@ object LayersTest {
       ApiRoutes.layer,
       AppConfigForTestContainers.fusekiOnlyTestcontainer,
       AppRouter.layer,
-      CacheServiceManager.layer,
       CacheServiceInMemImpl.layer,
+      CacheServiceManager.layer,
+      FusekiTestContainer.layer,
       HttpServer.layer,
       IIIFServiceManager.layer,
       IIIFServiceSipiImpl.layer, // alternative: MockSipiImpl.layer
+      IriConverter.layer,
       JWTService.layer,
       RepositoryUpdater.layer,
+      ResourceInfoRepo.layer,
+      RestResourceInfoService.layer,
       State.layer,
-      TriplestoreServiceManager.layer,
+      StringFormatter.live,
+      TestClientService.layer,
       TriplestoreServiceHttpConnectorImpl.layer,
-      // testcontainers
-      FusekiTestContainer.layer,
-      // Test services
-      TestClientService.layer
+      TriplestoreServiceManager.layer
     )
 
   /**
@@ -84,20 +93,22 @@ object LayersTest {
       ApiRoutes.layer,
       AppConfigForTestContainers.fusekiOnlyTestcontainer,
       AppRouter.layer,
-      CacheServiceManager.layer,
       CacheServiceInMemImpl.layer,
+      CacheServiceManager.layer,
+      FusekiTestContainer.layer,
       HttpServer.layer,
       IIIFServiceManager.layer,
-      IIIFServiceSipiImpl.layer, // alternative: MockSipiImpl.layer
+      IIIFServiceSipiImpl.layer,
+      IriConverter.layer,
       JWTService.layer,
       RepositoryUpdater.layer,
+      ResourceInfoRepo.layer,
+      RestResourceInfoService.layer,
       State.layer,
-      TriplestoreServiceManager.layer,
+      StringFormatter.live,
+      TestClientService.layer,
       TriplestoreServiceHttpConnectorImpl.layer,
-      // testcontainers
-      FusekiTestContainer.layer,
-      // Test services
-      TestClientService.layer
+      TriplestoreServiceManager.layer
     )
 
   /**
@@ -119,9 +130,11 @@ object LayersTest {
       State.layer,
       TriplestoreServiceManager.layer,
       TriplestoreServiceHttpConnectorImpl.layer,
-      // testcontainers
+      RestResourceInfoService.layer,
+      ResourceInfoRepo.layer,
+      IriConverter.layer,
+      StringFormatter.live,
       FusekiTestContainer.layer,
-      // Test services
       TestClientService.layer
     )
 
@@ -144,9 +157,11 @@ object LayersTest {
       State.layer,
       TriplestoreServiceManager.layer,
       TriplestoreServiceHttpConnectorImpl.layer,
-      // testcontainers
+      RestResourceInfoService.layer,
+      ResourceInfoRepo.layer,
+      IriConverter.layer,
+      StringFormatter.live,
       FusekiTestContainer.layer,
-      // Test services
       TestClientService.layer
     )
 }

webapi/src/it/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala

@@ -58,7 +58,7 @@ class ResourcesV1R2RSpec extends R2RSpec {
   private val resourcesPathV1 =
     DSPApiDirectives.handleErrors(system, appConfig)(new ResourcesRouteV1(routeData).makeRoute)
   private val resourcesPathV2 =
-    DSPApiDirectives.handleErrors(system, appConfig)(new ResourcesRouteV2(routeData).makeRoute)
+    DSPApiDirectives.handleErrors(system, appConfig)(new ResourcesRouteV2(routeData, null).makeRoute)
   private val valuesPathV1 =
     DSPApiDirectives.handleErrors(system, appConfig)(new ValuesRouteV1(routeData).makeRoute)
 

webapi/src/it/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala

@@ -25,7 +25,7 @@ import org.knora.webapi.routing.v2.ResourcesRouteV2
  */
 class JSONLDHandlingV2R2RSpec extends R2RSpec {
 
-  private val resourcesPath = new ResourcesRouteV2(routeData).makeRoute
+  private val resourcesPath = new ResourcesRouteV2(routeData, null).makeRoute
 
   implicit def default(implicit system: ActorSystem): RouteTestTimeout = RouteTestTimeout(
     appConfig.defaultTimeoutAsDuration

webapi/src/it/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala

@@ -66,7 +66,7 @@ class OntologyV2R2RSpec extends R2RSpec {
   private val ontologiesPath =
     DSPApiDirectives.handleErrors(system, appConfig)(new OntologiesRouteV2(routeData).makeRoute)
   private val resourcesPath =
-    DSPApiDirectives.handleErrors(system, appConfig)(new ResourcesRouteV2(routeData).makeRoute)
+    DSPApiDirectives.handleErrors(system, appConfig)(new ResourcesRouteV2(routeData, null).makeRoute)
 
   implicit def default(implicit system: ActorSystem): RouteTestTimeout = RouteTestTimeout(
     appConfig.defaultTimeoutAsDuration

webapi/src/it/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala

@@ -54,7 +54,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
   private val searchPath =
     DSPApiDirectives.handleErrors(system, appConfig)(new SearchRouteV2(routeData).makeRoute)
   private val resourcePath =
-    DSPApiDirectives.handleErrors(system, appConfig)(new ResourcesRouteV2(routeData).makeRoute)
+    DSPApiDirectives.handleErrors(system, appConfig)(new ResourcesRouteV2(routeData, null).makeRoute)
   private val standoffPath =
     DSPApiDirectives.handleErrors(system, appConfig)(new StandoffRouteV2(routeData).makeRoute)
   private val valuesPath =

webapi/src/it/scala/org/knora/webapi/slice/resourceinfo/api/IriConverterLiveSpec$.scala

@@ -0,0 +1,22 @@
+package org.knora.webapi.slice.resourceinfo.api
+
+import org.knora.webapi.messages.StringFormatter
+import org.knora.webapi.slice.resourceinfo.domain
+import org.knora.webapi.slice.resourceinfo.domain.{InternalIri, IriConverter}
+import zio.test._
+
+object IriConverterLiveSpec$ extends ZIOSpecDefault {
+
+  def spec = suite("IriConverter")(
+    test("should not convert the projectIri") {
+      for {
+        internal <- IriConverter.asInternalIri("http://project-iri")
+      } yield assertTrue(internal == domain.InternalIri("http://project-iri"))
+    },
+    test("should convert a resourceClassIri") {
+      for {
+        internal <- IriConverter.asInternalIri("http://0.0.0.0:3333/ontology/0001/anything/v2#Thing")
+      } yield assertTrue(internal == InternalIri("http://www.knora.org/ontology/0001/anything#Thing"))
+    }
+  ).provide(IriConverter.layer, StringFormatter.test)
+}

webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala

@@ -8,9 +8,12 @@ package org.knora.webapi.store.triplestore.upgrade.plugins
 import com.typesafe.scalalogging.Logger
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
-
+import scala.util.Failure
+import scala.util.Success
 import java.io.BufferedInputStream
+import java.io.ByteArrayInputStream
 import java.io.FileInputStream
+import scala.util.Using
 
 import org.knora.webapi.messages.util.ErrorHandlingMap
 import org.knora.webapi.messages.util.rdf._
@@ -37,6 +40,18 @@ abstract class UpgradePluginSpec extends AnyWordSpecLike with Matchers {
     rdfModel
   }
 
+  /**
+   * Parses a TriG String and returns it as an [[RdfModel]].
+   *
+   * @param s the [[String]] content of a "TriG file".
+   * @return an [[RdfModel]].
+   */
+  def stringToModel(s: String): RdfModel =
+    Using(new ByteArrayInputStream(s.getBytes))(rdfFormatUtil.inputStreamToRdfModel(_, TriG)) match {
+      case Success(value) => value
+      case Failure(e)     => throw new IllegalArgumentException("Invalid model", e)
+    }
+
   /**
    * Wraps expected SPARQL SELECT results in a [[SparqlSelectResultBody]].
    *

webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala

@@ -8,6 +8,8 @@ package org.knora.webapi.config
 import com.typesafe.config.ConfigFactory
 import zio._
 import zio.config._
+import zio.config.magnolia._
+import zio.config.typesafe._
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -19,13 +21,9 @@ import scala.util.Success
 import scala.util.Try
 
 import dsp.errors.FileWriteException
-import org.knora.webapi.messages.StringFormatter
 import org.knora.webapi.messages.util.rdf.RdfFeatureFactory
 import org.knora.webapi.util.cache.CacheUtil
 
-import typesafe._
-import magnolia._
-
 /**
  * Represents the configuration as defined in application.conf.
  */
@@ -272,7 +270,6 @@ object AppConfig {
       for {
         c <- configFromSource.orDie
         _ <- ZIO.attempt(RdfFeatureFactory.init(c)).orDie // needs early init before first usage
-        _ <- ZIO.attempt(StringFormatter.init(c)).orDie   // needs early init before first usage
       } yield c
     }.tap(_ => ZIO.logInfo(">>> AppConfig Live Initialized <<<"))
 
@@ -283,8 +280,7 @@ object AppConfig {
     ZLayer {
       for {
         c <- configFromSource.orDie
-        _ <- ZIO.attempt(RdfFeatureFactory.init(c)).orDie     // needs early init before first usage
-        _ <- ZIO.attempt(StringFormatter.initForTest()).orDie // needs early init before first usage
+        _ <- ZIO.attempt(RdfFeatureFactory.init(c)).orDie // needs early init before first usage
       } yield c
     }.tap(_ => ZIO.logInfo(">>> AppConfig Test Initialized <<<"))
 

webapi/src/main/scala/org/knora/webapi/core/HttpServerZ.scala

@@ -4,24 +4,28 @@
  */
 
 package org.knora.webapi.core
+import zhttp.http.HttpApp
 import zhttp.service.Server
 import zio.ZLayer
 import zio._
 
 import org.knora.webapi.config.AppConfig
 import org.knora.webapi.routing.admin.ProjectsRouteZ
+import org.knora.webapi.slice.resourceinfo.api.ResourceInfoRoute
 
 object HttpServerZ {
 
-  val layer: ZLayer[AppRouter & AppConfig & State & ProjectsRouteZ, Nothing, Unit] =
-    ZLayer {
-      for {
-        appConfig     <- ZIO.service[AppConfig]
-        projectsRoute <- ZIO.service[ProjectsRouteZ]
-        r              = projectsRoute.route
-        port           = appConfig.knoraApi.externalZioPort
-        _             <- Server.start(port, r).forkDaemon
-        _             <- ZIO.logInfo(">>> Acquire ZIO HTTP Server <<<")
-      } yield ()
-    }
+  private val apiRoutes: URIO[ResourceInfoRoute with ProjectsRouteZ, HttpApp[Any, Nothing]] = for {
+    projectsRoute <- ZIO.service[ProjectsRouteZ].map(_.route)
+    riRoute       <- ZIO.service[ResourceInfoRoute].map(_.route)
+  } yield projectsRoute ++ riRoute
+
+  val layer: ZLayer[ResourceInfoRoute with ProjectsRouteZ with AppConfig, Nothing, Unit] = ZLayer {
+    for {
+      port   <- ZIO.service[AppConfig].map(_.knoraApi.externalZioPort)
+      routes <- apiRoutes
+      _      <- Server.start(port, routes).forkDaemon
+      _      <- ZIO.logInfo(">>> Acquire ZIO HTTP Server <<<")
+    } yield ()
+  }
 }

webapi/src/main/scala/org/knora/webapi/core/InstrumentationHttpServer.scala

@@ -1,3 +1,8 @@
+/*
+ * 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.core
 
 import zhttp.service.Server

webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala

@@ -10,8 +10,13 @@ import zio.ZLayer
 
 import org.knora.webapi.auth.JWTService
 import org.knora.webapi.config.AppConfig
+import org.knora.webapi.messages.StringFormatter
 import org.knora.webapi.routing.ApiRoutes
 import org.knora.webapi.routing.admin.ProjectsRouteZ
+import org.knora.webapi.slice.resourceinfo.api.ResourceInfoRoute
+import org.knora.webapi.slice.resourceinfo.api.RestResourceInfoService
+import org.knora.webapi.slice.resourceinfo.domain.IriConverter
+import org.knora.webapi.slice.resourceinfo.domain.ResourceInfoRepo
 import org.knora.webapi.store.cache.CacheServiceManager
 import org.knora.webapi.store.cache.api.CacheService
 import org.knora.webapi.store.cache.impl.CacheServiceInMemImpl
@@ -53,17 +58,22 @@ object LayersLive {
       ApiRoutes.layer,
       AppConfig.live,
       AppRouter.layer,
-      CacheServiceManager.layer,
       CacheServiceInMemImpl.layer,
+      CacheServiceManager.layer,
       HttpServer.layer,
       HttpServerZ.layer, // this is the new ZIO HTTP server layer
       IIIFServiceManager.layer,
       IIIFServiceSipiImpl.layer,
+      IriConverter.layer,
       JWTService.layer,
+      ProjectsRouteZ.layer,
       RepositoryUpdater.layer,
+      ResourceInfoRepo.layer,
+      ResourceInfoRoute.layer,
+      RestResourceInfoService.layer,
       State.layer,
-      TriplestoreServiceManager.layer,
+      StringFormatter.live,
       TriplestoreServiceHttpConnectorImpl.layer,
-      ProjectsRouteZ.layer
+      TriplestoreServiceManager.layer
     )
 }

webapi/src/main/scala/org/knora/webapi/instrumentation/index/IndexApp.scala

@@ -1,3 +1,8 @@
+/*
+ * 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.instrumentation.index
 
 import zhttp.html.Html

webapi/src/main/scala/org/knora/webapi/instrumentation/prometheus/PrometheusApp.scala

@@ -1,3 +1,8 @@
+/*
+ * 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.instrumentation.prometheus
 
 import zhttp.http._