Merge branch '3.1.x'

Closes gh-36421
This commit is contained in:
Stephane Nicoll 2023-07-17 13:23:15 +02:00
commit c19a0a76c0
1 changed files with 6 additions and 6 deletions

View File

@ -31,12 +31,12 @@ public class PemSslBundleProperties extends SslBundleProperties {
/** /**
* Keystore properties. * Keystore properties.
*/ */
private Store keystore = new Store(); private final Store keystore = new Store();
/** /**
* Truststore properties. * Truststore properties.
*/ */
private Store truststore = new Store(); private final Store truststore = new Store();
public Store getKeystore() { public Store getKeystore() {
return this.keystore; return this.keystore;
@ -54,22 +54,22 @@ public class PemSslBundleProperties extends SslBundleProperties {
/** /**
* Type of the store to create, e.g. JKS. * Type of the store to create, e.g. JKS.
*/ */
String type; private String type;
/** /**
* Location or content of the certificate in PEM format. * Location or content of the certificate in PEM format.
*/ */
String certificate; private String certificate;
/** /**
* Location or content of the private key in PEM format. * Location or content of the private key in PEM format.
*/ */
String privateKey; private String privateKey;
/** /**
* Password used to decrypt an encrypted private key. * Password used to decrypt an encrypted private key.
*/ */
String privateKeyPassword; private String privateKeyPassword;
public String getType() { public String getType() {
return this.type; return this.type;