From 374522464610a2e29354d9e1c9a4ec5d46afb8c8 Mon Sep 17 00:00:00 2001 From: Xiu Hong Kooi Date: Tue, 20 Jun 2023 12:52:48 +0800 Subject: [PATCH 1/2] Remove redundant assertion in ReactorServerHttpResponse constructor See gh-30686 Closes gh-30696 --- .../http/server/reactive/ReactorServerHttpResponse.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java index 2449b72cf69..9ec3c5eb112 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java @@ -18,6 +18,7 @@ package org.springframework.http.server.reactive; import java.nio.file.Path; import java.util.List; +import java.util.Objects; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelId; @@ -55,8 +56,8 @@ class ReactorServerHttpResponse extends AbstractServerHttpResponse implements Ze public ReactorServerHttpResponse(HttpServerResponse response, DataBufferFactory bufferFactory) { - super(bufferFactory, new HttpHeaders(new NettyHeadersAdapter(response.responseHeaders()))); - Assert.notNull(response, "HttpServerResponse must not be null"); + super(bufferFactory, new HttpHeaders(new NettyHeadersAdapter(Objects.requireNonNull(response, + "HttpServerResponse must not be null").responseHeaders()))); this.response = response; } From 3d33d2baa9de61b07908695d3c4f1a9bcc8b0490 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 23 Jun 2023 13:35:16 +0200 Subject: [PATCH 2/2] Polish contribution --- .../http/server/reactive/ReactorServerHttpResponse.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java index 9ec3c5eb112..125db60e6d6 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. @@ -38,7 +38,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseCookie; import org.springframework.http.ZeroCopyHttpOutputMessage; -import org.springframework.util.Assert; /** * Adapt {@link ServerHttpResponse} to the {@link HttpServerResponse}.