From d0e5d717a95ae3413fab77cf39b1e4f5ee80f53b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:39:49 +0000 Subject: [PATCH 1/2] 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](https://github.com/arrow-kt/arrow/compare/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] --- build.gradle.kts | 2 +- shared/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 98e867d8a..33fa29eb6 100644 --- a/build.gradle.kts +++ b/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") diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 2a3e4ee61..00ae985eb 100644 --- a/shared/build.gradle.kts +++ b/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") From 8317e41fe8c0d09438826df6f16ff8f44032041a Mon Sep 17 00:00:00 2001 From: Benoit Orihuela Date: Wed, 11 Dec 2024 10:15:16 +0100 Subject: [PATCH 2/2] chore: migration to ArrowKt 2.0 --- .../search/authorization/web/EntityAccessControlHandler.kt | 1 - .../kotlin/com/egm/stellio/shared/model/ExpandedEntity.kt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/search-service/src/main/kotlin/com/egm/stellio/search/authorization/web/EntityAccessControlHandler.kt b/search-service/src/main/kotlin/com/egm/stellio/search/authorization/web/EntityAccessControlHandler.kt index 6bfaa771c..996dd3985 100644 --- a/search-service/src/main/kotlin/com/egm/stellio/search/authorization/web/EntityAccessControlHandler.kt +++ b/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 diff --git a/shared/src/main/kotlin/com/egm/stellio/shared/model/ExpandedEntity.kt b/shared/src/main/kotlin/com/egm/stellio/shared/model/ExpandedEntity.kt index 38ef13e98..4988d5e7d 100644 --- a/shared/src/main/kotlin/com/egm/stellio/shared/model/ExpandedEntity.kt +++ b/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 ->