From 8ee24014480915b18e9de57e896419be20d1ffbc Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Tue, 8 Nov 2022 16:18:58 +0200 Subject: [PATCH 1/7] [release] Back to snapshots, next is 1.2.1-SNAPSHOT --- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1bf5794..9ce9e24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=1.2.0 +version=1.2.1-SNAPSHOT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ca9865..f0c07c5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -reactorCore = "3.5.0" -reactorAddons = "3.5.0" +reactorCore = "3.5.1-SNAPSHOT" +reactorAddons = "3.5.1-SNAPSHOT" # Other shared versions kotlin = "1.7.0" From 9f397d3eda6041d1ab95bda419aca1cbace0938b Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Tue, 15 Nov 2022 11:54:42 +0200 Subject: [PATCH 2/7] [release] Prepare and release 1.1.8 --- README.md | 8 ++++---- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c2c7541..d42f377 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ With Gradle from repo.spring.io or Maven Central repositories (stable releases o } dependencies { - //compile "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.8-SNAPSHOT" - compile "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.7" + //compile "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.9-SNAPSHOT" + compile "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.8" } ``` @@ -29,7 +29,7 @@ With Maven from Maven Central repositories (stable releases): io.projectreactor.kotlin reactor-kotlin-extensions - 1.1.7 + 1.1.8 ``` @@ -42,7 +42,7 @@ Or from repo.spring.io with access to SNAPSHOT: io.projectreactor.kotlin reactor-kotlin-extensions - 1.1.8-SNAPSHOT + 1.1.9-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 9ab0e22..ae5a6d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=1.1.8-SNAPSHOT +version=1.1.8 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bd4ddc6..dd79f94 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -reactorCore = "3.4.24-SNAPSHOT" -reactorAddons = "3.4.9-SNAPSHOT" +reactorCore = "3.4.25" +reactorAddons = "3.4.9" # Other shared versions kotlin = "1.5.32" swt = "4.5.2" From fbc204ff4fa4097b1f2b1cecce8575f405d67a4f Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Tue, 15 Nov 2022 12:07:59 +0200 Subject: [PATCH 3/7] [release] Back to snapshots, next is 1.1.9-SNAPSHOT --- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index ae5a6d9..914b635 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=1.1.8 +version=1.1.9-SNAPSHOT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dd79f94..24122a6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -reactorCore = "3.4.25" -reactorAddons = "3.4.9" +reactorCore = "3.4.26-SNAPSHOT" +reactorAddons = "3.4.10-SNAPSHOT" # Other shared versions kotlin = "1.5.32" swt = "4.5.2" From f828c2fcdf6695623d76012b837410ae6b6cbf32 Mon Sep 17 00:00:00 2001 From: AramMessdaghi9001 <67048354+AramMessdaghi9001@users.noreply.github.com> Date: Tue, 6 Dec 2022 17:59:35 +0100 Subject: [PATCH 4/7] Add Flux collectMap of Pairs extension (#55) This commit adds an extension function to Flux> to collect it to a Mono>. Fixes #54. --- .../reactor/kotlin/core/publisher/FluxExtensions.kt | 9 +++++++++ .../kotlin/core/publisher/FluxExtensionsTests.kt | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/kotlin/reactor/kotlin/core/publisher/FluxExtensions.kt b/src/main/kotlin/reactor/kotlin/core/publisher/FluxExtensions.kt index d6f5c4d..2a75418 100644 --- a/src/main/kotlin/reactor/kotlin/core/publisher/FluxExtensions.kt +++ b/src/main/kotlin/reactor/kotlin/core/publisher/FluxExtensions.kt @@ -18,6 +18,7 @@ package reactor.kotlin.core.publisher import org.reactivestreams.Publisher import reactor.core.publisher.Flux +import reactor.core.publisher.Mono import java.util.stream.Stream import kotlin.reflect.KClass @@ -225,3 +226,11 @@ fun Flux.switchIfEmpty(s: () -> Publisher): Flux = this.switchIfEmp * @since 1.1.3 */ fun Flux.switchIfEmptyDeferred(s: () -> Publisher): Flux = this.switchIfEmpty(Flux.defer { s() }) + +/** + * Extension for [Flux.collectMap] to collect Kotlin [Pair]s into a [Map] + * + * @author Aram Messdaghi + * @since 1.1.9 + */ +fun Flux>.collectMap(): Mono> = collectMap(Pair::first, Pair::second) diff --git a/src/test/kotlin/reactor/kotlin/core/publisher/FluxExtensionsTests.kt b/src/test/kotlin/reactor/kotlin/core/publisher/FluxExtensionsTests.kt index 735772d..0997c79 100644 --- a/src/test/kotlin/reactor/kotlin/core/publisher/FluxExtensionsTests.kt +++ b/src/test/kotlin/reactor/kotlin/core/publisher/FluxExtensionsTests.kt @@ -251,4 +251,15 @@ class FluxExtensionsTests { .expectError() .verify() } + + @Test + fun `collectMap with pairs`() { + val inputPairs: List> = listOf("a" to 1, "b" to 2, "c" to 3) + val collectedMap: Mono> = inputPairs.toFlux() + .collectMap() + + collectedMap.test() + .expectNext(inputPairs.toMap()) + .verifyComplete() + } } From 84693ef0c2de2221abd4d0841203e1337289a49a Mon Sep 17 00:00:00 2001 From: Pierre De Rop Date: Tue, 13 Dec 2022 15:58:22 +0100 Subject: [PATCH 5/7] [release] Prepare and release 1.1.9 --- README.md | 8 ++++---- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d42f377..aded41a 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ With Gradle from repo.spring.io or Maven Central repositories (stable releases o } dependencies { - //compile "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.9-SNAPSHOT" - compile "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.8" + //compile "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.10-SNAPSHOT" + compile "io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.9" } ``` @@ -29,7 +29,7 @@ With Maven from Maven Central repositories (stable releases): io.projectreactor.kotlin reactor-kotlin-extensions - 1.1.8 + 1.1.9 ``` @@ -42,7 +42,7 @@ Or from repo.spring.io with access to SNAPSHOT: io.projectreactor.kotlin reactor-kotlin-extensions - 1.1.9-SNAPSHOT + 1.1.10-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 914b635..46d5266 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=1.1.9-SNAPSHOT +version=1.1.9 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24122a6..a33e20d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -reactorCore = "3.4.26-SNAPSHOT" -reactorAddons = "3.4.10-SNAPSHOT" +reactorCore = "3.4.26" +reactorAddons = "3.4.9" # Other shared versions kotlin = "1.5.32" swt = "4.5.2" From ceeb70c0e8dc8ce6fa601633f93ab0ea534890d8 Mon Sep 17 00:00:00 2001 From: Pierre De Rop Date: Tue, 13 Dec 2022 16:58:57 +0100 Subject: [PATCH 6/7] Empty-Commit From 1d3939e5d73f2fc3f3d1a4511092634893e63569 Mon Sep 17 00:00:00 2001 From: Pierre De Rop Date: Tue, 13 Dec 2022 21:00:29 +0100 Subject: [PATCH 7/7] [release] Prepare and release 1.2.1 --- README.md | 6 +++--- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 920a739..4ed6520 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ With Gradle from repo.spring.io or Maven Central repositories (stable releases o } dependencies { - //implementation "io.projectreactor.kotlin:reactor-kotlin-extensions:1.2.1-SNAPSHOT" - implementation "io.projectreactor.kotlin:reactor-kotlin-extensions:1.2.0" + //implementation "io.projectreactor.kotlin:reactor-kotlin-extensions:1.2.2-SNAPSHOT" + implementation "io.projectreactor.kotlin:reactor-kotlin-extensions:1.2.1" } ``` @@ -42,7 +42,7 @@ Or from repo.spring.io with access to SNAPSHOT: io.projectreactor.kotlin reactor-kotlin-extensions - 1.2.0 + 1.2.1 diff --git a/gradle.properties b/gradle.properties index 9ce9e24..2d48fba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=1.2.1-SNAPSHOT +version=1.2.1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f0c07c5..9a9f935 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -reactorCore = "3.5.1-SNAPSHOT" -reactorAddons = "3.5.1-SNAPSHOT" +reactorCore = "3.5.1" +reactorAddons = "3.5.0" # Other shared versions kotlin = "1.7.0"