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

Fix minor Assert-related issues

Browse Source
This commit is contained in:
Rossen Stoyanchev
2019-06-18 21:31:44 +01:00
parent ef6471fcbf
commit 73c2eb1b77
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java
View File

@@ -89,23 +89,19 @@ public final class MessageHandlerAcceptor extends RSocketMessageHandler
private MessagingRSocket createRSocket(ConnectionSetupPayload setupPayload, RSocket rsocket) {
MimeType dataMimeType = StringUtils.hasText(setupPayload.dataMimeType()) ?
MimeTypeUtils.parseMimeType(setupPayload.dataMimeType()) :
this.defaultDataMimeType;
Assert.notNull(dataMimeType,
"No `dataMimeType` in the ConnectionSetupPayload and no default value");
String s = setupPayload.dataMimeType();
MimeType dataMimeType = StringUtils.hasText(s) ? MimeTypeUtils.parseMimeType(s) : this.defaultDataMimeType;
Assert.notNull(dataMimeType, "No `dataMimeType` in ConnectionSetupPayload and no default value");
MimeType metadataMimeType = StringUtils.hasText(setupPayload.dataMimeType()) ?
MimeTypeUtils.parseMimeType(setupPayload.metadataMimeType()) :
this.defaultMetadataMimeType;
Assert.notNull(dataMimeType,
"No `metadataMimeType` in the ConnectionSetupPayload and no default value");
s = setupPayload.metadataMimeType();
MimeType metaMimeType = StringUtils.hasText(s) ? MimeTypeUtils.parseMimeType(s) : this.defaultMetadataMimeType;
Assert.notNull(dataMimeType, "No `metadataMimeType` in ConnectionSetupPayload and no default value");
RSocketRequester requester = RSocketRequester.wrap(
rsocket, dataMimeType, metadataMimeType, getRSocketStrategies());
rsocket, dataMimeType, metaMimeType, getRSocketStrategies());
return new MessagingRSocket(this, getRouteMatcher(), requester,
dataMimeType, metadataMimeType, getRSocketStrategies().dataBufferFactory());
dataMimeType, metaMimeType, getRSocketStrategies().dataBufferFactory());
}
}

6
spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java
View File

@@ -77,8 +77,8 @@ class MessagingRSocket extends AbstractRSocket {
Assert.notNull(messageHandler, "'messageHandler' is required");
Assert.notNull(routeMatcher, "'routeMatcher' is required");
Assert.notNull(requester, "'requester' is required");
Assert.notNull(requester, "'dataMimeType' is required");
Assert.notNull(requester, "'metadataMimeType' is required");
Assert.notNull(dataMimeType, "'dataMimeType' is required");
Assert.notNull(metadataMimeType, "'metadataMimeType' is required");
Assert.isTrue(DefaultRSocketRequester.METADATA_MIME_TYPES.contains(metadataMimeType),
() -> "Unexpected metadatata mime type: '" + metadataMimeType + "'");
@@ -192,7 +192,7 @@ class MessagingRSocket extends AbstractRSocket {
return payload.getMetadataUtf8();
}
// Should not happen (given constructor assertions)
throw new IllegalArgumentException("Unexpected metadata MimeType");
throw new IllegalArgumentException("Unexpected metadataMimeType");
}
private DataBuffer retainDataAndReleasePayload(Payload payload) {