Skip to content

Commit b814cc2

Browse files
ryanjbaxterryanjbaxter
committed
User Objects.requireNonNull
1 parent 4d76aa9 commit b814cc2

File tree

56 files changed

+173
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+173
-166
lines changed

‎spring-cloud-gateway-proxyexchange-webflux/src/main/java/org/springframework/cloud/gateway/webflux/ProxyExchange.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Collections;
2424
import java.util.HashSet;
2525
import java.util.Locale;
26+
import java.util.Objects;
2627
import java.util.Set;
2728
import java.util.function.Function;
2829
import java.util.stream.Collectors;
@@ -41,7 +42,6 @@
4142
import org.springframework.http.RequestEntity.BodyBuilder;
4243
import org.springframework.http.ResponseEntity;
4344
import org.springframework.http.converter.HttpMessageConverter;
44-
import org.springframework.util.Assert;
4545
import org.springframework.util.StringUtils;
4646
import org.springframework.validation.BindingResult;
4747
import org.springframework.web.bind.annotation.RequestBody;
@@ -246,7 +246,7 @@ public String path(String prefix) {
246246
}
247247

248248
public Mono<ResponseEntity<T>> get() {
249-
Assert.notNull(uri, "URI must not be null");
249+
Objects.requireNonNull(uri, "URI must not be null");
250250
RequestEntity<?> requestEntity = headers((BodyBuilder) RequestEntity.get(uri)).build();
251251
return exchange(requestEntity);
252252
}
@@ -256,7 +256,7 @@ public <S> Mono<ResponseEntity<S>> get(Function<ResponseEntity<T>, ResponseEntit
256256
}
257257

258258
public Mono<ResponseEntity<T>> head() {
259-
Assert.notNull(uri, "URI must not be null");
259+
Objects.requireNonNull(uri, "URI must not be null");
260260
RequestEntity<?> requestEntity = headers((BodyBuilder) RequestEntity.head(uri)).build();
261261
return exchange(requestEntity);
262262
}
@@ -266,7 +266,7 @@ public <S> Mono<ResponseEntity<S>> head(Function<ResponseEntity<T>, ResponseEnti
266266
}
267267

268268
public Mono<ResponseEntity<T>> options() {
269-
Assert.notNull(uri, "URI must not be null");
269+
Objects.requireNonNull(uri, "URI must not be null");
270270
RequestEntity<?> requestEntity = headers((BodyBuilder) RequestEntity.options(uri)).build();
271271
return exchange(requestEntity);
272272
}
@@ -296,7 +296,7 @@ public Mono<ResponseEntity<T>> put() {
296296
}
297297

