SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2020-01-14 09:58:28 +00:00
parent 75f3bbcff1
commit 09aad0d92a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/KeyStoreTextEncryptorLocator.java
View File

@@ -98,7 +98,8 @@ public class KeyStoreTextEncryptorLocator implements TextEncryptorLocator {
private RsaSecretEncryptor rsaSecretEncryptor(String alias, String secret) {
return new RsaSecretEncryptor(
this.keys.getKeyPair(alias, this.secretLocator.locate(secret)),
this.rsaAlgorithm, this.salt, this.strong);
this.keys.getKeyPair(alias, this.secretLocator.locate(secret)),
this.rsaAlgorithm, this.salt, this.strong);
}
}

7
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/encryption/KeyStoreTextEncryptorLocatorTests.java
View File

@@ -73,8 +73,11 @@ public class KeyStoreTextEncryptorLocatorTests {
@Test
public void testDefaultEncryptor() {
TextEncryptor encryptor1 = this.locator.locate(Collections.<String, String>emptyMap());
TextEncryptor encryptor2 = this.locator.locate(Collections.<String, String>emptyMap());
TextEncryptor encryptor1 = this.locator
.locate(Collections.<String, String>emptyMap());
TextEncryptor encryptor2 = this.locator
.locate(Collections.<String, String>emptyMap());
assertThat(encryptor1).isEqualTo(encryptor2);
}
}