From 18e03dbae194f620d0630b3e1d36109b677ac17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=A0=95=ED=9B=88=20Kang=20Jeonghun?= Date: Sat, 9 Aug 2025 17:49:25 +0900 Subject: [PATCH 1/2] Harmonize SslOptions#getCiphers and getEnabledProtocols Javadoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See gh-46756 Signed-off-by: 강정훈 Kang Jeonghun --- .../main/java/org/springframework/boot/ssl/SslOptions.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java index e6c3561df9b..1fd102cfda0 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java @@ -30,6 +30,7 @@ import org.springframework.core.style.ToStringCreator; * Configuration options that should be applied when establishing an SSL connection. * * @author Scott Frederick + * @author Jeonghun Kang * @since 3.1.0 * @see SslBundle#getOptions() */ @@ -49,7 +50,7 @@ public interface SslOptions { } /** - * Return the ciphers that can be used or an empty set. The cipher names in this set + * Return the ciphers that can be used or null. The cipher names in this set * should be compatible with those supported by * {@link SSLEngine#getSupportedCipherSuites()}. * @return the ciphers that can be used or {@code null} @@ -57,7 +58,7 @@ public interface SslOptions { String[] getCiphers(); /** - * Return the protocols that should be enabled or an empty set. The protocols names in + * Return the protocols that should be enabled or null. The protocols names in * this set should be compatible with those supported by * {@link SSLEngine#getSupportedProtocols()}. * @return the protocols to enable or {@code null} From bd39a9aebb600bf14ae99be9b6389fd3aead6fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 11 Aug 2025 11:12:19 +0200 Subject: [PATCH 2/2] Polish "Harmonize SslOptions#getCiphers and getEnabledProtocols Javadoc" See gh-46756 --- .../main/java/org/springframework/boot/ssl/SslOptions.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java index 1fd102cfda0..a2ff447b783 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java @@ -30,7 +30,6 @@ import org.springframework.core.style.ToStringCreator; * Configuration options that should be applied when establishing an SSL connection. * * @author Scott Frederick - * @author Jeonghun Kang * @since 3.1.0 * @see SslBundle#getOptions() */ @@ -50,7 +49,7 @@ public interface SslOptions { } /** - * Return the ciphers that can be used or null. The cipher names in this set + * Return the ciphers that can be used or {@code null}. The cipher names in this set * should be compatible with those supported by * {@link SSLEngine#getSupportedCipherSuites()}. * @return the ciphers that can be used or {@code null} @@ -58,7 +57,7 @@ public interface SslOptions { String[] getCiphers(); /** - * Return the protocols that should be enabled or null. The protocols names in + * Return the protocols that should be enabled or {@code null}. The protocols names in * this set should be compatible with those supported by * {@link SSLEngine#getSupportedProtocols()}. * @return the protocols to enable or {@code null}