From 595e00b84962fab688cb078f5e4b864430b010eb Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 18 May 2022 13:20:54 +0200 Subject: [PATCH] Fix logging conditions. Refactor tests. --- .../encryption/EncryptionController.java | 18 +++++++++++++++--- .../BootstrapConfigServerIntegrationTests.java | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java index 6497d98b..257ac316 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java @@ -109,7 +109,9 @@ public class EncryptionController { Map keys = helper.getEncryptorKeys(name, profiles, input); String textToEncrypt = helper.stripPrefix(input); String encrypted = helper.addPrefix(keys, encryptorLocator.locate(keys).encrypt(textToEncrypt)); - logger.info("Encrypted data"); + if (logger.isInfoEnabled()) { + logger.info("Encrypted data"); + } return encrypted; } @@ -128,21 +130,31 @@ public class EncryptionController { encryptor = getEncryptor(name, profiles, data); String input = stripFormData(helper.stripPrefix(data), type, true); String decrypted = encryptor.decrypt(input); - logger.info("Decrypted cipher data"); + if (logger.isInfoEnabled()) { + logger.info("Decrypted cipher data"); + } return decrypted; } catch (IllegalArgumentException | IllegalStateException e) { - logger.error("Cannot decrypt key:" + name + ", value:" + data, e); + if (logger.isErrorEnabled()) { + logger.error("Cannot decrypt key:" + name + ", value:" + data, e); + } throw new InvalidCipherException(); } } private TextEncryptor getEncryptor(String name, String profiles, String data) { if (encryptorLocator == null) { + if (logger.isDebugEnabled()) { + logger.debug("Text encryptorLocator is null."); + } throw new KeyNotInstalledException(); } TextEncryptor encryptor = encryptorLocator.locate(helper.getEncryptorKeys(name, profiles, data)); if (encryptor == null) { + if (logger.isDebugEnabled()) { + logger.debug("TextEncryptor is null."); + } throw new KeyNotInstalledException(); } return encryptor; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java index 2303c61b..102d9e7c 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java @@ -77,7 +77,7 @@ public class BootstrapConfigServerIntegrationTests { @Test @Ignore // FIXME: configdata - public void environmentBootstraps() throws Exception { + public void environmentBootstraps() { assertThat(this.env.getProperty("info.foo", "")).isEqualTo("bar"); assertThat(this.env.getProperty("config.foo", "")).isEqualTo("foo"); }