Check for null on the argument instead of the message
See gh-1307 Issue: SPR-15196
This commit is contained in:
committed by
Stephane Nicoll
parent
944d17f237
commit
f1c7e0f5b2
@@ -37,7 +37,7 @@ public abstract class AbstractCacheInvoker {
|
||||
}
|
||||
|
||||
protected AbstractCacheInvoker(CacheErrorHandler errorHandler) {
|
||||
Assert.notNull("ErrorHandler must not be null");
|
||||
Assert.notNull(errorHandler, "ErrorHandler must not be null");
|
||||
this.errorHandler = errorHandler;
|
||||
}
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ public class JmsMessagingTemplate extends AbstractMessagingTemplate<Destination>
|
||||
* Create a {@code JmsMessagingTemplate} instance with the {@link JmsTemplate} to use.
|
||||
*/
|
||||
public JmsMessagingTemplate(JmsTemplate jmsTemplate) {
|
||||
Assert.notNull("JmsTemplate must not be null");
|
||||
Assert.notNull(jmsTemplate, "JmsTemplate must not be null");
|
||||
this.jmsTemplate = jmsTemplate;
|
||||
}
|
||||
|
||||
|
||||
@@ -62,8 +62,8 @@ public class JettyWebSocketHandlerAdapter {
|
||||
public JettyWebSocketHandlerAdapter(WebSocketHandler handler,
|
||||
Function<Session, JettyWebSocketSession> sessionFactory) {
|
||||
|
||||
Assert.notNull("WebSocketHandler is required");
|
||||
Assert.notNull("'sessionFactory' is required");
|
||||
Assert.notNull(handler, "WebSocketHandler is required");
|
||||
Assert.notNull(sessionFactory, "'sessionFactory' is required");
|
||||
this.delegateHandler = handler;
|
||||
this.sessionFactory = sessionFactory;
|
||||
}
|
||||
|
||||
@@ -53,8 +53,8 @@ public class StandardWebSocketHandlerAdapter extends Endpoint {
|
||||
public StandardWebSocketHandlerAdapter(WebSocketHandler handler,
|
||||
Function<Session, StandardWebSocketSession> sessionFactory) {
|
||||
|
||||
Assert.notNull("WebSocketHandler is required");
|
||||
Assert.notNull("'sessionFactory' is required");
|
||||
Assert.notNull(handler, "WebSocketHandler is required");
|
||||
Assert.notNull(sessionFactory, "'sessionFactory' is required");
|
||||
this.delegateHandler = handler;
|
||||
this.sessionFactory = sessionFactory;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ public class UndertowWebSocketHandlerAdapter extends AbstractReceiveListener {
|
||||
|
||||
|
||||
public UndertowWebSocketHandlerAdapter(UndertowWebSocketSession session) {
|
||||
Assert.notNull("UndertowWebSocketSession is required");
|
||||
Assert.notNull(session, "UndertowWebSocketSession is required");
|
||||
this.session = session;
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ public class ReactorServerHttpRequest extends AbstractServerHttpRequest {
|
||||
}
|
||||
|
||||
private static URI initUri(HttpServerRequest channel) {
|
||||
Assert.notNull("'channel' must not be null");
|
||||
Assert.notNull(channel, "'channel' must not be null");
|
||||
InetSocketAddress address = channel.remoteAddress();
|
||||
return (address == null ? URI.create(channel.uri()) : getBaseUrl(address).resolve(channel.uri()));
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ public class ReactorServerHttpResponse extends AbstractServerHttpResponse
|
||||
|
||||
public ReactorServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory) {
|
||||
super(bufferFactory);
|
||||
Assert.notNull("'response' must not be null.");
|
||||
Assert.notNull(response, "'response' must not be null.");
|
||||
this.response = response;
|
||||
}
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ public class RxNettyServerHttpRequest extends AbstractServerHttpRequest {
|
||||
}
|
||||
|
||||
private static URI initUri(HttpServerRequest<ByteBuf> request) {
|
||||
Assert.notNull("'request', request must not be null");
|
||||
Assert.notNull(request, "'request' must not be null");
|
||||
return StringUtils.isEmpty(request.getHostHeader()) ?
|
||||
URI.create(request.getUri()) : getBaseUrl(request).resolve(request.getUri());
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ public class RxNettyServerHttpResponse extends AbstractServerHttpResponse {
|
||||
public RxNettyServerHttpResponse(HttpServerResponse<ByteBuf> response,
|
||||
NettyDataBufferFactory dataBufferFactory) {
|
||||
super(dataBufferFactory);
|
||||
Assert.notNull("'response', response must not be null.");
|
||||
Assert.notNull(response, "'response' must not be null.");
|
||||
|
||||
this.response = response;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user