diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/implicits/package.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/implicits/package.scala index 7c65691dbe..0f811de449 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/implicits/package.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/implicits/package.scala @@ -4,7 +4,7 @@ import ch.epfl.bluebrain.nexus.delta.kernel.syntax.{ClassTagSyntax, Http4sRespon import ch.epfl.bluebrain.nexus.delta.rdf.instances.{TripleInstances, UriInstances} import ch.epfl.bluebrain.nexus.delta.rdf.syntax.{IriSyntax, IterableSyntax, JsonLdEncoderSyntax, JsonSyntax, PathSyntax, UriSyntax} import ch.epfl.bluebrain.nexus.delta.sdk.instances.{CredentialsInstances, HttpResponseFieldsInstances, IdentityInstances, IriInstances, ProjectRefInstances} -import ch.epfl.bluebrain.nexus.delta.sdk.syntax.{HttpRequestSyntax, HttpResponseFieldsSyntax, IORejectSyntax, IriEncodingSyntax, ProjectionErrorsSyntax} +import ch.epfl.bluebrain.nexus.delta.sdk.syntax.{HttpResponseFieldsSyntax, IORejectSyntax, IriEncodingSyntax, ProjectionErrorsSyntax} /** * Aggregate instances and syntax from rdf plus the current sdk instances and syntax to avoid importing multiple @@ -28,7 +28,6 @@ package object implicits with IterableSyntax with KamonSyntax with IORejectSyntax - with HttpRequestSyntax with HttpResponseFieldsSyntax with IOSyntax with ClassTagSyntax diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/instances/CredentialsInstances.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/instances/CredentialsInstances.scala index 07dd484433..ad508468b6 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/instances/CredentialsInstances.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/instances/CredentialsInstances.scala @@ -1,15 +1,10 @@ package ch.epfl.bluebrain.nexus.delta.sdk.instances -import akka.http.scaladsl.model.headers.BasicHttpCredentials import org.http4s.BasicCredentials import pureconfig.* -import pureconfig.generic.semiauto.deriveReader trait CredentialsInstances { - implicit final val basicHttpCredentialsConfigReader: ConfigReader[BasicHttpCredentials] = - deriveReader[BasicHttpCredentials] - implicit final val basicCredentialsConfigReader: ConfigReader[BasicCredentials] = ConfigReader.forProduct2[BasicCredentials, String, String]("username", "password")(BasicCredentials(_, _)) } diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/syntax/HttpRequestSyntax.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/syntax/HttpRequestSyntax.scala deleted file mode 100644 index 39be8ea7f7..0000000000 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/syntax/HttpRequestSyntax.scala +++ /dev/null @@ -1,25 +0,0 @@ -package ch.epfl.bluebrain.nexus.delta.sdk.syntax - -import akka.http.scaladsl.model.HttpRequest -import akka.http.scaladsl.model.headers.{HttpCredentials, OAuth2BearerToken} -import ch.epfl.bluebrain.nexus.delta.kernel.jwt.AuthToken - -trait HttpRequestSyntax { - implicit final def httpRequestSyntax(req: HttpRequest): HttpRequestOpts = new HttpRequestOpts(req) -} - -final class HttpRequestOpts(private val req: HttpRequest) { - - /** - * Add the [[OAuth2BearerToken]] to the current request when the implicit optional [[AuthToken]] is present - */ - def withCredentials(implicit cred: Option[AuthToken]): HttpRequest = - withHttpCredentials(cred.map(token => OAuth2BearerToken(token.value))) - - /** - * Add the [[HttpCredentials]] to the current request when the passed value is some - */ - def withHttpCredentials(implicit cred: Option[HttpCredentials]): HttpRequest = - cred.fold(req)(req.addCredentials) - -} diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/syntax/package.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/syntax/package.scala index d438091178..d3dcb52e1b 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/syntax/package.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/syntax/package.scala @@ -15,7 +15,6 @@ package object syntax with IterableSyntax with KamonSyntax with IORejectSyntax - with HttpRequestSyntax with HttpResponseFieldsSyntax with ClassTagSyntax with IOSyntax diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala index 7f9ccf4b8d..1ea125da04 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/elasticsearch/ElasticSearchContainer.scala @@ -24,7 +24,7 @@ class ElasticSearchContainer(password: String) } object ElasticSearchContainer { - val Version = "8.17.4" + val Version = "9.0.0" private val ElasticSearchUser = "elastic" private val ElasticSearchPassword = "password" diff --git a/docs/src/main/paradox/docs/delta/api/assets/version.json b/docs/src/main/paradox/docs/delta/api/assets/version.json index cf0b03c547..e7b2d41533 100644 --- a/docs/src/main/paradox/docs/delta/api/assets/version.json +++ b/docs/src/main/paradox/docs/delta/api/assets/version.json @@ -4,7 +4,7 @@ "dependencies": { "blazegraph": "2.1.6-RC-21-jre", "postgresql": "17.4", - "elasticsearch": "8.17.4" + "elasticsearch": "9.0.0" }, "plugins": { "archive": "1.10.0", diff --git a/docs/src/main/paradox/docs/running-nexus/docker/docker-compose.yaml b/docs/src/main/paradox/docs/running-nexus/docker/docker-compose.yaml index 90fd2909df..1bf93c47f0 100644 --- a/docs/src/main/paradox/docs/running-nexus/docker/docker-compose.yaml +++ b/docs/src/main/paradox/docs/running-nexus/docker/docker-compose.yaml @@ -24,7 +24,7 @@ services: memory: 1024M elasticsearch: - image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.4" + image: "docker.elastic.co/elasticsearch/elasticsearch:9.0.0" environment: discovery.type: "single-node" bootstrap.memory_lock: "true" diff --git a/docs/src/main/paradox/docs/running-nexus/index.md b/docs/src/main/paradox/docs/running-nexus/index.md index 06a01930d9..460ca315b9 100644 --- a/docs/src/main/paradox/docs/running-nexus/index.md +++ b/docs/src/main/paradox/docs/running-nexus/index.md @@ -105,7 +105,7 @@ $ curl http://localhost/v1/version | jq "delta": "1.10.0", "dependencies": { "blazegraph": "2.1.6-SNAPSHOT", - "elasticsearch": "8.17.4", + "elasticsearch": "9.0.0", "postgres": "17.4" }, "environment": "dev", diff --git a/tests/docker/elasticsearch.yml b/tests/docker/elasticsearch.yml index 603e0e624c..21fed9bb51 100644 --- a/tests/docker/elasticsearch.yml +++ b/tests/docker/elasticsearch.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.17.4 + image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0 environment: ES_JAVA_OPTS: "-Xmx4G" discovery.type: "single-node"