298298
private Mono<ResponseEntity<T>> doExchange(Function<URI, RequestEntity.BodyBuilder> getBodyBuilder) {
299-
Assert.notNull(uri, "URI must not be null");
299+
Objects.requireNonNull(uri, "URI must not be null");
300300
BodyBuilder bodyBuilder = headers(getBodyBuilder.apply(uri));
301301
Publisher<?> body = body();
302302
RequestEntity<?> requestEntity = body != null ? bodyBuilder.body(body) : bodyBuilder.build();
@@ -369,7 +369,7 @@ else if (httpMethod.equals(HttpMethod.PATCH)) {
369369

370370
private Mono<ResponseEntity<T>> exchange(RequestEntity<?> requestEntity) {
371371
Type type = this.responseType;
372-
Assert.notNull(requestEntity.getMethod(), "Method must not be null");
372+
Objects.requireNonNull(requestEntity.getMethod(), "Method must not be null");
373373
RequestBodySpec builder = rest.method(requestEntity.getMethod())
374374
.uri(requestEntity.getUrl())
375375
.headers(headers -> addHeaders(headers, requestEntity.getHeaders()));

‎spring-cloud-gateway-proxyexchange-webmvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.LinkedHashSet;
3333
import java.util.List;
3434
import java.util.Locale;
35+
import java.util.Objects;
3536
import java.util.Set;
3637
import java.util.Vector;
3738
import java.util.function.Function;
@@ -56,7 +57,6 @@
5657
import org.springframework.http.ResponseEntity;
5758
import org.springframework.http.converter.HttpMessageConverter;
5859
import org.springframework.http.converter.HttpMessageNotWritableException;
59-
import org.springframework.util.Assert;
6060
import org.springframework.util.ClassUtils;
6161
import org.springframework.util.StringUtils;
6262
import org.springframework.validation.BindingResult;
@@ -268,8 +268,8 @@ public void forward(String path) {
268268
HttpServletRequest request = this.webRequest.getNativeRequest(HttpServletRequest.class);
269269
HttpServletResponse response = this.webRequest.getNativeResponse(HttpServletResponse.class);
270270
try {
271-
Assert.notNull(request, "HttpServletRequest is required");
272-
Assert.notNull(response, "HttpServletResponse is required");
271+
Objects.requireNonNull(request, "HttpServletRequest is required");
272+
Objects.requireNonNull(response, "HttpServletResponse is required");
273273
request.getRequestDispatcher(path)
274274
.forward(new BodyForwardingHttpServletRequest(request, response), response);
275275
}
@@ -279,7 +279,7 @@ public void forward(String path) {
279279
}
280280

281281
public ResponseEntity<T> get() {
282-
Assert.notNull(this.uri, "URI is required");
282+
Objects.requireNonNull(this.uri, "URI is required");
283283
Object body = body();
284284
BodyBuilder builder = headers((BodyBuilder) RequestEntity.get(uri));
285285
if (body != null) {
@@ -295,7 +295,7 @@ public <S> ResponseEntity<S> get(Function<ResponseEntity<T>, ResponseEntity<S>>
295295
}
296296

297297
public ResponseEntity<T> head() {
298-
Assert.notNull(this.uri, "URI is required");
298+
Objects.requireNonNull(this.uri, "URI is required");
299299
RequestEntity<?> requestEntity = headers((BodyBuilder) RequestEntity.head(uri)).build();
300300
return exchange(requestEntity);
301301
}
@@ -305,7 +305,7 @@ public <S> ResponseEntity<S> head(Function<ResponseEntity<T>, ResponseEntity<S>>
305305
}
306306

307307
public ResponseEntity<T> options() {
308-
Assert.notNull(this.uri, "URI is required");
308+
Objects.requireNonNull(this.uri, "URI is required");
309309
RequestEntity<?> requestEntity = headers((BodyBuilder) RequestEntity.options(uri)).build();
310310
return exchange(requestEntity);
311311
}
@@ -315,7 +315,7 @@ public <S> ResponseEntity<S> options(Function<ResponseEntity<T>, ResponseEntity<
315315
}
316316

317317
public ResponseEntity<T> post() {
318-
Assert.notNull(this.uri, "URI is required");
318+
Objects.requireNonNull(this.uri, "URI is required");
319319
Object body = body();
320320
BodyBuilder builder = headers(RequestEntity.post(uri));
321321
if (body != null) {
@@ -331,7 +331,7 @@ public <S> ResponseEntity<S> post(Function<ResponseEntity<T>, ResponseEntity<S>>
331331
}
332332

333333
public ResponseEntity<T> delete() {
334-
Assert.notNull(this.uri, "URI is required");
334+
Objects.requireNonNull(this.uri, "URI is required");
335335
Object body = body();
336336
BodyBuilder builder = headers((BodyBuilder) RequestEntity.delete(uri));
337337
if (body != null) {
@@ -347,7 +347,7 @@ public <S> ResponseEntity<S> delete(Function<ResponseEntity<T>, ResponseEntity<S
347347
}
348348

349349
public ResponseEntity<T> put() {
350-
Assert.notNull(this.uri, "URI is required");
350+
Objects.requireNonNull(this.uri, "URI is required");
351351
Object body = body();
352352
BodyBuilder builder = headers(RequestEntity.put(uri));
353353
if (body != null) {
@@ -363,7 +363,7 @@ public <S> ResponseEntity<S> put(Function<ResponseEntity<T>, ResponseEntity<S>>
363363
}
364364

365365
public ResponseEntity<T> patch() {
366-
Assert.notNull(this.uri, "URI is required");
366+
Objects.requireNonNull(this.uri, "URI is required");
367367
Object body = body();
368368
BodyBuilder builder = headers(RequestEntity.patch(uri));
369369
if (body != null) {
@@ -420,7 +420,7 @@ private Set<String> filterHeaderKeys(Collection<String> headerNames) {
420420

421421
private void proxy() {
422422
HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
423-
Assert.notNull(request, "Request is required");
423+
Objects.requireNonNull(request, "Request is required");
424424
try {
425425
URI uri = new URI(request.getRequestURL().toString());
426426
appendForwarded(uri);

‎spring-cloud-gateway-proxyexchange-webmvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyExchangeArgumentResolver.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Collections;
2222
import java.util.Enumeration;
2323
import java.util.Locale;
24+
import java.util.Objects;
2425
import java.util.Set;
2526

2627
import jakarta.servlet.http.HttpServletRequest;
@@ -29,7 +30,6 @@
2930
import org.springframework.cloud.gateway.mvc.ProxyExchange;
3031
import org.springframework.core.MethodParameter;
3132
import org.springframework.http.HttpHeaders;
32-
import org.springframework.util.Assert;
3333
import org.springframework.util.CollectionUtils;
3434
import org.springframework.web.bind.support.WebDataBinderFactory;
3535
import org.springframework.web.client.RestTemplate;
@@ -78,8 +78,8 @@ public boolean supportsParameter(MethodParameter parameter) {
7878
@Override
7979
public Object resolveArgument(MethodParameter parameter, @Nullable ModelAndViewContainer mavContainer,
8080
NativeWebRequest webRequest, @Nullable WebDataBinderFactory binderFactory) throws Exception {
81-
Assert.notNull(binderFactory, "WebDataBinderFactory is required");
82-
Assert.notNull(mavContainer, "ModelAndViewContainer is required");
81+
Objects.requireNonNull(binderFactory, "WebDataBinderFactory is required");
82+
Objects.requireNonNull(mavContainer, "ModelAndViewContainer is required");
8383
ProxyExchange<?> proxy = new ProxyExchange<>(rest, webRequest, mavContainer, binderFactory, type(parameter));
8484
configureHeaders(proxy);
8585
configureAutoForwardedHeaders(proxy, webRequest);
@@ -97,7 +97,7 @@ private Type type(MethodParameter parameter) {
9797

9898
private HttpHeaders extractAutoForwardedHeaders(NativeWebRequest webRequest) {
9999
HttpServletRequest nativeRequest = webRequest.getNativeRequest(HttpServletRequest.class);
100-
Assert.notNull(nativeRequest, "HttpServletRequest is required");
100+
Objects.requireNonNull(nativeRequest, "HttpServletRequest is required");
101101
Enumeration<String> headerNames = nativeRequest.getHeaderNames();
102102
HttpHeaders headers = new HttpHeaders();
103103
if (headerNames != null && autoForwardedHeaders != null) {

‎spring-cloud-gateway-proxyexchange-webmvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentRes
9494
argumentResolvers.add(context.getBean(ProxyExchangeArgumentResolver.class));
9595
}
9696

97-
private static class NoOpResponseErrorHandler extends DefaultResponseErrorHandler {
97+
private static final class NoOpResponseErrorHandler extends DefaultResponseErrorHandler {
9898

9999
@Override
100100
public void handleError(URI url, HttpMethod method, ClientHttpResponse response) throws IOException {

‎spring-cloud-gateway-proxyexchange-webmvc/src/test/java/org/springframework/cloud/gateway/mvc/GetWithBodyRequestTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void setName(final String name) {
194194

195195
}
196196

197-
private static class NoOpResponseErrorHandler extends DefaultResponseErrorHandler {
197+
private static final class NoOpResponseErrorHandler extends DefaultResponseErrorHandler {
198198

199199
@Override
200200
public void handleError(URI url, HttpMethod method, ClientHttpResponse response) throws IOException {

‎spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/ForwardRoutingFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.cloud.gateway.filter;
1818

1919
import java.net.URI;
20+
import java.util.Objects;
2021

2122
import org.apache.commons.logging.Log;
2223
import org.apache.commons.logging.LogFactory;
@@ -25,7 +26,6 @@
2526

2627
import org.springframework.beans.factory.ObjectProvider;
2728
import org.springframework.core.Ordered;
28-
import org.springframework.util.Assert;
2929
import org.springframework.web.reactive.DispatcherHandler;
3030
import org.springframework.web.server.ServerWebExchange;
3131

@@ -73,7 +73,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
7373
log.trace("Forwarding to URI: " + requestUrl);
7474
}
7575
DispatcherHandler handler = getDispatcherHandler();
76-
Assert.notNull(handler, "DispatcherHandler must not be null");
76+
Objects.requireNonNull(handler, "DispatcherHandler must not be null");
7777
return handle(handler, exchange);
7878
}
7979

‎spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/WeightCalculatorWebFilter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.LinkedHashMap;
2121
import java.util.List;
2222
import java.util.Map;
23+
import java.util.Objects;
2324
import java.util.concurrent.ConcurrentHashMap;
2425
import java.util.concurrent.ThreadLocalRandom;
2526
import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,7 +46,6 @@
4546
import org.springframework.core.Ordered;
4647
import org.springframework.core.log.LogMessage;
4748
import org.springframework.core.style.ToStringCreator;
48-
import org.springframework.util.Assert;
4949
import org.springframework.web.server.ServerWebExchange;
5050
import org.springframework.web.server.WebFilter;
5151
import org.springframework.web.server.WebFilterChain;
@@ -104,12 +104,12 @@ public void setOrder(int order) {
104104
}
105105

106106
public void setRandomSupplier(Supplier<Double> randomSupplier) {
107-
Assert.notNull(randomSupplier, "randomSupplier may not be null");
107+
Objects.requireNonNull(randomSupplier, "randomSupplier may not be null");
108108
this.randomFunction = exchange -> randomSupplier.get();
109109
}
110110

111111
public void setRandomFunction(Function<ServerWebExchange, Double> randomFunction) {
112-
Assert.notNull(randomFunction, "randomFunction may not be null");
112+
Objects.requireNonNull(randomFunction, "randomFunction may not be null");
113113
this.randomFunction = randomFunction;
114114
}
115115

‎spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/CacheRequestBodyGatewayFilterFactory.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.springframework.core.io.buffer.DataBufferUtils;
3131
import org.springframework.http.codec.HttpMessageReader;
3232
import org.springframework.http.server.reactive.ServerHttpRequest;
33-
import org.springframework.util.Assert;
3433
import org.springframework.web.reactive.function.server.HandlerStrategies;
3534
import org.springframework.web.reactive.function.server.ServerRequest;
3635
import org.springframework.web.server.ServerWebExchange;
@@ -91,7 +90,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
9190
}).then(Mono.defer(() -> {
9291
ServerHttpRequest cachedRequest = exchange
9392
.getAttribute(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR);
94-
Assert.notNull(cachedRequest, "cache request shouldn't be null");
93+
Objects.requireNonNull(cachedRequest, "cache request shouldn't be null");
9594
exchange.getAttributes().remove(CACHED_SERVER_HTTP_REQUEST_DECORATOR_ATTR);
9695
return chain.filter(exchange.mutate().request(cachedRequest).build()).doFinally(s -> {
9796
//

‎spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/JsonToGrpcGatewayFilterFactory.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import org.springframework.core.io.buffer.NettyDataBufferFactory;
7070
import org.springframework.http.codec.json.JacksonJsonDecoder;
7171
import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
72-
import org.springframework.util.Assert;
7372
import org.springframework.web.server.ServerWebExchange;
7473

7574
import static org.springframework.cloud.gateway.support.GatewayToStringStyler.filterToStringCreator;
@@ -224,7 +223,7 @@ private ClientCall<DynamicMessage, DynamicMessage> createClientCallForType(Confi
224223

225224
private Descriptors.MethodDescriptor getMethodDescriptor(Config config)
226225
throws IOException, Descriptors.DescriptorValidationException {
227-
Assert.notNull(config.getProtoDescriptor(), "Proto Descriptor must not be null");
226+
Objects.requireNonNull(config.getProtoDescriptor(), "Proto Descriptor must not be null");
228227
Resource descriptorFile = resourceLoader.getResource(config.getProtoDescriptor());
229228
DescriptorProtos.FileDescriptorSet fileDescriptorSet = DescriptorProtos.FileDescriptorSet
230229
.parseFrom(descriptorFile.getInputStream());

‎spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/RequestSizeGatewayFilterFactory.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.cloud.gateway.filter.factory;
1818

19+
import java.util.Objects;
20+
1921
import reactor.core.publisher.Mono;
2022

2123
import org.springframework.cloud.gateway.filter.GatewayFilter;
@@ -111,7 +113,7 @@ public RequestSizeGatewayFilterFactory.RequestSizeConfig setMaxSize(DataSize max
111113

112114
// TODO: use validator annotation
113115
public void validate() {
114-
Assert.notNull(this.maxSize, "maxSize may not be null");
116+
Objects.requireNonNull(this.maxSize, "maxSize may not be null");
115117
Assert.isTrue(this.maxSize.toBytes() > 0, "maxSize must be greater than 0");
116118
}
117119

0 commit comments

Comments
 (0)