Merge pull request quarkusio#40985 from cescoffier/tls-remove-lambdas

Remove the usage of lambdas in the TLS registry code
mkouba · Jun 5, 2024 · 73f14f6 · 73f14f6
2 parents 59fbe75 + 357a262
commit 73f14f6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/...nsions/tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/CertificateRecorder.java b/...nsions/tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/CertificateRecorder.java
@@ -138,7 +138,12 @@ public void register(String name, TlsConfiguration configuration) {
     }
 
     public Supplier<TlsConfigurationRegistry> getSupplier() {
-        return () -> this;
+        return new Supplier<TlsConfigurationRegistry>() {
+            @Override
+            public TlsConfigurationRegistry get() {
+                return CertificateRecorder.this;
+            }
+        };
     }
 
     public void register(String name, Supplier<TlsConfiguration> supplier) {

diff --git a/...ons/tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/VertxCertificateHolder.java b/...ons/tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/VertxCertificateHolder.java
@@ -16,7 +16,6 @@
 import javax.net.ssl.TrustManagerFactory;
 
 import io.quarkus.tls.TlsConfiguration;
-import io.quarkus.tls.runtime.config.KeyStoreConfig;
 import io.quarkus.tls.runtime.config.TlsBucketConfig;
 import io.quarkus.tls.runtime.config.TlsConfigUtils;
 import io.vertx.core.Vertx;
@@ -138,7 +137,10 @@ public Optional<String> getHostnameVerificationAlgorithm() {
 
     @Override
     public boolean usesSni() {
-        return config.keyStore().map(KeyStoreConfig::sni).orElse(false);
+        if (config.keyStore().isPresent()) {
+            return config.keyStore().get().sni();
+        }
+        return false;
     }
 
     @Override

diff --git a/...ons/tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/keystores/JKSKeyStores.java b/...ons/tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/keystores/JKSKeyStores.java
@@ -58,7 +58,9 @@ private static JksOptions toOptions(JKSKeyStoreConfig config,
                         + "' - the key store password is not set and cannot be retrieved from the credential provider.");
             }
             options.setPassword(p);
-            config.alias().ifPresent(options::setAlias);
+            if (config.alias().isPresent()) {
+                options.setAlias(config.alias().get());
+            }
             String ap = CredentialProviders.getAliasPassword(config.aliasPassword(), keyStoreCredentialProviderConfig)
                     .orElse(null);
             options.setAliasPassword(ap);
@@ -83,7 +85,9 @@ private static JksOptions toOptions(JKSTrustStoreConfig config,
                         + "' - the trust store password is not set and cannot be retrieved from the credential provider.");
             }
             options.setPassword(password);
-            config.alias().ifPresent(options::setAlias);
+            if (config.alias().isPresent()) {
+                options.setAlias(config.alias().get());
+            }
         } catch (UncheckedIOException e) {
             throw new IllegalStateException("Invalid JKS trust store configuration for certificate '" + name
                     + "' - cannot read the trust store file '" + config.path() + "'", e);

diff --git a/...ons/tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/keystores/P12KeyStores.java b/...ons/tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/keystores/P12KeyStores.java
@@ -57,7 +57,9 @@ private static PfxOptions toOptions(P12KeyStoreConfig config, KeyStoreCredential
                         + "' - the key store password is not set and cannot be retrieved from the credential provider.");
             }
             options.setPassword(password);
-            config.alias().ifPresent(options::setAlias);
+            if (config.alias().isPresent()) {
+                options.setAlias(config.alias().get());
+            }
             String ap = CredentialProviders.getAliasPassword(config.aliasPassword(), pc).orElse(null);
             options.setAliasPassword(ap);
         } catch (UncheckedIOException e) {
@@ -80,7 +82,9 @@ private static PfxOptions toOptions(P12TrustStoreConfig config, TrustStoreCreden
                         + "' - the trust store password is not set and cannot be retrieved from the credential provider.");
             }
             options.setPassword(password);
-            config.alias().ifPresent(options::setAlias);
+            if (config.alias().isPresent()) {
+                options.setAlias(config.alias().get());
+            }
         } catch (UncheckedIOException e) {
             throw new IllegalStateException("Invalid P12 trust store configuration for certificate '" + name
                     + "' - cannot read the trust store file '" + config.path() + "'", e);

diff --git a/.../tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/keystores/TrustAllOptions.java b/.../tls-registry/runtime/src/main/java/io/quarkus/tls/runtime/keystores/TrustAllOptions.java
@@ -68,6 +68,11 @@ protected TrustManager[] engineGetTrustManagers() {
 
     @Override
     public Function<String, TrustManager[]> trustManagerMapper(Vertx vertx) {
-        return name -> new TrustManager[] { TRUST_ALL_MANAGER };
+        return new Function<String, TrustManager[]>() {
+            @Override
+            public TrustManager[] apply(String name) {
+                return new TrustManager[] { TRUST_ALL_MANAGER };
+            }
+        };
     }
 }