From 18389b17acc437c6558fb2095e69f8ef13631b4f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 31 Jan 2023 13:43:08 +0100 Subject: [PATCH] Polishing. Consistent constant naming. --- .../vault/client/ClientHttpConnectorFactory.java | 12 ++++++------ .../client/ClientHttpRequestFactoryFactory.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java b/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java index 5dadad4f..57e9090f 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java @@ -65,13 +65,13 @@ import static org.springframework.vault.client.ClientHttpRequestFactoryFactory.* */ public class ClientHttpConnectorFactory { - private static final boolean REACTOR_NETTY_PRESENT = ClassUtils.isPresent("reactor.netty.http.client.HttpClient", + private static final boolean reactorNettyPresent = ClassUtils.isPresent("reactor.netty.http.client.HttpClient", ClientHttpConnectorFactory.class.getClassLoader()); - private static final boolean HTTP_COMPONENTS_PRESENT = ClassUtils.isPresent("org.apache.hc.client5.http.impl.async", + private static final boolean httpComponentsPresent = ClassUtils.isPresent("org.apache.hc.client5.http.impl.async", ClientHttpConnectorFactory.class.getClassLoader()); - private static final boolean JETTY_PRESENT = ClassUtils.isPresent("org.eclipse.jetty.client.HttpClient", + private static final boolean jettyPresent = ClassUtils.isPresent("org.eclipse.jetty.client.HttpClient", ClientHttpConnectorFactory.class.getClassLoader()); /** @@ -87,16 +87,16 @@ public class ClientHttpConnectorFactory { Assert.notNull(sslConfiguration, "SslConfiguration must not be null"); try { - if (REACTOR_NETTY_PRESENT) { + if (reactorNettyPresent) { return ReactorNetty.usingReactorNetty(options, sslConfiguration); } - if (HTTP_COMPONENTS_PRESENT) { + if (httpComponentsPresent) { return HttpComponents.usingHttpComponents(options, sslConfiguration); } - if (JETTY_PRESENT) { + if (jettyPresent) { return JettyClient.usingJetty(options, sslConfiguration); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpRequestFactoryFactory.java b/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpRequestFactoryFactory.java index 2e48e1cb..2aa04b75 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpRequestFactoryFactory.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpRequestFactoryFactory.java @@ -89,11 +89,11 @@ public class ClientHttpRequestFactoryFactory { @SuppressWarnings("FieldMayBeFinal") // allow setting via reflection. private static Log logger = LogFactory.getLog(ClientHttpRequestFactoryFactory.class); - private static final boolean HTTP_COMPONENTS_PRESENT = ClassUtils.isPresent( + private static final boolean httpComponentsPresent = ClassUtils.isPresent( "org.apache.hc.client5.http.impl.classic.HttpClientBuilder", ClientHttpRequestFactoryFactory.class.getClassLoader()); - private static final boolean OKHTTP3_PRESENT = ClassUtils.isPresent("okhttp3.OkHttpClient", + private static final boolean okHttp3Present = ClassUtils.isPresent("okhttp3.OkHttpClient", ClientHttpRequestFactoryFactory.class.getClassLoader()); /** @@ -111,11 +111,11 @@ public class ClientHttpRequestFactoryFactory { try { - if (HTTP_COMPONENTS_PRESENT) { + if (httpComponentsPresent) { return HttpComponents.usingHttpComponents(options, sslConfiguration); } - if (OKHTTP3_PRESENT) { + if (okHttp3Present) { return OkHttp3.usingOkHttp3(options, sslConfiguration); } }