diff --git a/pom.xml b/pom.xml index b9e3bc75..998c2d86 100644 --- a/pom.xml +++ b/pom.xml @@ -1007,6 +1007,4 @@ - - diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTransitIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTransitIntegrationTests.java index 9cb99ba0..f181d67b 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTransitIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTransitIntegrationTests.java @@ -516,7 +516,7 @@ public class ReactiveVaultTransitIntegrationTests extends IntegrationTestSupport assertThat(two).isNotNull(); this.reactiveTransitOperations.decrypt("myKey", Arrays.asList(one, two)) - .zipWith(Flux.merge(this.reactiveTransitOperations.decrypt("myKey", one), + .zipWith(Flux.concat(this.reactiveTransitOperations.decrypt("myKey", one), this.reactiveTransitOperations.decrypt("myKey", two))) .as(StepVerifier::create) .assertNext(it -> { @@ -860,7 +860,7 @@ public class ReactiveVaultTransitIntegrationTests extends IntegrationTestSupport .build(); this.reactiveTransitOperations.createKey("myKey", request) - .thenMany(Flux.merge(this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.HMAC_KEY), + .thenMany(Flux.concat(this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.HMAC_KEY), this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.SIGNING_KEY))) .as(StepVerifier::create) .assertNext(hmacKey -> assertThat(hmacKey.getKeys()).isNotEmpty()) @@ -877,7 +877,7 @@ public class ReactiveVaultTransitIntegrationTests extends IntegrationTestSupport .build(); this.reactiveTransitOperations.createKey("myKey", request) - .thenMany(Flux.merge(this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.HMAC_KEY), + .thenMany(Flux.concat(this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.HMAC_KEY), this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.SIGNING_KEY))) .as(StepVerifier::create) .assertNext(hmacKey -> assertThat(hmacKey.getKeys()).isNotEmpty())