test: rework ApplyConfigurationTest

diennea · Dec 10, 2024 · 8041f7a · 8041f7a
1 parent 9b18218
commit 8041f7a
Show file tree

Hide file tree

Showing 3 changed files with 239 additions and 236 deletions.
diff --git a/carapace-server/src/main/java/org/carapaceproxy/core/Listeners.java b/carapace-server/src/main/java/org/carapaceproxy/core/Listeners.java
@@ -398,7 +398,7 @@ private SslContext bootSslContext(NetworkListenerConfiguration listener, SSLCert
             try {
                 // Try to find certificate data on db
                 byte[] keystoreContent = parent.getDynamicCertificatesManager().getCertificateForDomain(certificate.getId());
-                KeyStore keystore;
+                final KeyStore keystore;
                 if (keystoreContent != null) {
                     LOG.debug("start SSL with dynamic certificate id {}, on listener {}:{}", certificate.getId(), listener.getHost(), port);
                     keystore = loadKeyStoreData(keystoreContent, certificate.getPassword());

diff --git a/...erver/src/main/java/org/carapaceproxy/server/certificates/DynamicCertificatesManager.java b/...erver/src/main/java/org/carapaceproxy/server/certificates/DynamicCertificatesManager.java
@@ -606,7 +606,7 @@ private RuntimeServerConfiguration getConfig() {
      * @return PKCS12 Keystore content
      */
     public byte[] getCertificateForDomain(String domain) {
-        CertificateData cert = certificates.get(domain); // certs always retrived from cache
+        CertificateData cert = certificates.get(domain); // certs always retrieved from cache
         if (cert == null || cert.getKeystoreData() == null || cert.getKeystoreData().length == 0) {
             LOG.error("No dynamic certificate available for domain {}", domain);
             return null;