From 8d6b0eb191f3f005a3c800b92e88a3c1a713b2ba Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Mon, 5 Jun 2023 18:34:03 +0300 Subject: [PATCH 1/4] Fix typo in UriUtils Javadoc Closes gh-30598 --- .../src/main/java/org/springframework/web/util/UriUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java index d6653c24f14..c8a5eaafea1 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java @@ -307,7 +307,7 @@ public abstract class UriUtils { * meaning, anywhere within a URI, as defined in * RFC 3986. * This is useful to ensure that the given String will be preserved as-is - * and will not have any o impact on the structure or meaning of the URI. + * and will not have any impact on the structure or meaning of the URI. * @param source the String to be encoded * @param charset the character encoding to encode to * @return the encoded String From 7ff80bc09d8132c8db33c91c60277d729d02069a Mon Sep 17 00:00:00 2001 From: Heo YounHaeng <44353046+heoYH@users.noreply.github.com> Date: Mon, 5 Jun 2023 15:32:37 +0900 Subject: [PATCH 2/4] Fix example in Javadoc for MultipartBodyBuilder See gh-30593 --- .../org/springframework/http/client/MultipartBodyBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java index fa724439374..63c6d67cac1 100644 --- a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java +++ b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java @@ -76,7 +76,7 @@ import org.springframework.util.MultiValueMap; * * Mono<Void> result = webClient.post() * .uri("...") - * .body(multipartBody) + * .body(BodyInserters.fromMultipartData(multipartBody)) * .retrieve() * .bodyToMono(Void.class) * From 8bf79cc9c455ae1c580ecabc2fb1e09c3fd8bd2f Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 7 Jul 2023 15:02:38 +0200 Subject: [PATCH 3/4] Polish contribution Closes gh-30593 --- .../org/springframework/http/client/MultipartBodyBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java index 63c6d67cac1..fb8f89c3a31 100644 --- a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java +++ b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java @@ -76,7 +76,7 @@ import org.springframework.util.MultiValueMap; * * Mono<Void> result = webClient.post() * .uri("...") - * .body(BodyInserters.fromMultipartData(multipartBody)) + * .bodyValue(multipartBody) * .retrieve() * .bodyToMono(Void.class) * From 75b540f25c07ac0a66349fe0549a12a0ae0a4a6a Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 7 Jul 2023 15:03:09 +0200 Subject: [PATCH 4/4] Update copyright headers --- .../jms/listener/AbstractJmsListeningContainer.java | 2 +- .../org/springframework/web/filter/ShallowEtagHeaderFilter.java | 2 +- .../src/main/java/org/springframework/web/util/UriUtils.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java index 104f98e79d0..297c3ab6c3b 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 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. diff --git a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java index a5dd68ac39f..7f830f9bdb4 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 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. diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java index c8a5eaafea1..c7b8aa409fa 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 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.