Skip to content

Commit 9bdff8c

Browse files
committed
Fix new Sonar smells
1 parent 5d50755 commit 9bdff8c

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java

+15-9
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.springframework.messaging.handler.invocation.reactive.HandlerMethodArgumentResolver;
3232
import org.springframework.messaging.handler.invocation.reactive.SyncHandlerMethodArgumentResolver;
3333
import org.springframework.messaging.rsocket.RSocketRequester;
34+
import org.springframework.messaging.rsocket.RSocketStrategies;
3435
import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
3536
import org.springframework.util.Assert;
3637
import org.springframework.util.MimeType;
@@ -123,18 +124,23 @@ protected List<? extends HandlerMethodArgumentResolver> initArgumentResolvers()
123124
}
124125

125126
protected IntegrationRSocket createRSocket(ConnectionSetupPayload setupPayload, RSocket rsocket) {
126-
String s = setupPayload.dataMimeType();
127-
MimeType dataMimeType = StringUtils.hasText(s) ? MimeTypeUtils.parseMimeType(s) : this.defaultDataMimeType;
127+
String mimeType = setupPayload.dataMimeType();
128+
MimeType dataMimeType =
129+
StringUtils.hasText(mimeType)
130+
? MimeTypeUtils.parseMimeType(mimeType)
131+
: this.defaultDataMimeType;
128132
Assert.notNull(dataMimeType, "No `dataMimeType` in ConnectionSetupPayload and no default value");
129-
130-
s = setupPayload.metadataMimeType();
131-
MimeType metaMimeType = StringUtils.hasText(s) ? MimeTypeUtils.parseMimeType(s) : this.defaultMetadataMimeType;
133+
mimeType = setupPayload.metadataMimeType();
134+
MimeType metaMimeType =
135+
StringUtils.hasText(mimeType)
136+
? MimeTypeUtils.parseMimeType(mimeType)
137+
: this.defaultMetadataMimeType;
132138
Assert.notNull(dataMimeType, "No `metadataMimeType` in ConnectionSetupPayload and no default value");
133-
134-
RSocketRequester requester = RSocketRequester.wrap(rsocket, dataMimeType, metaMimeType, getRSocketStrategies());
135-
139+
RSocketStrategies rSocketStrategies = getRSocketStrategies();
140+
Assert.notNull(rSocketStrategies, "No `rSocketStrategies` provided");
141+
RSocketRequester requester = RSocketRequester.wrap(rsocket, dataMimeType, metaMimeType, rSocketStrategies);
136142
return new IntegrationRSocket(this, getRouteMatcher(), requester, dataMimeType, metaMimeType,
137-
getRSocketStrategies().dataBufferFactory());
143+
rSocketStrategies.dataBufferFactory());
138144
}
139145

140146
private static final class MessageHandlerMethodArgumentResolver implements SyncHandlerMethodArgumentResolver {

0 commit comments

Comments
 (0)