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

Added keystore type and truststore type to rabbit properties

Browse Source 
See gh-10251
This commit is contained in:
Martin Greber
2017-09-11 23:02:35 +10:00
committed by Stephane Nicoll
parent f04fa32c27
commit b70ac99bcb
5 changed files with 101 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
View File

@@ -113,8 +113,14 @@ public class RabbitAutoConfiguration {
if (ssl.getAlgorithm() != null) {
factory.setSslAlgorithm(ssl.getAlgorithm());
}
if (ssl.getKeyStoreType() != null) {
factory.setKeyStoreType(ssl.getKeyStoreType());
}
factory.setKeyStore(ssl.getKeyStore());
factory.setKeyStorePassphrase(ssl.getKeyStorePassword());
if (ssl.getTrustStoreType() != null) {
factory.setTrustStoreType(ssl.getTrustStoreType());
}
factory.setTrustStore(ssl.getTrustStore());
factory.setTrustStorePassphrase(ssl.getTrustStorePassword());
}

26
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View File

@@ -314,6 +314,11 @@ public class RabbitProperties {
*/
private String keyStore;
/**
* Set the key store type (jks, pkcs12, etc).
*/
private String keyStoreType;
/**
* Password used to access the key store.
*/
@@ -324,6 +329,11 @@ public class RabbitProperties {
*/
private String trustStore;
/**
* Set the trust store type (jks, pkcs12, etc).
*/
private String trustStoreType;
/**
* Password used to access the trust store.
*/
@@ -351,6 +361,14 @@ public class RabbitProperties {
this.keyStore = keyStore;
}
public String getKeyStoreType() {
return this.keyStoreType;
}
public void setKeyStoreType(String keyStoreType) {
this.keyStoreType = keyStoreType;
}
public String getKeyStorePassword() {
return this.keyStorePassword;
}
@@ -367,6 +385,14 @@ public class RabbitProperties {
this.trustStore = trustStore;
}
public String getTrustStoreType() {
return this.trustStoreType;
}
public void setTrustStoreType(String trustStoreType) {
this.trustStoreType = trustStoreType;
}
public String getTrustStorePassword() {
return this.trustStorePassword;
}