Proxy Registry: fix a few glaring issues

Author: Ladicek

extensions/proxy-registry/runtime/src/main/java/io/quarkus/proxy/config/ProxyConfigurationRegistry.java

@@ -7,6 +7,7 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.StringJoiner;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -32,19 +33,13 @@ public Optional<NamedProxyConfig> getProxyConfig(Optional<String> name, NoneRetu
         }
         final String plainName = name.get();
         if (ProxyConfig.NO_PROXY.equals(plainName)) {
-            switch (noneBehavior) {
-                case NONE_INSTANCE: {
-                    return None.INSTANCE;
-                }
-                case EMPTY: {
-                    return Optional.empty();
-                }
-                default:
-                    throw new IllegalArgumentException("Unexpected value: " + noneBehavior);
-            }
+            return switch (noneBehavior) {
+                case NONE_INSTANCE -> None.INSTANCE;
+                case EMPTY -> Optional.empty();
+            };
         }
         final Optional<NamedProxyConfig> namedProxyConfig = namedProxyConfigs.getOrDefault(plainName, Optional.empty());
-        if (namedProxyConfig == null) {
+        if (namedProxyConfig.isEmpty()) {
             throw new IllegalStateException("Proxy configuration with name " + plainName + " was requested but "
                     + "quarkus.proxy.\"" + plainName + "\".host is not defined");
         }
@@ -62,11 +57,13 @@ public static Optional<UsernamePassword> getUsernamePassword(NamedProxyConfig co
                 String username = creds.get(cpConfig.usernameKey());
                 String password = creds.get(cpConfig.passwordKey());
                 if (username == null || password == null) {
-                    final String badKeys = Map.of(cpConfig.usernameKey(), username, cpConfig.passwordKey(), password).entrySet()
-                            .stream()
-                            .filter(en -> en.getValue() == null)
-                            .map(Entry::getKey)
-                            .collect(Collectors.joining(" and "));
+                    StringJoiner badKeys = new StringJoiner(" and ");
+                    if (username == null) {
+                        badKeys.add(cpConfig.usernameKey());
+                    }
+                    if (password == null) {
+                        badKeys.add(cpConfig.passwordKey());
+                    }
                     throw new IllegalStateException(
                             "Could not retrieve " + badKeys + " from credential bucket " + cpConfig.name().get());
                 }
@@ -97,19 +94,20 @@ static CredentialsProvider lookupCredentialsProvider(String name) {
 
     static Optional<NamedProxyConfig> assertValid(String prefix, NamedProxyConfig config) {
         if (config.host().isEmpty()) {
-            String badValues = Map.<String, Optional<?>> of(
+            String badValues = Map.of(
                     "port", config.port().isPresent() ? Optional.of(config.port().getAsInt()) : Optional.empty(),
                     "username", config.username(),
                     "password", config.password(),
-                    "nonProxyHosts", config.nonProxyHosts(),
-                    "proxyConnectTimeout", config.proxyConnectTimeout())
-                    .entrySet().stream()
+                    "non-proxy-hosts", config.nonProxyHosts(),
+                    "proxy-connect-timeout", config.proxyConnectTimeout())
+                    .entrySet()
+                    .stream()
                     .filter(en -> en.getValue().isPresent())
                     .map(en -> prefix + en.getKey())
                     .collect(Collectors.joining(", "));
             if (!badValues.isEmpty()) {
                 throw new IllegalStateException(
-                        "If " + prefix + ".host is not set, then all of " + badValues + " must not be set too");
+                        "If " + prefix + ".host is not set, then all of " + badValues + " must not be set either");
             }
             return Optional.empty();
         } else {
@@ -126,6 +124,9 @@ static Optional<NamedProxyConfig> assertValid(String prefix, NamedProxyConfig co
         }
     }
 
+    /**
+     * This method may only be called by {@code ProxyConfigProcessor} and must not be called elsewhere.
+     */
     public void init(ProxyConfig proxyConfig) {
         final HashMap<String, Optional<NamedProxyConfig>> m = new HashMap<>();
         for (Entry<String, NamedProxyConfig> en : proxyConfig.namedProxyConfigs().entrySet()) {
@@ -145,6 +146,9 @@ public void init(ProxyConfig proxyConfig) {
 
     }
 
+    /**
+     * This method may only be called by {@code ProxyConfigProcessor} and must not be called elsewhere.
+     */
     public Supplier<ProxyConfigurationRegistry> getSupplier() {
         return new Supplier<ProxyConfigurationRegistry>() {
             @Override