Polishing

Author: mp911de

spring-vault-core/src/main/java/org/springframework/vault/client/ClientConfiguration.java

@@ -150,9 +150,8 @@ private static void loadKeyStore(SslConfiguration.KeyStoreConfiguration keyStore
 			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 @@ private static void loadKeyStore(SslConfiguration.KeyStoreConfiguration keyStore
 				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 {

spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpRequestFactoryFactory.java

@@ -21,8 +21,6 @@
 
 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;
@@ -59,9 +57,6 @@
  */
 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());
 

spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java

@@ -217,7 +217,7 @@ static String prepareUriTemplate(@Nullable String baseUrl, String uriTemplate) {
 				return uriTemplate;
 			}
 		}
-		catch (IllegalArgumentException e) {
+		catch (IllegalArgumentException ignored) {
 		}
 
 		if (!uriTemplate.startsWith("/")) {

spring-vault-core/src/main/java/org/springframework/vault/client/VaultResponses.java

@@ -126,7 +126,7 @@ public Type getOwnerType() {
 			}
 		};
 
-		return new ParameterizedTypeReference<VaultResponseSupport<T>>() {
+		return new ParameterizedTypeReference<>() {
 			@Override
 			public Type getType() {
 				return supportType;
@@ -179,7 +179,7 @@ public static <T> T unwrap(final String wrappedResponse, Class<T> responseType)
 		try {
 			return (T) converter.read(responseType, new HttpInputMessage() {
 				@Override
-				public InputStream getBody() throws IOException {
+				public InputStream getBody() {
 					return new ByteArrayInputStream(wrappedResponse.getBytes());
 				}
 

spring-vault-core/src/main/java/org/springframework/vault/config/AbstractReactiveVaultConfiguration.java

@@ -206,8 +206,8 @@ protected VaultTokenSupplier vaultTokenSupplier() {
 			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));
 	}
 

spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java

@@ -269,8 +269,6 @@ public ClientAuthentication clientAuthentication() {
 			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()));
 		};
 	}
 

spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java

@@ -123,7 +123,6 @@ private <T extends VaultResponseSupport<?>> T writeAndReturn(String path, @Nulla
 		return response;
 	}
 
-	@Nullable
 	private void writeToken(String path, VaultToken token, Class<?> responseType) {
 
 		Assert.hasText(path, "Path must not be empty");