Merge pull request #1280 from stellio-hub/dependabot/gradle/io.arrow-…

…kt-arrow-fx-coroutines-2.0.0

* chore(deps): Bump io.arrow-kt:arrow-fx-coroutines from 1.2.4 to 2.0.0

Bumps [io.arrow-kt:arrow-fx-coroutines](https://github.com/arrow-kt/arrow) from 1.2.4 to 2.0.0.
- [Release notes](https://github.com/arrow-kt/arrow/releases)
- [Changelog](https://github.com/arrow-kt/arrow/blob/main/RELEASE.md)
- [Commits](arrow-kt/arrow@1.2.4...2.0.0)

---
updated-dependencies:
- dependency-name: io.arrow-kt:arrow-fx-coroutines
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: migration to ArrowKt 2.0

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Benoit Orihuela <benoit.orihuela@egm.io>

build.gradle.kts

@@ -69,7 +69,7 @@ subprojects {
         implementation("com.apicatalog:titanium-json-ld:1.4.1")
         implementation("org.glassfish:jakarta.json:2.0.1")
 
-        implementation("io.arrow-kt:arrow-fx-coroutines:1.2.4")
+        implementation("io.arrow-kt:arrow-fx-coroutines:2.0.0")
 
         implementation("org.locationtech.jts.io:jts-io-common:1.20.0")
 

search-service/src/main/kotlin/com/egm/stellio/search/authorization/web/EntityAccessControlHandler.kt

@@ -1,6 +1,5 @@
 package com.egm.stellio.search.authorization.web
 
-import arrow.core.computations.ResultEffect.bind
 import arrow.core.left
 import arrow.core.raise.either
 import com.egm.stellio.search.authorization.service.AuthorizationService

shared/build.gradle.kts

@@ -26,7 +26,7 @@ dependencies {
     testFixturesImplementation("org.springframework.security:spring-security-oauth2-jose")
     testFixturesImplementation("org.springframework.security:spring-security-test")
     testFixturesImplementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
-    testFixturesImplementation("io.arrow-kt:arrow-fx-coroutines:1.2.4")
+    testFixturesImplementation("io.arrow-kt:arrow-fx-coroutines:2.0.0")
     testFixturesImplementation("org.springframework.boot:spring-boot-starter-test") {
         // to ensure we are using mocks and spies from springmockk lib instead
         exclude(module = "mockito-core")

shared/src/main/kotlin/com/egm/stellio/shared/model/ExpandedEntity.kt

@@ -2,7 +2,7 @@ package com.egm.stellio.shared.model
 
 import arrow.core.Either
 import arrow.core.left
-import arrow.core.mapNotNull
+import arrow.core.mapValuesNotNull
 import arrow.core.right
 import com.egm.stellio.shared.util.JsonLdUtils
 import com.egm.stellio.shared.util.JsonLdUtils.JSONLD_CONTEXT
@@ -102,7 +102,7 @@ data class ExpandedEntity(
             members.filterKeys {
                 includedAttributes.isEmpty() ||
                     JSONLD_EXPANDED_ENTITY_CORE_MEMBERS.plus(includedAttributes).contains(it)
-            }.mapNotNull { entry ->
+            }.mapValuesNotNull { entry ->
                 if (entry.key in JSONLD_EXPANDED_ENTITY_CORE_MEMBERS)
                     entry.value
                 else (entry.value as ExpandedAttributeInstances).filter { expandedAttributeInstance ->