Update code to use recent language features.

Closes #881

Author: mp911de

spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java

@@ -15,6 +15,9 @@
  */
 package org.springframework.vault.authentication;
 
+import static org.springframework.vault.authentication.AuthenticationSteps.HttpRequestBuilder.*;
+import static org.springframework.vault.authentication.AuthenticationUtil.*;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -43,9 +46,6 @@
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestOperations;
 
-import static org.springframework.vault.authentication.AuthenticationSteps.HttpRequestBuilder.*;
-import static org.springframework.vault.authentication.AuthenticationUtil.*;
-
 /**
  * AppRole implementation of {@link ClientAuthentication}. RoleId and SecretId (optional)
  * are sent in the login request to Vault to obtain a {@link VaultToken}.
@@ -217,8 +217,8 @@ private String getRoleId(RoleId roleId) throws VaultLoginException {
 				return (String) entity.getBody().getRequiredData().get("role_id");
 			}
 			catch (HttpStatusCodeException e) {
-				throw new VaultLoginException(String.format("Cannot get Role id using AppRole: %s",
-						VaultResponses.getError(e.getResponseBodyAsString())), e);
+				throw new VaultLoginException("Cannot get Role id using AppRole: %s"
+					.formatted(VaultResponses.getError(e.getResponseBodyAsString())), e);
 			}
 		}
 
@@ -236,8 +236,8 @@ private String getRoleId(RoleId roleId) throws VaultLoginException {
 				return (String) response.getRequiredData().get("role_id");
 			}
 			catch (HttpStatusCodeException e) {
-				throw new VaultLoginException(String.format("Cannot unwrap Role id using AppRole: %s",
-						VaultResponses.getError(e.getResponseBodyAsString())), e);
+				throw new VaultLoginException("Cannot unwrap Role id using AppRole: %s"
+					.formatted(VaultResponses.getError(e.getResponseBodyAsString())), e);
 			}
 		}
 
@@ -260,8 +260,8 @@ private String getSecretId(SecretId secretId) throws VaultLoginException {
 				return (String) response.getRequiredData().get("secret_id");
 			}
 			catch (HttpStatusCodeException e) {
-				throw new VaultLoginException(String.format("Cannot get Secret id using AppRole: %s",
-						VaultResponses.getError(e.getResponseBodyAsString())), e);
+				throw new VaultLoginException("Cannot get Secret id using AppRole: %s"
+					.formatted(VaultResponses.getError(e.getResponseBodyAsString())), e);
 			}
 		}
 
@@ -280,8 +280,8 @@ private String getSecretId(SecretId secretId) throws VaultLoginException {
 				return (String) response.getRequiredData().get("secret_id");
 			}
 			catch (HttpStatusCodeException e) {
-				throw new VaultLoginException(String.format("Cannot unwrap Role id using AppRole: %s",
-						VaultResponses.getError(e.getResponseBodyAsString())), e);
+				throw new VaultLoginException("Cannot unwrap Role id using AppRole: %s"
+					.formatted(VaultResponses.getError(e.getResponseBodyAsString())), e);
 			}
 		}
 
@@ -331,11 +331,11 @@ private static Map<String, String> getAppRoleLoginBody(String roleId, @Nullable
 	}
 
 	private static String getSecretIdPath(AppRoleAuthenticationOptions options) {
-		return String.format("auth/%s/role/%s/secret-id", options.getPath(), options.getAppRole());
+		return "auth/%s/role/%s/secret-id".formatted(options.getPath(), options.getAppRole());
 	}
 
 	private static String getRoleIdIdPath(AppRoleAuthenticationOptions options) {
-		return String.format("auth/%s/role/%s/role-id", options.getPath(), options.getAppRole());
+		return "auth/%s/role/%s/role-id".formatted(options.getPath(), options.getAppRole());
 	}
 
 }

spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationSteps.java

@@ -446,7 +446,7 @@ public static class HttpRequest<T> {
 
 		@Override
 		public String toString() {
-			return String.format("%s %s AS %s", getMethod(), getUri() != null ? getUri() : getUriTemplate(),
+			return "%s %s AS %s".formatted(getMethod(), getUri() != null ? getUri() : getUriTemplate(),
 					getResponseType());
 		}
 
@@ -508,9 +508,8 @@ public Node<?> getPrevious() {
 		public boolean equals(Object o) {
 			if (this == o)
 				return true;
-			if (!(o instanceof HttpRequestNode))
+			if (!(o instanceof HttpRequestNode<?> that))
 				return false;
-			HttpRequestNode<?> that = (HttpRequestNode<?>) o;
 			return this.definition.equals(that.definition) && this.previous.equals(that.previous);
 		}
 
@@ -553,9 +552,8 @@ public Node<?> getPrevious() {
 		public boolean equals(Object o) {
 			if (this == o)
 				return true;
-			if (!(o instanceof MapStep))
+			if (!(o instanceof MapStep<?, ?> mapStep))
 				return false;
-			MapStep<?, ?> mapStep = (MapStep<?, ?>) o;
 			return this.mapper.equals(mapStep.mapper) && this.previous.equals(mapStep.previous);
 		}
 
@@ -599,9 +597,8 @@ public List<Node<?>> getRight() {
 		public boolean equals(Object o) {
 			if (this == o)
 				return true;
-			if (!(o instanceof ZipStep))
+			if (!(o instanceof ZipStep<?, ?> zipStep))
 				return false;
-			ZipStep<?, ?> zipStep = (ZipStep<?, ?>) o;
 			return this.left.equals(zipStep.left) && this.right.equals(zipStep.right);
 		}
 
@@ -645,9 +642,8 @@ public AuthenticationSteps.Node<?> getPrevious() {
 		public boolean equals(Object o) {
 			if (this == o)
 				return true;
-			if (!(o instanceof OnNextStep))
+			if (!(o instanceof OnNextStep<?> that))
 				return false;
-			OnNextStep<?> that = (OnNextStep<?>) o;
 			return this.consumer.equals(that.consumer) && this.previous.equals(that.previous);
 		}
 
@@ -686,9 +682,8 @@ public Node<?> getPrevious() {
 		public boolean equals(Object o) {
 			if (this == o)
 				return true;
-			if (!(o instanceof ScalarValueStep))
+			if (!(o instanceof ScalarValueStep<?> that))
 				return false;
-			ScalarValueStep<?> that = (ScalarValueStep<?>) o;
 			return this.value.equals(that.value) && this.previous.equals(that.previous);
 		}
 
@@ -731,9 +726,8 @@ public Node<?> getPrevious() {
 		public boolean equals(Object o) {
 			if (this == o)
 				return true;
-			if (!(o instanceof SupplierStep))
+			if (!(o instanceof SupplierStep<?> that))
 				return false;
-			SupplierStep<?> that = (SupplierStep<?>) o;
 			return this.supplier.equals(that.supplier) && this.previous.equals(that.previous);
 		}
 
@@ -798,9 +792,8 @@ public R getRight() {
 		public boolean equals(Object o) {
 			if (this == o)
 				return true;
-			if (!(o instanceof Pair))
+			if (!(o instanceof Pair<?, ?> pair))
 				return false;
-			Pair<?, ?> pair = (Pair<?, ?>) o;
 			return this.left.equals(pair.left) && this.right.equals(pair.right);
 		}