Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass RSocketStrategies to MetadataExtractor

Browse Source 
Simplify the creation of MetadataExtractor by not requiring
RSocketStrategies up front. The strategies are already configured in higher
level places like RSocketMessageHandler that invoke the MetadataExtractor.
The strategies are now passed in as an argument to the extract method.
This commit is contained in:
Rossen Stoyanchev
2019-07-17 14:17:33 +01:00
parent d33e4878a0
commit 1e9ccdd8b8
5 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultMetadataExtractorTests.java
View File

@@ -70,7 +70,7 @@ public class DefaultMetadataExtractorTests {
this.captor = ArgumentCaptor.forClass(Payload.class);
BDDMockito.when(this.rsocket.fireAndForget(captor.capture())).thenReturn(Mono.empty());
this.extractor = new DefaultMetadataExtractor(this.strategies);
this.extractor = new DefaultMetadataExtractor();
}
@After
@@ -91,7 +91,7 @@ public class DefaultMetadataExtractorTests {
.send().block();
Payload payload = this.captor.getValue();
Map<String, Object> result = this.extractor.extract(payload, COMPOSITE_METADATA);
Map<String, Object> result = this.extractor.extract(payload, COMPOSITE_METADATA, this.strategies);
payload.release();
assertThat(result).hasSize(1).containsEntry(ROUTE_KEY, "toA");
@@ -113,7 +113,7 @@ public class DefaultMetadataExtractorTests {
.block();
Payload payload = this.captor.getValue();
Map<String, Object> result = this.extractor.extract(payload, COMPOSITE_METADATA);
Map<String, Object> result = this.extractor.extract(payload, COMPOSITE_METADATA, this.strategies);
payload.release();
assertThat(result).hasSize(4)
@@ -128,7 +128,7 @@ public class DefaultMetadataExtractorTests {
requester(ROUTING).route("toA").data("data").send().block();
Payload payload = this.captor.getValue();
Map<String, Object> result = this.extractor.extract(payload, ROUTING);
Map<String, Object> result = this.extractor.extract(payload, ROUTING, this.strategies);
payload.release();
assertThat(result).hasSize(1).containsEntry(ROUTE_KEY, "toA");
@@ -141,7 +141,7 @@ public class DefaultMetadataExtractorTests {
requester(TEXT_PLAIN).route("toA").data("data").send().block();
Payload payload = this.captor.getValue();
Map<String, Object> result = this.extractor.extract(payload, TEXT_PLAIN);
Map<String, Object> result = this.extractor.extract(payload, TEXT_PLAIN, this.strategies);
payload.release();
assertThat(result).hasSize(1).containsEntry(ROUTE_KEY, "toA");
@@ -159,7 +159,7 @@ public class DefaultMetadataExtractorTests {
requester(TEXT_PLAIN).metadata("toA:text data", null).data("data").send().block();
Payload payload = this.captor.getValue();
Map<String, Object> result = this.extractor.extract(payload, TEXT_PLAIN);
Map<String, Object> result = this.extractor.extract(payload, TEXT_PLAIN, this.strategies);
payload.release();
assertThat(result).hasSize(2)