From 73c2eb1b779725a13e14f4284ec9010537b1001a Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 18 Jun 2019 21:31:44 +0100 Subject: [PATCH] Fix minor Assert-related issues --- .../rsocket/MessageHandlerAcceptor.java | 20 ++++++++----------- .../messaging/rsocket/MessagingRSocket.java | 6 +++--- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java index 9b7fce4254..4a92e69552 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java @@ -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()); } } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java index 973ff263b6..2ea3fd91eb 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java @@ -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) {