From bbbc95f77379e2ac2aea12de4baf17456a7f0638 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Sun, 7 Jul 2024 20:51:43 +0800 Subject: [PATCH 1/2] Implement DefaultErrorResponseBuilder#headers(Consumer) See gh-33156 --- .../web/DefaultErrorResponseBuilder.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/DefaultErrorResponseBuilder.java b/spring-web/src/main/java/org/springframework/web/DefaultErrorResponseBuilder.java index 2d564465863..8599d2fdfcb 100644 --- a/spring-web/src/main/java/org/springframework/web/DefaultErrorResponseBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/DefaultErrorResponseBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 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. @@ -30,6 +30,7 @@ import org.springframework.util.Assert; * Default implementation of {@link ErrorResponse.Builder}. * * @author Rossen Stoyanchev + * @author 海子 Yang * @since 6.0 */ final class DefaultErrorResponseBuilder implements ErrorResponse.Builder { @@ -66,18 +67,25 @@ final class DefaultErrorResponseBuilder implements ErrorResponse.Builder { @Override public ErrorResponse.Builder header(String headerName, String... headerValues) { - this.headers = (this.headers != null ? this.headers : new HttpHeaders()); for (String headerValue : headerValues) { - this.headers.add(headerName, headerValue); + httpHeaders().add(headerName, headerValue); } return this; } @Override public ErrorResponse.Builder headers(Consumer headersConsumer) { + headersConsumer.accept(httpHeaders()); return this; } + private HttpHeaders httpHeaders() { + if (this.headers == null) { + this.headers = new HttpHeaders(); + } + return this.headers; + } + @Override public ErrorResponse.Builder type(URI type) { this.problemDetail.setType(type); From 69850cad271d0f3e98f7961ae72edc9ca56f7b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 8 Jul 2024 13:09:42 +0200 Subject: [PATCH 2/2] Polish "Implement DefaultErrorResponseBuilder#headers(Consumer)" See gh-33156 --- .../web/DefaultErrorResponseBuilder.java | 7 ++- .../web/ErrorResponseTests.java | 54 +++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 spring-web/src/test/java/org/springframework/web/ErrorResponseTests.java diff --git a/spring-web/src/main/java/org/springframework/web/DefaultErrorResponseBuilder.java b/spring-web/src/main/java/org/springframework/web/DefaultErrorResponseBuilder.java index 8599d2fdfcb..72774ba60c3 100644 --- a/spring-web/src/main/java/org/springframework/web/DefaultErrorResponseBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/DefaultErrorResponseBuilder.java @@ -30,7 +30,6 @@ import org.springframework.util.Assert; * Default implementation of {@link ErrorResponse.Builder}. * * @author Rossen Stoyanchev - * @author 海子 Yang * @since 6.0 */ final class DefaultErrorResponseBuilder implements ErrorResponse.Builder { @@ -68,18 +67,18 @@ final class DefaultErrorResponseBuilder implements ErrorResponse.Builder { @Override public ErrorResponse.Builder header(String headerName, String... headerValues) { for (String headerValue : headerValues) { - httpHeaders().add(headerName, headerValue); + getHeaders().add(headerName, headerValue); } return this; } @Override public ErrorResponse.Builder headers(Consumer headersConsumer) { - headersConsumer.accept(httpHeaders()); + headersConsumer.accept(getHeaders()); return this; } - private HttpHeaders httpHeaders() { + private HttpHeaders getHeaders() { if (this.headers == null) { this.headers = new HttpHeaders(); } diff --git a/spring-web/src/test/java/org/springframework/web/ErrorResponseTests.java b/spring-web/src/test/java/org/springframework/web/ErrorResponseTests.java new file mode 100644 index 00000000000..f39afad7adf --- /dev/null +++ b/spring-web/src/test/java/org/springframework/web/ErrorResponseTests.java @@ -0,0 +1,54 @@ +/* + * Copyright 2002-2024 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.web; + +import java.util.List; + +import org.junit.jupiter.api.Test; + +import org.springframework.http.HttpStatus; + +import static java.util.Map.entry; +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link ErrorResponse}. + * + * @author Stephane Nicoll + */ +class ErrorResponseTests { + + @Test + void createWithHttpHeader() { + ErrorResponse response = ErrorResponse.builder(new IllegalStateException(), HttpStatus.BAD_REQUEST, "test") + .header("header", "value").build(); + assertThat(response.getHeaders()).containsOnly(entry("header", List.of("value"))); + } + + @Test + void createWithHttpHeadersConsumer() { + ErrorResponse response = ErrorResponse.builder(new IllegalStateException(), HttpStatus.BAD_REQUEST, "test") + .header("header", "value") + .headers(headers -> { + headers.add("header", "value2"); + headers.add("another", "value3"); + }).build(); + assertThat(response.getHeaders()).containsOnly(entry("header", List.of("value", "value2")), + entry("another", List.of("value3"))); + } + +}