Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35667 from quaff

Browse Source 
* pr/35667:
  Expose spring.ssl bundle keys

Closes gh-35667
This commit is contained in:
Stephane Nicoll
2023-06-06 17:53:13 +02:00
parent bd2fff1fd1 7a5f6d4123
commit f3b025c1f4
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ssl/SslProperties.java
View File

@@ -20,7 +20,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
/**
* Properties for centralized SSL trust material configuration.
@@ -48,13 +47,11 @@ public class SslProperties {
/**
* PEM-encoded SSL trust material.
*/
@NestedConfigurationProperty
private final Map<String, PemSslBundleProperties> pem = new LinkedHashMap<>();
/**
* Java keystore SSL trust material.
*/
@NestedConfigurationProperty
private final Map<String, JksSslBundleProperties> jks = new LinkedHashMap<>();
public Map<String, PemSslBundleProperties> getPem() {