diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/ClientConfiguration.java b/spring-vault-core/src/main/java/org/springframework/vault/client/ClientConfiguration.java index ac07bbc4..86ff090f 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/ClientConfiguration.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/ClientConfiguration.java @@ -150,9 +150,8 @@ class ClientConfiguration { logger.debug("Loading keystore from %s".formatted(keyStoreConfiguration.getResource())); } - InputStream inputStream = null; - try { - inputStream = keyStoreConfiguration.getResource().getInputStream(); + try (InputStream inputStream = keyStoreConfiguration.getResource() + .getInputStream()) { if (SslConfiguration.PEM_KEYSTORE_TYPE.equalsIgnoreCase(keyStoreConfiguration.getStoreType())) { @@ -167,11 +166,6 @@ class ClientConfiguration { logger.debug("Keystore loaded with %d entries".formatted(keyStore.size())); } } - finally { - if (inputStream != null) { - inputStream.close(); - } - } } private static void loadFromPem(KeyStore keyStore, InputStream inputStream) throws IOException, KeyStoreException { 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 cd3540d7..780780a1 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 @@ -33,8 +33,6 @@ import java.security.KeyStore; import javax.net.ssl.SSLContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.DefaultSchemePortResolver; @@ -76,9 +74,6 @@ import static org.springframework.vault.client.ClientConfiguration.*; */ public class ClientHttpRequestFactoryFactory { - @SuppressWarnings("FieldMayBeFinal") // allow setting via reflection. - private static Log logger = LogFactory.getLog(ClientHttpRequestFactoryFactory.class); - private static final boolean reactorNettyPresent = ClassUtils.isPresent("reactor.netty.http.client.HttpClient", ClientHttpConnectorFactory.class.getClassLoader()); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java index 5971d7fb..5c4d54b2 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java @@ -217,7 +217,7 @@ public class VaultClients { return uriTemplate; } } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ignored) { } if (!uriTemplate.startsWith("/")) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultResponses.java b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultResponses.java index ed3adfe6..fa8ad061 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultResponses.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultResponses.java @@ -126,7 +126,7 @@ public abstract class VaultResponses { } }; - return new ParameterizedTypeReference>() { + return new ParameterizedTypeReference<>() { @Override public Type getType() { return supportType; @@ -179,7 +179,7 @@ public abstract class VaultResponses { try { return (T) converter.read(responseType, new HttpInputMessage() { @Override - public InputStream getBody() throws IOException { + public InputStream getBody() { return new ByteArrayInputStream(wrappedResponse.getBytes()); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/config/AbstractReactiveVaultConfiguration.java b/spring-vault-core/src/main/java/org/springframework/vault/config/AbstractReactiveVaultConfiguration.java index 1e264998..c7e4f38a 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/config/AbstractReactiveVaultConfiguration.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/config/AbstractReactiveVaultConfiguration.java @@ -206,8 +206,8 @@ public abstract class AbstractReactiveVaultConfiguration extends AbstractVaultCo return CachingVaultTokenSupplier.of(stepsOperator); } - throw new IllegalStateException("Cannot construct VaultTokenSupplier from %s. " - + "ClientAuthentication must implement AuthenticationStepsFactory or be TokenAuthentication" + throw new IllegalStateException(("Cannot construct VaultTokenSupplier from %s. " + + "ClientAuthentication must implement AuthenticationStepsFactory or be TokenAuthentication") .formatted(clientAuthentication)); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java b/spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java index a9908b24..b34bd261 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java @@ -269,8 +269,6 @@ public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration im case CERT -> new ClientCertificateAuthentication(restOperations()); case CUBBYHOLE -> cubbyholeAuthentication(); case KUBERNETES -> kubeAuthentication(); - default -> throw new IllegalStateException("Vault authentication method %s is not supported with %s" - .formatted(authenticationMethod, getClass().getSimpleName())); }; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java index d378c563..900792d8 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java @@ -123,7 +123,6 @@ public class VaultTokenTemplate implements VaultTokenOperations { return response; } - @Nullable private void writeToken(String path, VaultToken token, Class responseType) { Assert.hasText(path, "Path must not be empty");