Browse Source

Fix precondition assertions

pull/29589/head
Sam Brannen 3 years ago
parent
commit
e5878ab15b
  1. 4
      spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionalOperatorImpl.java
  2. 5
      spring-web/src/main/java/org/springframework/http/ContentDisposition.java
  3. 2
      spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java
  4. 4
      spring-webmvc/src/main/java/org/springframework/web/servlet/handler/RequestMatchResult.java

4
spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionalOperatorImpl.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -57,7 +57,7 @@ final class TransactionalOperatorImpl implements TransactionalOperator { @@ -57,7 +57,7 @@ final class TransactionalOperatorImpl implements TransactionalOperator {
*/
TransactionalOperatorImpl(ReactiveTransactionManager transactionManager, TransactionDefinition transactionDefinition) {
Assert.notNull(transactionManager, "ReactiveTransactionManager must not be null");
Assert.notNull(transactionManager, "TransactionDefinition must not be null");
Assert.notNull(transactionDefinition, "TransactionDefinition must not be null");
this.transactionManager = transactionManager;
this.transactionDefinition = transactionDefinition;
}

5
spring-web/src/main/java/org/springframework/http/ContentDisposition.java

@ -465,8 +465,9 @@ public final class ContentDisposition { @@ -465,8 +465,9 @@ public final class ContentDisposition {
* @see <a href="https://tools.ietf.org/html/rfc5987">RFC 5987</a>
*/
private static String decodeFilename(String filename, Charset charset) {
Assert.notNull(filename, "'input' String should not be null");
Assert.notNull(charset, "'charset' should not be null");
Assert.notNull(filename, "'filename' must not be null");
Assert.notNull(charset, "'charset' must not be null");
byte[] value = filename.getBytes(charset);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
int index = 0;

2
spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java

@ -63,12 +63,12 @@ class UndertowServerHttpResponse extends AbstractListenerServerHttpResponse impl @@ -63,12 +63,12 @@ class UndertowServerHttpResponse extends AbstractListenerServerHttpResponse impl
HttpServerExchange exchange, DataBufferFactory bufferFactory, UndertowServerHttpRequest request) {
super(bufferFactory, createHeaders(exchange));
Assert.notNull(exchange, "HttpServerExchange must not be null");
this.exchange = exchange;
this.request = request;
}
private static HttpHeaders createHeaders(HttpServerExchange exchange) {
Assert.notNull(exchange, "HttpServerExchange must not be null");
UndertowHeadersAdapter headersMap = new UndertowHeadersAdapter(exchange.getResponseHeaders());
return new HttpHeaders(headersMap);
}

4
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/RequestMatchResult.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -59,7 +59,7 @@ public class RequestMatchResult { @@ -59,7 +59,7 @@ public class RequestMatchResult {
*/
public RequestMatchResult(PathPattern pathPattern, PathContainer lookupPath) {
Assert.notNull(pathPattern, "PathPattern is required");
Assert.notNull(pathPattern, "PathContainer is required");
Assert.notNull(lookupPath, "PathContainer is required");
this.pattern = null;
this.lookupPath = null;

Loading…
Cancel
Save