Polishing.

Avoid concurrent result reordering in tests.

See #837

Author: mp911de

pom.xml

@@ -1007,6 +1007,4 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-
-
 </project>

spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTransitIntegrationTests.java

@@ -516,7 +516,7 @@ void shouldBatchDecrypt() {
 		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 @@ void shouldExportEcDsaKey() {
 			.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 @@ void shouldExportEdKey() {
 			.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())