diff --git a/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySource.java b/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySource.java index 8dbb8ac3..847eb2e7 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySource.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySource.java @@ -27,9 +27,9 @@ import org.springframework.context.annotation.Import; /** * Annotation providing a convenient and declarative mechanism for adding a - * {@link VaultPropertySource} to Spring's - * {@link org.springframework.core.env.Environment Environment}. To be used in conjunction - * with @{@link Configuration} classes.

Example usage

+ * {@link VaultPropertySource} to Spring's {@link org.springframework.core.env.Environment + * Environment}. To be used in conjunction with @{@link Configuration} classes. + *

Example usage

*

* Given a Vault path {@code secret/my-application} containing the configuration data pair * {@code database.password=mysecretpassword}, the following {@code @Configuration} class @@ -65,9 +65,8 @@ import org.springframework.context.annotation.Import; * ordering is difficult to predict. In such cases - and if overriding is important - it * is recommended that the user fall back to using the programmatic PropertySource API. * See {@link org.springframework.core.env.ConfigurableEnvironment - * ConfigurableEnvironment} and - * {@link org.springframework.core.env.MutablePropertySources MutablePropertySources} - * javadocs for details. + * ConfigurableEnvironment} and {@link org.springframework.core.env.MutablePropertySources + * MutablePropertySources} javadocs for details. * * @author Mark Paluch */ diff --git a/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySourceRegistrar.java b/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySourceRegistrar.java index bf6cc829..b5c8e2df 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySourceRegistrar.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySourceRegistrar.java @@ -73,16 +73,14 @@ class VaultPropertySourceRegistrar implements ImportBeanDefinitionRegistrar, ConfigurableEnvironment env = beanFactory.getBean(ConfigurableEnvironment.class); MutablePropertySources propertySources = env.getPropertySources(); - registerPropertySources( - beanFactory.getBeansOfType( + registerPropertySources(beanFactory + .getBeansOfType( org.springframework.vault.core.env.VaultPropertySource.class) - .values(), propertySources); + .values(), propertySources); - registerPropertySources( - beanFactory - .getBeansOfType( - org.springframework.vault.core.env.LeaseAwareVaultPropertySource.class) - .values(), propertySources); + registerPropertySources(beanFactory.getBeansOfType( + org.springframework.vault.core.env.LeaseAwareVaultPropertySource.class) + .values(), propertySources); } private void registerPropertySources( @@ -134,8 +132,9 @@ class VaultPropertySourceRegistrar implements ImportBeanDefinitionRegistrar, "'vaultTemplateRef' in @EnableVaultPropertySource must not be empty"); PropertyTransformer propertyTransformer = StringUtils - .hasText(propertyNamePrefix) ? PropertyTransformers - .propertyNamePrefix(propertyNamePrefix) : PropertyTransformers.noop(); + .hasText(propertyNamePrefix) + ? PropertyTransformers.propertyNamePrefix(propertyNamePrefix) + : PropertyTransformers.noop(); for (String propertyPath : paths) { @@ -143,8 +142,8 @@ class VaultPropertySourceRegistrar implements ImportBeanDefinitionRegistrar, continue; } - AbstractBeanDefinition beanDefinition = createBeanDefinition(ref, - renewal, propertyTransformer, + AbstractBeanDefinition beanDefinition = createBeanDefinition(ref, renewal, + propertyTransformer, potentiallyResolveRequiredPlaceholders(propertyPath)); do { @@ -163,8 +162,9 @@ class VaultPropertySourceRegistrar implements ImportBeanDefinitionRegistrar, } private String potentiallyResolveRequiredPlaceholders(String expression) { - return this.environment != null ? this.environment - .resolveRequiredPlaceholders(expression) : expression; + return this.environment != null + ? this.environment.resolveRequiredPlaceholders(expression) + : expression; } private AbstractBeanDefinition createBeanDefinition(String ref, Renewal renewal, @@ -173,19 +173,20 @@ class VaultPropertySourceRegistrar implements ImportBeanDefinitionRegistrar, BeanDefinitionBuilder builder; if (isRenewable(renewal)) { - builder = BeanDefinitionBuilder - .rootBeanDefinition(org.springframework.vault.core.env.LeaseAwareVaultPropertySource.class); + builder = BeanDefinitionBuilder.rootBeanDefinition( + org.springframework.vault.core.env.LeaseAwareVaultPropertySource.class); - RequestedSecret requestedSecret = renewal == Renewal.ROTATE ? RequestedSecret - .rotating(propertyPath) : RequestedSecret.renewable(propertyPath); + RequestedSecret requestedSecret = renewal == Renewal.ROTATE + ? RequestedSecret.rotating(propertyPath) + : RequestedSecret.renewable(propertyPath); builder.addConstructorArgValue(propertyPath); builder.addConstructorArgReference("secretLeaseContainer"); builder.addConstructorArgValue(requestedSecret); } else { - builder = BeanDefinitionBuilder - .rootBeanDefinition(org.springframework.vault.core.env.VaultPropertySource.class); + builder = BeanDefinitionBuilder.rootBeanDefinition( + org.springframework.vault.core.env.VaultPropertySource.class); builder.addConstructorArgValue(propertyPath); builder.addConstructorArgReference(ref); @@ -210,8 +211,8 @@ class VaultPropertySourceRegistrar implements ImportBeanDefinitionRegistrar, addAttributesIfNotNull(result, metadata.getAnnotationAttributes(annotationClassName, false)); - Map container = metadata.getAnnotationAttributes( - containerClassName, false); + Map container = metadata + .getAnnotationAttributes(containerClassName, false); if (container != null && container.containsKey("value")) { for (Map containedAttributes : (Map[]) container .get("value")) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySources.java b/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySources.java index 3ad7cc32..a06c996b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySources.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/annotation/VaultPropertySources.java @@ -27,10 +27,10 @@ import org.springframework.context.annotation.Import; * Container annotation that aggregates several {@link VaultPropertySource} annotations. *

* Can be used natively, declaring several nested {@link VaultPropertySource} annotations. - * Can also be used in conjunction with Java 8's support for - * repeatable annotations, where {@link VaultPropertySource} can simply be - * declared several times on the same {@linkplain ElementType#TYPE type}, implicitly - * generating this container annotation. + * Can also be used in conjunction with Java 8's support for repeatable + * annotations, where {@link VaultPropertySource} can simply be declared several + * times on the same {@linkplain ElementType#TYPE type}, implicitly generating this + * container annotation. * * @author Mark Paluch * @see VaultPropertySource diff --git a/spring-vault-core/src/main/java/org/springframework/vault/annotation/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/annotation/package-info.java index 99c839c8..5fef6fd8 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/annotation/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/annotation/package-info.java @@ -4,4 +4,3 @@ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields package org.springframework.vault.annotation; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java index 34e2fdd7..0476625a 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java @@ -60,8 +60,8 @@ import static org.springframework.vault.authentication.AuthenticationSteps.HttpR * @see Auth Backend: * AppRole */ -public class AppRoleAuthentication implements ClientAuthentication, - AuthenticationStepsFactory { +public class AppRoleAuthentication + implements ClientAuthentication, AuthenticationStepsFactory { private static final Log logger = LogFactory.getLog(AppRoleAuthentication.class); @@ -102,19 +102,18 @@ public class AppRoleAuthentication implements ClientAuthentication, RoleId roleId = options.getRoleId(); SecretId secretId = options.getSecretId(); - return getAuthenticationSteps(options, roleId, secretId).login( - "auth/{mount}/login", options.getPath()); + return getAuthenticationSteps(options, roleId, secretId) + .login("auth/{mount}/login", options.getPath()); } private static Node> getAuthenticationSteps( - AppRoleAuthenticationOptions options, - RoleId roleId, SecretId secretId) { + AppRoleAuthenticationOptions options, RoleId roleId, SecretId secretId) { Node roleIdSteps = getRoleIdSteps(options, roleId); Node secretIdSteps = getSecretIdSteps(options, secretId); - return roleIdSteps.zipWith(secretIdSteps).map( - it -> getAppRoleLoginBody(it.getLeft(), it.getRight())); + return roleIdSteps.zipWith(secretIdSteps) + .map(it -> getAppRoleLoginBody(it.getLeft(), it.getRight())); } private static Node getRoleIdSteps(AppRoleAuthenticationOptions options, @@ -128,17 +127,18 @@ public class AppRoleAuthentication implements ClientAuthentication, HttpHeaders headers = createHttpHeaders(((Pull) roleId).getInitialToken()); - return AuthenticationSteps.fromHttpRequest( - get("auth/{mount}/role/{role}/role-id", options.getPath(), - options.getAppRole()).with(headers).as(VaultResponse.class)) - .map(vaultResponse -> (String) vaultResponse.getRequiredData().get( - "role_id")); + return AuthenticationSteps + .fromHttpRequest(get("auth/{mount}/role/{role}/role-id", + options.getPath(), options.getAppRole()).with(headers) + .as(VaultResponse.class)) + .map(vaultResponse -> (String) vaultResponse.getRequiredData() + .get("role_id")); } if (roleId instanceof Wrapped) { - return unwrapResponse(((Wrapped) roleId).getInitialToken()).map( - vaultResponse -> (String) vaultResponse.getRequiredData().get( - "role_id")); + return unwrapResponse(((Wrapped) roleId).getInitialToken()) + .map(vaultResponse -> (String) vaultResponse.getRequiredData() + .get("role_id")); } throw new IllegalArgumentException("Unknown RoleId configuration: " + roleId); @@ -154,18 +154,19 @@ public class AppRoleAuthentication implements ClientAuthentication, if (secretId instanceof Pull) { HttpHeaders headers = createHttpHeaders(((Pull) secretId).getInitialToken()); - return AuthenticationSteps.fromHttpRequest( - post("auth/{mount}/role/{role}/secret-id", options.getPath(), - options.getAppRole()).with(headers).as(VaultResponse.class)) - .map(vaultResponse -> (String) vaultResponse.getRequiredData().get( - "secret_id")); + return AuthenticationSteps + .fromHttpRequest(post("auth/{mount}/role/{role}/secret-id", + options.getPath(), options.getAppRole()).with(headers) + .as(VaultResponse.class)) + .map(vaultResponse -> (String) vaultResponse.getRequiredData() + .get("secret_id")); } if (secretId instanceof Wrapped) { - return unwrapResponse(((Wrapped) secretId).getInitialToken()).map( - vaultResponse -> (String) vaultResponse.getRequiredData().get( - "secret_id")); + return unwrapResponse(((Wrapped) secretId).getInitialToken()) + .map(vaultResponse -> (String) vaultResponse.getRequiredData() + .get("secret_id")); } throw new IllegalArgumentException("Unknown SecretId configuration: " + secretId); @@ -174,10 +175,9 @@ public class AppRoleAuthentication implements ClientAuthentication, private static Node unwrapResponse(VaultToken token) { - return AuthenticationSteps.fromHttpRequest( - get("cubbyhole/response").with(createHttpHeaders(token)).as( - VaultResponse.class)).map( - vaultResponse -> { + return AuthenticationSteps.fromHttpRequest(get("cubbyhole/response") + .with(createHttpHeaders(token)).as(VaultResponse.class)) + .map(vaultResponse -> { Map data = vaultResponse.getRequiredData(); return VaultResponses.unwrap((String) data.get("response"), @@ -235,9 +235,10 @@ public class AppRoleAuthentication implements ClientAuthentication, 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( + String.format("Cannot get Role id using AppRole: %s", + VaultResponses.getError(e.getResponseBodyAsString())), + e); } } @@ -252,15 +253,16 @@ public class AppRoleAuthentication implements ClientAuthentication, VaultResponse.class); Map data = entity.getBody().getRequiredData(); - VaultResponse response = VaultResponses.unwrap( - (String) data.get("response"), VaultResponse.class); + VaultResponse response = VaultResponses + .unwrap((String) data.get("response"), VaultResponse.class); 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( + String.format("Cannot unwrap Role id using AppRole: %s", + VaultResponses.getError(e.getResponseBodyAsString())), + e); } } @@ -284,9 +286,10 @@ public class AppRoleAuthentication implements ClientAuthentication, 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( + String.format("Cannot get Secret id using AppRole: %s", + VaultResponses.getError(e.getResponseBodyAsString())), + e); } } @@ -301,15 +304,16 @@ public class AppRoleAuthentication implements ClientAuthentication, VaultResponse.class); Map data = entity.getBody().getRequiredData(); - VaultResponse response = VaultResponses.unwrap( - (String) data.get("response"), VaultResponse.class); + VaultResponse response = VaultResponses + .unwrap((String) data.get("response"), VaultResponse.class); 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( + String.format("Cannot unwrap Role id using AppRole: %s", + VaultResponses.getError(e.getResponseBodyAsString())), + e); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthenticationOptions.java index bbcda28e..839a5308 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthenticationOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthenticationOptions.java @@ -298,8 +298,7 @@ public class AppRoleAuthenticationOptions { } else { - Assert.notNull( - initialToken, + Assert.notNull(initialToken, "AppRole authentication configured for pull mode. InitialToken must not be null (pull mode)"); roleId(RoleId.pull(initialToken)); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationSteps.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationSteps.java index 41f77316..4640ed46 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationSteps.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationSteps.java @@ -85,15 +85,15 @@ public class AuthenticationSteps { * Create a flow definition using a provided {@link VaultToken}. * * @param token the token to be used from this {@link AuthenticationSteps}, must not - * be {@literal null}. + * be {@literal null}. * @return the {@link AuthenticationSteps}. */ public static AuthenticationSteps just(VaultToken token) { Assert.notNull(token, "Vault token must not be null"); - return new AuthenticationSteps(new SupplierStep<>(() -> token, - AuthenticationSteps.HEAD)); + return new AuthenticationSteps( + new SupplierStep<>(() -> token, AuthenticationSteps.HEAD)); } /** @@ -106,15 +106,15 @@ public class AuthenticationSteps { Assert.notNull(request, "HttpRequest must not be null"); - return new AuthenticationSteps(new HttpRequestNode<>(request, - AuthenticationSteps.HEAD)); + return new AuthenticationSteps( + new HttpRequestNode<>(request, AuthenticationSteps.HEAD)); } /** * Start flow composition from a {@link Supplier}. * * @param supplier supplier function that will produce the flow value, must not be - * {@literal null}. + * {@literal null}. * @return the first {@link Node}. */ public static Node fromSupplier(Supplier supplier) { @@ -184,7 +184,7 @@ public class AuthenticationSteps { * Transform the state object into a different object. * * @param mappingFunction mapping function to be applied to the state object, must - * not be {@literal null}. + * not be {@literal null}. * @param resulting object type * @return the next {@link Node}. */ @@ -213,7 +213,7 @@ public class AuthenticationSteps { * Callback with the current state object. * * @param consumerFunction consumer function to be called with the state object, - * must not be {@literal null}. + * must not be {@literal null}. * @return the next {@link Node}. */ public Node onNext(Consumer consumerFunction) { @@ -241,7 +241,7 @@ public class AuthenticationSteps { * the current state to Vaults {@code uriTemplate}. * * @param uriTemplate Vault authentication endpoint, must not be {@literal null} - * or empty. + * or empty. * @param uriVariables URI variables for URI template expansion. * @return the {@link AuthenticationSteps}. */ @@ -249,8 +249,8 @@ public class AuthenticationSteps { Assert.hasText(uriTemplate, "URI template must not be null or empty"); - return login(HttpRequestBuilder.post(uriTemplate, uriVariables).as( - VaultResponse.class)); + return login(HttpRequestBuilder.post(uriTemplate, uriVariables) + .as(VaultResponse.class)); } /** @@ -272,7 +272,7 @@ public class AuthenticationSteps { * mapping {@link Function} to the current state object. * * @param mappingFunction mapping function to be applied to the state object, must - * not be {@literal null}. + * not be {@literal null}. * @return the {@link AuthenticationSteps}. */ public AuthenticationSteps login( @@ -331,7 +331,8 @@ public class AuthenticationSteps { * @param uriVariables the variables to expand the template. * @return a new {@link HttpRequestBuilder}. */ - public static HttpRequestBuilder post(String uriTemplate, String... uriVariables) { + public static HttpRequestBuilder post(String uriTemplate, + String... uriVariables) { return new HttpRequestBuilder(HttpMethod.POST, uriTemplate, uriVariables); } @@ -442,8 +443,8 @@ public class AuthenticationSteps { @Override public String toString() { - return String.format("%s %s AS %s", getMethod(), getUri() != null ? getUri() - : getUriTemplate(), getResponseType()); + return String.format("%s %s AS %s", getMethod(), + getUri() != null ? getUri() : getUriTemplate(), getResponseType()); } HttpMethod getMethod() { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsExecutor.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsExecutor.java index 55358965..2cf8bfe5 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsExecutor.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsExecutor.java @@ -74,7 +74,6 @@ public class AuthenticationStepsExecutor implements ClientAuthentication { @SuppressWarnings("unchecked") public VaultToken login() throws VaultException { - Iterable> steps = chain.steps; Object state = evaluate(steps); @@ -102,8 +101,8 @@ public class AuthenticationStepsExecutor implements ClientAuthentication { for (Node o : steps) { if (logger.isDebugEnabled()) { - logger.debug(String - .format("Executing %s with current state %s", o, state)); + logger.debug( + String.format("Executing %s with current state %s", o, state)); } try { @@ -128,8 +127,8 @@ public class AuthenticationStepsExecutor implements ClientAuthentication { } if (logger.isDebugEnabled()) { - logger.debug(String.format("Executed %s with current state %s", o, - state)); + logger.debug( + String.format("Executed %s with current state %s", o, state)); } } catch (HttpStatusCodeException e) { @@ -139,8 +138,8 @@ public class AuthenticationStepsExecutor implements ClientAuthentication { VaultResponses.getError(e.getResponseBodyAsString())), e); } catch (RuntimeException e) { - throw new VaultLoginException(String.format( - "Authentication execution failed in %s", o), e); + throw new VaultLoginException( + String.format("Authentication execution failed in %s", o), e); } } return state; @@ -172,11 +171,11 @@ public class AuthenticationStepsExecutor implements ClientAuthentication { if (definition.getUri() == null) { - ResponseEntity exchange = restOperations - .exchange(definition.getUriTemplate(), definition.getMethod(), - getEntity(definition.getEntity(), state), - definition.getResponseType(), - (Object[]) definition.getUrlVariables()); + ResponseEntity exchange = restOperations.exchange( + definition.getUriTemplate(), definition.getMethod(), + getEntity(definition.getEntity(), state), + definition.getResponseType(), + (Object[]) definition.getUrlVariables()); return exchange.getBody(); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java index fee48453..3a33d8e6 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsOperator.java @@ -80,31 +80,26 @@ public class AuthenticationStepsOperator implements VaultTokenSupplier { Mono state = createMono(chain.steps); - return state - .map(stateObject -> { + return state.map(stateObject -> { - if (stateObject instanceof VaultToken) { - return (VaultToken) stateObject; - } + if (stateObject instanceof VaultToken) { + return (VaultToken) stateObject; + } - if (stateObject instanceof VaultResponse) { + if (stateObject instanceof VaultResponse) { - VaultResponse response = (VaultResponse) stateObject; + VaultResponse response = (VaultResponse) stateObject; - Assert.state(response.getAuth() != null, - "Auth field must not be null"); + Assert.state(response.getAuth() != null, "Auth field must not be null"); - return LoginTokenUtil.from(response.getAuth()); - } + return LoginTokenUtil.from(response.getAuth()); + } - throw new IllegalStateException( - String.format( - "Cannot retrieve VaultToken from authentication chain. Got instead %s", - stateObject)); - }) - .onErrorMap( - t -> new VaultLoginException( - "Cannot retrieve VaultToken from authentication chain", t)); + throw new IllegalStateException(String.format( + "Cannot retrieve VaultToken from authentication chain. Got instead %s", + stateObject)); + }).onErrorMap(t -> new VaultLoginException( + "Cannot retrieve VaultToken from authentication chain", t)); } private Mono createMono(Iterable> steps) { @@ -114,13 +109,14 @@ public class AuthenticationStepsOperator implements VaultTokenSupplier { for (Node o : steps) { if (logger.isDebugEnabled()) { - logger.debug(String - .format("Executing %s with current state %s", o, state)); + logger.debug( + String.format("Executing %s with current state %s", o, state)); } if (o instanceof HttpRequestNode) { - state = state.flatMap(stateObject -> doHttpRequest( - (HttpRequestNode) o, stateObject)); + state = state + .flatMap(stateObject -> doHttpRequest((HttpRequestNode) o, + stateObject)); } if (o instanceof MapStep) { @@ -129,13 +125,13 @@ public class AuthenticationStepsOperator implements VaultTokenSupplier { } if (o instanceof ZipStep) { - state = state.zipWith(doZipStep((ZipStep) o)).map( - it -> Pair.of(it.getT1(), it.getT2())); + state = state.zipWith(doZipStep((ZipStep) o)) + .map(it -> Pair.of(it.getT1(), it.getT2())); } if (o instanceof OnNextStep) { - state = state.doOnNext(stateObject -> doOnNext((OnNextStep) o, - stateObject)); + state = state.doOnNext( + stateObject -> doOnNext((OnNextStep) o, stateObject)); } if (o instanceof SupplierStep) { @@ -144,7 +140,8 @@ public class AuthenticationStepsOperator implements VaultTokenSupplier { } if (logger.isDebugEnabled()) { - logger.debug(String.format("Executed %s with current state %s", o, state)); + logger.debug( + String.format("Executed %s with current state %s", o, state)); } } return state; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java index 49fe7bd2..c0c03774 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java @@ -46,8 +46,8 @@ import org.springframework.web.client.RestOperations; * @see Auth Backend: * aws-ec2 */ -public class AwsEc2Authentication implements ClientAuthentication, - AuthenticationStepsFactory { +public class AwsEc2Authentication + implements ClientAuthentication, AuthenticationStepsFactory { private static final Log logger = LogFactory.getLog(AwsEc2Authentication.class); @@ -81,7 +81,8 @@ public class AwsEc2Authentication implements ClientAuthentication, * @param awsMetadataRestOperations must not be {@literal null}. */ public AwsEc2Authentication(AwsEc2AuthenticationOptions options, - RestOperations vaultRestOperations, RestOperations awsMetadataRestOperations) { + RestOperations vaultRestOperations, + RestOperations awsMetadataRestOperations) { Assert.notNull(options, "AwsEc2AuthenticationOptions must not be null"); Assert.notNull(vaultRestOperations, "Vault RestOperations must not be null"); @@ -116,10 +117,9 @@ public class AwsEc2Authentication implements ClientAuthentication, Supplier nonceSupplier) { return AuthenticationSteps - .fromHttpRequest( - HttpRequestBuilder.get( - options.getIdentityDocumentUri().toString()).as( - String.class)) // + .fromHttpRequest(HttpRequestBuilder + .get(options.getIdentityDocumentUri().toString()) + .as(String.class)) // .map(pkcs7 -> pkcs7.replaceAll("\\r", "")) // .map(pkcs7 -> pkcs7.replace("\\n", "")) // .map(pkcs7 -> { @@ -169,10 +169,9 @@ public class AwsEc2Authentication implements ClientAuthentication, if (response.getAuth().get("metadata") instanceof Map) { Map metadata = (Map) response .getAuth().get("metadata"); - logger.debug(String - .format("Login successful using AWS-EC2 authentication for instance %s, AMI %s", - metadata.get("instance_id"), - metadata.get("instance_id"))); + logger.debug(String.format( + "Login successful using AWS-EC2 authentication for instance %s, AMI %s", + metadata.get("instance_id"), metadata.get("instance_id"))); } else { logger.debug("Login successful using AWS-EC2 authentication"); @@ -201,8 +200,8 @@ public class AwsEc2Authentication implements ClientAuthentication, login.put("nonce", new String(this.nonce.get())); try { - String pkcs7 = this.awsMetadataRestOperations.getForObject( - this.options.getIdentityDocumentUri(), String.class); + String pkcs7 = this.awsMetadataRestOperations + .getForObject(this.options.getIdentityDocumentUri(), String.class); if (StringUtils.hasText(pkcs7)) { login.put("pkcs7", pkcs7.replaceAll("\\r", "").replace("\\n", "")); } @@ -210,9 +209,10 @@ public class AwsEc2Authentication implements ClientAuthentication, return login; } catch (RestClientException e) { - throw new VaultLoginException(String.format( - "Cannot obtain Identity Document from %s", - options.getIdentityDocumentUri()), e); + throw new VaultLoginException( + String.format("Cannot obtain Identity Document from %s", + options.getIdentityDocumentUri()), + e); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java index 634ec2ab..ae27e076 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2AuthenticationOptions.java @@ -203,7 +203,8 @@ public class AwsEc2AuthenticationOptions { Assert.notNull(identityDocumentUri, "IdentityDocumentUri must not be null"); - return new AwsEc2AuthenticationOptions(path, identityDocumentUri, role, nonce); + return new AwsEc2AuthenticationOptions(path, identityDocumentUri, role, + nonce); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthentication.java index 1a7ca15f..f495339b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthentication.java @@ -62,12 +62,12 @@ import org.springframework.web.client.RestOperations; * @see RestOperations * @see Auth Backend: aws * (IAM) - * @see AWS: + * @see AWS: * GetCallerIdentity */ -public class AwsIamAuthentication implements ClientAuthentication, - AuthenticationStepsFactory { +public class AwsIamAuthentication + implements ClientAuthentication, AuthenticationStepsFactory { private static final Log logger = LogFactory.getLog(AwsIamAuthentication.class); @@ -123,8 +123,8 @@ public class AwsIamAuthentication implements ClientAuthentication, protected static AuthenticationSteps createAuthenticationSteps( AwsIamAuthenticationOptions options, AWSCredentials credentials) { - return AuthenticationSteps.fromSupplier( - () -> createRequestBody(options, credentials)) // + return AuthenticationSteps + .fromSupplier(() -> createRequestBody(options, credentials)) // .login("auth/{mount}/login", options.getPath()); } @@ -135,8 +135,8 @@ public class AwsIamAuthentication implements ClientAuthentication, @Override public AuthenticationSteps getAuthenticationSteps() { - return createAuthenticationSteps(this.options, this.options - .getCredentialsProvider().getCredentials()); + return createAuthenticationSteps(this.options, + this.options.getCredentialsProvider().getCredentials()); } @SuppressWarnings("unchecked") @@ -157,10 +157,10 @@ public class AwsIamAuthentication implements ClientAuthentication, if (response.getAuth().get("metadata") instanceof Map) { Map metadata = (Map) response .getAuth().get("metadata"); - logger.debug(String - .format("Login successful using AWS-IAM authentication for user id %s, ARN %s", - metadata.get("client_user_id"), - metadata.get("canonical_arn"))); + logger.debug(String.format( + "Login successful using AWS-IAM authentication for user id %s, ARN %s", + metadata.get("client_user_id"), + metadata.get("canonical_arn"))); } else { logger.debug("Login successful using AWS-IAM authentication"); @@ -183,8 +183,8 @@ public class AwsIamAuthentication implements ClientAuthentication, */ protected static Map createRequestBody( AwsIamAuthenticationOptions options) { - return createRequestBody(options, options.getCredentialsProvider() - .getCredentials()); + return createRequestBody(options, + options.getCredentialsProvider().getCredentials()); } /** @@ -200,8 +200,8 @@ public class AwsIamAuthentication implements ClientAuthentication, Map login = new HashMap<>(); login.put("iam_http_request_method", "POST"); - login.put("iam_request_url", Base64Utils.encodeToString(options.getEndpointUri() - .toString().getBytes())); + login.put("iam_request_url", Base64Utils + .encodeToString(options.getEndpointUri().toString().getBytes())); login.put("iam_request_body", REQUEST_BODY_BASE64_ENCODED); String headerJson = getSignedHeaders(options, credentials); @@ -252,7 +252,8 @@ public class AwsIamAuthentication implements ClientAuthentication, Map headers = new LinkedHashMap<>(); headers.put(HttpHeaders.CONTENT_LENGTH, "" + REQUEST_BODY.length()); - headers.put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); + headers.put(HttpHeaders.CONTENT_TYPE, + MediaType.APPLICATION_FORM_URLENCODED_VALUE); if (StringUtils.hasText(options.getServerId())) { headers.put("X-Vault-AWS-IAM-Server-ID", options.getServerId()); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthenticationOptions.java index 097d1999..ec736d99 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthenticationOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsIamAuthenticationOptions.java @@ -184,7 +184,8 @@ public class AwsIamAuthenticationOptions { * @return {@code this} {@link AwsIamAuthenticationOptionsBuilder}. * @see #credentialsProvider(AWSCredentialsProvider) */ - public AwsIamAuthenticationOptionsBuilder credentials(AWSCredentials credentials) { + public AwsIamAuthenticationOptionsBuilder credentials( + AWSCredentials credentials) { Assert.notNull(credentials, "Credentials must not be null"); @@ -203,7 +204,8 @@ public class AwsIamAuthenticationOptions { public AwsIamAuthenticationOptionsBuilder credentialsProvider( AWSCredentialsProvider credentialsProvider) { - Assert.notNull(credentialsProvider, "AWSCredentialsProvider must not be null"); + Assert.notNull(credentialsProvider, + "AWSCredentialsProvider must not be null"); this.credentialsProvider = credentialsProvider; return this; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AzureMsiAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AzureMsiAuthentication.java index 0d0c1ab8..dfecb2bd 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AzureMsiAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AzureMsiAuthentication.java @@ -92,7 +92,8 @@ public class AzureMsiAuthentication implements ClientAuthentication { * @param azureMetadataRestOperations must not be {@literal null}. */ public AzureMsiAuthentication(AzureMsiAuthenticationOptions options, - RestOperations vaultRestOperations, RestOperations azureMetadataRestOperations) { + RestOperations vaultRestOperations, + RestOperations azureMetadataRestOperations) { Assert.notNull(options, "AzureAuthenticationOptions must not be null"); Assert.notNull(vaultRestOperations, "Vault RestOperations must not be null"); @@ -123,17 +124,19 @@ public class AzureMsiAuthentication implements ClientAuthentication { AzureMsiAuthenticationOptions options, @Nullable AzureVmEnvironment environment) { - Node msiToken = AuthenticationSteps.fromHttpRequest( - HttpRequestBuilder.get(options.getIdentityTokenServiceUri()) - .with(METADATA_HEADERS).as(Map.class)) // + Node msiToken = AuthenticationSteps + .fromHttpRequest( + HttpRequestBuilder.get(options.getIdentityTokenServiceUri()) + .with(METADATA_HEADERS).as(Map.class)) // .map(token -> (String) token.get("access_token")); Node environmentSteps; if (environment == null) { - environmentSteps = AuthenticationSteps.fromHttpRequest( - HttpRequestBuilder.get(options.getInstanceMetadataServiceUri()) + environmentSteps = AuthenticationSteps + .fromHttpRequest(HttpRequestBuilder + .get(options.getInstanceMetadataServiceUri()) .with(METADATA_HEADERS).as(Map.class)) // .map(AzureMsiAuthentication::toAzureVmEnvironment); } @@ -141,8 +144,7 @@ public class AzureMsiAuthentication implements ClientAuthentication { environmentSteps = AuthenticationSteps.fromSupplier(() -> environment); } - return environmentSteps - .zipWith(msiToken) + return environmentSteps.zipWith(msiToken) .map(tuple -> getAzureLogin(options.getRole(), tuple.getLeft(), tuple.getRight())) // .login("auth/{mount}/login", options.getPath()); @@ -211,8 +213,8 @@ public class AzureMsiAuthentication implements ClientAuthentication { private AzureVmEnvironment fetchAzureVmEnvironment() { ResponseEntity response = this.azureMetadataRestOperations.exchange( - options.getInstanceMetadataServiceUri(), HttpMethod.GET, - METADATA_HEADERS, Map.class); + options.getInstanceMetadataServiceUri(), HttpMethod.GET, METADATA_HEADERS, + Map.class); return toAzureVmEnvironment(response.getBody()); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AzureMsiAuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AzureMsiAuthenticationOptions.java index a0a8591e..1451a797 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AzureMsiAuthenticationOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AzureMsiAuthenticationOptions.java @@ -40,8 +40,8 @@ public class AzureMsiAuthenticationOptions { public static final URI DEFAULT_INSTANCE_METADATA_SERVICE_URI = URI .create("http://169.254.169.254/metadata/instance?api-version=2017-08-01"); - public static final URI DEFAULT_IDENTITY_TOKEN_SERVICE_URI = URI - .create("http://169.254.169.254/metadata/identity/oauth2/token?resource=https://vault.hashicorp.com&api-version=2018-02-01"); + public static final URI DEFAULT_IDENTITY_TOKEN_SERVICE_URI = URI.create( + "http://169.254.169.254/metadata/identity/oauth2/token?resource=https://vault.hashicorp.com&api-version=2018-02-01"); /** * Path of the azure authentication backend mount. diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/CachingVaultTokenSupplier.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/CachingVaultTokenSupplier.java index cdc61cbf..542a70b1 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/CachingVaultTokenSupplier.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/CachingVaultTokenSupplier.java @@ -32,8 +32,8 @@ import org.springframework.vault.support.VaultToken; * @see VaultTokenSupplier * @see VaultToken */ -public class CachingVaultTokenSupplier implements VaultTokenSupplier, - ReactiveSessionManager { +public class CachingVaultTokenSupplier + implements VaultTokenSupplier, ReactiveSessionManager { private static final Mono EMPTY = Mono.empty(); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java index 4ebb46f8..22de494b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java @@ -33,8 +33,8 @@ import static org.springframework.vault.authentication.AuthenticationSteps.HttpR * * @author Mark Paluch */ -public class ClientCertificateAuthentication implements ClientAuthentication, - AuthenticationStepsFactory { +public class ClientCertificateAuthentication + implements ClientAuthentication, AuthenticationStepsFactory { private static final Log logger = LogFactory .getLog(ClientCertificateAuthentication.class); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthentication.java index 5e9904ee..91977b59 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthentication.java @@ -137,8 +137,8 @@ import static org.springframework.vault.authentication.AuthenticationSteps.HttpR * "https://www.vaultproject.io/docs/concepts/response-wrapping.html">Response * Wrapping */ -public class CubbyholeAuthentication implements ClientAuthentication, - AuthenticationStepsFactory { +public class CubbyholeAuthentication + implements ClientAuthentication, AuthenticationStepsFactory { private static final Log logger = LogFactory.getLog(CubbyholeAuthentication.class); @@ -194,8 +194,8 @@ public class CubbyholeAuthentication implements ClientAuthentication, if (shouldEnhanceTokenWithSelfLookup(tokenToUse)) { - LoginTokenAdapter adapter = new LoginTokenAdapter(new TokenAuthentication( - tokenToUse), restOperations); + LoginTokenAdapter adapter = new LoginTokenAdapter( + new TokenAuthentication(tokenToUse), restOperations); tokenToUse = adapter.login(); } @@ -261,10 +261,9 @@ public class CubbyholeAuthentication implements ClientAuthentication, } if (data == null || data.isEmpty()) { - throw new VaultLoginException( - String.format( - "Cannot retrieve Token from Cubbyhole: Response at %s does not contain a token", - options.getPath())); + throw new VaultLoginException(String.format( + "Cannot retrieve Token from Cubbyhole: Response at %s does not contain a token", + options.getPath())); } if (data.size() == 1) { @@ -272,9 +271,8 @@ public class CubbyholeAuthentication implements ClientAuthentication, return VaultToken.of(token); } - throw new VaultLoginException( - String.format( - "Cannot retrieve Token from Cubbyhole: Response at %s does not contain an unique token", - options.getPath())); + throw new VaultLoginException(String.format( + "Cannot retrieve Token from Cubbyhole: Response at %s does not contain an unique token", + options.getPath())); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthenticationOptions.java index be4d9265..6af149cf 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthenticationOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthenticationOptions.java @@ -126,7 +126,8 @@ public class CubbyholeAuthenticationOptions { * @param initialToken must not be {@literal null}. * @return {@code this} {@link CubbyholeAuthenticationOptionsBuilder}. */ - public CubbyholeAuthenticationOptionsBuilder initialToken(VaultToken initialToken) { + public CubbyholeAuthenticationOptionsBuilder initialToken( + VaultToken initialToken) { Assert.notNull(initialToken, "Initial Vault Token must not be null"); @@ -166,7 +167,7 @@ public class CubbyholeAuthenticationOptions { * {@literal true}. * * @param selfLookup {@literal true} to perform a self-lookup or {@literal false} - * to disable it. + * to disable it. * @return {@code this} {@link CubbyholeAuthenticationOptionsBuilder}. * @since 1.0.1 */ diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/DefaultGcpCredentialAccessors.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/DefaultGcpCredentialAccessors.java index ba0a4dd3..f43c39cf 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/DefaultGcpCredentialAccessors.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/DefaultGcpCredentialAccessors.java @@ -29,8 +29,8 @@ import org.springframework.util.StringUtils; * @since 2.1 * @see GcpIamAuthentication */ -enum DefaultGcpCredentialAccessors implements GcpProjectIdAccessor, - GcpServiceAccountIdAccessor { +enum DefaultGcpCredentialAccessors + implements GcpProjectIdAccessor, GcpServiceAccountIdAccessor { INSTANCE; @@ -44,8 +44,7 @@ enum DefaultGcpCredentialAccessors implements GcpProjectIdAccessor, public String getServiceAccountId(GoogleCredential credential) { Assert.notNull(credential, "GoogleCredential must not be null"); - Assert.notNull( - credential.getServiceAccountId(), + Assert.notNull(credential.getServiceAccountId(), "The configured GoogleCredential does not represent a service account. Configure the service account id with GcpIamAuthenticationOptionsBuilder#serviceAccountId(String)."); return credential.getServiceAccountId(); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpComputeAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpComputeAuthentication.java index 9e52cd78..b6cd4001 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpComputeAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpComputeAuthentication.java @@ -45,12 +45,12 @@ import static org.springframework.vault.authentication.AuthenticationSteps.HttpR * @see GcpComputeAuthenticationOptions * @see Auth Backend: gcp * (IAM) - * @see Google + * @see Google * Compute Engine: Verifying the Identity of Instances */ -public class GcpComputeAuthentication extends GcpJwtAuthenticationSupport implements - ClientAuthentication, AuthenticationStepsFactory { +public class GcpComputeAuthentication extends GcpJwtAuthenticationSupport + implements ClientAuthentication, AuthenticationStepsFactory { public static final String COMPUTE_METADATA_URL_TEMPLATE = "http://metadata/computeMetadata/v1/instance/service-accounts/{serviceAccount}/identity" + "?audience={audience}&format={format}"; @@ -112,8 +112,8 @@ public class GcpComputeAuthentication extends GcpJwtAuthenticationSupport implem HttpRequest jwtRequest = get(COMPUTE_METADATA_URL_TEMPLATE, serviceAccount, audience, "full") // - .with(getMetadataHttpHeaders()) // - .as(String.class); + .with(getMetadataHttpHeaders()) // + .as(String.class); return AuthenticationSteps.fromHttpRequest(jwtRequest) // diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpComputeAuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpComputeAuthenticationOptions.java index 242012ae..6af10154 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpComputeAuthenticationOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpComputeAuthenticationOptions.java @@ -122,7 +122,8 @@ public class GcpComputeAuthenticationOptions { * @param serviceAccount must not be empty or {@literal null}. * @return {@code this} {@link GcpComputeAuthenticationOptionsBuilder}. */ - public GcpComputeAuthenticationOptionsBuilder serviceAccount(String serviceAccount) { + public GcpComputeAuthenticationOptionsBuilder serviceAccount( + String serviceAccount) { Assert.hasText(serviceAccount, "Service account must not be null"); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java index 0d0faafa..e6ace98a 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java @@ -59,12 +59,12 @@ import org.springframework.web.client.RestOperations; * @see RestOperations * @see Auth Backend: gcp * (IAM) - * @see GCP: + * @see GCP: * projects.serviceAccounts.signJwt */ -public class GcpIamAuthentication extends GcpJwtAuthenticationSupport implements - ClientAuthentication { +public class GcpIamAuthentication extends GcpJwtAuthenticationSupport + implements ClientAuthentication { private static final JsonFactory JSON_FACTORY = new JacksonFactory(); @@ -82,9 +82,9 @@ public class GcpIamAuthentication extends GcpJwtAuthenticationSupport implements * @param options must not be {@literal null}. * @param restOperations HTTP client for for Vault login, must not be {@literal null}. * @throws GeneralSecurityException thrown by - * {@link GoogleApacheHttpTransport#newTrustedTransport()}. + * {@link GoogleApacheHttpTransport#newTrustedTransport()}. * @throws IOException thrown by - * {@link GoogleApacheHttpTransport#newTrustedTransport()}. + * {@link GoogleApacheHttpTransport#newTrustedTransport()}. */ public GcpIamAuthentication(GcpIamAuthenticationOptions options, RestOperations restOperations) throws GeneralSecurityException, IOException { @@ -139,12 +139,9 @@ public class GcpIamAuthentication extends GcpJwtAuthenticationSupport implements SignJwtRequest request = new SignJwtRequest(); request.setPayload(payload); - SignJwt signJwt = iam - .projects() - .serviceAccounts() - .signJwt( - String.format("projects/%s/serviceAccounts/%s", projectId, - serviceAccount), request); + SignJwt signJwt = iam.projects().serviceAccounts().signJwt(String + .format("projects/%s/serviceAccounts/%s", projectId, serviceAccount), + request); SignJwtResponse response = signJwt.execute(); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthenticationOptions.java index 560a591a..6ab95d3f 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthenticationOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthenticationOptions.java @@ -194,7 +194,8 @@ public class GcpIamAuthenticationOptions { * @return {@code this} {@link GcpIamAuthenticationOptionsBuilder}. * @see #credentialSupplier(GcpCredentialSupplier) */ - public GcpIamAuthenticationOptionsBuilder credential(GoogleCredential credential) { + public GcpIamAuthenticationOptionsBuilder credential( + GoogleCredential credential) { Assert.notNull(credential, "Credential must not be null"); @@ -227,11 +228,13 @@ public class GcpIamAuthenticationOptions { * @return {@code this} {@link GcpIamAuthenticationOptionsBuilder}. * @since 2.1 */ - public GcpIamAuthenticationOptionsBuilder serviceAccountId(String serviceAccountId) { + public GcpIamAuthenticationOptionsBuilder serviceAccountId( + String serviceAccountId) { Assert.notNull(serviceAccountId, "Service account id may not be null"); - return serviceAccountIdAccessor((GoogleCredential credential) -> serviceAccountId); + return serviceAccountIdAccessor( + (GoogleCredential credential) -> serviceAccountId); } /** @@ -276,7 +279,7 @@ public class GcpIamAuthenticationOptions { * {@link GoogleCredential#getServiceAccountProjectId()}. * * @param projectIdAccessor the GCP project id supplier to use in GCP IAM API - * calls + * calls * @return {@code this} {@link GcpIamAuthenticationOptionsBuilder}. * @since 2.1 */ diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpServiceAccountIdAccessor.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpServiceAccountIdAccessor.java index 6e7b2c86..8a306219 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpServiceAccountIdAccessor.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpServiceAccountIdAccessor.java @@ -18,8 +18,8 @@ package org.springframework.vault.authentication; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; /** - * Interface to obtain a service account id for GCP IAM authentication. - * Implementations are used by {@link GcpIamAuthentication}. + * Interface to obtain a service account id for GCP IAM authentication. Implementations + * are used by {@link GcpIamAuthentication}. * * @author Magnus Jungsbluth * @since 2.1 diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesAuthentication.java index aa492784..2031f94b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesAuthentication.java @@ -42,8 +42,8 @@ import org.springframework.web.client.RestOperations; * @see Auth Backend: * Kubernetes */ -public class KubernetesAuthentication implements ClientAuthentication, - AuthenticationStepsFactory { +public class KubernetesAuthentication + implements ClientAuthentication, AuthenticationStepsFactory { private static final Log logger = LogFactory.getLog(KubernetesAuthentication.class); @@ -81,16 +81,16 @@ public class KubernetesAuthentication implements ClientAuthentication, Assert.notNull(options, "CubbyholeAuthenticationOptions must not be null"); String token = options.getJwtSupplier().get(); - return AuthenticationSteps.fromSupplier( - () -> getKubernetesLogin(options.getRole(), token)) // + return AuthenticationSteps + .fromSupplier(() -> getKubernetesLogin(options.getRole(), token)) // .login("auth/{mount}/login", options.getPath()); } @Override public VaultToken login() throws VaultException { - Map login = getKubernetesLogin(options.getRole(), options - .getJwtSupplier().get()); + Map login = getKubernetesLogin(options.getRole(), + options.getJwtSupplier().get()); try { VaultResponse response = restOperations.postForObject("auth/{mount}/login", diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesAuthenticationOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesAuthenticationOptions.java index 620777d4..1a6a739b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesAuthenticationOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesAuthenticationOptions.java @@ -124,7 +124,7 @@ public class KubernetesAuthenticationOptions { * Configure the role. * * @param role name of the role against which the login is being attempted, must - * not be {@literal null} or empty. + * not be {@literal null} or empty. * @return {@code this} {@link KubernetesAuthenticationOptionsBuilder}. */ public KubernetesAuthenticationOptionsBuilder role(String role) { @@ -161,8 +161,8 @@ public class KubernetesAuthenticationOptions { Assert.notNull(role, "Role must not be null"); return new KubernetesAuthenticationOptions(path, role, - jwtSupplier == null ? new KubernetesServiceAccountTokenFile() - .cached() : jwtSupplier); + jwtSupplier == null ? new KubernetesServiceAccountTokenFile().cached() + : jwtSupplier); } } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesServiceAccountTokenFile.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesServiceAccountTokenFile.java index 8b087eb3..6a2a4cd5 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesServiceAccountTokenFile.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/KubernetesServiceAccountTokenFile.java @@ -52,7 +52,7 @@ public class KubernetesServiceAccountTokenFile implements KubernetesJwtSupplier * exception if the file does not exist. * * @throws IllegalArgumentException if the - * {@link #DEFAULT_KUBERNETES_SERVICE_ACCOUNT_TOKEN_FILE} does not exist. + * {@link #DEFAULT_KUBERNETES_SERVICE_ACCOUNT_TOKEN_FILE} does not exist. */ public KubernetesServiceAccountTokenFile() { this(DEFAULT_KUBERNETES_SERVICE_ACCOUNT_TOKEN_FILE); @@ -102,8 +102,8 @@ public class KubernetesServiceAccountTokenFile implements KubernetesJwtSupplier return new String(readToken(this.resource), StandardCharsets.US_ASCII); } catch (IOException e) { - throw new VaultException(String.format( - "Kube JWT token retrieval from %s failed", this.resource), e); + throw new VaultException(String + .format("Kube JWT token retrieval from %s failed", this.resource), e); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java index 5a65949a..606c2679 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java @@ -177,8 +177,8 @@ public class LifecycleAwareSessionManager extends LifecycleAwareSessionManagerSu try { dispatch(new BeforeLoginTokenRevocationEvent(token)); - restOperations.postForObject("auth/token/revoke-self", new HttpEntity<>( - VaultHttpHeaders.from(token)), Map.class); + restOperations.postForObject("auth/token/revoke-self", + new HttpEntity<>(VaultHttpHeaders.from(token)), Map.class); dispatch(new AfterLoginTokenRevocationEvent(token)); } catch (RuntimeException e) { @@ -251,11 +251,11 @@ public class LifecycleAwareSessionManager extends LifecycleAwareSessionManagerSu if (isExpired(renewed)) { if (logger.isDebugEnabled()) { - Duration validTtlThreshold = getRefreshTrigger().getValidTtlThreshold( - renewed); - logger.info(String - .format("Token TTL (%s) exceeded validity TTL threshold (%s). Dropping token.", - renewed.getLeaseDuration(), validTtlThreshold)); + Duration validTtlThreshold = getRefreshTrigger() + .getValidTtlThreshold(renewed); + logger.info(String.format( + "Token TTL (%s) exceeded validity TTL threshold (%s). Dropping token.", + renewed.getLeaseDuration(), validTtlThreshold)); } else { logger.info("Token TTL exceeded validity TTL threshold. Dropping token."); @@ -285,8 +285,8 @@ public class LifecycleAwareSessionManager extends LifecycleAwareSessionManagerSu } } - return getToken().map(TokenWrapper::getToken).orElseThrow( - () -> new IllegalStateException("Cannot obtain VaultToken")); + return getToken().map(TokenWrapper::getToken) + .orElseThrow(() -> new IllegalStateException("Cannot obtain VaultToken")); } private void doGetSessionToken() { @@ -311,8 +311,8 @@ public class LifecycleAwareSessionManager extends LifecycleAwareSessionManagerSu wrapper = new TokenWrapper(token, false); } catch (VaultTokenLookupException e) { - logger.warn(String.format( - "Cannot enhance VaultToken to a LoginToken: %s", e.getMessage())); + logger.warn(String.format("Cannot enhance VaultToken to a LoginToken: %s", + e.getMessage())); dispatch(new AuthenticationErrorEvent(token, e)); } } @@ -334,8 +334,7 @@ public class LifecycleAwareSessionManager extends LifecycleAwareSessionManagerSu */ protected boolean isTokenRenewable() { - return getToken().map(TokenWrapper::getToken) - .filter(LoginToken.class::isInstance) + return getToken().map(TokenWrapper::getToken).filter(LoginToken.class::isInstance) // .filter(it -> { @@ -379,8 +378,8 @@ public class LifecycleAwareSessionManager extends LifecycleAwareSessionManagerSu private OneShotTrigger createTrigger(TokenWrapper tokenWrapper) { - return new OneShotTrigger(getRefreshTrigger().nextExecutionTime( - (LoginToken) tokenWrapper.getToken())); + return new OneShotTrigger(getRefreshTrigger() + .nextExecutionTime((LoginToken) tokenWrapper.getToken())); } private static String format(String message, HttpStatusCodeException e) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupport.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupport.java index 5d49ea7e..a45449a5 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupport.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupport.java @@ -40,8 +40,8 @@ import org.springframework.vault.support.VaultToken; * @author Mark Paluch * @since 2.0 */ -public abstract class LifecycleAwareSessionManagerSupport extends - AuthenticationEventPublisher { +public abstract class LifecycleAwareSessionManagerSupport + extends AuthenticationEventPublisher { /** * Refresh 5 seconds before the token expires. @@ -125,7 +125,7 @@ public abstract class LifecycleAwareSessionManagerSupport extends * token is renewable and its TTL. * * @param tokenSelfLookupEnabled {@literal true} to enable self-lookup, - * {@literal false} to disable self-lookup. Enabled by default. + * {@literal false} to disable self-lookup. Enabled by default. */ public void setTokenSelfLookupEnabled(boolean tokenSelfLookupEnabled) { this.tokenSelfLookupEnabled = tokenSelfLookupEnabled; @@ -260,8 +260,8 @@ public abstract class LifecycleAwareSessionManagerSupport extends * * @param timeout timeout value. * @param validTtlThreshold minimum TTL duration to consider a Token as valid. - * Tokens with a shorter TTL are not used anymore. Should be greater than - * {@code timeout} to prevent token expiry. + * Tokens with a shorter TTL are not used anymore. Should be greater than + * {@code timeout} to prevent token expiry. * @since 2.0 */ public FixedTimeoutRefreshTrigger(Duration timeout, Duration validTtlThreshold) { @@ -278,8 +278,8 @@ public abstract class LifecycleAwareSessionManagerSupport extends @Override public Date nextExecutionTime(LoginToken loginToken) { - long milliseconds = Math.max(ONE_SECOND.toMillis(), loginToken - .getLeaseDuration().toMillis() - duration.toMillis()); + long milliseconds = Math.max(ONE_SECOND.toMillis(), + loginToken.getLeaseDuration().toMillis() - duration.toMillis()); return new Date(System.currentTimeMillis() + milliseconds); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginToken.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginToken.java index 071707b7..1c60beb4 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginToken.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginToken.java @@ -108,7 +108,7 @@ public class LoginToken extends VaultToken { * @param token must not be {@literal null}. * * @param leaseDuration the lease duration, must not be negative and not be - * {@literal null}. + * {@literal null}. * @return the created {@link VaultToken} * @since 2.0 */ diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java index c8934904..0e4e69bf 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java @@ -56,7 +56,8 @@ public class LoginTokenAdapter implements ClientAuthentication { * @param delegate must not be {@literal null}. * @param restOperations must not be {@literal null}. */ - public LoginTokenAdapter(ClientAuthentication delegate, RestOperations restOperations) { + public LoginTokenAdapter(ClientAuthentication delegate, + RestOperations restOperations) { Assert.notNull(delegate, "ClientAuthentication delegate must not be null"); Assert.notNull(restOperations, "RestOperations must not be null"); @@ -94,8 +95,8 @@ public class LoginTokenAdapter implements ClientAuthentication { try { ResponseEntity entity = restOperations.exchange( - "auth/token/lookup-self", HttpMethod.GET, new HttpEntity<>( - VaultHttpHeaders.from(token)), VaultResponse.class); + "auth/token/lookup-self", HttpMethod.GET, + new HttpEntity<>(VaultHttpHeaders.from(token)), VaultResponse.class); Assert.state(entity.getBody() != null && entity.getBody().getData() != null, "Token response is null"); @@ -103,9 +104,9 @@ public class LoginTokenAdapter implements ClientAuthentication { return entity.getBody().getData(); } catch (HttpStatusCodeException e) { - throw new VaultTokenLookupException(String.format( - "Token self-lookup failed: %s %s", e.getRawStatusCode(), - VaultResponses.getError(e.getResponseBodyAsString()))); + throw new VaultTokenLookupException( + String.format("Token self-lookup failed: %s %s", e.getRawStatusCode(), + VaultResponses.getError(e.getResponseBodyAsString()))); } catch (RestClientException e) { throw new VaultTokenLookupException("Token self-lookup failed", e); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManager.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManager.java index 17c775b1..e97c71d1 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManager.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManager.java @@ -80,9 +80,9 @@ import org.springframework.web.reactive.function.client.WebClientResponseExcepti * @see TaskScheduler * @see AuthenticationEventPublisher */ -public class ReactiveLifecycleAwareSessionManager extends - LifecycleAwareSessionManagerSupport implements ReactiveSessionManager, - DisposableBean { +public class ReactiveLifecycleAwareSessionManager + extends LifecycleAwareSessionManagerSupport + implements ReactiveSessionManager, DisposableBean { private static final Mono EMPTY = Mono.empty(); @@ -182,14 +182,9 @@ public class ReactiveLifecycleAwareSessionManager extends */ protected Mono revoke(VaultToken token) { - return webClient - .post() - .uri("auth/token/revoke-self") - .headers(httpHeaders -> { - httpHeaders.addAll(VaultHttpHeaders.from(token)); - }) - .retrieve() - .bodyToMono(String.class) + return webClient.post().uri("auth/token/revoke-self").headers(httpHeaders -> { + httpHeaders.addAll(VaultHttpHeaders.from(token)); + }).retrieve().bodyToMono(String.class) .doOnSubscribe( ignore -> dispatch(new BeforeLoginTokenRevocationEvent(token))) .doOnNext(ignore -> dispatch(new AfterLoginTokenRevocationEvent(token))) @@ -237,55 +232,44 @@ public class ReactiveLifecycleAwareSessionManager extends private Mono doRenewToken(TokenWrapper wrapper) { - return doRenew(wrapper) - .onErrorResume( - WebClientResponseException.class, - e -> { + return doRenew(wrapper).onErrorResume(WebClientResponseException.class, e -> { - dropCurrentToken(); + dropCurrentToken(); - String message = "Cannot renew token, resetting token and performing re-login on next token access"; + String message = "Cannot renew token, resetting token and performing re-login on next token access"; - if (e.getStatusCode().is4xxClientError()) { + if (e.getStatusCode().is4xxClientError()) { - logger.warn(format(message, e)); - dispatch(new LoginTokenRenewalFailedEvent(wrapper - .getToken(), e)); - return EMPTY; - } + logger.warn(format(message, e)); + dispatch(new LoginTokenRenewalFailedEvent(wrapper.getToken(), e)); + return EMPTY; + } - logger.debug(format(message, e)); + logger.debug(format(message, e)); - return Mono.error(new VaultTokenRenewalException(format( - "Cannot renew token", e), e)); - }) - .onErrorMap( - it -> !(it instanceof VaultTokenRenewalException), - e -> { + return Mono.error( + new VaultTokenRenewalException(format("Cannot renew token", e), e)); + }).onErrorMap(it -> !(it instanceof VaultTokenRenewalException), e -> { - dropCurrentToken(); - logger.debug(String - .format("Cannot renew token, resetting token and performing re-login on next token access: %s", - e.toString())); + dropCurrentToken(); + logger.debug(String.format( + "Cannot renew token, resetting token and performing re-login on next token access: %s", + e.toString())); - return new VaultTokenRenewalException("Cannot renew token", e); - }); + return new VaultTokenRenewalException("Cannot renew token", e); + }); } private Mono doRenew(TokenWrapper tokenWrapper) { - Mono exchange = webClient - .post() - .uri("auth/token/renew-self") - .headers( - httpHeaders -> httpHeaders.putAll(VaultHttpHeaders - .from(tokenWrapper.token))).retrieve() - .bodyToMono(VaultResponse.class); + Mono exchange = webClient.post().uri("auth/token/renew-self") + .headers(httpHeaders -> httpHeaders + .putAll(VaultHttpHeaders.from(tokenWrapper.token))) + .retrieve().bodyToMono(VaultResponse.class); return exchange - .doOnSubscribe( - ignore -> dispatch(new BeforeLoginTokenRenewedEvent(tokenWrapper - .getToken()))) + .doOnSubscribe(ignore -> dispatch( + new BeforeLoginTokenRenewedEvent(tokenWrapper.getToken()))) .handle((response, sink) -> { LoginToken renewed = LoginTokenUtil.from(response.getRequiredAuth()); @@ -300,12 +284,13 @@ public class ReactiveLifecycleAwareSessionManager extends Duration validTtlThreshold = getRefreshTrigger() .getValidTtlThreshold(renewed); - logger.info(String - .format("Token TTL (%s) exceeded validity TTL threshold (%s). Dropping token.", - renewed.getLeaseDuration(), validTtlThreshold)); + logger.info(String.format( + "Token TTL (%s) exceeded validity TTL threshold (%s). Dropping token.", + renewed.getLeaseDuration(), validTtlThreshold)); } else { - logger.info("Token TTL exceeded validity TTL threshold. Dropping token."); + logger.info( + "Token TTL exceeded validity TTL threshold. Dropping token."); } dropCurrentToken(); @@ -356,17 +341,16 @@ public class ReactiveLifecycleAwareSessionManager extends if (isTokenSelfLookupEnabled() && !ClassUtils.isAssignableValue(LoginToken.class, token)) { - Mono loginTokenMono = augmentWithSelfLookup(this.webClient, token); + Mono loginTokenMono = augmentWithSelfLookup(this.webClient, + token); - return loginTokenMono.onErrorResume( - e -> { + return loginTokenMono.onErrorResume(e -> { - logger.warn(String.format( - "Cannot enhance VaultToken to a LoginToken: %s", - e.getMessage())); - dispatch(new AuthenticationErrorEvent(token, e)); - return Mono.just(token); - }).map(it -> new TokenWrapper(it, false)); + logger.warn(String.format("Cannot enhance VaultToken to a LoginToken: %s", + e.getMessage())); + dispatch(new AuthenticationErrorEvent(token, e)); + return Mono.just(token); + }).map(it -> new TokenWrapper(it, false)); } return Mono.just(wrapper); @@ -377,8 +361,7 @@ public class ReactiveLifecycleAwareSessionManager extends */ protected boolean isTokenRenewable(VaultToken token) { - return Optional.of(token) - .filter(LoginToken.class::isInstance) + return Optional.of(token).filter(LoginToken.class::isInstance) // .filter(it -> { @@ -421,8 +404,8 @@ public class ReactiveLifecycleAwareSessionManager extends private OneShotTrigger createTrigger(VaultToken token) { - return new OneShotTrigger(getRefreshTrigger().nextExecutionTime( - (LoginToken) token)); + return new OneShotTrigger( + getRefreshTrigger().nextExecutionTime((LoginToken) token)); } private static Mono augmentWithSelfLookup(WebClient webClient, @@ -448,23 +431,16 @@ public class ReactiveLifecycleAwareSessionManager extends private static Mono> lookupSelf(WebClient webClient, VaultToken token) { - return webClient - .get() - .uri("auth/token/lookup-self") + return webClient.get().uri("auth/token/lookup-self") .headers(httpHeaders -> httpHeaders.putAll(VaultHttpHeaders.from(token))) - .retrieve() - .bodyToMono(VaultResponse.class) - .map(it -> { + .retrieve().bodyToMono(VaultResponse.class).map(it -> { Assert.state(it.getData() != null, "Token response is null"); return it.getRequiredData(); - }) - .onErrorMap( - WebClientResponseException.class, - e -> { - return new VaultTokenLookupException(format( - "Token self-lookup", e), e); - }); + }).onErrorMap(WebClientResponseException.class, e -> { + return new VaultTokenLookupException(format("Token self-lookup", e), + e); + }); } private static String format(String message, WebClientResponseException e) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/TokenAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/TokenAuthentication.java index f80949dd..bc773e47 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/TokenAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/TokenAuthentication.java @@ -30,8 +30,8 @@ import static org.springframework.vault.authentication.AuthenticationSteps.HttpR * @see VaultToken * @see Auth Backend: Token */ -public class TokenAuthentication implements ClientAuthentication, - AuthenticationStepsFactory { +public class TokenAuthentication + implements ClientAuthentication, AuthenticationStepsFactory { private final VaultToken token; @@ -65,8 +65,8 @@ public class TokenAuthentication implements ClientAuthentication, * * @param token must not be {@literal null}. * @param selfLookup {@literal true} to perform a self-lookup using the given - * {@link VaultToken}. Self-lookup will create a {@link LoginToken} and provide - * renewability and TTL. + * {@link VaultToken}. Self-lookup will create a {@link LoginToken} and provide + * renewability and TTL. * @return {@link AuthenticationSteps} for token authentication. * @since 2.0 */ @@ -77,11 +77,11 @@ public class TokenAuthentication implements ClientAuthentication, if (selfLookup) { - HttpRequest httpRequest = get("auth/token/lookup-self").with( - VaultHttpHeaders.from(token)).as(VaultResponse.class); + HttpRequest httpRequest = get("auth/token/lookup-self") + .with(VaultHttpHeaders.from(token)).as(VaultResponse.class); - return AuthenticationSteps.fromHttpRequest(httpRequest).login( - response -> LoginTokenUtil.from(token.toCharArray(), + return AuthenticationSteps.fromHttpRequest(httpRequest) + .login(response -> LoginTokenUtil.from(token.toCharArray(), response.getRequiredData())); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginEvent.java index a5b6b27e..c75fd9f1 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginEvent.java @@ -33,7 +33,7 @@ public class AfterLoginEvent extends AuthenticationEvent { * Create a new {@link AfterLoginEvent} given {@link VaultToken}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. */ public AfterLoginEvent(VaultToken source) { super(source); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginTokenRenewedEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginTokenRenewedEvent.java index 3a001a10..893f01d6 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginTokenRenewedEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginTokenRenewedEvent.java @@ -33,7 +33,7 @@ public class AfterLoginTokenRenewedEvent extends AuthenticationEvent { * Create a new {@link AfterLoginTokenRenewedEvent} given {@link VaultToken}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. */ public AfterLoginTokenRenewedEvent(VaultToken source) { super(source); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginTokenRevocationEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginTokenRevocationEvent.java index 12fa526d..a51d4eff 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginTokenRevocationEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AfterLoginTokenRevocationEvent.java @@ -33,7 +33,7 @@ public class AfterLoginTokenRevocationEvent extends AuthenticationEvent { * Create a new {@link AfterLoginTokenRevocationEvent} given {@link VaultToken}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. */ public AfterLoginTokenRevocationEvent(VaultToken source) { super(source); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AuthenticationEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AuthenticationEvent.java index 5c72e0a2..58237fba 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AuthenticationEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/AuthenticationEvent.java @@ -33,7 +33,7 @@ public abstract class AuthenticationEvent extends ApplicationEvent { * Create a new {@link AuthenticationEvent} given {@link VaultToken}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. */ protected AuthenticationEvent(VaultToken source) { super(source); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/BeforeLoginTokenRenewedEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/BeforeLoginTokenRenewedEvent.java index 4396dba9..2eeb85b5 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/BeforeLoginTokenRenewedEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/BeforeLoginTokenRenewedEvent.java @@ -33,7 +33,7 @@ public class BeforeLoginTokenRenewedEvent extends AuthenticationEvent { * Create a new {@link BeforeLoginTokenRenewedEvent} given {@link VaultToken}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. */ public BeforeLoginTokenRenewedEvent(VaultToken source) { super(source); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/BeforeLoginTokenRevocationEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/BeforeLoginTokenRevocationEvent.java index 2a47454a..8dcbbdda 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/BeforeLoginTokenRevocationEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/BeforeLoginTokenRevocationEvent.java @@ -33,7 +33,7 @@ public class BeforeLoginTokenRevocationEvent extends AuthenticationEvent { * Create a new {@link BeforeLoginTokenRevocationEvent} given {@link VaultToken}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. */ public BeforeLoginTokenRevocationEvent(VaultToken source) { super(source); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginFailedEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginFailedEvent.java index 08235dad..10d5c98b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginFailedEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginFailedEvent.java @@ -38,7 +38,7 @@ public class LoginFailedEvent extends AuthenticationErrorEvent { * Create a new {@link LoginFailedEvent} given {@link Exception}. * * @param source the {@link ClientAuthentication} or {@link VaultTokenSupplier} - * associated with this event, must not be {@literal null}. + * associated with this event, must not be {@literal null}. * @param exception must not be {@literal null}. */ public LoginFailedEvent(Object source, Throwable exception) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenExpiredEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenExpiredEvent.java index 4b0bfc20..d0ccc6cb 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenExpiredEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenExpiredEvent.java @@ -33,7 +33,7 @@ public class LoginTokenExpiredEvent extends AuthenticationEvent { * Create a new {@link LoginTokenExpiredEvent} given {@link VaultToken}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. */ public LoginTokenExpiredEvent(VaultToken source) { super(source); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenRenewalFailedEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenRenewalFailedEvent.java index 46bdf6f7..402cd3e7 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenRenewalFailedEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenRenewalFailedEvent.java @@ -34,7 +34,7 @@ public class LoginTokenRenewalFailedEvent extends AuthenticationErrorEvent { * {@link Exception}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. * @param exception must not be {@literal null}. */ public LoginTokenRenewalFailedEvent(VaultToken source, Throwable exception) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenRevocationFailedEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenRevocationFailedEvent.java index 282769a4..398f53d3 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenRevocationFailedEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/LoginTokenRevocationFailedEvent.java @@ -34,7 +34,7 @@ public class LoginTokenRevocationFailedEvent extends AuthenticationErrorEvent { * {@link Exception}. * * @param source the {@link VaultToken} associated with this event, must not be - * {@literal null}. + * {@literal null}. * @param exception must not be {@literal null}. */ public LoginTokenRevocationFailedEvent(VaultToken source, Throwable exception) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/package-info.java index f343d03e..88a0c93b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/event/package-info.java @@ -4,4 +4,3 @@ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields package org.springframework.vault.authentication.event; - 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 c5ecc07b..0603824e 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 @@ -51,9 +51,11 @@ import static org.springframework.vault.client.ClientHttpRequestFactoryFactory.h */ public class ClientHttpConnectorFactory { - private static final boolean REACTOR_NETTY_PRESENT = isPresent("reactor.netty.http.client.HttpClient"); + private static final boolean REACTOR_NETTY_PRESENT = isPresent( + "reactor.netty.http.client.HttpClient"); - private static final boolean JETTY_PRESENT = isPresent("org.eclipse.jetty.client.HttpClient"); + private static final boolean JETTY_PRESENT = isPresent( + "org.eclipse.jetty.client.HttpClient"); /** * Checks for presence of all {@code classNames} using this class' classloader. @@ -106,8 +108,8 @@ public class ClientHttpConnectorFactory { try { if (sslConfiguration.getTrustStoreConfiguration().isPresent()) { - sslContextBuilder.trustManager(createTrustManagerFactory(sslConfiguration - .getTrustStoreConfiguration())); + sslContextBuilder.trustManager(createTrustManagerFactory( + sslConfiguration.getTrustStoreConfiguration())); } if (sslConfiguration.getKeyStoreConfiguration().isPresent()) { @@ -142,9 +144,9 @@ public class ClientHttpConnectorFactory { }); } - client = client.tcpConfiguration(it -> it.option( - ChannelOption.CONNECT_TIMEOUT_MILLIS, - Math.toIntExact(options.getConnectionTimeout().toMillis()))); + client = client.tcpConfiguration( + it -> it.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, + Math.toIntExact(options.getConnectionTimeout().toMillis()))); return new ReactorClientHttpConnector(client); } @@ -155,8 +157,8 @@ public class ClientHttpConnectorFactory { SslConfiguration sslConfiguration) { try { - return new JettyClientHttpConnector(configureClient( - getHttpClient(sslConfiguration), options)); + return new JettyClientHttpConnector( + configureClient(getHttpClient(sslConfiguration), options)); } catch (GeneralSecurityException | IOException e) { throw new IllegalStateException(e); @@ -167,8 +169,8 @@ public class ClientHttpConnectorFactory { org.eclipse.jetty.client.HttpClient httpClient, ClientOptions options) { httpClient.setConnectTimeout(options.getConnectionTimeout().toMillis()); - httpClient.setAddressResolutionTimeout(options.getConnectionTimeout() - .toMillis()); + httpClient.setAddressResolutionTimeout( + options.getConnectionTimeout().toMillis()); return httpClient; } @@ -201,8 +203,8 @@ public class ClientHttpConnectorFactory { } if (keyConfiguration.getKeyPassword() != null) { - sslContextFactory.setKeyManagerPassword(new String(keyConfiguration - .getKeyPassword())); + sslContextFactory.setKeyManagerPassword( + new String(keyConfiguration.getKeyPassword())); } return new org.eclipse.jetty.client.HttpClient(sslContextFactory); 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 aaf220d5..696ea8be 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 @@ -83,7 +83,8 @@ public class ClientHttpRequestFactoryFactory { private static final Log logger = LogFactory .getLog(ClientHttpRequestFactoryFactory.class); - private static final boolean HTTP_COMPONENTS_PRESENT = isPresent("org.apache.http.client.HttpClient"); + private static final boolean HTTP_COMPONENTS_PRESENT = isPresent( + "org.apache.http.client.HttpClient"); private static final boolean OKHTTP3_PRESENT = isPresent("okhttp3.OkHttpClient"); @@ -158,10 +159,10 @@ public class ClientHttpRequestFactoryFactory { TrustManager[] trustManagers) throws GeneralSecurityException, IOException { KeyConfiguration keyConfiguration = sslConfiguration.getKeyConfiguration(); - KeyManager[] keyManagers = sslConfiguration.getKeyStoreConfiguration() - .isPresent() ? createKeyManagerFactory( - sslConfiguration.getKeyStoreConfiguration(), keyConfiguration) - .getKeyManagers() : null; + KeyManager[] keyManagers = sslConfiguration.getKeyStoreConfiguration().isPresent() + ? createKeyManagerFactory(sslConfiguration.getKeyStoreConfiguration(), + keyConfiguration).getKeyManagers() + : null; SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(keyManagers, trustManagers, null); @@ -172,13 +173,15 @@ public class ClientHttpRequestFactoryFactory { private static TrustManager[] getTrustManagers(SslConfiguration sslConfiguration) throws GeneralSecurityException, IOException { - return sslConfiguration.getTrustStoreConfiguration().isPresent() ? createTrustManagerFactory( - sslConfiguration.getTrustStoreConfiguration()).getTrustManagers() + return sslConfiguration.getTrustStoreConfiguration().isPresent() + ? createTrustManagerFactory(sslConfiguration.getTrustStoreConfiguration()) + .getTrustManagers() : null; } static KeyManagerFactory createKeyManagerFactory( - KeyStoreConfiguration keyStoreConfiguration, KeyConfiguration keyConfiguration) + KeyStoreConfiguration keyStoreConfiguration, + KeyConfiguration keyConfiguration) throws GeneralSecurityException, IOException { KeyStore keyStore = getKeyStore(keyStoreConfiguration); @@ -189,7 +192,8 @@ public class ClientHttpRequestFactoryFactory { char[] keyPasswordToUse = keyConfiguration.getKeyPassword(); if (keyPasswordToUse == null) { - keyPasswordToUse = keyStoreConfiguration.getStorePassword() == null ? new char[0] + keyPasswordToUse = keyStoreConfiguration.getStorePassword() == null + ? new char[0] : keyStoreConfiguration.getStorePassword(); } @@ -206,17 +210,18 @@ public class ClientHttpRequestFactoryFactory { throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException { - KeyStore keyStore = KeyStore.getInstance(StringUtils - .hasText(keyStoreConfiguration.getStoreType()) ? keyStoreConfiguration - .getStoreType() : KeyStore.getDefaultType()); + KeyStore keyStore = KeyStore + .getInstance(StringUtils.hasText(keyStoreConfiguration.getStoreType()) + ? keyStoreConfiguration.getStoreType() + : KeyStore.getDefaultType()); loadKeyStore(keyStoreConfiguration, keyStore); return keyStore; } static TrustManagerFactory createTrustManagerFactory( - KeyStoreConfiguration keyStoreConfiguration) throws GeneralSecurityException, - IOException { + KeyStoreConfiguration keyStoreConfiguration) + throws GeneralSecurityException, IOException { KeyStore trustStore = getKeyStore(keyStoreConfiguration); @@ -228,8 +233,8 @@ public class ClientHttpRequestFactoryFactory { } private static void loadKeyStore(KeyStoreConfiguration keyStoreConfiguration, - KeyStore keyStore) throws IOException, NoSuchAlgorithmException, - CertificateException { + KeyStore keyStore) + throws IOException, NoSuchAlgorithmException, CertificateException { InputStream inputStream = null; try { @@ -256,8 +261,8 @@ public class ClientHttpRequestFactoryFactory { static class HttpComponents { static ClientHttpRequestFactory usingHttpComponents(ClientOptions options, - SslConfiguration sslConfiguration) throws GeneralSecurityException, - IOException { + SslConfiguration sslConfiguration) + throws GeneralSecurityException, IOException { HttpClientBuilder httpClientBuilder = HttpClients.custom(); @@ -274,8 +279,7 @@ public class ClientHttpRequestFactoryFactory { httpClientBuilder.setSSLContext(sslContext); } - RequestConfig requestConfig = RequestConfig - .custom() + RequestConfig requestConfig = RequestConfig.custom() // .setConnectTimeout( Math.toIntExact(options.getConnectionTimeout().toMillis())) // @@ -301,8 +305,8 @@ public class ClientHttpRequestFactoryFactory { static class OkHttp3 { static ClientHttpRequestFactory usingOkHttp3(ClientOptions options, - SslConfiguration sslConfiguration) throws GeneralSecurityException, - IOException { + SslConfiguration sslConfiguration) + throws GeneralSecurityException, IOException { Builder builder = new Builder(); @@ -324,7 +328,7 @@ public class ClientHttpRequestFactoryFactory { builder.connectTimeout(options.getConnectionTimeout().toMillis(), TimeUnit.MILLISECONDS).readTimeout( - options.getReadTimeout().toMillis(), TimeUnit.MILLISECONDS); + options.getReadTimeout().toMillis(), TimeUnit.MILLISECONDS); return new OkHttp3ClientHttpRequestFactory(builder.build()); } @@ -338,8 +342,8 @@ public class ClientHttpRequestFactoryFactory { static class Netty { static ClientHttpRequestFactory usingNetty(ClientOptions options, - SslConfiguration sslConfiguration) throws GeneralSecurityException, - IOException { + SslConfiguration sslConfiguration) + throws GeneralSecurityException, IOException { Netty4ClientHttpRequestFactory requestFactory = new Netty4ClientHttpRequestFactory(); @@ -349,9 +353,8 @@ public class ClientHttpRequestFactoryFactory { .forClient(); if (sslConfiguration.getTrustStoreConfiguration().isPresent()) { - sslContextBuilder - .trustManager(createTrustManagerFactory(sslConfiguration - .getTrustStoreConfiguration())); + sslContextBuilder.trustManager(createTrustManagerFactory( + sslConfiguration.getTrustStoreConfiguration())); } if (sslConfiguration.getKeyStoreConfiguration().isPresent()) { @@ -360,14 +363,14 @@ public class ClientHttpRequestFactoryFactory { sslConfiguration.getKeyConfiguration())); } - requestFactory.setSslContext(sslContextBuilder.sslProvider( - SslProvider.JDK).build()); + requestFactory.setSslContext( + sslContextBuilder.sslProvider(SslProvider.JDK).build()); } - requestFactory.setConnectTimeout(Math.toIntExact(options - .getConnectionTimeout().toMillis())); - requestFactory.setReadTimeout(Math.toIntExact(options.getReadTimeout() - .toMillis())); + requestFactory.setConnectTimeout( + Math.toIntExact(options.getConnectionTimeout().toMillis())); + requestFactory + .setReadTimeout(Math.toIntExact(options.getReadTimeout().toMillis())); return requestFactory; } @@ -401,7 +404,8 @@ public class ClientHttpRequestFactoryFactory { && keyManagers[0] instanceof X509ExtendedKeyManager) { return new KeyManager[] { new KeySelectingX509KeyManager( - (X509ExtendedKeyManager) keyManagers[0], keyConfiguration) }; + (X509ExtendedKeyManager) keyManagers[0], + keyConfiguration) }; } return keyManagers; @@ -443,7 +447,8 @@ public class ClientHttpRequestFactoryFactory { } @Override - public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) { + public String chooseServerAlias(String keyType, Principal[] issuers, + Socket socket) { return delegate.chooseServerAlias(keyType, issuers, socket); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/RestTemplateBuilder.java b/spring-vault-core/src/main/java/org/springframework/vault/client/RestTemplateBuilder.java index fedf8f37..5136e6eb 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/RestTemplateBuilder.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/RestTemplateBuilder.java @@ -234,14 +234,14 @@ public class RestTemplateBuilder { ClientHttpRequestFactory requestFactory = this.requestFactory.get(); RestTemplateBuilderClientHttpRequestFactoryWrapper wrapper = new RestTemplateBuilderClientHttpRequestFactoryWrapper( - requestFactory, new LinkedHashMap<>(defaultHeaders), new LinkedHashSet<>( - requestCustomizers)); + requestFactory, new LinkedHashMap<>(defaultHeaders), + new LinkedHashSet<>(requestCustomizers)); return VaultClients.createRestTemplate(endpointProvider, wrapper); } - static class RestTemplateBuilderClientHttpRequestFactoryWrapper extends - AbstractClientHttpRequestFactoryWrapper { + static class RestTemplateBuilderClientHttpRequestFactoryWrapper + extends AbstractClientHttpRequestFactoryWrapper { private final Map defaultHeaders; 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 60f3b2d0..85e7f39a 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 @@ -124,8 +124,8 @@ public class VaultClients { RestTemplate restTemplate = new RestTemplate(messageConverters); - restTemplate.getInterceptors().add( - (request, body, execution) -> execution.execute(request, body)); + restTemplate.getInterceptors() + .add((request, body, execution) -> execution.execute(request, body)); return restTemplate; } @@ -140,7 +140,8 @@ public class VaultClients { * @see VaultHttpHeaders#VAULT_NAMESPACE * @since 2.2 */ - public static ClientHttpRequestInterceptor createNamespaceInterceptor(String namespace) { + public static ClientHttpRequestInterceptor createNamespaceInterceptor( + String namespace) { Assert.hasText(namespace, "Vault Namespace must not be empty!"); @@ -220,11 +221,11 @@ public class VaultClients { VaultEndpoint endpoint = endpointProvider.getVaultEndpoint(); String baseUri = toBaseUri(endpoint); - UriComponents uriComponents = UriComponentsBuilder.fromUriString( - prepareUriTemplate(baseUri, uriTemplate)).build(); + UriComponents uriComponents = UriComponentsBuilder + .fromUriString(prepareUriTemplate(baseUri, uriTemplate)).build(); - return UriComponentsBuilder.fromUriString(baseUri).uriComponents( - uriComponents); + return UriComponentsBuilder.fromUriString(baseUri) + .uriComponents(uriComponents); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultEndpoint.java b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultEndpoint.java index 6a9068b3..c61f3467 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultEndpoint.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultEndpoint.java @@ -80,7 +80,7 @@ public class VaultEndpoint implements Serializable { * Create a {@link VaultEndpoint} given a {@link URI}. * * @param uri must contain hostname, port and scheme, must not be empty or - * {@literal null}. + * {@literal null}. * @return a new {@link VaultEndpoint}. */ public static VaultEndpoint from(URI uri) { @@ -93,12 +93,12 @@ public class VaultEndpoint implements Serializable { vaultEndpoint.setHost(uri.getHost()); try { - vaultEndpoint.setPort(uri.getPort() == -1 ? uri.toURL().getDefaultPort() - : uri.getPort()); + vaultEndpoint.setPort( + uri.getPort() == -1 ? uri.toURL().getDefaultPort() : uri.getPort()); } catch (MalformedURLException e) { - throw new IllegalArgumentException(String.format( - "Can't retrieve default port from %s", uri), e); + throw new IllegalArgumentException( + String.format("Can't retrieve default port from %s", uri), e); } vaultEndpoint.setScheme(uri.getScheme()); @@ -180,7 +180,7 @@ public class VaultEndpoint implements Serializable { /** * @param path context path prefix. Must not be {@literal null} or empty and must not - * start with a leading slash. + * start with a leading slash. * @since 2.1 */ public void setPath(String path) { 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 2c16e364..8164729b 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 @@ -64,8 +64,9 @@ public abstract class VaultResponses { e.getRawStatusCode(), e.getStatusText(), message), e); } - return new VaultException(String.format("Status %s %s", e.getRawStatusCode(), - e.getStatusText()), e); + return new VaultException( + String.format("Status %s %s", e.getRawStatusCode(), e.getStatusText()), + e); } /** @@ -86,17 +87,16 @@ public abstract class VaultResponses { e.getRawStatusCode(), e.getStatusText(), path, message), e); } - return new VaultException(String.format("Status %s %s [%s]", - e.getRawStatusCode(), e.getStatusText(), path), e); + return new VaultException(String.format("Status %s %s [%s]", e.getRawStatusCode(), + e.getStatusText(), path), e); } public static VaultException buildException(HttpStatus statusCode, String path, String message) { if (StringUtils.hasText(message)) { - return new VaultException(String.format("Status %s [%s]: %s", statusCode, - path, - message)); + return new VaultException( + String.format("Status %s [%s]: %s", statusCode, path, message)); } return new VaultException(String.format("Status %s [%s]", statusCode, path)); 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 ba83be42..e6defe7c 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 @@ -61,8 +61,8 @@ import org.springframework.web.reactive.function.client.WebClient; * @since 2.0 */ @Configuration -public abstract class AbstractReactiveVaultConfiguration extends - AbstractVaultConfiguration { +public abstract class AbstractReactiveVaultConfiguration + extends AbstractVaultConfiguration { /** * Create a {@link WebClientBuilder} initialized with {@link VaultEndpointProvider} @@ -89,8 +89,9 @@ public abstract class AbstractReactiveVaultConfiguration extends */ @Bean public ReactiveVaultTemplate reactiveVaultTemplate() { - return new ReactiveVaultTemplate(webClientBuilder(vaultEndpointProvider(), - clientHttpConnector()), reactiveSessionManager()); + return new ReactiveVaultTemplate( + webClientBuilder(vaultEndpointProvider(), clientHttpConnector()), + reactiveSessionManager()); } /** @@ -154,11 +155,10 @@ public abstract class AbstractReactiveVaultConfiguration extends return CachingVaultTokenSupplier.of(stepsOperator); } - throw new IllegalStateException( - String.format( - "Cannot construct VaultTokenSupplier from %s. " - + "ClientAuthentication must implement AuthenticationStepsFactory or be TokenAuthentication", - clientAuthentication)); + throw new IllegalStateException(String.format( + "Cannot construct VaultTokenSupplier from %s. " + + "ClientAuthentication must implement AuthenticationStepsFactory or be TokenAuthentication", + clientAuthentication)); } /** diff --git a/spring-vault-core/src/main/java/org/springframework/vault/config/AbstractVaultConfiguration.java b/spring-vault-core/src/main/java/org/springframework/vault/config/AbstractVaultConfiguration.java index 8bd06f29..872780d6 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/config/AbstractVaultConfiguration.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/config/AbstractVaultConfiguration.java @@ -103,8 +103,9 @@ public abstract class AbstractVaultConfiguration implements ApplicationContextAw */ @Bean public VaultTemplate vaultTemplate() { - return new VaultTemplate(restTemplateBuilder(vaultEndpointProvider(), - clientHttpRequestFactoryWrapper().getClientHttpRequestFactory()), + return new VaultTemplate( + restTemplateBuilder(vaultEndpointProvider(), + clientHttpRequestFactoryWrapper().getClientHttpRequestFactory()), sessionManager()); } @@ -201,8 +202,8 @@ public abstract class AbstractVaultConfiguration implements ApplicationContextAw */ @Bean public ClientFactoryWrapper clientHttpRequestFactoryWrapper() { - return new ClientFactoryWrapper(ClientHttpRequestFactoryFactory.create( - clientOptions(), sslConfiguration())); + return new ClientFactoryWrapper(ClientHttpRequestFactoryFactory + .create(clientOptions(), sslConfiguration())); } /** diff --git a/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpConnectorFactory.java b/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpConnectorFactory.java index 2ed3ee75..2e2ec81b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpConnectorFactory.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpConnectorFactory.java @@ -43,7 +43,7 @@ public class ClientHttpConnectorFactory { */ public static ClientHttpConnector create(ClientOptions options, SslConfiguration sslConfiguration) { - return org.springframework.vault.client.ClientHttpConnectorFactory.create( - options, sslConfiguration); + return org.springframework.vault.client.ClientHttpConnectorFactory.create(options, + sslConfiguration); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpRequestFactoryFactory.java b/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpRequestFactoryFactory.java index fbbd241e..f4f3a51b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpRequestFactoryFactory.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpRequestFactoryFactory.java @@ -43,7 +43,7 @@ public class ClientHttpRequestFactoryFactory { */ public static ClientHttpRequestFactory create(ClientOptions options, SslConfiguration sslConfiguration) { - return org.springframework.vault.client.ClientHttpRequestFactoryFactory.create( - options, sslConfiguration); + return org.springframework.vault.client.ClientHttpRequestFactoryFactory + .create(options, sslConfiguration); } } 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 35fb278d..29d5e367 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 @@ -30,8 +30,11 @@ import org.springframework.vault.authentication.AppIdAuthenticationOptions; import org.springframework.vault.authentication.AppIdUserIdMechanism; import org.springframework.vault.authentication.AppRoleAuthentication; import org.springframework.vault.authentication.AppRoleAuthenticationOptions; +import org.springframework.vault.authentication.AppRoleAuthenticationOptions.RoleId; +import org.springframework.vault.authentication.AppRoleAuthenticationOptions.SecretId; import org.springframework.vault.authentication.AwsEc2Authentication; import org.springframework.vault.authentication.AwsEc2AuthenticationOptions; +import org.springframework.vault.authentication.AwsEc2AuthenticationOptions.AwsEc2AuthenticationOptionsBuilder; import org.springframework.vault.authentication.AzureMsiAuthentication; import org.springframework.vault.authentication.AzureMsiAuthenticationOptions; import org.springframework.vault.authentication.ClientAuthentication; @@ -46,13 +49,10 @@ import org.springframework.vault.authentication.KubernetesServiceAccountTokenFil import org.springframework.vault.authentication.MacAddressUserId; import org.springframework.vault.authentication.StaticUserId; import org.springframework.vault.authentication.TokenAuthentication; -import org.springframework.vault.authentication.AppRoleAuthenticationOptions.RoleId; -import org.springframework.vault.authentication.AppRoleAuthenticationOptions.SecretId; -import org.springframework.vault.authentication.AwsEc2AuthenticationOptions.AwsEc2AuthenticationOptionsBuilder; import org.springframework.vault.client.VaultEndpoint; import org.springframework.vault.support.SslConfiguration; -import org.springframework.vault.support.VaultToken; import org.springframework.vault.support.SslConfiguration.KeyStoreConfiguration; +import org.springframework.vault.support.VaultToken; import org.springframework.web.client.RestOperations; /** @@ -149,8 +149,8 @@ import org.springframework.web.client.RestOperations; * @see KubernetesAuthentication */ @Configuration -public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration implements - ApplicationContextAware { +public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration + implements ApplicationContextAware { private @Nullable RestOperations cachedRestOperations; private @Nullable ApplicationContext applicationContext; @@ -317,8 +317,8 @@ public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration im Assert.hasText(roleId, "Vault AWS EC2 authentication: RoleId (vault.aws-ec2.role-id) must not be empty"); - AwsEc2AuthenticationOptionsBuilder builder = AwsEc2AuthenticationOptions - .builder().role(roleId); + AwsEc2AuthenticationOptionsBuilder builder = AwsEc2AuthenticationOptions.builder() + .role(roleId); if (StringUtils.hasText(identityDocument)) { builder.identityDocumentUri(URI.create(identityDocument)); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/config/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/config/package-info.java index fd296b5a..351f1436 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/config/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/config/package-info.java @@ -4,4 +4,3 @@ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields package org.springframework.vault.config; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultOperations.java b/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultOperations.java index 01400cbf..8cbb993f 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultOperations.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultOperations.java @@ -110,13 +110,13 @@ public interface ReactiveVaultOperations { * @param clientCallback the request. * @return the {@link RestOperationsCallback} return value. * @throws VaultException when a - * {@link org.springframework.web.client.HttpStatusCodeException} occurs. + * {@link org.springframework.web.client.HttpStatusCodeException} occurs. * @throws WebClientException exceptions from - * {@link org.springframework.web.reactive.function.client.WebClient}. + * {@link org.springframework.web.reactive.function.client.WebClient}. */ > T doWithVault( - Function clientCallback) throws VaultException, - WebClientException; + Function clientCallback) + throws VaultException, WebClientException; /** * Executes a Vault {@link RestOperationsCallback}. Allows to interact with Vault in @@ -125,11 +125,11 @@ public interface ReactiveVaultOperations { * @param sessionCallback the request. * @return the {@link RestOperationsCallback} return value. * @throws VaultException when a - * {@link org.springframework.web.client.HttpStatusCodeException} occurs. + * {@link org.springframework.web.client.HttpStatusCodeException} occurs. * @throws WebClientException exceptions from - * {@link org.springframework.web.reactive.function.client.WebClient}. + * {@link org.springframework.web.reactive.function.client.WebClient}. */ > T doWithSession( - Function sessionCallback) throws VaultException, - WebClientException; + Function sessionCallback) + throws VaultException, WebClientException; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java index b16666f9..f4cda72d 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/ReactiveVaultTemplate.java @@ -45,8 +45,8 @@ import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.reactive.function.client.WebClientException; import org.springframework.web.reactive.function.client.WebClient.RequestBodySpec; +import org.springframework.web.reactive.function.client.WebClientException; import static org.springframework.web.reactive.function.client.ExchangeFilterFunction.ofRequestProcessor; @@ -76,7 +76,8 @@ public class ReactiveVaultTemplate implements ReactiveVaultOperations { */ public ReactiveVaultTemplate(VaultEndpoint vaultEndpoint, ClientHttpConnector connector, VaultTokenSupplier vaultTokenSupplier) { - this(SimpleVaultEndpointProvider.of(vaultEndpoint), connector, vaultTokenSupplier); + this(SimpleVaultEndpointProvider.of(vaultEndpoint), connector, + vaultTokenSupplier); } /** @@ -168,8 +169,8 @@ public class ReactiveVaultTemplate implements ReactiveVaultOperations { private ExchangeFilterFunction getSessionFilter() { - return ofRequestProcessor(request -> vaultTokenSupplier.getVaultToken().map( - token -> { + return ofRequestProcessor( + request -> vaultTokenSupplier.getVaultToken().map(token -> { return ClientRequest.from(request).headers(headers -> { headers.set(VaultHttpHeaders.VAULT_TOKEN, token.getToken()); @@ -208,8 +209,8 @@ public class ReactiveVaultTemplate implements ReactiveVaultOperations { .filter(response -> response.getData() != null && response.getData().containsKey("keys")) // - .flatMapIterable( - response -> (List) response.getRequiredData().get("keys")); + .flatMapIterable(response -> (List) response.getRequiredData() + .get("keys")); } @Override @@ -239,8 +240,8 @@ public class ReactiveVaultTemplate implements ReactiveVaultOperations { @Override public > T doWithVault( - Function clientCallback) throws VaultException, - WebClientException { + Function clientCallback) + throws VaultException, WebClientException { Assert.notNull(clientCallback, "Client callback must not be null"); @@ -254,8 +255,8 @@ public class ReactiveVaultTemplate implements ReactiveVaultOperations { @Override public > T doWithSession( - Function sessionCallback) throws VaultException, - WebClientException { + Function sessionCallback) + throws VaultException, WebClientException { Assert.notNull(sessionCallback, "Session callback must not be null"); @@ -282,31 +283,32 @@ public class ReactiveVaultTemplate implements ReactiveVaultOperations { private static Function> mapResponse( ParameterizedTypeReference typeReference, String path) { - return response -> isSuccess(response) ? response.body(BodyExtractors - .toMono(typeReference)) : mapOtherwise(response, path); + return response -> isSuccess(response) + ? response.body(BodyExtractors.toMono(typeReference)) + : mapOtherwise(response, path); } private static boolean isSuccess(ClientResponse response) { return response.statusCode().is2xxSuccessful(); } - private static Mono mapOtherwise(ClientResponse response, String path) { + private static Mono mapOtherwise(ClientResponse response, + String path) { if (response.statusCode() == HttpStatus.NOT_FOUND) { return Mono.empty(); } - return response.bodyToMono(String.class).flatMap( - body -> { + return response.bodyToMono(String.class).flatMap(body -> { - String error = VaultResponses.getError(body); + String error = VaultResponses.getError(body); - return Mono.error(VaultResponses.buildException( - response.statusCode(), path, error)); - }); + return Mono.error( + VaultResponses.buildException(response.statusCode(), path, error)); + }); } - private static class VaultListResponse extends - VaultResponseSupport> { + private static class VaultListResponse + extends VaultResponseSupport> { } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue1Template.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue1Template.java index 8d740933..3eb12613 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue1Template.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue1Template.java @@ -33,8 +33,8 @@ import org.springframework.vault.support.VaultResponseSupport; * @since 2.1 * @see KeyValueBackend#KV_1 */ -class VaultKeyValue1Template extends VaultKeyValueAccessor implements - VaultKeyValueOperations { +class VaultKeyValue1Template extends VaultKeyValueAccessor + implements VaultKeyValueOperations { private final VaultOperations vaultOperations; private final String path; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue2Accessor.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue2Accessor.java index fdd8b374..cbab174a 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue2Accessor.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue2Accessor.java @@ -54,13 +54,14 @@ abstract class VaultKeyValue2Accessor extends VaultKeyValueAccessor { @SuppressWarnings("unchecked") public List list(String path) { - String pathToUse = path.equals("/") ? "" : path.endsWith("/") ? path - : (path + "/"); + String pathToUse = path.equals("/") ? "" + : path.endsWith("/") ? path : (path + "/"); VaultListResponse read = doRead(restOperations -> { - return restOperations.exchange(String.format("%s?list=true", - createBackendPath("metadata", pathToUse)), HttpMethod.GET, null, - VaultListResponse.class); + return restOperations.exchange( + String.format("%s?list=true", + createBackendPath("metadata", pathToUse)), + HttpMethod.GET, null, VaultListResponse.class); }); if (read == null) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue2Template.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue2Template.java index 8efa70e2..1713c350 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue2Template.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValue2Template.java @@ -30,8 +30,8 @@ import org.springframework.vault.support.VaultResponseSupport; * @author Mark Paluch * @since 2.1 */ -class VaultKeyValue2Template extends VaultKeyValue2Accessor implements - VaultKeyValueOperations { +class VaultKeyValue2Template extends VaultKeyValue2Accessor + implements VaultKeyValueOperations { /** * Create a new {@link VaultKeyValue2Template} given {@link VaultOperations} and the diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueAccessor.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueAccessor.java index 3649cdf6..457beb5c 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueAccessor.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultKeyValueAccessor.java @@ -80,8 +80,7 @@ abstract class VaultKeyValueAccessor implements VaultKeyValueOperationsSupport { Assert.hasText(path, "Path must not be empty"); vaultOperations.doWithSession((restOperations -> { - restOperations.exchange(createDataPath(path), HttpMethod.DELETE, - null, + restOperations.exchange(createDataPath(path), HttpMethod.DELETE, null, Void.class); return null; @@ -95,7 +94,7 @@ abstract class VaultKeyValueAccessor implements VaultKeyValueOperationsSupport { * @param path must not be {@literal null}. * @param deserializeAs must not be {@literal null}. * @param mappingFunction Mapping function to convert from the intermediate to the - * target data type. Must not be {@literal null}. + * target data type. Must not be {@literal null}. * @param intermediate data type for {@literal data} deserialization. * @param return type. Value is created by the {@code mappingFunction}. * @return mapped value. @@ -166,8 +165,7 @@ abstract class VaultKeyValueAccessor implements VaultKeyValueOperationsSupport { return vaultOperations.doWithSession((restOperations) -> { try { - return callback.apply(restOperations) - .getBody(); + return callback.apply(restOperations).getBody(); } catch (HttpStatusCodeException e) { @@ -196,8 +194,7 @@ abstract class VaultKeyValueAccessor implements VaultKeyValueOperationsSupport { return vaultOperations.doWithSession((restOperations) -> { return restOperations.exchange(path, HttpMethod.POST, - new HttpEntity<>(body), VaultResponse.class) - .getBody(); + new HttpEntity<>(body), VaultResponse.class).getBody(); }); } catch (HttpStatusCodeException e) { @@ -221,26 +218,24 @@ abstract class VaultKeyValueAccessor implements VaultKeyValueOperationsSupport { private static ObjectMapper extractObjectMapper(VaultOperations vaultOperations) { - Optional mapper = vaultOperations - .doWithSession(operations -> { + Optional mapper = vaultOperations.doWithSession(operations -> { - if (operations instanceof RestTemplate) { + if (operations instanceof RestTemplate) { - RestTemplate template = (RestTemplate) operations; + RestTemplate template = (RestTemplate) operations; - Optional jackson2Converter = template - .getMessageConverters() - .stream() - .filter(AbstractJackson2HttpMessageConverter.class::isInstance) // - .map(AbstractJackson2HttpMessageConverter.class::cast) // - .findFirst(); + Optional jackson2Converter = template + .getMessageConverters().stream() + .filter(AbstractJackson2HttpMessageConverter.class::isInstance) // + .map(AbstractJackson2HttpMessageConverter.class::cast) // + .findFirst(); - return jackson2Converter - .map(AbstractJackson2HttpMessageConverter::getObjectMapper); - } + return jackson2Converter + .map(AbstractJackson2HttpMessageConverter::getObjectMapper); + } - return Optional.empty(); - }); + return Optional.empty(); + }); return mapper.orElseGet(ObjectMapper::new); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultOperations.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultOperations.java index 12b2a814..02413863 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultOperations.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultOperations.java @@ -176,13 +176,13 @@ public interface VaultOperations { * @param clientCallback the request. * @return the {@link RestOperationsCallback} return value. * @throws VaultException when a - * {@link org.springframework.web.client.HttpStatusCodeException} occurs. + * {@link org.springframework.web.client.HttpStatusCodeException} occurs. * @throws RestClientException exceptions from - * {@link org.springframework.web.client.RestOperations}. + * {@link org.springframework.web.client.RestOperations}. */ @Nullable - T doWithVault(RestOperationsCallback clientCallback) throws VaultException, - RestClientException; + T doWithVault(RestOperationsCallback clientCallback) + throws VaultException, RestClientException; /** * Executes a Vault {@link RestOperationsCallback}. Allows to interact with Vault in @@ -191,12 +191,12 @@ public interface VaultOperations { * @param sessionCallback the request. * @return the {@link RestOperationsCallback} return value. * @throws VaultException when a - * {@link org.springframework.web.client.HttpStatusCodeException} occurs. + * {@link org.springframework.web.client.HttpStatusCodeException} occurs. * @throws RestClientException exceptions from - * {@link org.springframework.web.client.RestOperations}. + * {@link org.springframework.web.client.RestOperations}. */ @Nullable - T doWithSession(RestOperationsCallback sessionCallback) throws VaultException, - RestClientException; + T doWithSession(RestOperationsCallback sessionCallback) + throws VaultException, RestClientException; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiOperations.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiOperations.java index d360a47b..7ae6d902 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiOperations.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiOperations.java @@ -49,8 +49,8 @@ public interface VaultPkiOperations { * @param certificateRequest must not be {@literal null}. * @return the {@link VaultCertificateResponse} containing a {@link CertificateBundle} * . - * @see POST + * @see POST * /pki/issue/[role name] */ VaultCertificateResponse issueCertificate(String roleName, @@ -68,8 +68,8 @@ public interface VaultPkiOperations { * @return the {@link VaultCertificateResponse} containing a * {@link org.springframework.vault.support.Certificate} . * @since 2.0 - * @see POST + * @see POST * /pki/sign/[role name] */ VaultSignCertificateRequestResponse signCertificateRequest(String roleName, @@ -82,8 +82,8 @@ public interface VaultPkiOperations { * * @param serialNumber must not be empty or {@literal null}. * @since 2.0 - * @see POST + * @see POST * /pki/revoke */ void revoke(String serialNumber) throws VaultException; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java index 60dccc75..42b588e2 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java @@ -72,7 +72,8 @@ public class VaultPkiTemplate implements VaultPkiOperations { @Override public VaultSignCertificateRequestResponse signCertificateRequest(String roleName, - String csr, VaultCertificateRequest certificateRequest) throws VaultException { + String csr, VaultCertificateRequest certificateRequest) + throws VaultException { Assert.hasText(roleName, "Role name must not be empty"); Assert.hasText(csr, "CSR name must not be empty"); @@ -136,8 +137,8 @@ public class VaultPkiTemplate implements VaultPkiOperations { String requestPath = encoding == Encoding.DER ? "{path}/crl" : "{path}/crl/pem"; try { - ResponseEntity response = restOperations.getForEntity( - requestPath, byte[].class, path); + ResponseEntity response = restOperations.getForEntity(requestPath, + byte[].class, path); return new ByteArrayInputStream(response.getBody()); } @@ -163,17 +164,13 @@ public class VaultPkiTemplate implements VaultPkiOperations { request.put("common_name", certificateRequest.getCommonName()); if (!certificateRequest.getAltNames().isEmpty()) { - request.put( - "alt_names", - StringUtils.collectionToDelimitedString( - certificateRequest.getAltNames(), ",")); + request.put("alt_names", StringUtils + .collectionToDelimitedString(certificateRequest.getAltNames(), ",")); } if (!certificateRequest.getIpSubjectAltNames().isEmpty()) { - request.put( - "ip_sans", - StringUtils.collectionToDelimitedString( - certificateRequest.getIpSubjectAltNames(), ",")); + request.put("ip_sans", StringUtils.collectionToDelimitedString( + certificateRequest.getIpSubjectAltNames(), ",")); } if (certificateRequest.getTtl() != null) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java index ee1ccfa0..0f2feb8e 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java @@ -45,11 +45,11 @@ import org.springframework.vault.support.VaultHealth; import org.springframework.vault.support.VaultInitializationRequest; import org.springframework.vault.support.VaultInitializationResponse; import org.springframework.vault.support.VaultMount; +import org.springframework.vault.support.VaultMount.VaultMountBuilder; import org.springframework.vault.support.VaultResponse; import org.springframework.vault.support.VaultResponseSupport; import org.springframework.vault.support.VaultToken; import org.springframework.vault.support.VaultUnsealStatus; -import org.springframework.vault.support.VaultMount.VaultMountBuilder; import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestOperations; @@ -118,14 +118,15 @@ public class VaultSysTemplate implements VaultSysOperations { public VaultInitializationResponse initialize( VaultInitializationRequest vaultInitializationRequest) { - Assert.notNull(vaultInitializationRequest, "VaultInitialization must not be null"); + Assert.notNull(vaultInitializationRequest, + "VaultInitialization must not be null"); return requireResponse(vaultOperations.doWithVault(restOperations -> { try { ResponseEntity exchange = restOperations - .exchange("sys/init", HttpMethod.PUT, new HttpEntity( - vaultInitializationRequest), + .exchange("sys/init", HttpMethod.PUT, + new HttpEntity(vaultInitializationRequest), VaultInitializationResponseImpl.class); Assert.state(exchange.getBody() != null, @@ -298,8 +299,8 @@ public class VaultSysTemplate implements VaultSysOperations { return response; } - private static class GetUnsealStatus implements - RestOperationsCallback { + private static class GetUnsealStatus + implements RestOperationsCallback { @Override public VaultUnsealStatus doWithRestOperations(RestOperations restOperations) { @@ -318,8 +319,8 @@ public class VaultSysTemplate implements VaultSysOperations { } - private static class GetMounts implements - RestOperationsCallback> { + private static class GetMounts + implements RestOperationsCallback> { private static final ParameterizedTypeReference MOUNT_TYPE_REF = new ParameterizedTypeReference() { }; @@ -331,7 +332,8 @@ public class VaultSysTemplate implements VaultSysOperations { } @Override - public Map doWithRestOperations(RestOperations restOperations) { + public Map doWithRestOperations( + RestOperations restOperations) { ResponseEntity exchange = restOperations.exchange(path, HttpMethod.GET, null, MOUNT_TYPE_REF, Collections.emptyMap()); @@ -347,8 +349,8 @@ public class VaultSysTemplate implements VaultSysOperations { return body.getTopLevelMounts(); } - private static class VaultMountsResponse extends - VaultResponseSupport> { + private static class VaultMountsResponse + extends VaultResponseSupport> { private Map topLevelMounts = new HashMap<>(); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTemplate.java index f2df327c..ed49e90c 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTemplate.java @@ -179,17 +179,13 @@ public class VaultTemplate implements InitializingBean, VaultOperations, Disposa * @return the {@link RestTemplate} used for Vault communication. * @since 2.1 */ - protected RestTemplate doCreateSessionTemplate( - VaultEndpointProvider endpointProvider, + protected RestTemplate doCreateSessionTemplate(VaultEndpointProvider endpointProvider, ClientHttpRequestFactory requestFactory) { - return RestTemplateBuilder - .builder() - .endpointProvider(endpointProvider) - .requestFactory(requestFactory) - .customizer( - restTemplate -> restTemplate.getInterceptors().add( - getSessionInterceptor())).build(); + return RestTemplateBuilder.builder().endpointProvider(endpointProvider) + .requestFactory(requestFactory).customizer(restTemplate -> restTemplate + .getInterceptors().add(getSessionInterceptor())) + .build(); } private ClientHttpRequestInterceptor getSessionInterceptor() { @@ -231,7 +227,8 @@ public class VaultTemplate implements InitializingBean, VaultOperations, Disposa } @Override - public VaultKeyValueOperations opsForKeyValue(String path, KeyValueBackend apiVersion) { + public VaultKeyValueOperations opsForKeyValue(String path, + KeyValueBackend apiVersion) { switch (apiVersion) { case KV_1: @@ -240,8 +237,8 @@ public class VaultTemplate implements InitializingBean, VaultOperations, Disposa return new VaultKeyValue2Template(this, path); } - throw new UnsupportedOperationException(String.format( - "Key/Value backend version %s not supported", apiVersion)); + throw new UnsupportedOperationException( + String.format("Key/Value backend version %s not supported", apiVersion)); } @@ -301,8 +298,8 @@ public class VaultTemplate implements InitializingBean, VaultOperations, Disposa .getTypeReference(responseType); try { - ResponseEntity> exchange = sessionTemplate.exchange( - path, HttpMethod.GET, null, ref); + ResponseEntity> exchange = sessionTemplate + .exchange(path, HttpMethod.GET, null, ref); return exchange.getBody(); } 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 365ffae4..b76db434 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 @@ -109,8 +109,9 @@ public class VaultTokenTemplate implements VaultTokenOperations { T response = vaultOperations.doWithSession(restOperations -> { try { ResponseEntity exchange = restOperations.exchange(path, - HttpMethod.POST, body == null ? HttpEntity.EMPTY - : new HttpEntity<>(body), responseType); + HttpMethod.POST, + body == null ? HttpEntity.EMPTY : new HttpEntity<>(body), + responseType); return exchange.getBody(); } @@ -132,8 +133,9 @@ public class VaultTokenTemplate implements VaultTokenOperations { vaultOperations.doWithSession(restOperations -> { try { - restOperations.exchange(path, HttpMethod.POST, new HttpEntity<>( - Collections.singletonMap("token", token.getToken())), + restOperations.exchange(path, HttpMethod.POST, + new HttpEntity<>( + Collections.singletonMap("token", token.getToken())), responseType); return null; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitOperations.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitOperations.java index 7484be3b..cce06693 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitOperations.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitOperations.java @@ -143,7 +143,7 @@ public interface VaultTransitOperations { * @param keyName must not be empty or {@literal null}. * @param plaintext must not be empty or {@literal null}. * @param transitRequest must not be {@literal null}. Use - * {@link VaultTransitContext#empty()} if no request options provided. + * {@link VaultTransitContext#empty()} if no request options provided. * @return cipher text. */ String encrypt(String keyName, byte[] plaintext, VaultTransitContext transitRequest); @@ -154,7 +154,7 @@ public interface VaultTransitOperations { * * @param keyName must not be empty or {@literal null}. * @param batchRequest a list of {@link Plaintext} which includes plaintext and an - * optional context. + * optional context. * @return the encrypted result in the order of {@code batchRequest} plaintexts. * @since 1.1 */ @@ -185,7 +185,7 @@ public interface VaultTransitOperations { * @param keyName must not be empty or {@literal null}. * @param ciphertext must not be empty or {@literal null}. * @param transitContext must not be {@literal null}. Use - * {@link VaultTransitContext#empty()} if no request options provided. + * {@link VaultTransitContext#empty()} if no request options provided. * @return cipher text. * @return plain text. */ @@ -198,7 +198,7 @@ public interface VaultTransitOperations { * * @param keyName must not be empty or {@literal null}. * @param batchRequest a list of {@link Ciphertext} which includes plaintext and an - * optional context. + * optional context. * @return the decrypted result in the order of {@code batchRequest} ciphertexts. * @since 1.1 */ @@ -224,7 +224,7 @@ public interface VaultTransitOperations { * @param keyName must not be empty or {@literal null}. * @param ciphertext must not be empty or {@literal null}. * @param transitContext must not be {@literal null}. Use - * {@link VaultTransitContext#empty()} if no request options provided. + * {@link VaultTransitContext#empty()} if no request options provided. * @return cipher text. * @see #rotate(String) */ @@ -299,7 +299,7 @@ public interface VaultTransitOperations { * * @param keyName must not be empty or {@literal null}. * @param request {@link VaultSignatureVerificationRequest} must not be - * {@literal null}. + * {@literal null}. * @return the resulting {@link SignatureValidation}. * @since 2.0 */ diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java index 43bafb49..1b101036 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java @@ -89,7 +89,8 @@ public class VaultTransitTemplate implements VaultTransitOperations { } @Override - public void createKey(String keyName, VaultTransitKeyCreationRequest createKeyRequest) { + public void createKey(String keyName, + VaultTransitKeyCreationRequest createKeyRequest) { Assert.hasText(keyName, "KeyName must not be empty"); Assert.notNull(createKeyRequest, @@ -102,15 +103,16 @@ public class VaultTransitTemplate implements VaultTransitOperations { @Override public List getKeys() { - VaultResponse response = vaultOperations.read(String.format("%s/keys?list=true", - path)); + VaultResponse response = vaultOperations + .read(String.format("%s/keys?list=true", path)); - return response == null ? Collections.emptyList() : (List) response - .getRequiredData().get("keys"); + return response == null ? Collections.emptyList() + : (List) response.getRequiredData().get("keys"); } @Override - public void configureKey(String keyName, VaultTransitKeyConfiguration keyConfiguration) { + public void configureKey(String keyName, + VaultTransitKeyConfiguration keyConfiguration) { Assert.hasText(keyName, "KeyName must not be empty"); Assert.notNull(keyConfiguration, "VaultKeyConfiguration must not be empty"); @@ -444,8 +446,8 @@ public class VaultTransitTemplate implements VaultTransitOperations { "Signature verification request must not be null"); Map request = new LinkedHashMap<>(); - request.put("input", Base64Utils.encodeToString(verificationRequest - .getPlaintext().getPlaintext())); + request.put("input", Base64Utils + .encodeToString(verificationRequest.getPlaintext().getPlaintext())); if (verificationRequest.getHmac() != null) { request.put("hmac", verificationRequest.getHmac().getHmac()); @@ -459,10 +461,12 @@ public class VaultTransitTemplate implements VaultTransitOperations { request.put("algorithm", verificationRequest.getAlgorithm()); } - Map response = vaultOperations.write( - String.format("%s/verify/%s", path, keyName), request).getRequiredData(); + Map response = vaultOperations + .write(String.format("%s/verify/%s", path, keyName), request) + .getRequiredData(); - if (response.containsKey("valid") && Boolean.valueOf("" + response.get("valid"))) { + if (response.containsKey("valid") + && Boolean.valueOf("" + response.get("valid"))) { return SignatureValidation.valid(); } @@ -496,17 +500,17 @@ public class VaultTransitTemplate implements VaultTransitOperations { Map data = batchData.get(i); if (StringUtils.hasText(data.get("error"))) { - encrypted = new VaultEncryptionResult(new VaultException( - data.get("error"))); + encrypted = new VaultEncryptionResult( + new VaultException(data.get("error"))); } else { - encrypted = new VaultEncryptionResult(toCiphertext( - data.get("ciphertext"), plaintext.getContext())); + encrypted = new VaultEncryptionResult( + toCiphertext(data.get("ciphertext"), plaintext.getContext())); } } else { - encrypted = new VaultEncryptionResult(new VaultException( - "No result for plaintext #" + i)); + encrypted = new VaultEncryptionResult( + new VaultException("No result for plaintext #" + i)); } result.add(encrypted); @@ -531,8 +535,8 @@ public class VaultTransitTemplate implements VaultTransitOperations { encrypted = getDecryptionResult(batchData.get(i), ciphertext); } else { - encrypted = new VaultDecryptionResult(new VaultException( - "No result for ciphertext #" + i)); + encrypted = new VaultDecryptionResult( + new VaultException("No result for ciphertext #" + i)); } result.add(encrypted); @@ -551,8 +555,8 @@ public class VaultTransitTemplate implements VaultTransitOperations { if (StringUtils.hasText(data.get("plaintext"))) { byte[] plaintext = Base64Utils.decodeFromString(data.get("plaintext")); - return new VaultDecryptionResult(Plaintext.of(plaintext).with( - ciphertext.getContext())); + return new VaultDecryptionResult( + Plaintext.of(plaintext).with(ciphertext.getContext())); } return new VaultDecryptionResult(Plaintext.empty().with(ciphertext.getContext())); @@ -560,14 +564,14 @@ public class VaultTransitTemplate implements VaultTransitOperations { private static Ciphertext toCiphertext(String ciphertext, @Nullable VaultTransitContext context) { - return context != null ? Ciphertext.of(ciphertext).with(context) : Ciphertext - .of(ciphertext); + return context != null ? Ciphertext.of(ciphertext).with(context) + : Ciphertext.of(ciphertext); } @SuppressWarnings("unchecked") private static List> getBatchData(VaultResponse vaultResponse) { - return (List>) vaultResponse.getRequiredData().get( - "batch_results"); + return (List>) vaultResponse.getRequiredData() + .get("batch_results"); } static class VaultTransitKeyImpl implements VaultTransitKey { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultVersionedKeyValueTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultVersionedKeyValueTemplate.java index 382781fc..da42e246 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultVersionedKeyValueTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultVersionedKeyValueTemplate.java @@ -37,8 +37,8 @@ import org.springframework.vault.support.VaultResponse; import org.springframework.vault.support.VaultResponseSupport; import org.springframework.vault.support.Versioned; import org.springframework.vault.support.Versioned.Metadata; -import org.springframework.vault.support.Versioned.Version; import org.springframework.vault.support.Versioned.Metadata.MetadataBuilder; +import org.springframework.vault.support.Versioned.Version; import org.springframework.web.client.HttpStatusCodeException; /** @@ -48,8 +48,8 @@ import org.springframework.web.client.HttpStatusCodeException; * @author Maciej Drozdzowski * @since 2.1 */ -public class VaultVersionedKeyValueTemplate extends VaultKeyValue2Accessor implements - VaultVersionedKeyValueOperations { +public class VaultVersionedKeyValueTemplate extends VaultKeyValue2Accessor + implements VaultVersionedKeyValueOperations { private final VaultOperations vaultOperations; @@ -92,8 +92,10 @@ public class VaultVersionedKeyValueTemplate extends VaultKeyValue2Accessor imple @Nullable private Versioned doRead(String path, Version version, Class responseType) { - String secretPath = version.isVersioned() ? String.format("%s?version=%d", - createDataPath(path), version.getVersion()) : createDataPath(path); + String secretPath = version.isVersioned() + ? String.format("%s?version=%d", createDataPath(path), + version.getVersion()) + : createDataPath(path); VersionedResponse response = vaultOperations.doWithSession(restOperations -> { @@ -239,7 +241,7 @@ public class VaultVersionedKeyValueTemplate extends VaultKeyValue2Accessor imple Collections.singletonMap("versions", versions)); } - private static class VersionedResponse extends - VaultResponseSupport> { + private static class VersionedResponse + extends VaultResponseSupport> { } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultWrappingTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultWrappingTemplate.java index 983ccdfd..a2d79b51 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultWrappingTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultWrappingTemplate.java @@ -91,12 +91,10 @@ public class VaultWrappingTemplate implements VaultWrappingOperations { @Override public VaultResponse read(VaultToken token) { - return doUnwrap( - token, - (restOperations, entity) -> { - return restOperations.exchange("sys/wrapping/unwrap", - HttpMethod.POST, entity, VaultResponse.class).getBody(); - }); + return doUnwrap(token, (restOperations, entity) -> { + return restOperations.exchange("sys/wrapping/unwrap", HttpMethod.POST, entity, + VaultResponse.class).getBody(); + }); } @Nullable @@ -106,12 +104,11 @@ public class VaultWrappingTemplate implements VaultWrappingOperations { ParameterizedTypeReference> ref = VaultResponses .getTypeReference(responseType); - return doUnwrap( - token, - (restOperations, entity) -> { - return restOperations.exchange("sys/wrapping/unwrap", - HttpMethod.POST, entity, ref).getBody(); - }); + return doUnwrap(token, (restOperations, entity) -> { + return restOperations + .exchange("sys/wrapping/unwrap", HttpMethod.POST, entity, ref) + .getBody(); + }); } @Nullable @@ -121,8 +118,8 @@ public class VaultWrappingTemplate implements VaultWrappingOperations { return vaultOperations.doWithVault(restOperations -> { try { - return requestFunction.apply(restOperations, new HttpEntity<>( - VaultHttpHeaders.from(token))); + return requestFunction.apply(restOperations, + new HttpEntity<>(VaultHttpHeaders.from(token))); } catch (HttpStatusCodeException e) { @@ -164,8 +161,10 @@ public class VaultWrappingTemplate implements VaultWrappingOperations { HttpHeaders headers = new HttpHeaders(); headers.add("X-Vault-Wrap-TTL", Long.toString(duration.getSeconds())); - return restOperations.exchange("sys/wrapping/wrap", HttpMethod.POST, - new HttpEntity<>(body, headers), VaultResponse.class).getBody(); + return restOperations + .exchange("sys/wrapping/wrap", HttpMethod.POST, + new HttpEntity<>(body, headers), VaultResponse.class) + .getBody(); }); Map wrapInfo = response.getWrapInfo(); @@ -188,8 +187,9 @@ public class VaultWrappingTemplate implements VaultWrappingOperations { String date = (String) ((Map) responseMetadata).getOrDefault(key, ""); - return StringUtils.hasText(date) ? DateTimeFormatter.ISO_OFFSET_DATE_TIME - .parse(date) : null; + return StringUtils.hasText(date) + ? DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(date) + : null; } @Nullable diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/env/VaultPropertySource.java b/spring-vault-core/src/main/java/org/springframework/vault/core/env/VaultPropertySource.java index b33bd10f..8aac6d75 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/env/VaultPropertySource.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/env/VaultPropertySource.java @@ -66,7 +66,7 @@ public class VaultPropertySource extends EnumerablePropertySource getLeaseRenewalBody(Lease lease) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java index 894f34b1..f91c6bc1 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ScheduledFuture; @@ -117,8 +117,8 @@ import org.springframework.web.client.HttpStatusCodeException; * @see Lease * @see LeaseEndpoints */ -public class SecretLeaseContainer extends SecretLeaseEventPublisher implements - InitializingBean, DisposableBean { +public class SecretLeaseContainer extends SecretLeaseEventPublisher + implements InitializingBean, DisposableBean { private static final AtomicIntegerFieldUpdater UPDATER = AtomicIntegerFieldUpdater .newUpdater(SecretLeaseContainer.class, "status"); @@ -204,7 +204,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements * {@code minRenewalSeconds} prevents renewals from happening too often. * * @param minRenewalSeconds number of seconds that is at least required before - * renewing a {@link Lease}, must not be negative. + * renewing a {@link Lease}, must not be negative. * @deprecated since 2.0, use {@link #setMinRenewal(Duration)} for time unit safety. */ @Deprecated @@ -217,7 +217,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements * {@code minRenewal} prevents renewals from happening too often. * * @param minRenewal duration that is at least required before renewing a - * {@link Lease}, must not be {@literal null} or negative. + * {@link Lease}, must not be {@literal null} or negative. * @since 2.0 */ public void setMinRenewal(Duration minRenewal) { @@ -234,7 +234,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements * expires. * * @param expiryThresholdSeconds number of seconds before {@link Lease} expiry, must - * not be negative. + * not be negative. * @deprecated since 2.0, use {@link #setExpiryThreshold(Duration)} for time unit * safety. */ @@ -248,7 +248,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements * expires. * * @param expiryThreshold duration before {@link Lease} expiry, must not be - * {@literal null} or negative. + * {@literal null} or negative. * @since 2.0 */ public void setExpiryThreshold(Duration expiryThreshold) { @@ -389,8 +389,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements secrets.isRenewable()); } else if (isRotatingGenericSecret(requestedSecret, secrets)) { - lease = Lease.fromTimeToLive(Duration.ofSeconds(secrets - .getLeaseDuration())); + lease = Lease + .fromTimeToLive(Duration.ofSeconds(secrets.getLeaseDuration())); } else { lease = Lease.none(); @@ -445,8 +445,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); scheduler.setDaemon(true); - scheduler.setThreadNamePrefix(String.format("%s-%d-", getClass() - .getSimpleName(), poolId.incrementAndGet())); + scheduler.setThreadNamePrefix(String.format("%s-%d-", + getClass().getSimpleName(), poolId.incrementAndGet())); scheduler.afterPropertiesSet(); this.taskScheduler = scheduler; @@ -454,8 +454,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements } for (RequestedSecret requestedSecret : requestedSecrets) { - this.renewals.put(requestedSecret, new LeaseRenewalScheduler( - this.taskScheduler)); + this.renewals.put(requestedSecret, + new LeaseRenewalScheduler(this.taskScheduler)); } } } @@ -530,7 +530,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements onLeaseExpired(requestedSecret, leaseToRotate); return Lease.none(); // rotation creates a new lease. - }, lease, getMinRenewal(), getExpiryThreshold()); + }, lease, getMinRenewal(), getExpiryThreshold()); } private static void logRenewalCandidate(RequestedSecret requestedSecret, Lease lease, @@ -557,7 +557,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements * Retrieve secrets from {@link VaultOperations}. * * @param requestedSecret the {@link RequestedSecret} providing the secret - * {@code path}. + * {@code path}. * @return the response. */ @Nullable @@ -591,8 +591,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements try { Lease renewed = lease.hasLeaseId() ? renew(lease) : lease; - if (!renewed.hasLeaseId() || renewed.getLeaseDuration().isZero() - || renewed.getLeaseDuration().getSeconds() < minRenewal.getSeconds()) { + if (!renewed.hasLeaseId() || renewed.getLeaseDuration().isZero() || renewed + .getLeaseDuration().getSeconds() < minRenewal.getSeconds()) { onLeaseExpired(requestedSecret, lease); return Lease.none(); @@ -602,7 +602,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements } catch (RuntimeException e) { - HttpStatusCodeException httpException = potentiallyUnwrapHttpStatusCodeException(e); + HttpStatusCodeException httpException = potentiallyUnwrapHttpStatusCodeException( + e); if (httpException != null) { @@ -610,11 +611,9 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements onLeaseExpired(requestedSecret, lease); } - onError(requestedSecret, - lease, - new VaultException(String.format("Cannot renew lease: %s", - VaultResponses.getError(httpException - .getResponseBodyAsString())))); + onError(requestedSecret, lease, new VaultException( + String.format("Cannot renew lease: %s", VaultResponses + .getError(httpException.getResponseBodyAsString())))); } else { onError(requestedSecret, lease, e); @@ -641,8 +640,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements private Lease renew(Lease lease) { - return operations.doWithSession(restOperations -> leaseEndpoints.renew(lease, - restOperations)); + return operations.doWithSession( + restOperations -> leaseEndpoints.renew(lease, restOperations)); } /** @@ -683,8 +682,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements onAfterLeaseRevocation(requestedSecret, lease); } catch (HttpStatusCodeException e) { - onError(requestedSecret, - lease, + onError(requestedSecret, lease, new VaultException(String.format("Cannot revoke lease: %s", VaultResponses.getError(e.getResponseBodyAsString())))); } @@ -725,7 +723,7 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements * @param renewLease strategy to renew a {@link Lease}. * @param lease the current {@link Lease}. * @param minRenewal minimum duration before renewing a {@link Lease}. This is to - * prevent too many renewals in a very short timeframe. + * prevent too many renewals in a very short timeframe. * @param expiryThreshold duration to renew before {@link Lease}. */ void scheduleRenewal(RequestedSecret requestedSecret, RenewLease renewLease, @@ -733,16 +731,16 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements if (log.isDebugEnabled()) { if (lease.hasLeaseId()) { - log.debug(String - .format("Scheduling renewal for secret %s with lease %s, lease duration %d", - requestedSecret.getPath(), lease.getLeaseId(), lease - .getLeaseDuration().getSeconds())); + log.debug(String.format( + "Scheduling renewal for secret %s with lease %s, lease duration %d", + requestedSecret.getPath(), lease.getLeaseId(), + lease.getLeaseDuration().getSeconds())); } else { - log.debug(String - .format("Scheduling renewal for secret %s, with cache hint duration %d", - requestedSecret.getPath(), lease.getLeaseDuration() - .getSeconds())); + log.debug(String.format( + "Scheduling renewal for secret %s, with cache hint duration %d", + requestedSecret.getPath(), + lease.getLeaseDuration().getSeconds())); } } @@ -781,8 +779,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements // Renew lease may call scheduleRenewal(…) with a different lease // Id to alter set up its own renewal schedule. If it's the old // lease, then renewLease() outcome controls the current LeaseId. - currentLeaseRef - .compareAndSet(lease, renewLease.renewLease(lease)); + currentLeaseRef.compareAndSet(lease, + renewLease.renewLease(lease)); } catch (Exception e) { log.error(String.format("Cannot renew lease %s", @@ -791,10 +789,9 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements } }; - ScheduledFuture scheduledFuture = taskScheduler.schedule( - task, - new OneShotTrigger(getRenewalSeconds(lease, minRenewal, - expiryThreshold))); + ScheduledFuture scheduledFuture = taskScheduler.schedule(task, + new OneShotTrigger( + getRenewalSeconds(lease, minRenewal, expiryThreshold))); schedules.put(lease, scheduledFuture); } @@ -830,8 +827,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements private long getRenewalSeconds(Lease lease, Duration minRenewal, Duration expiryThreshold) { - return Math.max(minRenewal.getSeconds(), lease.getLeaseDuration() - .getSeconds() - expiryThreshold.getSeconds()); + return Math.max(minRenewal.getSeconds(), + lease.getLeaseDuration().getSeconds() - expiryThreshold.getSeconds()); } private boolean isLeaseRenewable(@Nullable Lease lease, @@ -893,8 +890,8 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements public Date nextExecutionTime(TriggerContext triggerContext) { if (UPDATER.compareAndSet(this, STATUS_ARMED, STATUS_FIRED)) { - return new Date(System.currentTimeMillis() - + TimeUnit.SECONDS.toMillis(seconds)); + return new Date( + System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(seconds)); } return null; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseEventPublisher.java b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseEventPublisher.java index 5abe7d15..3f184fcb 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseEventPublisher.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseEventPublisher.java @@ -41,8 +41,8 @@ import org.springframework.vault.core.lease.event.SecretLeaseExpiredEvent; * Publisher for {@link SecretLeaseEvent}s. *

* This publisher dispatches events to {@link LeaseListener} and - * {@link LeaseErrorListener}. Instances are thread-safe once - * {@link #afterPropertiesSet() initialized}. + * {@link LeaseErrorListener}. Instances are thread-safe once {@link #afterPropertiesSet() + * initialized}. * * @author Mark Paluch * @see SecretLeaseEvent @@ -218,9 +218,8 @@ public class SecretLeaseEventPublisher implements InitializingBean { @Override public void onLeaseError(SecretLeaseEvent leaseEvent, Exception exception) { - log.warn( - String.format("[%s] %s %s", leaseEvent.getSource(), - leaseEvent.getLease(), exception.getMessage()), exception); + log.warn(String.format("[%s] %s %s", leaseEvent.getSource(), + leaseEvent.getLease(), exception.getMessage()), exception); } } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/event/BeforeSecretLeaseRevocationEvent.java b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/event/BeforeSecretLeaseRevocationEvent.java index 6dacca12..eb93363d 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/lease/event/BeforeSecretLeaseRevocationEvent.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/lease/event/BeforeSecretLeaseRevocationEvent.java @@ -36,7 +36,8 @@ public class BeforeSecretLeaseRevocationEvent extends SecretLeaseEvent { * @param requestedSecret must not be {@literal null}. * @param lease must not be {@literal null}. */ - public BeforeSecretLeaseRevocationEvent(RequestedSecret requestedSecret, Lease lease) { + public BeforeSecretLeaseRevocationEvent(RequestedSecret requestedSecret, + Lease lease) { super(requestedSecret, lease); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/util/KeyValueDelegate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/util/KeyValueDelegate.java index b71a43a5..7f8eb145 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/util/KeyValueDelegate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/util/KeyValueDelegate.java @@ -23,8 +23,8 @@ import java.util.function.Supplier; import org.springframework.lang.Nullable; import org.springframework.util.ConcurrentReferenceHashMap; import org.springframework.util.StringUtils; -import org.springframework.vault.core.VaultOperations; import org.springframework.vault.core.VaultKeyValueOperationsSupport.KeyValueBackend; +import org.springframework.vault.core.VaultOperations; import org.springframework.vault.support.VaultResponse; /** @@ -80,8 +80,8 @@ public class KeyValueDelegate { return this.operations.read(path); } - VaultResponse response = this.operations.read(getKeyValue2Path( - mountInfo.getPath(), path)); + VaultResponse response = this.operations + .read(getKeyValue2Path(mountInfo.getPath(), path)); unwrapDataResponse(response); return response; @@ -106,16 +106,16 @@ public class KeyValueDelegate { return; } - Map nested = new LinkedHashMap<>((Map) response.getRequiredData() - .get("data")); + Map nested = new LinkedHashMap<>( + (Map) response.getRequiredData().get("data")); response.setData(nested); } @SuppressWarnings("unchecked") private MountInfo doGetMountInfo(String path) { - VaultResponse response = this.operations.read(String.format( - "sys/internal/ui/mounts/%s", path)); + VaultResponse response = this.operations + .read(String.format("sys/internal/ui/mounts/%s", path)); if (response == null || response.getData() == null) { return MountInfo.unavailable(); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/util/PropertyTransformers.java b/spring-vault-core/src/main/java/org/springframework/vault/core/util/PropertyTransformers.java index 3491f26b..022687d0 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/util/PropertyTransformers.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/util/PropertyTransformers.java @@ -72,7 +72,8 @@ public abstract class PropertyTransformers { } @Override - public Map transformProperties(Map input) { + public Map transformProperties( + Map input) { return (Map) input; } } @@ -95,10 +96,10 @@ public abstract class PropertyTransformers { } @Override - public Map transformProperties(Map input) { + public Map transformProperties( + Map input) { - Map target = new LinkedHashMap<>(input.size(), - 1); + Map target = new LinkedHashMap<>(input.size(), 1); for (Entry entry : input.entrySet()) { @@ -131,7 +132,7 @@ public abstract class PropertyTransformers { * Create a new {@link KeyPrefixPropertyTransformer} that adds a prefix to each * key name. * @param propertyNamePrefix the property name prefix to be added in front of each - * property name, must not be {@literal null}. + * property name, must not be {@literal null}. * @return a new {@link KeyPrefixPropertyTransformer} that adds a prefix to each * key name. */ @@ -140,10 +141,10 @@ public abstract class PropertyTransformers { } @Override - public Map transformProperties(Map input) { + public Map transformProperties( + Map input) { - Map target = new LinkedHashMap<>(input.size(), - 1); + Map target = new LinkedHashMap<>(input.size(), 1); for (Entry entry : input.entrySet()) { target.put(propertyNamePrefix + entry.getKey(), entry.getValue()); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/util/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/core/util/package-info.java index ab4f1dc6..46d397e1 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/util/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/util/package-info.java @@ -4,4 +4,3 @@ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields package org.springframework.vault.core.util; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/EnableVaultRepositories.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/EnableVaultRepositories.java index fbf3896d..dbf69967 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/EnableVaultRepositories.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/EnableVaultRepositories.java @@ -23,8 +23,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.beans.factory.FactoryBean; -import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Import; import org.springframework.data.keyvalue.core.KeyValueOperations; import org.springframework.data.keyvalue.repository.config.QueryCreatorType; import org.springframework.data.repository.config.DefaultRepositoryBaseClass; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java index d017c990..3268ec8c 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java @@ -39,8 +39,8 @@ import org.springframework.vault.repository.mapping.VaultMappingContext; * @author Mark Paluch * @since 2.0 */ -public class VaultRepositoryConfigurationExtension extends - KeyValueRepositoryConfigurationExtension { +public class VaultRepositoryConfigurationExtension + extends KeyValueRepositoryConfigurationExtension { private static final String VAULT_ADAPTER_BEAN_NAME = "vaultKeyValueAdapter"; @@ -68,7 +68,8 @@ public class VaultRepositoryConfigurationExtension extends Optional vaultTemplateRef = configurationSource .getAttribute("vaultTemplateRef"); - RootBeanDefinition mappingContextDefinition = createVaultMappingContext(configurationSource); + RootBeanDefinition mappingContextDefinition = createVaultMappingContext( + configurationSource); mappingContextDefinition.setSource(configurationSource.getSource()); registerIfNotAlreadyRegistered(() -> mappingContextDefinition, registry, @@ -83,8 +84,8 @@ public class VaultRepositoryConfigurationExtension extends constructorArgumentValuesForVaultKeyValueAdapter.addIndexedArgumentValue(0, new RuntimeBeanReference(vaultTemplateRef.orElse("vaultTemplate"))); - vaultKeyValueAdapterDefinition - .setConstructorArgumentValues(constructorArgumentValuesForVaultKeyValueAdapter); + vaultKeyValueAdapterDefinition.setConstructorArgumentValues( + constructorArgumentValuesForVaultKeyValueAdapter); registerIfNotAlreadyRegistered(() -> vaultKeyValueAdapterDefinition, registry, VAULT_ADAPTER_BEAN_NAME, configurationSource); @@ -99,7 +100,8 @@ public class VaultRepositoryConfigurationExtension extends registerIfNotAlreadyRegistered( () -> getDefaultKeyValueTemplateBeanDefinition(configurationSource), - registry, keyValueTemplateName.get(), configurationSource.getSource()); + registry, keyValueTemplateName.get(), + configurationSource.getSource()); } super.registerBeansForRoot(registry, configurationSource); @@ -132,8 +134,8 @@ public class VaultRepositoryConfigurationExtension extends constructorArgumentValuesForKeyValueTemplate.addIndexedArgumentValue(1, new RuntimeBeanReference(VAULT_MAPPING_CONTEXT_BEAN_NAME)); - keyValueTemplateDefinition - .setConstructorArgumentValues(constructorArgumentValuesForKeyValueTemplate); + keyValueTemplateDefinition.setConstructorArgumentValues( + constructorArgumentValuesForKeyValueTemplate); return keyValueTemplateDefinition; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java index c3f09124..c657d574 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java @@ -116,8 +116,8 @@ public class DefaultVaultTypeMapper extends DefaultTypeMapper> { + static class SecretDocumentTypeAliasAccessor + implements TypeAliasAccessor> { private final @Nullable String typeKey; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java index 0ac81cba..f079c5e0 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Map.Entry; +import java.util.Optional; import org.springframework.core.CollectionFactory; import org.springframework.core.convert.support.DefaultConversionService; @@ -102,8 +102,8 @@ public class MappingVaultConverter extends AbstractVaultConverter { SecretDocument secretDocument = getSecretDocument(source); - TypeInformation typeToUse = secretDocument != null ? typeMapper - .readType(secretDocument.getBody(), type) + TypeInformation typeToUse = secretDocument != null + ? typeMapper.readType(secretDocument.getBody(), type) : (TypeInformation) ClassTypeInformation.OBJECT; Class rawType = typeToUse.getType(); @@ -127,10 +127,8 @@ public class MappingVaultConverter extends AbstractVaultConverter { return (S) source; } - return read( - (VaultPersistentEntity) mappingContext - .getRequiredPersistentEntity(typeToUse), - secretDocument); + return read((VaultPersistentEntity) mappingContext + .getRequiredPersistentEntity(typeToUse), secretDocument); } @Nullable @@ -159,7 +157,8 @@ public class MappingVaultConverter extends AbstractVaultConverter { @Nullable @Override - public T getParameterValue(Parameter parameter) { + public T getParameterValue( + Parameter parameter) { Object value = parameterProvider.getParameterValue(parameter); return value != null ? readValue(value, parameter.getType()) : null; @@ -206,8 +205,9 @@ public class MappingVaultConverter extends AbstractVaultConverter { Object resolvedValue = documentAccessor.get(idProperty); - return resolvedValue != null ? readValue(resolvedValue, - idProperty.getTypeInformation()) : null; + return resolvedValue != null + ? readValue(resolvedValue, idProperty.getTypeInformation()) + : null; } private void readProperties(VaultPersistentEntity entity, @@ -261,21 +261,25 @@ public class MappingVaultConverter extends AbstractVaultConverter { */ @Nullable @SuppressWarnings({ "rawtypes", "unchecked" }) - private Object readCollectionOrArray(TypeInformation targetType, List sourceValue) { + private Object readCollectionOrArray(TypeInformation targetType, + List sourceValue) { Assert.notNull(targetType, "Target type must not be null"); Class collectionType = targetType.getType(); - TypeInformation componentType = targetType.getComponentType() != null ? targetType - .getComponentType() : ClassTypeInformation.OBJECT; + TypeInformation componentType = targetType.getComponentType() != null + ? targetType.getComponentType() + : ClassTypeInformation.OBJECT; Class rawComponentType = componentType.getType(); - collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType + collectionType = Collection.class.isAssignableFrom(collectionType) + ? collectionType : List.class; - Collection items = targetType.getType().isArray() ? new ArrayList<>( - sourceValue.size()) : CollectionFactory.createCollection(collectionType, - rawComponentType, sourceValue.size()); + Collection items = targetType.getType().isArray() + ? new ArrayList<>(sourceValue.size()) + : CollectionFactory.createCollection(collectionType, rawComponentType, + sourceValue.size()); if (sourceValue.isEmpty()) { return getPotentiallyConvertedSimpleRead(items, collectionType); @@ -302,7 +306,7 @@ public class MappingVaultConverter extends AbstractVaultConverter { * {@link Map}s as well. * * @param type the {@link Map} {@link TypeInformation} to be used to unmarshal this - * {@link Map}. + * {@link Map}. * @param sourceMap must not be {@literal null} * @return */ @@ -344,8 +348,9 @@ public class MappingVaultConverter extends AbstractVaultConverter { } else if (value instanceof List) { map.put(key, - readCollectionOrArray(valueType != null ? valueType - : ClassTypeInformation.LIST, (List) value)); + readCollectionOrArray( + valueType != null ? valueType : ClassTypeInformation.LIST, + (List) value)); } else { map.put(key, getPotentiallyConvertedSimpleRead(value, rawValueType)); @@ -368,7 +373,8 @@ public class MappingVaultConverter extends AbstractVaultConverter { private Object getPotentiallyConvertedSimpleRead(@Nullable Object value, @Nullable Class target) { - if (value == null || target == null || target.isAssignableFrom(value.getClass())) { + if (value == null || target == null + || target.isAssignableFrom(value.getClass())) { return value; } @@ -503,8 +509,8 @@ public class MappingVaultConverter extends AbstractVaultConverter { } // Lookup potential custom target type - Optional> basicTargetType = conversions.getCustomWriteTarget(obj - .getClass()); + Optional> basicTargetType = conversions + .getCustomWriteTarget(obj.getClass()); if (basicTargetType.isPresent()) { @@ -512,9 +518,9 @@ public class MappingVaultConverter extends AbstractVaultConverter { return; } - VaultPersistentEntity entity = isSubtype(prop.getType(), obj.getClass()) ? mappingContext - .getRequiredPersistentEntity(obj.getClass()) : mappingContext - .getRequiredPersistentEntity(type); + VaultPersistentEntity entity = isSubtype(prop.getType(), obj.getClass()) + ? mappingContext.getRequiredPersistentEntity(obj.getClass()) + : mappingContext.getRequiredPersistentEntity(type); SecretDocumentAccessor nested = accessor.writeNested(prop); @@ -546,7 +552,7 @@ public class MappingVaultConverter extends AbstractVaultConverter { * Populates the given {@link List} with values from the given {@link Collection}. * * @param source the collection to create a {@link List} for, must not be - * {@literal null}. + * {@literal null}. * @param type the {@link TypeInformation} to consider or {@literal null} if unknown. * @param sink the {@link List} to write to. * @return @@ -596,7 +602,8 @@ public class MappingVaultConverter extends AbstractVaultConverter { Assert.notNull(map, "Given map must not be null"); Assert.notNull(property, "PersistentProperty must not be null"); - return writeMapInternal(map, new LinkedHashMap<>(), property.getTypeInformation()); + return writeMapInternal(map, new LinkedHashMap<>(), + property.getTypeInformation()); } /** @@ -624,16 +631,15 @@ public class MappingVaultConverter extends AbstractVaultConverter { } else if (val instanceof Collection || val.getClass().isArray()) { - bson.put( - simpleKey, - writeCollectionInternal(asCollection(val), - propertyType.getMapValueType(), new ArrayList<>())); + bson.put(simpleKey, writeCollectionInternal(asCollection(val), + propertyType.getMapValueType(), new ArrayList<>())); } else { SecretDocumentAccessor nested = new SecretDocumentAccessor( new SecretDocument()); - TypeInformation valueTypeInfo = propertyType.isMap() ? propertyType - .getMapValueType() : ClassTypeInformation.OBJECT; + TypeInformation valueTypeInfo = propertyType.isMap() + ? propertyType.getMapValueType() + : ClassTypeInformation.OBJECT; writeInternal(val, nested, valueTypeInfo); bson.put(simpleKey, nested.getBody()); } @@ -682,8 +688,8 @@ public class MappingVaultConverter extends AbstractVaultConverter { return null; } - Optional> customTarget = conversions.getCustomWriteTarget(value - .getClass()); + Optional> customTarget = conversions + .getCustomWriteTarget(value.getClass()); if (customTarget.isPresent()) { return conversionService.convert(value, customTarget.get()); @@ -726,8 +732,8 @@ public class MappingVaultConverter extends AbstractVaultConverter { * {@link SecretDocument}. * */ - class VaultPropertyValueProvider implements - PropertyValueProvider { + class VaultPropertyValueProvider + implements PropertyValueProvider { private final SecretDocumentAccessor source; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java index e26e1d62..9e02ace9 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/SecretDocumentAccessor.java @@ -44,7 +44,7 @@ class SecretDocumentAccessor { * Creates a new {@link SecretDocumentAccessor} for the given {@link SecretDocument}. * * @param document must be a {@link SecretDocument} effectively, must not be - * {@literal null}. + * {@literal null}. */ SecretDocumentAccessor(SecretDocument document) { @@ -59,7 +59,7 @@ class SecretDocumentAccessor { * and {@link Map body}. * * @param document must be a {@link SecretDocument} effectively, must not be - * {@literal null} + * {@literal null} * @param body must not be {@literal null}. */ private SecretDocumentAccessor(SecretDocument document, Map body) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultConverter.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultConverter.java index 4f0a5c50..65761fa2 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultConverter.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultConverter.java @@ -24,7 +24,6 @@ import org.springframework.vault.repository.mapping.VaultPersistentProperty; * * @since 2.0 */ -public interface VaultConverter - extends +public interface VaultConverter extends EntityConverter, VaultPersistentProperty, Object, SecretDocument> { } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java index 7c62534c..1fd8b2b8 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/VaultCustomConversions.java @@ -40,8 +40,8 @@ import org.springframework.vault.repository.mapping.VaultSimpleTypes; * @see org.springframework.data.mapping.model.SimpleTypeHolder * @see VaultSimpleTypes */ -public class VaultCustomConversions extends - org.springframework.data.convert.CustomConversions { +public class VaultCustomConversions + extends org.springframework.data.convert.CustomConversions { private static final StoreConversions STORE_CONVERSIONS; @@ -55,8 +55,8 @@ public class VaultCustomConversions extends converters.addAll(JodaTimeConverters.getConvertersToRegister()); STORE_CONVERTERS = Collections.unmodifiableList(converters); - STORE_CONVERSIONS = StoreConversions - .of(VaultSimpleTypes.HOLDER, STORE_CONVERTERS); + STORE_CONVERSIONS = StoreConversions.of(VaultSimpleTypes.HOLDER, + STORE_CONVERTERS); } /** diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/package-info.java index 2def3b3d..b6f87721 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/convert/package-info.java @@ -3,4 +3,3 @@ */ @org.springframework.lang.NonNullApi package org.springframework.vault.repository.convert; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/core/MappingVaultEntityInformation.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/MappingVaultEntityInformation.java index 6760386c..63961aa3 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/core/MappingVaultEntityInformation.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/MappingVaultEntityInformation.java @@ -40,10 +40,9 @@ public class MappingVaultEntityInformation extends if (!entity.hasIdProperty()) { - throw new MappingException( - String.format( - "Entity %s requires to have an explicit id field. Did you forget to provide one using @Id?", - entity.getName())); + throw new MappingException(String.format( + "Entity %s requires to have an explicit id field. Did you forget to provide one using @Id?", + entity.getName())); } } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultQueryEngine.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultQueryEngine.java index 8331d15e..3fe40973 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultQueryEngine.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/VaultQueryEngine.java @@ -40,8 +40,8 @@ import org.springframework.vault.repository.query.VaultQuery; * @see VaultQuery * @see org.springframework.vault.repository.query.VaultQueryCreator */ -class VaultQueryEngine extends - QueryEngine> { +class VaultQueryEngine + extends QueryEngine> { private static final SpelExpressionParser parser = new SpelExpressionParser(); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/core/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/package-info.java index 586add58..f655ae1a 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/core/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/core/package-info.java @@ -3,4 +3,3 @@ */ @org.springframework.lang.NonNullApi package org.springframework.vault.repository.core; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java index b7630151..2351fe41 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java @@ -47,7 +47,8 @@ public class VaultMappingContext extends @Override protected VaultPersistentEntity createPersistentEntity( TypeInformation typeInformation) { - return new BasicVaultPersistentEntity<>(typeInformation, fallbackKeySpaceResolver); + return new BasicVaultPersistentEntity<>(typeInformation, + fallbackKeySpaceResolver); } @Override diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentEntity.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentEntity.java index 1483aed8..94427ee6 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentEntity.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentEntity.java @@ -24,8 +24,8 @@ import org.springframework.data.mapping.PersistentEntity; * @author Mark Paluch * @since 2.0 */ -public interface VaultPersistentEntity extends - KeyValuePersistentEntity { +public interface VaultPersistentEntity + extends KeyValuePersistentEntity { /** * @return the secret backend in which this {@link PersistentEntity} is stored. diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentProperty.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentProperty.java index 09e2c958..c58db49b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentProperty.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultPersistentProperty.java @@ -30,8 +30,8 @@ import org.springframework.data.mapping.model.SimpleTypeHolder; * @author Mark Paluch * @since 2.0 */ -public class VaultPersistentProperty extends - KeyValuePersistentProperty { +public class VaultPersistentProperty + extends KeyValuePersistentProperty { private static final Set SUPPORTED_ID_PROPERTY_NAMES = new HashSet(); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultSimpleTypes.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultSimpleTypes.java index fc6e812a..f6b1a16a 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultSimpleTypes.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultSimpleTypes.java @@ -40,8 +40,8 @@ public abstract class VaultSimpleTypes { } private static final Set> VAULT_SIMPLE_TYPES; - public static final SimpleTypeHolder HOLDER = new SimpleTypeHolder( - VAULT_SIMPLE_TYPES, true); + public static final SimpleTypeHolder HOLDER = new SimpleTypeHolder(VAULT_SIMPLE_TYPES, + true); private VaultSimpleTypes() { } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/package-info.java index 9329c895..7a33e8bd 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/package-info.java @@ -3,4 +3,3 @@ */ @org.springframework.lang.NonNullApi package org.springframework.vault.repository.mapping; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultPartTreeQuery.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultPartTreeQuery.java index 299d1f4b..ddb55065 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultPartTreeQuery.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultPartTreeQuery.java @@ -56,8 +56,8 @@ public class VaultPartTreeQuery extends KeyValuePartTreeQuery { (MappingContext) keyValueOperations.getMappingContext())); } - static class VaultQueryCreatorFactory implements - QueryCreatorFactory { + static class VaultQueryCreatorFactory + implements QueryCreatorFactory { private final MappingContext, VaultPersistentProperty> mappingContext; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultQueryCreator.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultQueryCreator.java index e7f9af39..911e9d67 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultQueryCreator.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/VaultQueryCreator.java @@ -30,9 +30,9 @@ import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.repository.query.ParameterAccessor; import org.springframework.data.repository.query.parser.AbstractQueryCreator; import org.springframework.data.repository.query.parser.Part; -import org.springframework.data.repository.query.parser.PartTree; import org.springframework.data.repository.query.parser.Part.IgnoreCaseType; import org.springframework.data.repository.query.parser.Part.Type; +import org.springframework.data.repository.query.parser.PartTree; import org.springframework.vault.repository.mapping.VaultPersistentEntity; import org.springframework.vault.repository.mapping.VaultPersistentProperty; @@ -44,8 +44,8 @@ import org.springframework.vault.repository.mapping.VaultPersistentProperty; * @author Mark Paluch * @since 2.0 */ -public class VaultQueryCreator extends - AbstractQueryCreator, VaultQuery> { +public class VaultQueryCreator + extends AbstractQueryCreator, VaultQuery> { private final MappingContext, VaultPersistentProperty> mappingContext; @@ -57,9 +57,7 @@ public class VaultQueryCreator extends * @param parameters must not be {@literal null}. * @param mappingContext must not be {@literal null}. */ - public VaultQueryCreator( - PartTree tree, - ParameterAccessor parameters, + public VaultQueryCreator(PartTree tree, ParameterAccessor parameters, MappingContext, VaultPersistentProperty> mappingContext) { super(tree, parameters); @@ -83,9 +81,9 @@ public class VaultQueryCreator extends if (propertyPath.getLeafProperty() != null && !propertyPath.getLeafProperty().isIdProperty()) { - throw new InvalidDataAccessApiUsageException(String.format( - "Cannot create criteria for non-@Id property %s", - propertyPath.getLeafProperty())); + throw new InvalidDataAccessApiUsageException( + String.format("Cannot create criteria for non-@Id property %s", + propertyPath.getLeafProperty())); } VariableAccessor accessor = getVariableAccessor(part); @@ -147,8 +145,10 @@ public class VaultQueryCreator extends return new Criteria<>(accessor.nextString(parameters), (value, it) -> !it.contains(value)); case REGEX: - return Pattern.compile((String) parameters.next(), - isIgnoreCase(part) ? Pattern.CASE_INSENSITIVE : 0).asPredicate(); + return Pattern + .compile((String) parameters.next(), + isIgnoreCase(part) ? Pattern.CASE_INSENSITIVE : 0) + .asPredicate(); case TRUE: return it -> it.equalsIgnoreCase("true"); case FALSE: @@ -220,13 +220,13 @@ public class VaultQueryCreator extends final Criteria other = (Criteria) o; final Object this$value = this.getValue(); final Object other$value = other.getValue(); - if (this$value == null ? other$value != null : !this$value - .equals(other$value)) + if (this$value == null ? other$value != null + : !this$value.equals(other$value)) return false; final Object this$predicate = this.getPredicate(); final Object other$predicate = other.getPredicate(); - if (this$predicate == null ? other$predicate != null : !this$predicate - .equals(other$predicate)) + if (this$predicate == null ? other$predicate != null + : !this$predicate.equals(other$predicate)) return false; return true; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/query/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/package-info.java index 8ede8366..00311b43 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/query/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/query/package-info.java @@ -3,4 +3,3 @@ */ @org.springframework.lang.NonNullApi package org.springframework.vault.repository.query; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/support/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/support/package-info.java index 382e6ca1..c3c16f5b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/repository/support/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/support/package-info.java @@ -3,4 +3,3 @@ */ @org.springframework.lang.NonNullApi package org.springframework.vault.repository.support; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/security/VaultBytesKeyGenerator.java b/spring-vault-core/src/main/java/org/springframework/vault/security/VaultBytesKeyGenerator.java index fa1ce035..5de0cc2f 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/security/VaultBytesKeyGenerator.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/security/VaultBytesKeyGenerator.java @@ -57,7 +57,7 @@ public class VaultBytesKeyGenerator implements BytesKeyGenerator { * * @param vaultOperations must not be {@literal null}. * @param transitPath path of the transit backend, must not be {@literal null} or - * empty. + * empty. * @param length number of random bytes to generate. Must be greater than zero. */ public VaultBytesKeyGenerator(VaultOperations vaultOperations, String transitPath, diff --git a/spring-vault-core/src/main/java/org/springframework/vault/security/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/security/package-info.java index 3f37de89..2f3f6087 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/security/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/security/package-info.java @@ -4,4 +4,3 @@ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields package org.springframework.vault.security; - diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/ClientOptions.java b/spring-vault-core/src/main/java/org/springframework/vault/support/ClientOptions.java index a798036c..00889a4e 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/ClientOptions.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/ClientOptions.java @@ -50,9 +50,9 @@ public class ClientOptions { * Create new {@link ClientOptions}. * * @param connectionTimeout connection timeout in {@link TimeUnit#MILLISECONDS}, must - * not be negative. + * not be negative. * @param readTimeout read timeout in {@link TimeUnit#MILLISECONDS}, must not be - * negative. + * negative. * @deprecated since 2.0, use {@link #ClientOptions(Duration, Duration)} for time unit * safety. */ diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/JsonMapFlattener.java b/spring-vault-core/src/main/java/org/springframework/vault/support/JsonMapFlattener.java index 9c61507e..f3093597 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/JsonMapFlattener.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/JsonMapFlattener.java @@ -72,7 +72,8 @@ public abstract class JsonMapFlattener { Map resultMap = new LinkedHashMap<>(); - doFlatten("", inputMap.entrySet().iterator(), resultMap, UnaryOperator.identity()); + doFlatten("", inputMap.entrySet().iterator(), resultMap, + UnaryOperator.identity()); return resultMap; } @@ -92,8 +93,8 @@ public abstract class JsonMapFlattener { Map resultMap = new LinkedHashMap<>(); - doFlatten("", inputMap.entrySet().iterator(), resultMap, it -> it == null ? null - : it.toString()); + doFlatten("", inputMap.entrySet().iterator(), resultMap, + it -> it == null ? null : it.toString()); return resultMap; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/KeystoreUtil.java b/spring-vault-core/src/main/java/org/springframework/vault/support/KeystoreUtil.java index 9670b36f..d79a1522 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/KeystoreUtil.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/KeystoreUtil.java @@ -41,8 +41,8 @@ import java.util.List; class KeystoreUtil { /** - * Create a {@link KeyStore} containing the {@link KeySpec} and - * {@link X509Certificate certificates} using the given {@code keyAlias}. + * Create a {@link KeyStore} containing the {@link KeySpec} and {@link X509Certificate + * certificates} using the given {@code keyAlias}. * * @param keyAlias * @param certificates @@ -51,7 +51,8 @@ class KeystoreUtil { * @throws IOException */ static KeyStore createKeyStore(String keyAlias, KeySpec privateKeySpec, - X509Certificate... certificates) throws GeneralSecurityException, IOException { + X509Certificate... certificates) + throws GeneralSecurityException, IOException { KeyFactory kf = KeyFactory.getInstance("RSA"); PrivateKey privateKey = kf.generatePrivate(privateKeySpec); @@ -84,24 +85,22 @@ class KeystoreUtil { int counter = 0; for (X509Certificate certificate : certificates) { - keyStore.setCertificateEntry(String.format("cert_%d", counter++), certificate); + keyStore.setCertificateEntry(String.format("cert_%d", counter++), + certificate); } return keyStore; } - static X509Certificate getCertificate(byte[] source) throws CertificateException, - IOException { + static X509Certificate getCertificate(byte[] source) + throws CertificateException, IOException { CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509"); List certificates = getCertificates(certificateFactory, source); - return certificates - .stream() - .findFirst() - .orElseThrow( - () -> new IllegalArgumentException("No X509Certificate found")); + return certificates.stream().findFirst().orElseThrow( + () -> new IllegalArgumentException("No X509Certificate found")); } /** @@ -111,7 +110,8 @@ class KeystoreUtil { * @throws GeneralSecurityException * @throws IOException */ - private static KeyStore createKeyStore() throws GeneralSecurityException, IOException { + private static KeyStore createKeyStore() + throws GeneralSecurityException, IOException { KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); keyStore.load(null, new char[0]); @@ -320,8 +320,8 @@ class KeystoreUtil { // We can't handle length longer than 4 bytes if (i >= 0xFF || num > 4) { - throw new IllegalStateException("Invalid DER: length field too big (" + i - + ")"); + throw new IllegalStateException( + "Invalid DER: length field too big (" + i + ")"); } byte[] bytes = new byte[num]; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/Policy.java b/spring-vault-core/src/main/java/org/springframework/vault/support/Policy.java index d25d9d72..e5222f87 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/Policy.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/Policy.java @@ -33,8 +33,8 @@ import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -230,8 +230,7 @@ public class Policy { private final Map> deniedParameters; @JsonCreator - private Rule( - @JsonProperty("capabilities") List capabilities, + private Rule(@JsonProperty("capabilities") List capabilities, @JsonProperty("min_wrapping_ttl") @JsonDeserialize(converter = StringToDurationConverter.class) Duration minWrappingTtl, @JsonProperty("max_wrapping_ttl") @JsonDeserialize(converter = StringToDurationConverter.class) Duration maxWrappingTtl, @JsonProperty("allowed_parameters") Map> allowedParameters, @@ -386,7 +385,7 @@ public class Policy { * @param capabilities must not be {@literal null}. * @return {@code this} {@link RuleBuilder}. * @throws IllegalArgumentException if the capability cannot be resolved to a - * built-in {@link Capability}. + * built-in {@link Capability}. */ public RuleBuilder capabilities(String... capabilities) { @@ -394,18 +393,16 @@ public class Policy { Assert.noNullElements(capabilities, "Capabilities must not contain null elements"); - List mapped = Arrays - .stream(capabilities) - .map(value -> { + List mapped = Arrays.stream(capabilities).map(value -> { - Capability capability = BuiltinCapabilities.find(value); + Capability capability = BuiltinCapabilities.find(value); - if (capability == null) { - throw new IllegalArgumentException("Cannot resolve " - + value + " to a capability"); - } - return capability; - }).collect(Collectors.toList()); + if (capability == null) { + throw new IllegalArgumentException( + "Cannot resolve " + value + " to a capability"); + } + return capability; + }).collect(Collectors.toList()); return capabilities(mapped); } @@ -504,12 +501,12 @@ public class Policy { capabilities = Collections.emptyList(); break; case 1: - capabilities = Collections.singletonList(this.capabilities.iterator() - .next()); + capabilities = Collections + .singletonList(this.capabilities.iterator().next()); break; default: - capabilities = Collections.unmodifiableList(new ArrayList<>( - this.capabilities)); + capabilities = Collections + .unmodifiableList(new ArrayList<>(this.capabilities)); } return new Rule(path, capabilities, minWrappingTtl, maxWrappingTtl, @@ -517,7 +514,8 @@ public class Policy { createMap(this.deniedParameters)); } - private Map> createMap(Map> source) { + private Map> createMap( + Map> source) { if (source.isEmpty()) { return Collections.emptyMap(); @@ -769,7 +767,8 @@ public class Policy { return Duration.ofHours(Long.parseLong(matcher.group(1))); } - throw new IllegalArgumentException("Unsupported duration value: " + value); + throw new IllegalArgumentException( + "Unsupported duration value: " + value); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/SslConfiguration.java b/spring-vault-core/src/main/java/org/springframework/vault/support/SslConfiguration.java index af61aadc..a44f9999 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/SslConfiguration.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/SslConfiguration.java @@ -65,17 +65,18 @@ public class SslConfiguration { Resource trustStore, @Nullable String trustStorePassword) { this(new KeyStoreConfiguration(keyStore, charsOrNull(keyStorePassword), - DEFAULT_KEYSTORE_TYPE), new KeyStoreConfiguration(trustStore, - charsOrNull(trustStorePassword), DEFAULT_KEYSTORE_TYPE)); + DEFAULT_KEYSTORE_TYPE), + new KeyStoreConfiguration(trustStore, charsOrNull(trustStorePassword), + DEFAULT_KEYSTORE_TYPE)); } /** * Create a new {@link SslConfiguration}. * * @param keyStoreConfiguration the key store configuration, must not be - * {@literal null}. + * {@literal null}. * @param trustStoreConfiguration the trust store configuration, must not be - * {@literal null}. + * {@literal null}. * @since 1.1 */ public SslConfiguration(KeyStoreConfiguration keyStoreConfiguration, @@ -88,11 +89,11 @@ public class SslConfiguration { * Create a new {@link SslConfiguration}. * * @param keyStoreConfiguration the key store configuration, must not be - * {@literal null}. + * {@literal null}. * @param keyConfiguration the configuration for a specific key in - * {@code keyStoreConfiguration} to use. + * {@code keyStoreConfiguration} to use. * @param trustStoreConfiguration the trust store configuration, must not be - * {@literal null}. + * {@literal null}. * @since 2.2 */ public SslConfiguration(KeyStoreConfiguration keyStoreConfiguration, @@ -114,7 +115,7 @@ public class SslConfiguration { * {@link KeyStore} type. * * @param trustStore resource pointing to an existing trust store, must not be - * {@literal null}. + * {@literal null}. * @param trustStorePassword may be {@literal null}. * @return the created {@link SslConfiguration}. * @see java.security.KeyStore @@ -133,7 +134,7 @@ public class SslConfiguration { * {@link KeyStore} type. * * @param trustStore resource pointing to an existing trust store, must not be - * {@literal null}. + * {@literal null}. * @param trustStorePassword may be {@literal null}. * @return the created {@link SslConfiguration}. * @see java.security.KeyStore @@ -154,7 +155,7 @@ public class SslConfiguration { * Create a new {@link SslConfiguration} for the given {@link KeyStoreConfiguration * trust store}. * - @param trustStore must not be {@literal null}. + * @param trustStore must not be {@literal null}. * @return a new {@link SslConfiguration} with {@link KeyStoreConfiguration trust * store configuration} applied. * @since 2.2 @@ -169,7 +170,7 @@ public class SslConfiguration { * {@link KeyStore} type. * * @param keyStore resource pointing to an existing key store, must not be - * {@literal null}. + * {@literal null}. * @param keyStorePassword may be {@literal null}. * @return the created {@link SslConfiguration}. * @see java.security.KeyStore @@ -188,7 +189,7 @@ public class SslConfiguration { * {@link KeyStore} type. * * @param keyStore resource pointing to an existing key store, must not be - * {@literal null}. + * {@literal null}. * @param keyStorePassword may be {@literal null}. * @return the created {@link SslConfiguration}. * @see java.security.KeyStore @@ -204,7 +205,7 @@ public class SslConfiguration { * key store}. * * @param keyStore resource pointing to an existing key store, must not be - * {@literal null}. + * {@literal null}. * @return the created {@link SslConfiguration}. * @since 2.2 * @see java.security.KeyStore @@ -218,9 +219,9 @@ public class SslConfiguration { * key store} and {@link KeyConfiguration}. * * @param keyStore resource pointing to an existing key store, must not be - * {@literal null}. + * {@literal null}. * @param keyConfiguration the configuration for a specific key in - * {@code keyStoreConfiguration} to use. + * {@code keyStoreConfiguration} to use. * @return the created {@link SslConfiguration}. * @since 2.2 * @see java.security.KeyStore @@ -235,10 +236,10 @@ public class SslConfiguration { * {@link KeyStore} type. * * @param keyStore resource pointing to an existing key store, must not be - * {@literal null}. + * {@literal null}. * @param keyStorePassword may be {@literal null}. * @param keyConfiguration the configuration for a specific key in - * {@code keyStoreConfiguration} to use. + * {@code keyStoreConfiguration} to use. * @return the created {@link SslConfiguration}. * @since 2.2 * @see java.security.KeyStore @@ -251,9 +252,10 @@ public class SslConfiguration { () -> String.format("KeyStore %s does not exist", keyStore)); Assert.notNull(keyConfiguration, "KeyConfiguration must not be null"); - return new SslConfiguration(new KeyStoreConfiguration(keyStore, keyStorePassword, - DEFAULT_KEYSTORE_TYPE), keyConfiguration, - KeyStoreConfiguration.unconfigured()); + return new SslConfiguration( + new KeyStoreConfiguration(keyStore, keyStorePassword, + DEFAULT_KEYSTORE_TYPE), + keyConfiguration, KeyStoreConfiguration.unconfigured()); } /** @@ -261,10 +263,10 @@ public class SslConfiguration { * {@link KeyStore} type. * * @param keyStore resource pointing to an existing keystore, must not be - * {@literal null}. + * {@literal null}. * @param keyStorePassword may be {@literal null}. * @param trustStore resource pointing to an existing trust store, must not be - * {@literal null}. + * {@literal null}. * @param trustStorePassword may be {@literal null}. * @return the created {@link SslConfiguration}. * @see java.security.KeyStore @@ -284,10 +286,10 @@ public class SslConfiguration { * {@link KeyStore} type. * * @param keyStore resource pointing to an existing keystore, must not be - * {@literal null}. + * {@literal null}. * @param keyStorePassword may be {@literal null}. * @param trustStore resource pointing to an existing trust store, must not be - * {@literal null}. + * {@literal null}. * @param trustStorePassword may be {@literal null}. * @return the created {@link SslConfiguration}. * @see java.security.KeyStore @@ -304,9 +306,11 @@ public class SslConfiguration { Assert.isTrue(trustStore.exists(), String.format("TrustStore %s does not exist", trustStore)); - return new SslConfiguration(new KeyStoreConfiguration(keyStore, keyStorePassword, - DEFAULT_KEYSTORE_TYPE), new KeyStoreConfiguration(trustStore, - trustStorePassword, DEFAULT_KEYSTORE_TYPE)); + return new SslConfiguration( + new KeyStoreConfiguration(keyStore, keyStorePassword, + DEFAULT_KEYSTORE_TYPE), + new KeyStoreConfiguration(trustStore, trustStorePassword, + DEFAULT_KEYSTORE_TYPE)); } /** @@ -370,12 +374,12 @@ public class SslConfiguration { /** * Create a new {@link SslConfiguration} with {@link KeyStoreConfiguration} and - * {@link KeyConfiguration} applied retaining the - * {@link #getTrustStoreConfiguration() trust store} configuration. + * {@link KeyConfiguration} applied retaining the {@link #getTrustStoreConfiguration() + * trust store} configuration. * * @param configuration must not be {@literal null}. * @param keyConfiguration the configuration for a specific key in - * {@code keyStoreConfiguration} to use. + * {@code keyStoreConfiguration} to use. * @return a new {@link SslConfiguration} with {@link KeyStoreConfiguration} and * {@link KeyConfiguration} applied. * @since 2.2 @@ -491,7 +495,7 @@ public class SslConfiguration { * Create a new {@link KeyStoreConfiguration} given {@link Resource}. * * @param resource resource referencing the key store, must not be {@literal null} - * . + * . * @return the {@link KeyStoreConfiguration} for {@code resource}. * @since 2.0 */ @@ -504,7 +508,7 @@ public class SslConfiguration { * {@code storePassword} using the default keystore type. * * @param resource resource referencing the key store, must not be {@literal null} - * . + * . * @param storePassword key store password, may be {@literal null}. * @return the {@link KeyStoreConfiguration} for {@code resource}. * @since 2.0 @@ -573,7 +577,8 @@ public class SslConfiguration { private final @Nullable String keyAlias; - private KeyConfiguration(@Nullable char[] keyPassword, @Nullable String keyAlias) { + private KeyConfiguration(@Nullable char[] keyPassword, + @Nullable String keyAlias) { if (keyPassword == null) { this.keyPassword = null; @@ -599,9 +604,9 @@ public class SslConfiguration { * {@link KeyStore}. * * @param keyPassword the key password to use. Uses - * {@link KeyStoreConfiguration#getStorePassword()} if left {@code null}. + * {@link KeyStoreConfiguration#getStorePassword()} if left {@code null}. * @param keyAlias the key alias to use. Uses the first alias if left {@code null} - * . + * . * @return the {@link KeyConfiguration}. */ public static KeyConfiguration of(@Nullable char[] keyPassword, diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java index 472489fa..e69778fd 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultCertificateRequest.java @@ -188,7 +188,8 @@ public class VaultCertificateRequest { * @param ipSubjectAltName must not be empty or {@literal null}. * @return {@code this} {@link VaultCertificateRequestBuilder}. */ - public VaultCertificateRequestBuilder withIpSubjectAltName(String ipSubjectAltName) { + public VaultCertificateRequestBuilder withIpSubjectAltName( + String ipSubjectAltName) { Assert.hasText(ipSubjectAltName, "IP subject alt name must not be empty"); @@ -277,8 +278,8 @@ public class VaultCertificateRequest { altNames = java.util.Collections.singletonList(this.altNames.get(0)); break; default: - altNames = java.util.Collections.unmodifiableList(new ArrayList<>( - this.altNames)); + altNames = java.util.Collections + .unmodifiableList(new ArrayList<>(this.altNames)); } List ipSubjectAltNames; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultHmacRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultHmacRequest.java index aeb7854a..193152eb 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultHmacRequest.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultHmacRequest.java @@ -111,8 +111,9 @@ public class VaultHmacRequest { * Configure the algorithm to be used for the operation. * * @param algorithm Specify the algorithm to be used for the operation. Supported - * algorithms are: {@literal sha2-224}, {@literal sha2-256}, {@literal sha2-384}, - * {@literal sha2-512}. Defaults to {@literal sha2-256} if not set. + * algorithms are: {@literal sha2-224}, {@literal sha2-256}, + * {@literal sha2-384}, {@literal sha2-512}. Defaults to {@literal sha2-256} + * if not set. * @return {@code this} {@link VaultHmacRequestBuilder}. */ public VaultHmacRequestBuilder algorithm(String algorithm) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultInitializationRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultInitializationRequest.java index 94f57653..8157a337 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultInitializationRequest.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultInitializationRequest.java @@ -43,7 +43,8 @@ public class VaultInitializationRequest { * @param secretThreshold number of required keys for unsealing. * @return a new {@link VaultInitializationRequest}. */ - public static VaultInitializationRequest create(int secretShares, int secretThreshold) { + public static VaultInitializationRequest create(int secretShares, + int secretThreshold) { return new VaultInitializationRequest(secretShares, secretThreshold); } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignCertificateRequestResponse.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignCertificateRequestResponse.java index e5a65c3e..ac85bb9e 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignCertificateRequestResponse.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignCertificateRequestResponse.java @@ -20,6 +20,6 @@ package org.springframework.vault.support; * * @author Mark Paluch */ -public class VaultSignCertificateRequestResponse extends - VaultResponseSupport { +public class VaultSignCertificateRequestResponse + extends VaultResponseSupport { } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignRequest.java index 2f7902a9..92c16bfd 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignRequest.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignRequest.java @@ -97,8 +97,9 @@ public class VaultSignRequest { * Configure the algorithm to be used for the operation. * * @param algorithm Specify the algorithm to be used for the operation. Supported - * algorithms are: {@literal sha2-224}, {@literal sha2-256}, {@literal sha2-384}, - * {@literal sha2-512}. Defaults to {@literal sha2-256} if not set. + * algorithms are: {@literal sha2-224}, {@literal sha2-256}, + * {@literal sha2-384}, {@literal sha2-512}. Defaults to {@literal sha2-256} + * if not set. * @return {@code this} {@link VaultSignRequestBuilder}. */ public VaultSignRequestBuilder algorithm(String algorithm) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignatureVerificationRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignatureVerificationRequest.java index 1e0e09be..b458508b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignatureVerificationRequest.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultSignatureVerificationRequest.java @@ -36,7 +36,8 @@ public class VaultSignatureVerificationRequest { private final @Nullable String algorithm; private VaultSignatureVerificationRequest(Plaintext plaintext, - @Nullable Signature signature, @Nullable Hmac hmac, @Nullable String algorithm) { + @Nullable Signature signature, @Nullable Hmac hmac, + @Nullable String algorithm) { this.plaintext = plaintext; this.signature = signature; @@ -74,7 +75,8 @@ public class VaultSignatureVerificationRequest { * @return a new {@link VaultSignatureVerificationRequest} for {@link Plaintext} and * {@link Hmac}. */ - public static VaultSignatureVerificationRequest create(Plaintext plaintext, Hmac hmac) { + public static VaultSignatureVerificationRequest create(Plaintext plaintext, + Hmac hmac) { return builder().plaintext(plaintext).hmac(hmac).build(); } @@ -177,8 +179,9 @@ public class VaultSignatureVerificationRequest { * Configure the algorithm to be used for the operation. * * @param algorithm Specify the algorithm to be used for the operation. Supported - * algorithms are: {@literal sha2-224}, {@literal sha2-256}, {@literal sha2-384}, - * {@literal sha2-512}. Defaults to {@literal sha2-256} if not set. + * algorithms are: {@literal sha2-224}, {@literal sha2-256}, + * {@literal sha2-384}, {@literal sha2-512}. Defaults to {@literal sha2-256} + * if not set. * @return {@code this} {@link VaultSignatureVerificationRequestBuilder}. */ public VaultSignatureVerificationRequestBuilder algorithm(String algorithm) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTokenRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTokenRequest.java index 07f11a8d..7c449294 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTokenRequest.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTokenRequest.java @@ -284,7 +284,7 @@ public class VaultTokenRequest { * Configure whether the default policy should be part of the token's policy set. * * @param noDefaultPolicy {@literal true} to omit the default policy in the - * token's policy set. + * token's policy set. * @return {@code this} {@link VaultTokenRequestBuilder}. */ public VaultTokenRequestBuilder noDefaultPolicy(boolean noDefaultPolicy) { @@ -305,8 +305,8 @@ public class VaultTokenRequest { * Configure TTL extension/renewal for the token. * * @param renewable {@literal false} to disable the ability of the token to be - * renewed past its initial TTL. {@literal true}, or omitting this option, will - * allow the token to be renewable up to the system/mount maximum TTL. + * renewed past its initial TTL. {@literal true}, or omitting this option, + * will allow the token to be renewable up to the system/mount maximum TTL. * @return {@code this} {@link VaultTokenRequestBuilder}. */ public VaultTokenRequestBuilder renewable(boolean renewable) { @@ -392,8 +392,8 @@ public class VaultTokenRequest { Assert.isTrue(explicitMaxTtl >= 0, "TTL must not be negative"); Assert.notNull(timeUnit, "TimeUnit must not be null"); - this.explicitMaxTtl = String - .format("%ss", timeUnit.toSeconds(explicitMaxTtl)); + this.explicitMaxTtl = String.format("%ss", + timeUnit.toSeconds(explicitMaxTtl)); return this; } @@ -404,7 +404,7 @@ public class VaultTokenRequest { * able to be renewed or used past the value set at issue time. * * @param explicitMaxTtl the time to live, must not be {@literal null} or - * negative. + * negative. * @return {@code this} {@link VaultTokenRequestBuilder}. * @since 2.0 */ diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitContext.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitContext.java index 43e409d8..6550ae95 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitContext.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitContext.java @@ -124,7 +124,7 @@ public class VaultTransitContext { * Configure a key derivation context for the {@code transit} operation. * * @param context key derivation context, provided as a binary data. Must be - * provided if derivation is enabled. + * provided if derivation is enabled. * @return {@code this} {@link VaultTransitRequestBuilder}. */ public VaultTransitRequestBuilder context(byte[] context) { @@ -141,8 +141,8 @@ public class VaultTransitContext { * Vault 0.6.1. Not required for keys created in 0.6.2+. * * @param nonce value must be exactly 96 bits (12 bytes) long and the user must - * ensure that for any given context (and thus, any given encryption key) this - * nonce value is never reused + * ensure that for any given context (and thus, any given encryption key) this + * nonce value is never reused * @return {@code this} {@link VaultTransitRequestBuilder}. */ public VaultTransitRequestBuilder nonce(byte[] nonce) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKeyConfiguration.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKeyConfiguration.java index fbc6aa84..18e4f774 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKeyConfiguration.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKeyConfiguration.java @@ -39,7 +39,8 @@ public class VaultTransitKeyConfiguration { private final Integer minEncryptionVersion; private VaultTransitKeyConfiguration(@Nullable Boolean deletionAllowed, - @Nullable Integer minDecryptionVersion, @Nullable Integer minEncryptionVersion) { + @Nullable Integer minDecryptionVersion, + @Nullable Integer minEncryptionVersion) { this.deletionAllowed = deletionAllowed; this.minDecryptionVersion = minDecryptionVersion; @@ -103,7 +104,8 @@ public class VaultTransitKeyConfiguration { * @param deletionAllowed {@literal true} if key deletion should be allowed. * @return {@code this} {@link VaultTransitKeyConfigurationBuilder}. */ - public VaultTransitKeyConfigurationBuilder deletionAllowed(boolean deletionAllowed) { + public VaultTransitKeyConfigurationBuilder deletionAllowed( + boolean deletionAllowed) { this.deletionAllowed = deletionAllowed; return this; } @@ -147,8 +149,8 @@ public class VaultTransitKeyConfiguration { * @return a new {@link VaultTransitKeyConfiguration}. */ public VaultTransitKeyConfiguration build() { - return new VaultTransitKeyConfiguration(deletionAllowed, - minDecryptionVersion, minEncryptionVersion); + return new VaultTransitKeyConfiguration(deletionAllowed, minDecryptionVersion, + minEncryptionVersion); } } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKeyCreationRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKeyCreationRequest.java index d1fa06b8..05826fbe 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKeyCreationRequest.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultTransitKeyCreationRequest.java @@ -128,8 +128,8 @@ public class VaultTransitKeyCreationRequest { * Configure key derivation. * * @param derived {@literal true} if key derivation MUST be used. If enabled, all - * encrypt/decrypt requests to this named key must provide a context which is used - * for key derivation. Defaults to {@literal false}. + * encrypt/decrypt requests to this named key must provide a context which is + * used for key derivation. Defaults to {@literal false}. * @return {@code this} {@link VaultTransitKeyCreationRequestBuilder}. */ public VaultTransitKeyCreationRequestBuilder derived(boolean derived) { @@ -143,7 +143,7 @@ public class VaultTransitKeyCreationRequest { * ciphertext. Requires {@link #derived(boolean)} to be {@literal true}. * * @param convergentEncryption {@literal true} the same plaintext creates the same - * ciphertext. Defaults to {@literal false}. + * ciphertext. Defaults to {@literal false}. * @return {@code this} {@link VaultTransitKeyCreationRequestBuilder}. */ public VaultTransitKeyCreationRequestBuilder convergentEncryption( @@ -157,7 +157,7 @@ public class VaultTransitKeyCreationRequest { * Configure if the raw key is exportable. * * @param exportable {@literal true} the raw key is exportable. Defaults to - * {@literal false}. + * {@literal false}. * @return {@code this} {@link VaultTransitKeyCreationRequestBuilder}. */ public VaultTransitKeyCreationRequestBuilder exportable(boolean exportable) { @@ -176,8 +176,8 @@ public class VaultTransitKeyCreationRequest { Assert.hasText(type, "Type must not be empty"); - return new VaultTransitKeyCreationRequest(derived, type, - convergentEncryption, exportable); + return new VaultTransitKeyCreationRequest(derived, type, convergentEncryption, + exportable); } } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/Versioned.java b/spring-vault-core/src/main/java/org/springframework/vault/support/Versioned.java index a90b4d68..7952e3e9 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/Versioned.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/Versioned.java @@ -312,7 +312,7 @@ public class Versioned { * Configure a created at {@link Instant}. * * @param createdAt timestamp at which the version was created, must not be - * {@literal null}. + * {@literal null}. * @return {@code this} {@link MetadataBuilder}. */ public MetadataBuilder createdAt(Instant createdAt) { @@ -327,7 +327,7 @@ public class Versioned { * Configure a deleted at {@link Instant}. * * @param deletedAt timestamp at which the version was deleted, must not be - * {@literal null}. + * {@literal null}. * @return {@code this} {@link MetadataBuilder}. */ public MetadataBuilder deletedAt(Instant deletedAt) { diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/package-info.java b/spring-vault-core/src/main/java/org/springframework/vault/support/package-info.java index f91b26be..c7e971d0 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/package-info.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/package-info.java @@ -4,4 +4,3 @@ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields package org.springframework.vault.support; - diff --git a/spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java index 26e91435..b9fa5409 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java @@ -44,7 +44,8 @@ import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration class LeaseAwareVaultPropertySourceIntegrationTests { - @VaultPropertySource(value = { "secret/myapp", "secret/myapp/profile" }, renewal = Renewal.RENEW) + @VaultPropertySource(value = { "secret/myapp", + "secret/myapp/profile" }, renewal = Renewal.RENEW) static class Config extends VaultIntegrationTestConfiguration { } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/annotation/VaultPropertySourceUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/annotation/VaultPropertySourceUnitTests.java index 1a503455..68ad270b 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/annotation/VaultPropertySourceUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/annotation/VaultPropertySourceUnitTests.java @@ -150,8 +150,8 @@ class VaultPropertySourceUnitTests { SecretLeaseContainer leaseContainerMock = ctx.getBean(SecretLeaseContainer.class); verify(leaseContainerMock).afterPropertiesSet(); verify(leaseContainerMock).addLeaseListener(any()); - verify(leaseContainerMock).addRequestedSecret( - RequestedSecret.renewable("foo/renewable")); + verify(leaseContainerMock) + .addRequestedSecret(RequestedSecret.renewable("foo/renewable")); verifyNoMoreInteractions(leaseContainerMock); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationIntegrationTestBase.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationIntegrationTestBase.java index ffdd451d..4dfeb9db 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationIntegrationTestBase.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationIntegrationTestBase.java @@ -27,8 +27,8 @@ import org.springframework.vault.util.IntegrationTestSupport; * * @author Mark Paluch */ -public abstract class AppIdAuthenticationIntegrationTestBase extends - IntegrationTestSupport { +public abstract class AppIdAuthenticationIntegrationTestBase + extends IntegrationTestSupport { @BeforeEach public void before() { @@ -41,21 +41,20 @@ public abstract class AppIdAuthenticationIntegrationTestBase extends Map appIdData = new HashMap(); appIdData.put("value", "dummy"); // policy - appIdData.put("display_name", "this is my test application"); + appIdData.put("display_name", "this is my test application"); - restOperations.postForEntity("auth/app-id/map/app-id/myapp", appIdData, - Map.class); + restOperations.postForEntity("auth/app-id/map/app-id/myapp", appIdData, + Map.class); - Map userIdData = new HashMap(); - userIdData.put("value", "myapp"); // name of the app-id - userIdData.put("cidr_block", "0.0.0.0/0"); + Map userIdData = new HashMap(); + userIdData.put("value", "myapp"); // name of the app-id + userIdData.put("cidr_block", "0.0.0.0/0"); - restOperations.postForEntity( - "auth/app-id/map/user-id/static-userid-value", userIdData, - Map.class); + restOperations.postForEntity("auth/app-id/map/user-id/static-userid-value", + userIdData, Map.class); - return null; - }); + return null; + }); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationIntegrationTests.java index 960ddecb..9257e480 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationIntegrationTests.java @@ -31,8 +31,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * * @author Mark Paluch */ -class AppIdAuthenticationIntegrationTests extends - AppIdAuthenticationIntegrationTestBase { +class AppIdAuthenticationIntegrationTests extends AppIdAuthenticationIntegrationTestBase { @Test void shouldLoginSuccessfully() { @@ -42,8 +41,8 @@ class AppIdAuthenticationIntegrationTests extends .userIdMechanism(new StaticUserId("static-userid-value")) // .build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); AppIdAuthentication authentication = new AppIdAuthentication(options, restTemplate); @@ -60,11 +59,11 @@ class AppIdAuthenticationIntegrationTests extends .userIdMechanism(new StaticUserId("wrong")) // .build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); - assertThatExceptionOfType(VaultException.class).isThrownBy( - () -> new AppIdAuthentication(options, restTemplate).login()); + assertThatExceptionOfType(VaultException.class) + .isThrownBy(() -> new AppIdAuthentication(options, restTemplate).login()); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationOperatorIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationOperatorIntegrationTests.java index 696460ff..b0b540b9 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationOperatorIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationOperatorIntegrationTests.java @@ -28,8 +28,8 @@ import org.springframework.web.reactive.function.client.WebClient; * * @author Mark Paluch */ -class AppIdAuthenticationOperatorIntegrationTests extends - AppIdAuthenticationIntegrationTestBase { +class AppIdAuthenticationOperatorIntegrationTests + extends AppIdAuthenticationIntegrationTestBase { WebClient webClient = TestWebClientFactory.create(Settings.createSslConfiguration()); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationStepsIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationStepsIntegrationTests.java index 35ffce99..b9433697 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationStepsIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationStepsIntegrationTests.java @@ -32,8 +32,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * * @author Mark Paluch */ -class AppIdAuthenticationStepsIntegrationTests extends - AppIdAuthenticationIntegrationTestBase { +class AppIdAuthenticationStepsIntegrationTests + extends AppIdAuthenticationIntegrationTestBase { @Test void authenticationStepsShouldLoginSuccessfully() { @@ -43,8 +43,8 @@ class AppIdAuthenticationStepsIntegrationTests extends .userIdMechanism(new StaticUserId("static-userid-value")) // .build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); AuthenticationStepsExecutor executor = new AuthenticationStepsExecutor( AppIdAuthentication.createAuthenticationSteps(options), restTemplate); @@ -62,8 +62,8 @@ class AppIdAuthenticationStepsIntegrationTests extends .userIdMechanism(new StaticUserId("wrong")) // .build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); AuthenticationStepsExecutor executor = new AuthenticationStepsExecutor( AppIdAuthentication.createAuthenticationSteps(options), restTemplate); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationUnitTests.java index 30c84399..56499c3c 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppIdAuthenticationUnitTests.java @@ -67,9 +67,8 @@ class AppIdAuthenticationUnitTests { .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.app_id").value("hello")) .andExpect(jsonPath("$.user_id").value("world")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); AppIdAuthentication authentication = new AppIdAuthentication(options, restTemplate); @@ -90,7 +89,7 @@ class AppIdAuthenticationUnitTests { mockRest.expect(requestTo("/auth/app-id/login")) // .andRespond(withServerError()); - assertThatExceptionOfType(VaultException.class).isThrownBy( - () -> new AppIdAuthentication(options, restTemplate).login()); + assertThatExceptionOfType(VaultException.class) + .isThrownBy(() -> new AppIdAuthentication(options, restTemplate).login()); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationIntegrationTestBase.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationIntegrationTestBase.java index 87ce8545..0eb26b81 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationIntegrationTestBase.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationIntegrationTestBase.java @@ -48,30 +48,29 @@ class AppRoleAuthenticationIntegrationTestBase extends IntegrationTestSupport { prepare().mountAuth("approle"); } - getVaultOperations().doWithSession( - restOperations -> { + getVaultOperations().doWithSession(restOperations -> { - Map withSecretId = new HashMap<>(); - withSecretId.put("policies", "dummy"); - withSecretId.put("bound_cidr_list", "0.0.0.0/0"); - withSecretId.put("bind_secret_id", "true"); - withSecretId.put("token_ttl", "60s"); - withSecretId.put("token_max_ttl", "60s"); + Map withSecretId = new HashMap<>(); + withSecretId.put("policies", "dummy"); + withSecretId.put("bound_cidr_list", "0.0.0.0/0"); + withSecretId.put("bind_secret_id", "true"); + withSecretId.put("token_ttl", "60s"); + withSecretId.put("token_max_ttl", "60s"); - restOperations.postForEntity("auth/approle/role/with-secret-id", - withSecretId, Map.class); + restOperations.postForEntity("auth/approle/role/with-secret-id", withSecretId, + Map.class); - Map noSecretIdRole = new HashMap<>(); - noSecretIdRole.put("policies", "dummy"); // policy - noSecretIdRole.put("bound_cidr_list", "0.0.0.0/0"); - noSecretIdRole.put("bind_secret_id", "false"); - noSecretIdRole.put("max_ttl", "60s"); + Map noSecretIdRole = new HashMap<>(); + noSecretIdRole.put("policies", "dummy"); // policy + noSecretIdRole.put("bound_cidr_list", "0.0.0.0/0"); + noSecretIdRole.put("bind_secret_id", "false"); + noSecretIdRole.put("max_ttl", "60s"); - restOperations.postForEntity("auth/approle/role/no-secret-id", - noSecretIdRole, Map.class); + restOperations.postForEntity("auth/approle/role/no-secret-id", noSecretIdRole, + Map.class); - return null; - }); + return null; + }); } VaultOperations getVaultOperations() { @@ -86,32 +85,32 @@ class AppRoleAuthenticationIntegrationTestBase extends IntegrationTestSupport { VaultToken generateWrappedSecretIdResponse() { - return getVaultOperations().doWithVault( - restOperations -> { + return getVaultOperations().doWithVault(restOperations -> { - HttpEntity httpEntity = getWrappingHeaders(); + HttpEntity httpEntity = getWrappingHeaders(); - VaultResponse response = restOperations.exchange( - "auth/approle/role/with-secret-id/secret-id", HttpMethod.PUT, - httpEntity, VaultResponse.class).getBody(); + VaultResponse response = restOperations + .exchange("auth/approle/role/with-secret-id/secret-id", + HttpMethod.PUT, httpEntity, VaultResponse.class) + .getBody(); - return VaultToken.of(response.getWrapInfo().get("token")); - }); + return VaultToken.of(response.getWrapInfo().get("token")); + }); } VaultToken generateWrappedRoleIdResponse() { - return getVaultOperations().doWithVault( - restOperations -> { + return getVaultOperations().doWithVault(restOperations -> { - HttpEntity httpEntity = getWrappingHeaders(); + HttpEntity httpEntity = getWrappingHeaders(); - VaultResponse response = restOperations.exchange( - "auth/approle/role/with-secret-id/role-id", HttpMethod.GET, - httpEntity, VaultResponse.class).getBody(); + VaultResponse response = restOperations + .exchange("auth/approle/role/with-secret-id/role-id", HttpMethod.GET, + httpEntity, VaultResponse.class) + .getBody(); - return VaultToken.of(response.getWrapInfo().get("token")); - }); + return VaultToken.of(response.getWrapInfo().get("token")); + }); } private HttpEntity getWrappingHeaders() { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationIntegrationTests.java index cfa01bf4..ddd8de8a 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationIntegrationTests.java @@ -35,8 +35,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @author Mark Paluch * @author Christophe Tafani-Dereeper */ -class AppRoleAuthenticationIntegrationTests extends - AppRoleAuthenticationIntegrationTestBase { +class AppRoleAuthenticationIntegrationTests + extends AppRoleAuthenticationIntegrationTestBase { @Test void shouldAuthenticateWithRoleIdOnly() { @@ -81,7 +81,8 @@ class AppRoleAuthenticationIntegrationTests extends String roleId = getRoleId("with-secret-id"); String secretId = (String) getVaultOperations() .write(String.format("auth/approle/role/%s/secret-id", "with-secret-id"), - null).getRequiredData().get("secret_id"); + null) + .getRequiredData().get("secret_id"); AppRoleAuthenticationOptions options = AppRoleAuthenticationOptions.builder() .roleId(RoleId.provided(roleId)).secretId(SecretId.provided(secretId)) diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationStepsIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationStepsIntegrationTests.java index 97b1ee4a..e487b4b1 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationStepsIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationStepsIntegrationTests.java @@ -19,7 +19,6 @@ import java.util.Collections; import org.junit.jupiter.api.Test; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.vault.VaultException; import org.springframework.vault.authentication.AppRoleAuthenticationOptions.RoleId; import org.springframework.vault.authentication.AppRoleAuthenticationOptions.SecretId; diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationUnitTests.java index 55b6b5e0..e29c45fc 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AppRoleAuthenticationUnitTests.java @@ -80,9 +80,8 @@ class AppRoleAuthenticationUnitTests { .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role_id").value("hello")) .andExpect(jsonPath("$.secret_id").value("world")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); AppRoleAuthentication sut = new AppRoleAuthentication(options, restTemplate); @@ -101,24 +100,21 @@ class AppRoleAuthenticationUnitTests { mockRest.expect(requestTo("/auth/approle/role/app_role/role-id")) .andExpect(method(HttpMethod.GET)) .andExpect(header("X-Vault-token", "initial_token")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\": {\"role_id\": \"hello\"}}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\": {\"role_id\": \"hello\"}}")); mockRest.expect(requestTo("/auth/approle/role/app_role/secret-id")) .andExpect(method(HttpMethod.POST)) .andExpect(header("X-Vault-token", "initial_token")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\": {\"secret_id\": \"world\"}}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\": {\"secret_id\": \"world\"}}")); mockRest.expect(requestTo("/auth/approle/login")) .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role_id").value("hello")) .andExpect(jsonPath("$.secret_id").value("world")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); AppRoleAuthentication sut = new AppRoleAuthentication(options, restTemplate); @@ -130,15 +126,14 @@ class AppRoleAuthenticationUnitTests { @Test void optionsShouldRequireTokenOrRoleIdIfNothingIsSet() { - assertThatIllegalArgumentException().isThrownBy( - () -> AppRoleAuthenticationOptions.builder().build()); + assertThatIllegalArgumentException() + .isThrownBy(() -> AppRoleAuthenticationOptions.builder().build()); } @Test void optionsShouldRequireTokenOrRoleIdIfTokenIsSet() { - assertThatIllegalArgumentException().isThrownBy( - () -> AppRoleAuthenticationOptions.builder() - .initialToken(VaultToken.of("foo")).build()); + assertThatIllegalArgumentException().isThrownBy(() -> AppRoleAuthenticationOptions + .builder().initialToken(VaultToken.of("foo")).build()); } @Test @@ -158,12 +153,9 @@ class AppRoleAuthenticationUnitTests { .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role_id").value("hello")) .andExpect(jsonPath("$.secret_id").doesNotExist()) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"lease_duration\": 10, \"renewable\": true}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"lease_duration\": 10, \"renewable\": true}" + + "}")); AppRoleAuthentication sut = new AppRoleAuthentication(options, restTemplate); @@ -171,8 +163,8 @@ class AppRoleAuthenticationUnitTests { assertThat(login).isInstanceOf(LoginToken.class); assertThat(login.getToken()).isEqualTo("my-token"); - assertThat(((LoginToken) login).getLeaseDuration()).isEqualTo( - Duration.ofSeconds(10)); + assertThat(((LoginToken) login).getLeaseDuration()) + .isEqualTo(Duration.ofSeconds(10)); assertThat(((LoginToken) login).isRenewable()).isTrue(); } @@ -210,24 +202,19 @@ class AppRoleAuthenticationUnitTests { mockRest.expect(requestTo("/cubbyhole/response")) .andExpect(header("X-Vault-Token", "unwrapping_token")) .andExpect(method(HttpMethod.GET)) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\":{\"response\":" - + OBJECT_MAPPER - .writeValueAsString(wrappedResponse) - + "} }")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\":{\"response\":" + + OBJECT_MAPPER.writeValueAsString(wrappedResponse) + + "} }")); // Also expect a second request to retrieve a token mockRest.expect(requestTo("/auth/approle/login")) .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role_id").value("my_role_id")) .andExpect(jsonPath("$.secret_id").value("my_secret_id")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"lease_duration\": 10, \"renewable\": true}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"lease_duration\": 10, \"renewable\": true}" + + "}")); AppRoleAuthentication auth = new AppRoleAuthentication(options, restTemplate); @@ -235,8 +222,8 @@ class AppRoleAuthenticationUnitTests { assertThat(login).isInstanceOf(LoginToken.class); assertThat(login.getToken()).isEqualTo("my-token"); - assertThat(((LoginToken) login).getLeaseDuration()).isEqualTo( - Duration.ofSeconds(10)); + assertThat(((LoginToken) login).getLeaseDuration()) + .isEqualTo(Duration.ofSeconds(10)); assertThat(((LoginToken) login).isRenewable()).isTrue(); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AuthenticationStepsExecutorUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AuthenticationStepsExecutorUnitTests.java index 50810e48..73bd778e 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AuthenticationStepsExecutorUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AuthenticationStepsExecutorUnitTests.java @@ -84,17 +84,13 @@ class AuthenticationStepsExecutorUnitTests { @Test void justLoginRequestShouldLogin() { - mockRest.expect(requestTo("/auth/cert/login")) - .andExpect(method(HttpMethod.POST)) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" - + "}")); + mockRest.expect(requestTo("/auth/cert/login")).andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" + + "}")); - AuthenticationSteps steps = AuthenticationSteps.just(post("/auth/{path}/login", - "cert").as(VaultResponse.class)); + AuthenticationSteps steps = AuthenticationSteps + .just(post("/auth/{path}/login", "cert").as(VaultResponse.class)); assertThat(login(steps)).isEqualTo(VaultToken.of("my-token")); } @@ -105,11 +101,10 @@ class AuthenticationStepsExecutorUnitTests { mockRest.expect(requestTo("/auth/cert/login")).andExpect(method(HttpMethod.POST)) .andRespond(withBadRequest().body("foo")); - AuthenticationSteps steps = AuthenticationSteps.just(post("/auth/{path}/login", - "cert").as(VaultResponse.class)); + AuthenticationSteps steps = AuthenticationSteps + .just(post("/auth/{path}/login", "cert").as(VaultResponse.class)); - assertThatExceptionOfType(VaultException.class) - .isThrownBy(() -> login(steps)) + assertThatExceptionOfType(VaultException.class).isThrownBy(() -> login(steps)) .withMessageContaining( "HTTP request POST /auth/{path}/login AS class org.springframework.vault.support.VaultResponse " + "in state null failed with Status 400 and body foo"); @@ -121,15 +116,11 @@ class AuthenticationStepsExecutorUnitTests { mockRest.expect(requestTo("somewhere/else")).andExpect(method(HttpMethod.GET)) .andRespond(withSuccess().contentType(MediaType.TEXT_PLAIN).body("foo")); - mockRest.expect(requestTo("/auth/cert/login")) - .andExpect(method(HttpMethod.POST)) + mockRest.expect(requestTo("/auth/cert/login")).andExpect(method(HttpMethod.POST)) .andExpect(content().string("foo-token")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"foo-token\", \"renewable\": true, \"lease_duration\": 10}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"foo-token\", \"renewable\": true, \"lease_duration\": 10}" + + "}")); AuthenticationSteps steps = AuthenticationSteps .fromHttpRequest(get(URI.create("somewhere/else")).as(String.class)) @@ -148,20 +139,17 @@ class AuthenticationStepsExecutorUnitTests { .andExpect(method(HttpMethod.GET)) // .andRespond(withSuccess().contentType(MediaType.TEXT_PLAIN).body("foo")); - mockRest.expect(requestTo("/auth/cert/login")) - .andExpect(content().string("foo")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"foo-token\", \"renewable\": true, \"lease_duration\": 10}" - + "}")); + mockRest.expect(requestTo("/auth/cert/login")).andExpect(content().string("foo")) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"foo-token\", \"renewable\": true, \"lease_duration\": 10}" + + "}")); HttpHeaders headers = new HttpHeaders(); headers.add("foo", "bar"); - AuthenticationSteps steps = AuthenticationSteps.fromHttpRequest( - get(URI.create("somewhere/else")).with(headers).as(String.class)) // + AuthenticationSteps steps = AuthenticationSteps + .fromHttpRequest( + get(URI.create("somewhere/else")).with(headers).as(String.class)) // .login("/auth/cert/login"); assertThat(login(steps)).isEqualTo(VaultToken.of("foo-token")); @@ -170,27 +158,22 @@ class AuthenticationStepsExecutorUnitTests { @Test void zipWithShouldRequestTwoItems() { - mockRest.expect(requestTo("/auth/login/left")) - .andExpect(method(HttpMethod.POST)) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{" + "\"request_id\": \"left\"}")); + mockRest.expect(requestTo("/auth/login/left")).andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{" + "\"request_id\": \"left\"}")); - mockRest.expect(requestTo("/auth/login/right")) - .andExpect(method(HttpMethod.POST)) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{" + "\"request_id\": \"right\"}")); + mockRest.expect(requestTo("/auth/login/right")).andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{" + "\"request_id\": \"right\"}")); - Node left = AuthenticationSteps.fromHttpRequest(post( - "/auth/login/left").as(VaultResponse.class)); + Node left = AuthenticationSteps + .fromHttpRequest(post("/auth/login/left").as(VaultResponse.class)); - Node right = AuthenticationSteps.fromHttpRequest(post( - "/auth/login/right").as(VaultResponse.class)); + Node right = AuthenticationSteps + .fromHttpRequest(post("/auth/login/right").as(VaultResponse.class)); - AuthenticationSteps steps = left.zipWith(right).login( - it -> VaultToken.of(it.getLeft().getRequestId() + "-" - + it.getRight().getRequestId())); + AuthenticationSteps steps = left.zipWith(right).login(it -> VaultToken + .of(it.getLeft().getRequestId() + "-" + it.getRight().getRequestId())); assertThat(login(steps)).isEqualTo(VaultToken.of("left-right")); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AuthenticationStepsOperatorUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AuthenticationStepsOperatorUnitTests.java index 47bab553..327e9802 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AuthenticationStepsOperatorUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AuthenticationStepsOperatorUnitTests.java @@ -76,13 +76,13 @@ class AuthenticationStepsOperatorUnitTests { response.setBody("{" + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" + "}"); - ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request).then( - Mono.just(response)); + ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request) + .then(Mono.just(response)); WebClient webClient = WebClient.builder().clientConnector(connector).build(); - AuthenticationSteps steps = AuthenticationSteps.just(post("/auth/{path}/login", - "cert").as(VaultResponse.class)); + AuthenticationSteps steps = AuthenticationSteps + .just(post("/auth/{path}/login", "cert").as(VaultResponse.class)); login(steps, webClient).as(StepVerifier::create) // .expectNext(VaultToken.of("my-token")) // @@ -96,13 +96,13 @@ class AuthenticationStepsOperatorUnitTests { "/auth/cert/login"); MockClientHttpResponse response = new MockClientHttpResponse( HttpStatus.BAD_REQUEST); - ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request).then( - Mono.just(response)); + ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request) + .then(Mono.just(response)); WebClient webClient = WebClient.builder().clientConnector(connector).build(); - AuthenticationSteps steps = AuthenticationSteps.just(post("/auth/{path}/login", - "cert").as(VaultResponse.class)); + AuthenticationSteps steps = AuthenticationSteps + .just(post("/auth/{path}/login", "cert").as(VaultResponse.class)); login(steps, webClient).as(StepVerifier::create) // .expectError() // @@ -135,15 +135,14 @@ class AuthenticationStepsOperatorUnitTests { WebClient webClient = WebClient.builder().clientConnector(connector).build(); - Node left = AuthenticationSteps.fromHttpRequest(post( - "/auth/login/left").as(VaultResponse.class)); + Node left = AuthenticationSteps + .fromHttpRequest(post("/auth/login/left").as(VaultResponse.class)); - Node right = AuthenticationSteps.fromHttpRequest(post( - "/auth/login/right").as(VaultResponse.class)); + Node right = AuthenticationSteps + .fromHttpRequest(post("/auth/login/right").as(VaultResponse.class)); - AuthenticationSteps steps = left.zipWith(right).login( - it -> VaultToken.of(it.getLeft().getRequestId() + "-" - + it.getRight().getRequestId())); + AuthenticationSteps steps = left.zipWith(right).login(it -> VaultToken + .of(it.getLeft().getRequestId() + "-" + it.getRight().getRequestId())); login(steps, webClient).as(StepVerifier::create) // .expectNext(VaultToken.of("left-right")) // diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AwsEc2AuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AwsEc2AuthenticationUnitTests.java index 27b79b2c..9ab5204f 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AwsEc2AuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AwsEc2AuthenticationUnitTests.java @@ -64,8 +64,8 @@ class AwsEc2AuthenticationUnitTests { @Test void shouldObtainIdentityDocument() { - mockRest.expect( - requestTo("http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // + mockRest.expect(requestTo( + "http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // .andExpect(method(HttpMethod.GET)) // .andRespond(withSuccess().body("Hello, world")); @@ -81,8 +81,8 @@ class AwsEc2AuthenticationUnitTests { AwsEc2AuthenticationOptions options = AwsEc2AuthenticationOptions.builder() .role("ami").build(); - mockRest.expect( - requestTo("http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // + mockRest.expect(requestTo( + "http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // .andExpect(method(HttpMethod.GET)) // .andRespond(withSuccess().body("Hello, world")); @@ -103,8 +103,8 @@ class AwsEc2AuthenticationUnitTests { AwsEc2AuthenticationOptions authenticationOptions = AwsEc2AuthenticationOptions .builder().nonce(nonce).build(); - mockRest.expect( - requestTo("http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // + mockRest.expect(requestTo( + "http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // .andExpect(method(HttpMethod.GET)) // .andRespond(withSuccess().body("value")); @@ -112,12 +112,9 @@ class AwsEc2AuthenticationUnitTests { .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.pkcs7").value("value")) .andExpect(jsonPath("$.nonce").value("foo")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"lease_duration\":20}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"lease_duration\":20}" + + "}")); AwsEc2Authentication authentication = new AwsEc2Authentication( authenticationOptions, restTemplate, restTemplate); @@ -126,8 +123,8 @@ class AwsEc2AuthenticationUnitTests { assertThat(login).isInstanceOf(LoginToken.class); assertThat(login.getToken()).isEqualTo("my-token"); - assertThat(((LoginToken) login).getLeaseDuration()).isEqualTo( - Duration.ofSeconds(20)); + assertThat(((LoginToken) login).getLeaseDuration()) + .isEqualTo(Duration.ofSeconds(20)); assertThat(((LoginToken) login).isRenewable()).isFalse(); } @@ -139,8 +136,8 @@ class AwsEc2AuthenticationUnitTests { AwsEc2AuthenticationOptions options = AwsEc2AuthenticationOptions.builder() .nonce(nonce).build(); - mockRest.expect( - requestTo("http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // + mockRest.expect(requestTo( + "http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // .andExpect(method(HttpMethod.GET)) // .andRespond(withSuccess().body("value")); @@ -148,12 +145,9 @@ class AwsEc2AuthenticationUnitTests { .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.pkcs7").value("value")) .andExpect(jsonPath("$.nonce").value("foo")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"lease_duration\":20}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"lease_duration\":20}" + + "}")); AuthenticationStepsExecutor executor = new AuthenticationStepsExecutor( AwsEc2Authentication.createAuthenticationSteps(options), restTemplate); @@ -161,20 +155,20 @@ class AwsEc2AuthenticationUnitTests { assertThat(login).isInstanceOf(LoginToken.class); assertThat(login.getToken()).isEqualTo("my-token"); - assertThat(((LoginToken) login).getLeaseDuration()).isEqualTo( - Duration.ofSeconds(20)); + assertThat(((LoginToken) login).getLeaseDuration()) + .isEqualTo(Duration.ofSeconds(20)); assertThat(((LoginToken) login).isRenewable()).isFalse(); } @Test void loginShouldFailWhileObtainingIdentityDocument() { - mockRest.expect( - requestTo("http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // + mockRest.expect(requestTo( + "http://169.254.169.254/latest/dynamic/instance-identity/pkcs7")) // .andRespond(withServerError()); - assertThatExceptionOfType(VaultException.class).isThrownBy( - () -> new AwsEc2Authentication(restTemplate).login()); + assertThatExceptionOfType(VaultException.class) + .isThrownBy(() -> new AwsEc2Authentication(restTemplate).login()); } @Test @@ -183,8 +177,8 @@ class AwsEc2AuthenticationUnitTests { mockRest.expect(requestTo("/auth/aws-ec2/login")) // .andRespond(withServerError()); - assertThatExceptionOfType(VaultException.class).isThrownBy( - () -> new AwsEc2Authentication(restTemplate) { + assertThatExceptionOfType(VaultException.class) + .isThrownBy(() -> new AwsEc2Authentication(restTemplate) { @Override protected Map getEc2Login() { return Collections.singletonMap("pkcs7", "value"); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AwsIamAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AwsIamAuthenticationUnitTests.java index 7546195c..bb01db71 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AwsIamAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AwsIamAuthenticationUnitTests.java @@ -59,19 +59,15 @@ class AwsIamAuthenticationUnitTests { @Test void shouldAuthenticate() { - mockRest.expect(requestTo("/auth/aws/login")) - .andExpect(method(HttpMethod.POST)) + mockRest.expect(requestTo("/auth/aws/login")).andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.iam_http_request_method").value("POST")) .andExpect(jsonPath("$.iam_request_url").exists()) .andExpect(jsonPath("$.iam_request_body").exists()) .andExpect(jsonPath("$.iam_request_headers").exists()) .andExpect(jsonPath("$.role").value("foo-role")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" + + "}")); AwsIamAuthenticationOptions options = AwsIamAuthenticationOptions.builder() .role("foo-role").credentials(new BasicAWSCredentials("foo", "bar")) @@ -82,27 +78,23 @@ class AwsIamAuthenticationUnitTests { assertThat(login).isInstanceOf(LoginToken.class); assertThat(login.getToken()).isEqualTo("my-token"); - assertThat(((LoginToken) login).getLeaseDuration()).isEqualTo( - Duration.ofSeconds(10)); + assertThat(((LoginToken) login).getLeaseDuration()) + .isEqualTo(Duration.ofSeconds(10)); assertThat(((LoginToken) login).isRenewable()).isTrue(); } @Test void shouldUsingAuthenticationSteps() { - mockRest.expect(requestTo("/auth/aws/login")) - .andExpect(method(HttpMethod.POST)) + mockRest.expect(requestTo("/auth/aws/login")).andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.iam_http_request_method").value("POST")) .andExpect(jsonPath("$.iam_request_url").exists()) .andExpect(jsonPath("$.iam_request_body").exists()) .andExpect(jsonPath("$.iam_request_headers").exists()) .andExpect(jsonPath("$.role").value("foo-role")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" + + "}")); AwsIamAuthenticationOptions options = AwsIamAuthenticationOptions.builder() .role("foo-role").credentials(new BasicAWSCredentials("foo", "bar")) @@ -117,8 +109,8 @@ class AwsIamAuthenticationUnitTests { assertThat(login).isInstanceOf(LoginToken.class); assertThat(login.getToken()).isEqualTo("my-token"); - assertThat(((LoginToken) login).getLeaseDuration()).isEqualTo( - Duration.ofSeconds(10)); + assertThat(((LoginToken) login).getLeaseDuration()) + .isEqualTo(Duration.ofSeconds(10)); assertThat(((LoginToken) login).isRenewable()).isTrue(); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AzureMsiAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AzureMsiAuthenticationUnitTests.java index da9a56ca..33266146 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/AzureMsiAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/AzureMsiAuthenticationUnitTests.java @@ -76,12 +76,11 @@ class AzureMsiAuthenticationUnitTests { @Test void loginShouldObtainToken() { - AzureMsiAuthenticationOptions options = AzureMsiAuthenticationOptions - .builder() + AzureMsiAuthenticationOptions options = AzureMsiAuthenticationOptions.builder() .role("dev-role") - .vmEnvironment( - new AzureVmEnvironment("foobar-subscription", "vault", - "vault-client")).build(); + .vmEnvironment(new AzureVmEnvironment("foobar-subscription", "vault", + "vault-client")) + .build(); expectIdentityTokenRequest(); expectLoginRequest(); @@ -116,12 +115,11 @@ class AzureMsiAuthenticationUnitTests { @Test void loginWithStepsShouldObtainToken() { - AzureMsiAuthenticationOptions options = AzureMsiAuthenticationOptions - .builder() + AzureMsiAuthenticationOptions options = AzureMsiAuthenticationOptions.builder() .role("dev-role") - .vmEnvironment( - new AzureVmEnvironment("foobar-subscription", "vault", - "vault-client")).build(); + .vmEnvironment(new AzureVmEnvironment("foobar-subscription", "vault", + "vault-client")) + .build(); expectIdentityTokenRequest(); expectLoginRequest(); @@ -136,44 +134,36 @@ class AzureMsiAuthenticationUnitTests { private void expectMetadataRequest() { - mockRest.expect( - requestTo(AzureMsiAuthenticationOptions.DEFAULT_INSTANCE_METADATA_SERVICE_URI)) - .andExpect(method(HttpMethod.GET)) - .andExpect(header("Metadata", "true")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{\n" - + " \"compute\": {\n" - + " \"name\": \"vault-client\",\n" - + " \"resourceGroupName\": \"vault\",\n" - + " \"subscriptionId\": \"foobar-subscription\"\n" - + " }\n" + "}")); + mockRest.expect(requestTo( + AzureMsiAuthenticationOptions.DEFAULT_INSTANCE_METADATA_SERVICE_URI)) + .andExpect(method(HttpMethod.GET)).andExpect(header("Metadata", "true")) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\n" + " \"compute\": {\n" + + " \"name\": \"vault-client\",\n" + + " \"resourceGroupName\": \"vault\",\n" + + " \"subscriptionId\": \"foobar-subscription\"\n" + + " }\n" + "}")); } private void expectIdentityTokenRequest() { - mockRest.expect( - requestTo(AzureMsiAuthenticationOptions.DEFAULT_IDENTITY_TOKEN_SERVICE_URI)) - .andExpect(method(HttpMethod.GET)) - .andExpect(header("Metadata", "true")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"access_token\": \"my-token\" }")); + mockRest.expect(requestTo( + AzureMsiAuthenticationOptions.DEFAULT_IDENTITY_TOKEN_SERVICE_URI)) + .andExpect(method(HttpMethod.GET)).andExpect(header("Metadata", "true")) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"access_token\": \"my-token\" }")); } private void expectLoginRequest() { - mockRest.expect(requestTo("/auth/azure/login")) - .andExpect(method(HttpMethod.POST)) + mockRest.expect(requestTo("/auth/azure/login")).andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role").value("dev-role")) .andExpect(jsonPath("$.jwt").value("my-token")) .andExpect(jsonPath("$.subscription_id").value("foobar-subscription")) .andExpect(jsonPath("$.resource_group_name").value("vault")) .andExpect(jsonPath("$.vm_name").value("vault-client")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTestBase.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTestBase.java index 8209ef55..f7f02a31 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTestBase.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTestBase.java @@ -37,8 +37,8 @@ import static org.springframework.vault.util.Settings.findWorkDir; * * @author Mark Paluch */ -public abstract class ClientCertificateAuthenticationIntegrationTestBase extends - IntegrationTestSupport { +public abstract class ClientCertificateAuthenticationIntegrationTestBase + extends IntegrationTestSupport { @BeforeEach public void before() { @@ -47,12 +47,13 @@ public abstract class ClientCertificateAuthenticationIntegrationTestBase extends prepare().mountAuth("cert"); } - prepare().getVaultOperations().doWithSession( - (RestOperationsCallback) restOperations -> { + prepare().getVaultOperations() + .doWithSession((RestOperationsCallback) restOperations -> { File workDir = findWorkDir(); - String certificate = Files.contentOf(new File(workDir, - "ca/certs/client.cert.pem"), StandardCharsets.US_ASCII); + String certificate = Files.contentOf( + new File(workDir, "ca/certs/client.cert.pem"), + StandardCharsets.US_ASCII); return restOperations.postForEntity("auth/cert/certs/my-role", Collections.singletonMap("certificate", certificate), @@ -61,8 +62,8 @@ public abstract class ClientCertificateAuthenticationIntegrationTestBase extends } static SslConfiguration prepareCertAuthenticationMethod() { - return prepareCertAuthenticationMethod(SslConfiguration.KeyConfiguration - .unconfigured()); + return prepareCertAuthenticationMethod( + SslConfiguration.KeyConfiguration.unconfigured()); } static SslConfiguration prepareCertAuthenticationMethod( @@ -70,8 +71,11 @@ public abstract class ClientCertificateAuthenticationIntegrationTestBase extends SslConfiguration original = createSslConfiguration(); - return new SslConfiguration(KeyStoreConfiguration.of(new FileSystemResource( - new File(findWorkDir(), "client-cert.jks")), "changeit".toCharArray()), + return new SslConfiguration( + KeyStoreConfiguration.of( + new FileSystemResource( + new File(findWorkDir(), "client-cert.jks")), + "changeit".toCharArray()), keyConfiguration, original.getTrustStoreConfiguration()); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java index a4faa99f..ce4b8549 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java @@ -37,8 +37,8 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; * * @author Mark Paluch */ -class ClientCertificateAuthenticationIntegrationTests extends - ClientCertificateAuthenticationIntegrationTestBase { +class ClientCertificateAuthenticationIntegrationTests + extends ClientCertificateAuthenticationIntegrationTestBase { @Test void shouldLoginSuccessfully() { @@ -85,8 +85,8 @@ class ClientCertificateAuthenticationIntegrationTests extends ClientCertificateAuthentication authentication = new ClientCertificateAuthentication( restTemplate); - assertThatExceptionOfType(NestedRuntimeException.class).isThrownBy( - authentication::login); + assertThatExceptionOfType(NestedRuntimeException.class) + .isThrownBy(authentication::login); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationOperatorIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationOperatorIntegrationTests.java index 3073dbbd..1fc3f789 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationOperatorIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationOperatorIntegrationTests.java @@ -30,8 +30,8 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; * * @author Mark Paluch */ -class ClientCertificateAuthenticationOperatorIntegrationTests extends - ClientCertificateAuthenticationIntegrationTestBase { +class ClientCertificateAuthenticationOperatorIntegrationTests + extends ClientCertificateAuthenticationIntegrationTestBase { @Test void authenticationStepsShouldLoginSuccessfully() { @@ -51,9 +51,8 @@ class ClientCertificateAuthenticationOperatorIntegrationTests extends @Test void shouldSelectKey() { - WebClient webClient = TestWebClientFactory - .create(prepareCertAuthenticationMethod(SslConfiguration.KeyConfiguration - .of("changeit".toCharArray(), "1"))); + WebClient webClient = TestWebClientFactory.create(prepareCertAuthenticationMethod( + SslConfiguration.KeyConfiguration.of("changeit".toCharArray(), "1"))); AuthenticationStepsOperator operator = new AuthenticationStepsOperator( ClientCertificateAuthentication.createAuthenticationSteps(), webClient); @@ -67,9 +66,8 @@ class ClientCertificateAuthenticationOperatorIntegrationTests extends @Test void shouldSelectInvalidKey() { - WebClient webClient = TestWebClientFactory - .create(prepareCertAuthenticationMethod(SslConfiguration.KeyConfiguration - .of("changeit".toCharArray(), "2"))); + WebClient webClient = TestWebClientFactory.create(prepareCertAuthenticationMethod( + SslConfiguration.KeyConfiguration.of("changeit".toCharArray(), "2"))); AuthenticationStepsOperator operator = new AuthenticationStepsOperator( ClientCertificateAuthentication.createAuthenticationSteps(), webClient); @@ -81,10 +79,8 @@ class ClientCertificateAuthenticationOperatorIntegrationTests extends @Test void shouldProvideInvalidKeyPassword() { - assertThatIllegalStateException() - .isThrownBy( - () -> TestWebClientFactory - .create(prepareCertAuthenticationMethod(SslConfiguration.KeyConfiguration - .of("wrong".toCharArray(), "1")))); + assertThatIllegalStateException().isThrownBy(() -> TestWebClientFactory + .create(prepareCertAuthenticationMethod(SslConfiguration.KeyConfiguration + .of("wrong".toCharArray(), "1")))); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationStepsIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationStepsIntegrationTests.java index c4ec4889..b6768893 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationStepsIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationStepsIntegrationTests.java @@ -36,8 +36,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * * @author Mark Paluch */ -class ClientCertificateAuthenticationStepsIntegrationTests extends - ClientCertificateAuthenticationIntegrationTestBase { +class ClientCertificateAuthenticationStepsIntegrationTests + extends ClientCertificateAuthenticationIntegrationTestBase { @Test void authenticationStepsShouldLoginSuccessfully() { @@ -49,7 +49,8 @@ class ClientCertificateAuthenticationStepsIntegrationTests extends TestRestTemplateFactory.TEST_VAULT_ENDPOINT, clientHttpRequestFactory); AuthenticationStepsExecutor executor = new AuthenticationStepsExecutor( - ClientCertificateAuthentication.createAuthenticationSteps(), restTemplate); + ClientCertificateAuthentication.createAuthenticationSteps(), + restTemplate); VaultToken login = executor.login(); @@ -66,8 +67,9 @@ class ClientCertificateAuthenticationStepsIntegrationTests extends RestTemplate restTemplate = VaultClients.createRestTemplate( TestRestTemplateFactory.TEST_VAULT_ENDPOINT, clientHttpRequestFactory); - assertThatExceptionOfType(NestedRuntimeException.class).isThrownBy( - () -> new AuthenticationStepsExecutor(ClientCertificateAuthentication - .createAuthenticationSteps(), restTemplate).login()); + assertThatExceptionOfType(NestedRuntimeException.class) + .isThrownBy(() -> new AuthenticationStepsExecutor( + ClientCertificateAuthentication.createAuthenticationSteps(), + restTemplate).login()); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationUnitTests.java index eb59b235..12c435e1 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationUnitTests.java @@ -60,14 +60,10 @@ class ClientCertificateAuthenticationUnitTests { @Test void loginShouldObtainToken() { - mockRest.expect(requestTo("/auth/cert/login")) - .andExpect(method(HttpMethod.POST)) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" - + "}")); + mockRest.expect(requestTo("/auth/cert/login")).andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" + + "}")); ClientCertificateAuthentication sut = new ClientCertificateAuthentication( restTemplate); @@ -76,8 +72,8 @@ class ClientCertificateAuthenticationUnitTests { assertThat(login).isInstanceOf(LoginToken.class); assertThat(login.getToken()).isEqualTo("my-token"); - assertThat(((LoginToken) login).getLeaseDuration()).isEqualTo( - Duration.ofSeconds(10)); + assertThat(((LoginToken) login).getLeaseDuration()) + .isEqualTo(Duration.ofSeconds(10)); assertThat(((LoginToken) login).isRenewable()).isTrue(); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationIntegrationTestBase.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationIntegrationTestBase.java index 7d72b11d..ed473f87 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationIntegrationTestBase.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationIntegrationTestBase.java @@ -31,22 +31,19 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Mark Paluch */ -abstract class CubbyholeAuthenticationIntegrationTestBase extends - IntegrationTestSupport { +abstract class CubbyholeAuthenticationIntegrationTestBase extends IntegrationTestSupport { Map prepareWrappedToken() { ResponseEntity response = prepare().getVaultOperations() - .doWithSession( - restOperations -> { + .doWithSession(restOperations -> { - HttpHeaders headers = new HttpHeaders(); - headers.add("X-Vault-Wrap-TTL", "10m"); + HttpHeaders headers = new HttpHeaders(); + headers.add("X-Vault-Wrap-TTL", "10m"); - return restOperations.exchange("auth/token/create", - HttpMethod.POST, new HttpEntity(headers), - VaultResponse.class); - }); + return restOperations.exchange("auth/token/create", HttpMethod.POST, + new HttpEntity(headers), VaultResponse.class); + }); Map wrapInfo = response.getBody().getWrapInfo(); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationIntegrationTests.java index 2270351d..a431eff6 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationIntegrationTests.java @@ -33,8 +33,8 @@ import static org.assertj.core.api.Assertions.fail; * * @author Mark Paluch */ -class CubbyholeAuthenticationIntegrationTests extends - CubbyholeAuthenticationIntegrationTestBase { +class CubbyholeAuthenticationIntegrationTests + extends CubbyholeAuthenticationIntegrationTestBase { @Test void shouldCreateWrappedToken() { @@ -45,8 +45,8 @@ class CubbyholeAuthenticationIntegrationTests extends CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of(initialToken)).wrapped().build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); CubbyholeAuthentication authentication = new CubbyholeAuthentication(options, restTemplate); @@ -60,8 +60,8 @@ class CubbyholeAuthenticationIntegrationTests extends CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of("Hello")).wrapped().build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); CubbyholeAuthentication authentication = new CubbyholeAuthentication(options, restTemplate); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationOperatorIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationOperatorIntegrationTests.java index 01a309aa..319c84d1 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationOperatorIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationOperatorIntegrationTests.java @@ -33,11 +33,11 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Mark Paluch */ -class CubbyholeAuthenticationOperatorIntegrationTests extends - CubbyholeAuthenticationIntegrationTestBase { +class CubbyholeAuthenticationOperatorIntegrationTests + extends CubbyholeAuthenticationIntegrationTestBase { - private WebClient webClient = TestWebClientFactory.create(Settings - .createSslConfiguration()); + private WebClient webClient = TestWebClientFactory + .create(Settings.createSslConfiguration()); @Test void authenticationStepsShouldCreateWrappedToken() { @@ -55,12 +55,11 @@ class CubbyholeAuthenticationOperatorIntegrationTests extends operator.getVaultToken() // .as(StepVerifier::create) // - .consumeNextWith( - actual -> { + .consumeNextWith(actual -> { - assertThat(actual).isNotEqualTo(Settings.token().getToken()) - .isNotNull(); - }) // + assertThat(actual).isNotEqualTo(Settings.token().getToken()) + .isNotNull(); + }) // .verifyComplete(); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationStepsIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationStepsIntegrationTests.java index 71024da6..1d3a39ac 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationStepsIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationStepsIntegrationTests.java @@ -32,8 +32,8 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Mark Paluch */ -class CubbyholeAuthenticationStepsIntegrationTests extends - CubbyholeAuthenticationIntegrationTestBase { +class CubbyholeAuthenticationStepsIntegrationTests + extends CubbyholeAuthenticationIntegrationTestBase { @Test void authenticationStepsShouldCreateWrappedToken() { @@ -44,8 +44,8 @@ class CubbyholeAuthenticationStepsIntegrationTests extends CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of(initialToken)).wrapped().build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); AuthenticationStepsExecutor executor = new AuthenticationStepsExecutor( CubbyholeAuthentication.createAuthenticationSteps(options), restTemplate); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationUnitTests.java index a4e8413d..a145637e 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/CubbyholeAuthenticationUnitTests.java @@ -25,8 +25,8 @@ import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.test.web.client.MockRestServiceServer; import org.springframework.vault.VaultException; -import org.springframework.vault.client.VaultHttpHeaders; import org.springframework.vault.client.VaultClients.PrefixAwareUriTemplateHandler; +import org.springframework.vault.client.VaultHttpHeaders; import org.springframework.vault.support.ObjectMapperSupplier; import org.springframework.vault.support.VaultToken; import org.springframework.web.client.RestTemplate; @@ -72,12 +72,10 @@ class CubbyholeAuthenticationUnitTests { mockRest.expect(requestTo("/cubbyhole/response")) .andExpect(method(HttpMethod.GET)) .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, "hello")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\":{\"response\":" - + OBJECT_MAPPER - .writeValueAsString(wrappedResponse) - + "} }")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\":{\"response\":" + + OBJECT_MAPPER.writeValueAsString(wrappedResponse) + + "} }")); CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of("hello")).wrapped().build(); @@ -106,23 +104,18 @@ class CubbyholeAuthenticationUnitTests { mockRest.expect(requestTo("/cubbyhole/response")) .andExpect(method(HttpMethod.GET)) .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, "hello")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\":{\"response\":" - + OBJECT_MAPPER - .writeValueAsString(wrappedResponse) - + "} }")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\":{\"response\":" + + OBJECT_MAPPER.writeValueAsString(wrappedResponse) + + "} }")); mockRest.expect(requestTo("/auth/token/lookup-self")) .andExpect(method(HttpMethod.GET)) - .andExpect( - header(VaultHttpHeaders.VAULT_TOKEN, - "5e6332cf-f003-6369-8cba-5bce2330f6cc")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\": {\n" + " \"creation_ttl\": 600,\n" - + " \"renewable\": false,\n" - + " \"ttl\": 456} }")); + .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, + "5e6332cf-f003-6369-8cba-5bce2330f6cc")) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\": {\n" + " \"creation_ttl\": 600,\n" + + " \"renewable\": false,\n" + " \"ttl\": 456} }")); CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of("hello")).wrapped().build(); @@ -143,13 +136,10 @@ class CubbyholeAuthenticationUnitTests { @Test void shouldLoginUsingStoredLogin() { - mockRest.expect(requestTo("/cubbyhole/token")) - .andExpect(method(HttpMethod.GET)) + mockRest.expect(requestTo("/cubbyhole/token")).andExpect(method(HttpMethod.GET)) .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, "hello")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{\"data\":{\"mytoken\":\"058222ef-9ab9-ff39-f087-9d5bee64e46d\"} }")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body( + "{\"data\":{\"mytoken\":\"058222ef-9ab9-ff39-f087-9d5bee64e46d\"} }")); CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of("hello")).path("cubbyhole/token") @@ -167,24 +157,18 @@ class CubbyholeAuthenticationUnitTests { @Test void shouldRetrieveRenewabilityUsingStoredLogin() { - mockRest.expect(requestTo("/cubbyhole/token")) - .andExpect(method(HttpMethod.GET)) + mockRest.expect(requestTo("/cubbyhole/token")).andExpect(method(HttpMethod.GET)) .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, "hello")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{\"data\":{\"mytoken\":\"058222ef-9ab9-ff39-f087-9d5bee64e46d\"} }")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body( + "{\"data\":{\"mytoken\":\"058222ef-9ab9-ff39-f087-9d5bee64e46d\"} }")); mockRest.expect(requestTo("/auth/token/lookup-self")) .andExpect(method(HttpMethod.GET)) - .andExpect( - header(VaultHttpHeaders.VAULT_TOKEN, - "058222ef-9ab9-ff39-f087-9d5bee64e46d")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\": {\n" + " \"creation_ttl\": 600,\n" - + " \"renewable\": true,\n" - + " \"ttl\": 456} }")); + .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, + "058222ef-9ab9-ff39-f087-9d5bee64e46d")) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\": {\n" + " \"creation_ttl\": 600,\n" + + " \"renewable\": true,\n" + " \"ttl\": 456} }")); CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of("hello")).path("cubbyhole/token").build(); @@ -205,12 +189,10 @@ class CubbyholeAuthenticationUnitTests { @Test void shouldFailUsingStoredLoginNoData() { - mockRest.expect(requestTo("/cubbyhole/token")) - .andExpect(method(HttpMethod.GET)) + mockRest.expect(requestTo("/cubbyhole/token")).andExpect(method(HttpMethod.GET)) .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, "hello")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\":{} }")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\":{} }")); CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of("hello")).path("cubbyhole/token").build(); @@ -230,12 +212,10 @@ class CubbyholeAuthenticationUnitTests { @Test void shouldFailUsingStoredMultipleEntries() { - mockRest.expect(requestTo("/cubbyhole/token")) - .andExpect(method(HttpMethod.GET)) + mockRest.expect(requestTo("/cubbyhole/token")).andExpect(method(HttpMethod.GET)) .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, "hello")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\":{\"key1\":1, \"key2\":2} }")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\":{\"key1\":1, \"key2\":2} }")); CubbyholeAuthenticationOptions options = CubbyholeAuthenticationOptions.builder() .initialToken(VaultToken.of("hello")).path("cubbyhole/token").build(); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpComputeAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpComputeAuthenticationUnitTests.java index 42cfc40f..e67f662c 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpComputeAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpComputeAuthenticationUnitTests.java @@ -54,22 +54,17 @@ class GcpComputeAuthenticationUnitTests { private void setupMocks() { - mockRest.expect( - requestTo("http://metadata/computeMetadata/v1/instance/service-accounts/default/identity?audience=https://localhost:8200/vault/dev-role&format=full")) - .andExpect(method(HttpMethod.GET)) - .andRespond( + mockRest.expect(requestTo( + "http://metadata/computeMetadata/v1/instance/service-accounts/default/identity?audience=https://localhost:8200/vault/dev-role&format=full")) + .andExpect(method(HttpMethod.GET)).andRespond( withSuccess().contentType(MediaType.TEXT_PLAIN).body("my-jwt")); - mockRest.expect(requestTo("/auth/gcp/login")) - .andExpect(method(HttpMethod.POST)) + mockRest.expect(requestTo("/auth/gcp/login")).andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role").value("dev-role")) .andExpect(jsonPath("$.jwt").value("my-jwt")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" + + "}")); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpIamAuthenticationOptionsBuilderUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpIamAuthenticationOptionsBuilderUnitTests.java index 59b35a79..89a6a1d1 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpIamAuthenticationOptionsBuilderUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpIamAuthenticationOptionsBuilderUnitTests.java @@ -60,8 +60,7 @@ class GcpIamAuthenticationOptionsBuilderUnitTests { GoogleCredential credential = createGoogleCredential(); - GcpIamAuthenticationOptions options = GcpIamAuthenticationOptions - .builder() + GcpIamAuthenticationOptions options = GcpIamAuthenticationOptions.builder() .credential(credential) .serviceAccountIdAccessor( (GoogleCredential googleCredential) -> "override@foo.com") @@ -79,8 +78,8 @@ class GcpIamAuthenticationOptionsBuilderUnitTests { GcpIamAuthenticationOptions options = GcpIamAuthenticationOptions.builder() .credential(credential).role("foo").build(); - assertThat(options.getProjectIdAccessor().getProjectId(credential)).isEqualTo( - "project-id"); + assertThat(options.getProjectIdAccessor().getProjectId(credential)) + .isEqualTo("project-id"); } @Test @@ -91,8 +90,8 @@ class GcpIamAuthenticationOptionsBuilderUnitTests { GcpIamAuthenticationOptions options = GcpIamAuthenticationOptions.builder() .credential(credential).projectId("my-project").role("foo").build(); - assertThat(options.getProjectIdAccessor().getProjectId(credential)).isEqualTo( - "my-project"); + assertThat(options.getProjectIdAccessor().getProjectId(credential)) + .isEqualTo("my-project"); } @Test @@ -105,8 +104,8 @@ class GcpIamAuthenticationOptionsBuilderUnitTests { .projectIdAccessor((GoogleCredential googleCredential) -> "my-project") .role("foo").build(); - assertThat(options.getProjectIdAccessor().getProjectId(credential)).isEqualTo( - "my-project"); + assertThat(options.getProjectIdAccessor().getProjectId(credential)) + .isEqualTo("my-project"); } private static GoogleCredential createGoogleCredential() { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpIamAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpIamAuthenticationUnitTests.java index 0ccd7074..e701bf79 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpIamAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/GcpIamAuthenticationUnitTests.java @@ -69,19 +69,15 @@ class GcpIamAuthenticationUnitTests { response.setStatusCode(200); response.setContent("{\"keyId\":\"keyid\", \"signedJwt\":\"my-jwt\"}"); - mockHttpTransport = new MockHttpTransport.Builder().setLowLevelHttpResponse( - response).build(); + mockHttpTransport = new MockHttpTransport.Builder() + .setLowLevelHttpResponse(response).build(); - mockRest.expect(requestTo("/auth/gcp/login")) - .andExpect(method(HttpMethod.POST)) + mockRest.expect(requestTo("/auth/gcp/login")).andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role").value("dev-role")) .andExpect(jsonPath("$.jwt").value("my-jwt")) - .andRespond( - withSuccess() - .contentType(MediaType.APPLICATION_JSON) - .body("{" - + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" - + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON).body("{" + + "\"auth\":{\"client_token\":\"my-token\", \"renewable\": true, \"lease_duration\": 10}" + + "}")); PrivateKey privateKeyMock = mock(PrivateKey.class); GoogleCredential credential = new Builder().setServiceAccountId("hello@world") diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/IpAddressUserIdTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/IpAddressUserIdTests.java index 94d0e304..a2858467 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/IpAddressUserIdTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/IpAddressUserIdTests.java @@ -33,7 +33,7 @@ class IpAddressUserIdTests { String userId = new IpAddressUserId().createUserId(); - assertThat(userId).matches(Pattern.compile("[0-9A-F]+")).doesNotMatch( - Pattern.compile("[a-f]")); + assertThat(userId).matches(Pattern.compile("[0-9A-F]+")) + .doesNotMatch(Pattern.compile("[a-f]")); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubeServiceAccountTokenFileUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubeServiceAccountTokenFileUnitTests.java index 40507e3b..0936f3cf 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubeServiceAccountTokenFileUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubeServiceAccountTokenFileUnitTests.java @@ -48,8 +48,8 @@ class KubeServiceAccountTokenFileUnitTests { @Test void shouldGetJwtTokenFromResource() { - String jwt = new KubernetesServiceAccountTokenFile(new ClassPathResource( - "kube-jwt-token")).get(); + String jwt = new KubernetesServiceAccountTokenFile( + new ClassPathResource("kube-jwt-token")).get(); assertThat(jwt).isEqualTo(TEST_TOKEN); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationIntegrationTestBase.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationIntegrationTestBase.java index 4bab7f8d..82315c19 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationIntegrationTestBase.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationIntegrationTestBase.java @@ -37,8 +37,8 @@ import static org.springframework.vault.util.Settings.findWorkDir; * @author Michal Budzyn */ @RequiresVaultVersion("0.8.3") -public abstract class KubernetesAuthenticationIntegrationTestBase extends - IntegrationTestSupport { +public abstract class KubernetesAuthenticationIntegrationTestBase + extends IntegrationTestSupport { @BeforeEach public void before() { @@ -50,12 +50,13 @@ public abstract class KubernetesAuthenticationIntegrationTestBase extends prepare().mountAuth("kubernetes"); } - prepare().getVaultOperations().doWithSession( - (RestOperationsCallback) restOperations -> { + prepare().getVaultOperations() + .doWithSession((RestOperationsCallback) restOperations -> { File workDir = findWorkDir(); - String certificate = Files.contentOf(new File(workDir, - "minikube/ca.crt"), StandardCharsets.US_ASCII); + String certificate = Files.contentOf( + new File(workDir, "minikube/ca.crt"), + StandardCharsets.US_ASCII); String host = String.format("https://%s:8443", minikubeIp); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationIntegrationTests.java index d3227db1..c904b492 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationIntegrationTests.java @@ -35,8 +35,8 @@ import static org.springframework.vault.util.Settings.findWorkDir; * * @author Michal Budzyn */ -class KubernetesAuthenticationIntegrationTests extends - KubernetesAuthenticationIntegrationTestBase { +class KubernetesAuthenticationIntegrationTests + extends KubernetesAuthenticationIntegrationTestBase { @Test void shouldLoginSuccessfully() { @@ -47,8 +47,8 @@ class KubernetesAuthenticationIntegrationTests extends .builder().role("my-role") .jwtSupplier(new KubernetesServiceAccountTokenFile(tokenFile)).build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); KubernetesAuthentication authentication = new KubernetesAuthentication(options, restTemplate); @@ -66,8 +66,8 @@ class KubernetesAuthenticationIntegrationTests extends .builder().role("wrong") .jwtSupplier(new KubernetesServiceAccountTokenFile(tokenFile)).build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); assertThatExceptionOfType(VaultException.class).isThrownBy( () -> new KubernetesAuthentication(options, restTemplate).login()); @@ -83,8 +83,8 @@ class KubernetesAuthenticationIntegrationTests extends .jwtSupplier(new KubernetesServiceAccountTokenFile(tokenResource)) .build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); assertThatExceptionOfType(VaultException.class).isThrownBy( () -> new KubernetesAuthentication(options, restTemplate).login()); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationStepsIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationStepsIntegrationTests.java index c81dc868..d2c59233 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationStepsIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationStepsIntegrationTests.java @@ -33,8 +33,8 @@ import static org.springframework.vault.util.Settings.findWorkDir; * * @author Mark Paluch */ -class KubernetesAuthenticationStepsIntegrationTests extends - KubernetesAuthenticationIntegrationTestBase { +class KubernetesAuthenticationStepsIntegrationTests + extends KubernetesAuthenticationIntegrationTestBase { @Test void shouldLoginSuccessfully() { @@ -45,11 +45,12 @@ class KubernetesAuthenticationStepsIntegrationTests extends .builder().role("my-role") .jwtSupplier(new KubernetesServiceAccountTokenFile(tokenFile)).build(); - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); AuthenticationStepsExecutor executor = new AuthenticationStepsExecutor( - KubernetesAuthentication.createAuthenticationSteps(options), restTemplate); + KubernetesAuthentication.createAuthenticationSteps(options), + restTemplate); VaultToken login = executor.login(); assertThat(login.getToken()).doesNotContain(Settings.token().getToken()); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationUnitTests.java index 272bb121..2156a98e 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/KubernetesAuthenticationUnitTests.java @@ -69,9 +69,8 @@ class KubernetesAuthenticationUnitTests { .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role").value("hello")) .andExpect(jsonPath("$.jwt").value("my-jwt-token")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); KubernetesAuthentication authentication = new KubernetesAuthentication(options, restTemplate); @@ -108,9 +107,8 @@ class KubernetesAuthenticationUnitTests { .andExpect(method(HttpMethod.POST)) .andExpect(jsonPath("$.role").value("hello")) .andExpect(jsonPath("$.jwt").value("foo")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{" + "\"auth\":{\"client_token\":\"my-token\"}" + "}")); KubernetesAuthentication authentication = new KubernetesAuthentication(options, restTemplate); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerIntegrationTests.java index f6f1fb4f..581b2a31 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerIntegrationTests.java @@ -112,22 +112,21 @@ class LifecycleAwareSessionManagerIntegrationTests extends IntegrationTestSuppor sessionManager.getSessionToken(); sessionManager.destroy(); - prepare().getVaultOperations().doWithSession( - restOperations -> { + prepare().getVaultOperations().doWithSession(restOperations -> { - try { - restOperations.getForEntity("auth/token/lookup/{token}", - Map.class, loginToken.toCharArray()); - fail("Missing HttpStatusCodeException"); - } - catch (HttpStatusCodeException e) { - // Compatibility across Vault versions. - assertThat(e.getStatusCode()).isIn(HttpStatus.BAD_REQUEST, - HttpStatus.NOT_FOUND, HttpStatus.FORBIDDEN); - } + try { + restOperations.getForEntity("auth/token/lookup/{token}", Map.class, + loginToken.toCharArray()); + fail("Missing HttpStatusCodeException"); + } + catch (HttpStatusCodeException e) { + // Compatibility across Vault versions. + assertThat(e.getStatusCode()).isIn(HttpStatus.BAD_REQUEST, + HttpStatus.NOT_FOUND, HttpStatus.FORBIDDEN); + } - return null; - }); + return null; + }); } private LoginToken createLoginToken() { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupportUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupportUnitTests.java index af80961a..26e1fbba 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupportUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerSupportUnitTests.java @@ -38,8 +38,8 @@ class LifecycleAwareSessionManagerSupportUnitTests { FixedTimeoutRefreshTrigger trigger = new FixedTimeoutRefreshTrigger(5, TimeUnit.SECONDS); - Date nextExecutionTime = trigger.nextExecutionTime(LoginToken.of( - "foo".toCharArray(), Duration.ofMinutes(1))); + Date nextExecutionTime = trigger.nextExecutionTime( + LoginToken.of("foo".toCharArray(), Duration.ofMinutes(1))); assertThat(nextExecutionTime).isBetween( new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(52)), new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(56))); @@ -51,8 +51,8 @@ class LifecycleAwareSessionManagerSupportUnitTests { FixedTimeoutRefreshTrigger trigger = new FixedTimeoutRefreshTrigger(5, TimeUnit.SECONDS); - Date nextExecutionTime = trigger.nextExecutionTime(LoginToken.of( - "foo".toCharArray(), Duration.ofSeconds(2))); + Date nextExecutionTime = trigger.nextExecutionTime( + LoginToken.of("foo".toCharArray(), Duration.ofSeconds(2))); assertThat(nextExecutionTime).isBetween( new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(0)), new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(2))); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java index a21e6c29..2dc898ee 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerUnitTests.java @@ -116,8 +116,8 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenThrow(new VaultLoginException("foo")); - assertThatExceptionOfType(VaultLoginException.class).isThrownBy( - () -> sessionManager.getSessionToken()); + assertThatExceptionOfType(VaultLoginException.class) + .isThrownBy(() -> sessionManager.getSessionToken()); verifyZeroInteractions(listener); verify(errorListener).onAuthenticationError(any(LoginFailedEvent.class)); } @@ -131,10 +131,9 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn(VaultToken.of("login")); - when( - restOperations.exchange(anyString(), any(), any(), - ArgumentMatchers. any())).thenReturn( - new ResponseEntity<>(vaultResponse, HttpStatus.OK)); + when(restOperations.exchange(anyString(), any(), any(), + ArgumentMatchers. any())) + .thenReturn(new ResponseEntity<>(vaultResponse, HttpStatus.OK)); LoginToken sessionToken = (LoginToken) sessionManager.getSessionToken(); assertThat(sessionToken.getLeaseDuration()).isEqualTo(Duration.ofSeconds(100)); @@ -157,10 +156,9 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn(VaultToken.of("login")); - when( - restOperations.exchange(anyString(), any(), any(), - ArgumentMatchers. any())).thenThrow( - new HttpClientErrorException(HttpStatus.FORBIDDEN)); + when(restOperations.exchange(anyString(), any(), any(), + ArgumentMatchers. any())) + .thenThrow(new HttpClientErrorException(HttpStatus.FORBIDDEN)); VaultToken sessionToken = sessionManager.getSessionToken(); assertThat(sessionToken).isExactlyInstanceOf(VaultToken.class); @@ -174,9 +172,8 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn( LoginToken.renewable("login".toCharArray(), Duration.ofMinutes(5))); when(restOperations.postForObject(anyString(), any(HttpEntity.class), any())) - .thenThrow( - new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, - "Some server error")); + .thenThrow(new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, + "Some server error")); sessionManager.getSessionToken(); assertThatThrownBy(() -> sessionManager.renewToken()) @@ -223,10 +220,9 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn(LoginToken.of("login")); - when( - restOperations.postForObject(anyString(), any(), - ArgumentMatchers. any())).thenThrow( - new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR)); + when(restOperations.postForObject(anyString(), any(), + ArgumentMatchers. any())).thenThrow( + new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR)); sessionManager.renewToken(); sessionManager.destroy(); @@ -238,8 +234,8 @@ class LifecycleAwareSessionManagerUnitTests { verify(listener) .onAuthenticationEvent(any(BeforeLoginTokenRevocationEvent.class)); verifyNoMoreInteractions(listener); - verify(errorListener).onAuthenticationError( - any(LoginTokenRevocationFailedEvent.class)); + verify(errorListener) + .onAuthenticationError(any(LoginTokenRevocationFailedEvent.class)); } @Test @@ -260,9 +256,8 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn( LoginToken.renewable("login".toCharArray(), Duration.ofSeconds(5))); when(restOperations.postForObject(anyString(), any(), eq(VaultResponse.class))) - .thenReturn( - fromToken(LoginToken.of("foo".toCharArray(), - Duration.ofSeconds(10)))); + .thenReturn(fromToken( + LoginToken.of("foo".toCharArray(), Duration.ofSeconds(10)))); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); @@ -271,10 +266,9 @@ class LifecycleAwareSessionManagerUnitTests { runnableCaptor.getValue().run(); - verify(restOperations).postForObject( - eq("auth/token/renew-self"), - eq(new HttpEntity<>(VaultHttpHeaders.from(LoginToken.renewable( - "login".toCharArray(), Duration.ofSeconds(5))))), + verify(restOperations).postForObject(eq("auth/token/renew-self"), + eq(new HttpEntity<>(VaultHttpHeaders.from(LoginToken + .renewable("login".toCharArray(), Duration.ofSeconds(5))))), any(Class.class)); verify(clientAuthentication, times(1)).login(); verify(listener).onAuthenticationEvent(any(BeforeLoginTokenRenewedEvent.class)); @@ -287,9 +281,8 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn( LoginToken.renewable("login".toCharArray(), Duration.ofSeconds(5))); when(restOperations.postForObject(anyString(), any(), eq(VaultResponse.class))) - .thenReturn( - fromToken(LoginToken.of("foo".toCharArray(), - Duration.ofSeconds(10)))); + .thenReturn(fromToken( + LoginToken.of("foo".toCharArray(), Duration.ofSeconds(10)))); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); @@ -307,9 +300,8 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn( LoginToken.renewable("login".toCharArray(), Duration.ofSeconds(5))); when(restOperations.postForObject(anyString(), any(), eq(VaultResponse.class))) - .thenReturn( - fromToken(LoginToken.of("foo".toCharArray(), - Duration.ofSeconds(2)))); + .thenReturn(fromToken( + LoginToken.of("foo".toCharArray(), Duration.ofSeconds(2)))); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); @@ -328,9 +320,8 @@ class LifecycleAwareSessionManagerUnitTests { LoginToken.renewable("login".toCharArray(), Duration.ofSeconds(5)), LoginToken.renewable("bar".toCharArray(), Duration.ofSeconds(5))); when(restOperations.postForObject(anyString(), any(), eq(VaultResponse.class))) - .thenReturn( - fromToken(LoginToken.of("foo".toCharArray(), - Duration.ofSeconds(2)))); + .thenReturn(fromToken( + LoginToken.of("foo".toCharArray(), Duration.ofSeconds(2)))); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); sessionManager.getSessionToken(); @@ -389,10 +380,9 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn( LoginToken.renewable("login".toCharArray(), Duration.ofSeconds(5))); - when( - restOperations.postForObject(anyString(), any(), - ArgumentMatchers. any())).thenThrow( - new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR)); + when(restOperations.postForObject(anyString(), any(), + ArgumentMatchers. any())).thenThrow( + new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR)); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); @@ -423,10 +413,9 @@ class LifecycleAwareSessionManagerUnitTests { when(clientAuthentication.login()).thenReturn( LoginToken.renewable("login".toCharArray(), Duration.ofSeconds(5))); - when( - restOperations.postForObject(anyString(), ArgumentMatchers.any(), - ArgumentMatchers. any())).thenThrow( - new HttpServerErrorException(HttpStatus.BAD_REQUEST)); + when(restOperations.postForObject(anyString(), ArgumentMatchers.any(), + ArgumentMatchers. any())) + .thenThrow(new HttpServerErrorException(HttpStatus.BAD_REQUEST)); sessionManager.getSessionToken(); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LoginTokenAdapterUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LoginTokenAdapterUnitTests.java index b2155fcc..03808f0e 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LoginTokenAdapterUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LoginTokenAdapterUnitTests.java @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.test.web.client.MockRestServiceServer; -import org.springframework.vault.client.VaultHttpHeaders; import org.springframework.vault.client.VaultClients.PrefixAwareUriTemplateHandler; +import org.springframework.vault.client.VaultHttpHeaders; import org.springframework.vault.support.VaultToken; import org.springframework.web.client.RestTemplate; @@ -58,17 +58,15 @@ class LoginTokenAdapterUnitTests { mockRest.expect(requestTo("/auth/token/lookup-self")) .andExpect(method(HttpMethod.GET)) - .andExpect( - header(VaultHttpHeaders.VAULT_TOKEN, - "5e6332cf-f003-6369-8cba-5bce2330f6cc")) - .andRespond( - withSuccess().contentType(MediaType.APPLICATION_JSON).body( - "{\"data\": {\n" + " \"creation_ttl\": 600,\n" - + " \"renewable\": false,\n" - + " \"ttl\": 456} }")); + .andExpect(header(VaultHttpHeaders.VAULT_TOKEN, + "5e6332cf-f003-6369-8cba-5bce2330f6cc")) + .andRespond(withSuccess().contentType(MediaType.APPLICATION_JSON) + .body("{\"data\": {\n" + " \"creation_ttl\": 600,\n" + + " \"renewable\": false,\n" + " \"ttl\": 456} }")); - LoginTokenAdapter adapter = new LoginTokenAdapter(new TokenAuthentication( - "5e6332cf-f003-6369-8cba-5bce2330f6cc"), restTemplate); + LoginTokenAdapter adapter = new LoginTokenAdapter( + new TokenAuthentication("5e6332cf-f003-6369-8cba-5bce2330f6cc"), + restTemplate); VaultToken login = adapter.login(); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LoginTokenUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LoginTokenUnitTests.java index 32b35455..6dc28d9a 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LoginTokenUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LoginTokenUnitTests.java @@ -37,11 +37,11 @@ class LoginTokenUnitTests { @Test void toStringShouldPrintFields() { - assertThat(LoginToken.of("token").toString()).isEqualTo( - "LoginToken [renewable=false, leaseDuration=PT0S]"); - assertThat(LoginToken.of("token", 1).toString()).isEqualTo( - "LoginToken [renewable=false, leaseDuration=PT1S]"); - assertThat(LoginToken.renewable("token", 1).toString()).isEqualTo( - "LoginToken [renewable=true, leaseDuration=PT1S]"); + assertThat(LoginToken.of("token").toString()) + .isEqualTo("LoginToken [renewable=false, leaseDuration=PT0S]"); + assertThat(LoginToken.of("token", 1).toString()) + .isEqualTo("LoginToken [renewable=false, leaseDuration=PT1S]"); + assertThat(LoginToken.renewable("token", 1).toString()) + .isEqualTo("LoginToken [renewable=true, leaseDuration=PT1S]"); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/MacAddressUserIdUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/MacAddressUserIdUnitTests.java index 24a8d6a1..2b9fee7c 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/MacAddressUserIdUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/MacAddressUserIdUnitTests.java @@ -38,8 +38,8 @@ class MacAddressUserIdUnitTests { String userId = new MacAddressUserId().createUserId(); - assertThat(userId).matches(Pattern.compile("[0-9A-F]+")).doesNotMatch( - Pattern.compile("[a-f]")); + assertThat(userId).matches(Pattern.compile("[0-9A-F]+")) + .doesNotMatch(Pattern.compile("[a-f]")); } @Test @@ -50,8 +50,8 @@ class MacAddressUserIdUnitTests { String userId = new MacAddressUserId(index).createUserId(); - assertThat(userId).matches(Pattern.compile("[0-9A-F]+")).doesNotMatch( - Pattern.compile("[a-f]")); + assertThat(userId).matches(Pattern.compile("[0-9A-F]+")) + .doesNotMatch(Pattern.compile("[a-f]")); } /** @@ -62,8 +62,8 @@ class MacAddressUserIdUnitTests { */ private int getValidNetworkInterfaceIndex() throws SocketException { - List interfaces = Collections.list(NetworkInterface - .getNetworkInterfaces()); + List interfaces = Collections + .list(NetworkInterface.getNetworkInterfaces()); int index = -1; diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerIntegrationTests.java index b15f111d..b89ba1b1 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerIntegrationTests.java @@ -53,7 +53,8 @@ import static org.springframework.vault.util.Settings.findWorkDir; * @author Mark Paluch */ @RequiresVaultVersion("0.6.2") -class ReactiveLifecycleAwareSessionManagerIntegrationTests extends IntegrationTestSupport { +class ReactiveLifecycleAwareSessionManagerIntegrationTests + extends IntegrationTestSupport { private ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler(); @@ -66,12 +67,13 @@ class ReactiveLifecycleAwareSessionManagerIntegrationTests extends IntegrationTe prepare().mountAuth("cert"); } - prepare().getVaultOperations().doWithSession( - (RestOperationsCallback) restOperations -> { + prepare().getVaultOperations() + .doWithSession((RestOperationsCallback) restOperations -> { File workDir = findWorkDir(); - String certificate = Files.contentOf(new File(workDir, - "ca/certs/client.cert.pem"), StandardCharsets.US_ASCII); + String certificate = Files.contentOf( + new File(workDir, "ca/certs/client.cert.pem"), + StandardCharsets.US_ASCII); Map body = new HashMap<>(); body.put("certificate", certificate); @@ -159,22 +161,21 @@ class ReactiveLifecycleAwareSessionManagerIntegrationTests extends IntegrationTe .verifyComplete(); sessionManager.destroy(); - prepare().getVaultOperations().doWithSession( - restOperations -> { + prepare().getVaultOperations().doWithSession(restOperations -> { - try { - restOperations.getForEntity("auth/token/lookup/{token}", - Map.class, loginToken.toCharArray()); - fail("Missing HttpStatusCodeException"); - } - catch (HttpStatusCodeException e) { - // Compatibility across Vault versions. - assertThat(e.getStatusCode()).isIn(HttpStatus.BAD_REQUEST, - HttpStatus.NOT_FOUND, HttpStatus.FORBIDDEN); - } + try { + restOperations.getForEntity("auth/token/lookup/{token}", Map.class, + loginToken.toCharArray()); + fail("Missing HttpStatusCodeException"); + } + catch (HttpStatusCodeException e) { + // Compatibility across Vault versions. + assertThat(e.getStatusCode()).isIn(HttpStatus.BAD_REQUEST, + HttpStatus.NOT_FOUND, HttpStatus.FORBIDDEN); + } - return null; - }); + return null; + }); } private LoginToken createLoginToken() { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerUnitTests.java index 632cdc96..25b0f622 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManagerUnitTests.java @@ -47,12 +47,12 @@ import org.springframework.vault.authentication.event.LoginTokenExpiredEvent; import org.springframework.vault.support.VaultResponse; import org.springframework.vault.support.VaultToken; import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.reactive.function.client.WebClientResponseException; import org.springframework.web.reactive.function.client.WebClient.RequestBodySpec; import org.springframework.web.reactive.function.client.WebClient.RequestBodyUriSpec; import org.springframework.web.reactive.function.client.WebClient.RequestHeadersSpec; import org.springframework.web.reactive.function.client.WebClient.RequestHeadersUriSpec; import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; +import org.springframework.web.reactive.function.client.WebClientResponseException; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -144,8 +144,8 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { @Test void loginShouldFail() { - when(tokenSupplier.getVaultToken()).thenReturn( - Mono.error(new VaultLoginException("foo"))); + when(tokenSupplier.getVaultToken()) + .thenReturn(Mono.error(new VaultLoginException("foo"))); sessionManager.getSessionToken() // .as(StepVerifier::create) // @@ -165,16 +165,12 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { when(responseSpec.bodyToMono((Class) any())).thenReturn(Mono.just(vaultResponse)); - sessionManager - .getSessionToken() - .as(StepVerifier::create) - .assertNext( - it -> { + sessionManager.getSessionToken().as(StepVerifier::create).assertNext(it -> { - LoginToken sessionToken = (LoginToken) it; - assertThat(sessionToken.getLeaseDuration()).isEqualTo( - Duration.ofSeconds(100)); - }).verifyComplete(); + LoginToken sessionToken = (LoginToken) it; + assertThat(sessionToken.getLeaseDuration()) + .isEqualTo(Duration.ofSeconds(100)); + }).verifyComplete(); verify(webClient.get()).uri("auth/token/lookup-self"); verify(listener).onAuthenticationEvent(captor.capture()); @@ -191,9 +187,9 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { mockToken(VaultToken.of("login")); - when(responseSpec.bodyToMono((Class) any())).thenReturn( - Mono.error(new WebClientResponseException("forbidden", 403, "Forbidden", - null, null, null))); + when(responseSpec.bodyToMono((Class) any())) + .thenReturn(Mono.error(new WebClientResponseException("forbidden", 403, + "Forbidden", null, null, null))); sessionManager.getSessionToken() // .as(StepVerifier::create) // @@ -209,23 +205,19 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { mockToken(LoginToken.renewable("foo".toCharArray(), Duration.ofMinutes(1))); - when(responseSpec.bodyToMono((Class) any())).thenReturn( - Mono.error(new WebClientResponseException("Some server error", 500, - "Some server error", null, null, null))); + when(responseSpec.bodyToMono((Class) any())) + .thenReturn(Mono.error(new WebClientResponseException("Some server error", + 500, "Some server error", null, null, null))); sessionManager.getVaultToken().as(StepVerifier::create).expectNextCount(1) .verifyComplete(); - sessionManager - .renewToken() - .as(StepVerifier::create) - .consumeErrorWith( - exception -> { - assertThat(exception) - .isInstanceOf(VaultTokenRenewalException.class) - .hasCauseInstanceOf(WebClientResponseException.class) - .hasMessageContaining( - "Cannot renew token: Status 500 Some server error"); - }).verify(); + sessionManager.renewToken().as(StepVerifier::create) + .consumeErrorWith(exception -> { + assertThat(exception).isInstanceOf(VaultTokenRenewalException.class) + .hasCauseInstanceOf(WebClientResponseException.class) + .hasMessageContaining( + "Cannot renew token: Status 500 Some server error"); + }).verify(); } @Test @@ -273,9 +265,9 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { mockToken(LoginToken.of("login")); - when(responseSpec.bodyToMono((Class) any())).thenReturn( - Mono.error(new WebClientResponseException("forbidden", 403, "Forbidden", - null, null, null))); + when(responseSpec.bodyToMono((Class) any())) + .thenReturn(Mono.error(new WebClientResponseException("forbidden", 403, + "Forbidden", null, null, null))); sessionManager.renewToken() // .as(StepVerifier::create) // @@ -311,8 +303,8 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { auth.put("ttl", 100); vaultResponse.setAuth(auth); - when(responseSpec.bodyToMono(VaultResponse.class)).thenReturn( - Mono.just(vaultResponse)); + when(responseSpec.bodyToMono(VaultResponse.class)) + .thenReturn(Mono.just(vaultResponse)); sessionManager.getSessionToken() // .as(StepVerifier::create) // @@ -336,9 +328,8 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { mockToken(LoginToken.renewable("login".toCharArray(), Duration.ofSeconds(5))); - when(responseSpec.bodyToMono(VaultResponse.class)).thenReturn( - Mono.just(fromToken(LoginToken.of("foo".toCharArray(), - Duration.ofSeconds(10))))); + when(responseSpec.bodyToMono(VaultResponse.class)).thenReturn(Mono.just( + fromToken(LoginToken.of("foo".toCharArray(), Duration.ofSeconds(10))))); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); @@ -357,9 +348,8 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { void shouldNotScheduleRenewalIfRenewalTtlExceedsThreshold() { mockToken(LoginToken.renewable("login".toCharArray(), Duration.ofSeconds(5))); - when(responseSpec.bodyToMono(VaultResponse.class)).thenReturn( - Mono.just(fromToken(LoginToken.of("foo".toCharArray(), - Duration.ofSeconds(2))))); + when(responseSpec.bodyToMono(VaultResponse.class)).thenReturn(Mono.just( + fromToken(LoginToken.of("foo".toCharArray(), Duration.ofSeconds(2))))); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); @@ -375,15 +365,13 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { @Test void shouldReLoginIfRenewalTtlExceedsThreshold() { - when(tokenSupplier.getVaultToken()) - .thenReturn( - Mono.just(LoginToken.renewable("login".toCharArray(), - Duration.ofSeconds(5))), - Mono.just(LoginToken.renewable("bar".toCharArray(), - Duration.ofSeconds(5)))); - when(responseSpec.bodyToMono(VaultResponse.class)).thenReturn( - Mono.just(fromToken(LoginToken.of("foo".toCharArray(), - Duration.ofSeconds(2))))); + when(tokenSupplier.getVaultToken()).thenReturn( + Mono.just(LoginToken.renewable("login".toCharArray(), + Duration.ofSeconds(5))), + Mono.just(LoginToken.renewable("bar".toCharArray(), + Duration.ofSeconds(5)))); + when(responseSpec.bodyToMono(VaultResponse.class)).thenReturn(Mono.just( + fromToken(LoginToken.of("foo".toCharArray(), Duration.ofSeconds(2))))); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); sessionManager.getSessionToken() // @@ -393,9 +381,7 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { verify(taskScheduler).schedule(runnableCaptor.capture(), any(Trigger.class)); runnableCaptor.getValue().run(); - sessionManager - .getSessionToken() - .as(StepVerifier::create) + sessionManager.getSessionToken().as(StepVerifier::create) .expectNext( LoginToken.renewable("bar".toCharArray(), Duration.ofSeconds(5))) .verifyComplete(); @@ -408,14 +394,13 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { @Test void shouldReLoginIfRenewFails() { - when(tokenSupplier.getVaultToken()) - .thenReturn( - Mono.just(LoginToken.renewable("login".toCharArray(), - Duration.ofSeconds(5))), - Mono.just(LoginToken.renewable("bar".toCharArray(), - Duration.ofSeconds(5)))); - when(responseSpec.bodyToMono(VaultResponse.class)).thenReturn( - Mono.error(new RuntimeException("foo"))); + when(tokenSupplier.getVaultToken()).thenReturn( + Mono.just(LoginToken.renewable("login".toCharArray(), + Duration.ofSeconds(5))), + Mono.just(LoginToken.renewable("bar".toCharArray(), + Duration.ofSeconds(5)))); + when(responseSpec.bodyToMono(VaultResponse.class)) + .thenReturn(Mono.error(new RuntimeException("foo"))); ArgumentCaptor runnableCaptor = ArgumentCaptor.forClass(Runnable.class); sessionManager.getSessionToken() // @@ -425,9 +410,7 @@ class ReactiveLifecycleAwareSessionManagerUnitTests { verify(taskScheduler).schedule(runnableCaptor.capture(), any(Trigger.class)); runnableCaptor.getValue().run(); - sessionManager - .getSessionToken() - .as(StepVerifier::create) + sessionManager.getSessionToken().as(StepVerifier::create) .expectNext( LoginToken.renewable("bar".toCharArray(), Duration.ofSeconds(5))) .verifyComplete(); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationIntegrationTestBase.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationIntegrationTestBase.java index 0b647db9..da0e7c9a 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationIntegrationTestBase.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationIntegrationTestBase.java @@ -24,7 +24,6 @@ import org.springframework.vault.util.RequiresVaultVersion; * @author Mark Paluch */ @RequiresVaultVersion("0.6.4") -abstract class TokenAuthenticationIntegrationTestBase extends - IntegrationTestSupport { +abstract class TokenAuthenticationIntegrationTestBase extends IntegrationTestSupport { } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationOperatorIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationOperatorIntegrationTests.java index 08989f25..aa584b0b 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationOperatorIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationOperatorIntegrationTests.java @@ -35,8 +35,8 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Mark Paluch */ -class TokenAuthenticationOperatorIntegrationTests extends - TokenAuthenticationIntegrationTestBase { +class TokenAuthenticationOperatorIntegrationTests + extends TokenAuthenticationIntegrationTestBase { WebClient webClient = TestWebClientFactory.create(Settings.createSslConfiguration()); @@ -52,20 +52,17 @@ class TokenAuthenticationOperatorIntegrationTests extends AuthenticationStepsOperator operator = new AuthenticationStepsOperator( TokenAuthentication.createAuthenticationSteps(token, true), webClient); - operator.getVaultToken() - .as(StepVerifier::create) - .consumeNextWith( - actual -> { + operator.getVaultToken().as(StepVerifier::create).consumeNextWith(actual -> { - assertThat(actual).isInstanceOf(LoginToken.class); + assertThat(actual).isInstanceOf(LoginToken.class); - LoginToken loginToken = (LoginToken) actual; + LoginToken loginToken = (LoginToken) actual; - assertThat(loginToken.getLeaseDuration()).isBetween( - Duration.ofSeconds(40), Duration.ofSeconds(60)); - assertThat(loginToken.isRenewable()).isTrue(); + assertThat(loginToken.getLeaseDuration()).isBetween(Duration.ofSeconds(40), + Duration.ofSeconds(60)); + assertThat(loginToken.isRenewable()).isTrue(); - }).verifyComplete(); + }).verifyComplete(); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationStepsIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationStepsIntegrationTests.java index 3cf85810..16ca5d03 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationStepsIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/TokenAuthenticationStepsIntegrationTests.java @@ -35,11 +35,11 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * * @author Mark Paluch */ -class TokenAuthenticationStepsIntegrationTests extends - TokenAuthenticationIntegrationTestBase { +class TokenAuthenticationStepsIntegrationTests + extends TokenAuthenticationIntegrationTestBase { - RestTemplate restTemplate = TestRestTemplateFactory.create(Settings - .createSslConfiguration()); + RestTemplate restTemplate = TestRestTemplateFactory + .create(Settings.createSslConfiguration()); @Test void shouldSelfLookup() { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/client/ClientHttpRequestFactoryFactoryIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/client/ClientHttpRequestFactoryFactoryIntegrationTests.java index 58bfdb5f..b3f585b4 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/client/ClientHttpRequestFactoryFactoryIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/client/ClientHttpRequestFactoryFactoryIntegrationTests.java @@ -94,8 +94,8 @@ class ClientHttpRequestFactoryFactoryIntegrationTests { // Uninitialized and sealed can cause status 500 try { - ResponseEntity responseEntity = template.exchange(url, - HttpMethod.GET, null, String.class); + ResponseEntity responseEntity = template.exchange(url, HttpMethod.GET, + null, String.class); return responseEntity.getBody(); } catch (HttpStatusCodeException e) { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/client/ReactiveVaultClientsUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/client/ReactiveVaultClientsUnitTests.java index d5eebd73..721f03dc 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/client/ReactiveVaultClientsUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/client/ReactiveVaultClientsUnitTests.java @@ -45,8 +45,8 @@ class ReactiveVaultClientsUnitTests { "/auth/foo"); MockClientHttpResponse response = new MockClientHttpResponse(HttpStatus.OK); - ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request).then( - Mono.just(response)); + ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request) + .then(Mono.just(response)); WebClient webClient = WebClient.builder().clientConnector(connector) .filter(ReactiveVaultClients.namespace("foo/bar")).build(); @@ -66,8 +66,8 @@ class ReactiveVaultClientsUnitTests { "/auth/foo"); MockClientHttpResponse response = new MockClientHttpResponse(HttpStatus.OK); - ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request).then( - Mono.just(response)); + ClientHttpConnector connector = (method, uri, fn) -> fn.apply(request) + .then(Mono.just(response)); WebClient webClient = WebClient.builder().clientConnector(connector) .filter(ReactiveVaultClients.namespace("foo/bar")).build(); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/client/RestTemplateBuilderUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/client/RestTemplateBuilderUnitTests.java index c4bd3c6b..043ed136 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/client/RestTemplateBuilderUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/client/RestTemplateBuilderUnitTests.java @@ -69,8 +69,8 @@ class RestTemplateBuilderUnitTests { restTemplate.getInterceptors().clear(); - ClientHttpRequest request = restTemplate.getRequestFactory().createRequest( - URI.create("/"), HttpMethod.GET); + ClientHttpRequest request = restTemplate.getRequestFactory() + .createRequest(URI.create("/"), HttpMethod.GET); assertThat(request.getHeaders()).containsEntry("header", Collections.singletonList("value")); @@ -79,16 +79,15 @@ class RestTemplateBuilderUnitTests { @Test void shouldApplyRequestCustomizers() throws IOException { - RestTemplate restTemplate = RestTemplateBuilder - .builder() - .endpoint(VaultEndpoint.create("localhost", 8200)) - .requestCustomizers( - request -> request.getHeaders().add("header", "value")).build(); + RestTemplate restTemplate = RestTemplateBuilder.builder() + .endpoint(VaultEndpoint.create("localhost", 8200)).requestCustomizers( + request -> request.getHeaders().add("header", "value")) + .build(); restTemplate.getInterceptors().clear(); - ClientHttpRequest request = restTemplate.getRequestFactory().createRequest( - URI.create("/"), HttpMethod.GET); + ClientHttpRequest request = restTemplate.getRequestFactory() + .createRequest(URI.create("/"), HttpMethod.GET); assertThat(request.getHeaders()).containsEntry("header", Collections.singletonList("value")); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/client/VaultClientsUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/client/VaultClientsUnitTests.java index 05019897..cde3121b 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/client/VaultClientsUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/client/VaultClientsUnitTests.java @@ -94,8 +94,8 @@ class VaultClientsUnitTests { void shouldApplyNamespace() { RestTemplate restTemplate = VaultClients.createRestTemplate(); - restTemplate.getInterceptors().add( - VaultClients.createNamespaceInterceptor("foo/bar")); + restTemplate.getInterceptors() + .add(VaultClients.createNamespaceInterceptor("foo/bar")); restTemplate.setUriTemplateHandler(new PrefixAwareUriTemplateHandler()); MockRestServiceServer mockRest = MockRestServiceServer.createServer(restTemplate); @@ -111,8 +111,8 @@ class VaultClientsUnitTests { void shouldAllowNamespaceOverride() { RestTemplate restTemplate = VaultClients.createRestTemplate(); - restTemplate.getInterceptors().add( - VaultClients.createNamespaceInterceptor("foo/bar")); + restTemplate.getInterceptors() + .add(VaultClients.createNamespaceInterceptor("foo/bar")); restTemplate.setUriTemplateHandler(new PrefixAwareUriTemplateHandler()); MockRestServiceServer mockRest = MockRestServiceServer.createServer(restTemplate); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/client/VaultEndpointUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/client/VaultEndpointUnitTests.java index 206c9024..ba326335 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/client/VaultEndpointUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/client/VaultEndpointUnitTests.java @@ -63,11 +63,11 @@ class VaultEndpointUnitTests { @Test void shouldCreateEndpointWithPath() { - VaultEndpoint endpoint = VaultEndpoint.from(URI - .create("http://127.0.0.1/context")); + VaultEndpoint endpoint = VaultEndpoint + .from(URI.create("http://127.0.0.1/context")); assertThat(endpoint.getPath()).isEqualTo("context"); - assertThat(endpoint.createUri("foo")).isEqualTo( - URI.create("http://127.0.0.1:80/context/foo")); + assertThat(endpoint.createUri("foo")) + .isEqualTo(URI.create("http://127.0.0.1:80/context/foo")); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java index 060b77c5..0369a01c 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java @@ -52,8 +52,9 @@ class VaultResponsesUnitTests { "{\"errors\":[\"some-error\"]}".getBytes(), StandardCharsets.US_ASCII); VaultException vaultException = VaultResponses.buildException(cause); - assertThat(vaultException).hasMessageContaining( - "Status 400 Bad Request: some-error;").hasCause(cause); + assertThat(vaultException) + .hasMessageContaining("Status 400 Bad Request: some-error;") + .hasCause(cause); } @Test @@ -63,8 +64,9 @@ class VaultResponsesUnitTests { HttpStatus.BAD_REQUEST, "Bad Request"); VaultException vaultException = VaultResponses.buildException(cause, "sys/path"); - assertThat(vaultException).hasMessageContaining( - "Status 400 Bad Request [sys/path];").hasCause(cause); + assertThat(vaultException) + .hasMessageContaining("Status 400 Bad Request [sys/path];") + .hasCause(cause); } @Test @@ -75,7 +77,8 @@ class VaultResponsesUnitTests { "{\"errors\":[\"some-error\"]}".getBytes(), StandardCharsets.US_ASCII); VaultException vaultException = VaultResponses.buildException(cause, "sys/path"); - assertThat(vaultException).hasMessageContaining( - "Status 400 Bad Request [sys/path]: some-error;").hasCause(cause); + assertThat(vaultException) + .hasMessageContaining("Status 400 Bad Request [sys/path]: some-error;") + .hasCause(cause); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationClientCertAuthenticationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationClientCertAuthenticationUnitTests.java index ceb58222..bcd87171 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationClientCertAuthenticationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationClientCertAuthenticationUnitTests.java @@ -51,7 +51,7 @@ class EnvironmentVaultConfigurationClientCertAuthenticationUnitTests { ClientAuthentication clientAuthentication = configuration.clientAuthentication(); - assertThat(clientAuthentication).isInstanceOf( - ClientCertificateAuthentication.class); + assertThat(clientAuthentication) + .isInstanceOf(ClientCertificateAuthentication.class); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationUnitTests.java index 9fd5b023..c9d23cf0 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/config/EnvironmentVaultConfigurationUnitTests.java @@ -91,8 +91,8 @@ class EnvironmentVaultConfigurationUnitTests { assertThat(sslConfiguration.getTrustStore()) .isInstanceOf(ClassPathResource.class); - assertThat(sslConfiguration.getTrustStorePassword()).isEqualTo( - "trust store password"); + assertThat(sslConfiguration.getTrustStorePassword()) + .isEqualTo("trust store password"); configurableEnvironment.getPropertySources().remove(propertySource.getName()); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/AbstractVaultKeyValueTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/AbstractVaultKeyValueTemplateIntegrationTests.java index 4f5ac404..c40140de 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/AbstractVaultKeyValueTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/AbstractVaultKeyValueTemplateIntegrationTests.java @@ -37,8 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RequiresVaultVersion(VaultInitializer.VERSIONING_INTRODUCED_WITH_VALUE) -abstract class AbstractVaultKeyValueTemplateIntegrationTests extends - IntegrationTestSupport { +abstract class AbstractVaultKeyValueTemplateIntegrationTests + extends IntegrationTestSupport { private final String path; @@ -49,7 +49,8 @@ abstract class AbstractVaultKeyValueTemplateIntegrationTests extends VaultKeyValueOperations kvOperations; - AbstractVaultKeyValueTemplateIntegrationTests(String path, KeyValueBackend apiVersion) { + AbstractVaultKeyValueTemplateIntegrationTests(String path, + KeyValueBackend apiVersion) { this.path = path; this.apiVersion = apiVersion; } @@ -104,8 +105,8 @@ abstract class AbstractVaultKeyValueTemplateIntegrationTests extends kvOperations.put("my-secret", person); - assertThat(kvOperations.get("my-secret").getRequiredData()).containsEntry( - "firstname", "Walter"); + assertThat(kvOperations.get("my-secret").getRequiredData()) + .containsEntry("firstname", "Walter"); assertThat(kvOperations.get("my-secret", Person.class).getRequiredData()) .isEqualTo(person); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/PkiSecretIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/PkiSecretIntegrationTests.java index 419ec2f4..4680b44d 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/PkiSecretIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/PkiSecretIntegrationTests.java @@ -48,15 +48,15 @@ class PkiSecretIntegrationTests extends IntegrationTestSupport { File workDir = findWorkDir(new File(System.getProperty("user.dir"))); - String cert = Files.contentOf( - new File(workDir, "ca/certs/intermediate.cert.pem"), + String cert = Files.contentOf(new File(workDir, "ca/certs/intermediate.cert.pem"), StandardCharsets.US_ASCII); - String key = Files.contentOf(new File(workDir, - "ca/private/intermediate.decrypted.key.pem"), StandardCharsets.US_ASCII); + String key = Files.contentOf( + new File(workDir, "ca/private/intermediate.decrypted.key.pem"), + StandardCharsets.US_ASCII); - Map pembundle = Collections - .singletonMap("pem_bundle", cert + key); + Map pembundle = Collections.singletonMap("pem_bundle", + cert + key); VaultOperations vaultOperations = prepare().getVaultOperations(); vaultOperations.write("pki/config/ca", pembundle); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTemplateGenericIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTemplateGenericIntegrationTests.java index 199238c9..79db7f8e 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTemplateGenericIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTemplateGenericIntegrationTests.java @@ -62,36 +62,29 @@ class ReactiveVaultTemplateGenericIntegrationTests extends IntegrationTestSuppor .as(StepVerifier::create) // .verifyComplete(); - vaultOperations - .read("secret/mykey") - .as(StepVerifier::create) - .consumeNextWith( - actual -> assertThat(actual.getRequiredData()).containsEntry( - "hello", "world")) // + vaultOperations.read("secret/mykey").as(StepVerifier::create) + .consumeNextWith(actual -> assertThat(actual.getRequiredData()) + .containsEntry("hello", "world")) // .verifyComplete(); } @Test void readShouldReturnNestedPropertiesKey() throws IOException { - Map map = OBJECT_MAPPER - .readValue( - "{ \"hello.array[0]\":\"array-value0\", \"hello.array[1]\":\"array-value1\" }", - Map.class); + Map map = OBJECT_MAPPER.readValue( + "{ \"hello.array[0]\":\"array-value0\", \"hello.array[1]\":\"array-value1\" }", + Map.class); vaultOperations.write("secret/mykey", map).as(StepVerifier::create) .verifyComplete(); - vaultOperations - .read("secret/mykey") - .as(StepVerifier::create) - .consumeNextWith( - actual -> { - assertThat(actual.getRequiredData()).containsEntry( - "hello.array[0]", "array-value0"); - assertThat(actual.getRequiredData()).containsEntry( - "hello.array[1]", "array-value1"); - }).verifyComplete(); + vaultOperations.read("secret/mykey").as(StepVerifier::create) + .consumeNextWith(actual -> { + assertThat(actual.getRequiredData()).containsEntry("hello.array[0]", + "array-value0"); + assertThat(actual.getRequiredData()).containsEntry("hello.array[1]", + "array-value1"); + }).verifyComplete(); } @@ -108,14 +101,10 @@ class ReactiveVaultTemplateGenericIntegrationTests extends IntegrationTestSuppor Collections.singletonMap("hello", "world"), Collections.singletonMap("hello1", "world1")); - vaultOperations - .read("secret/mykey") - .as(StepVerifier::create) - .consumeNextWith( - actual -> { - assertThat(actual.getRequiredData()).containsEntry("array", - expected); - }).verifyComplete(); + vaultOperations.read("secret/mykey").as(StepVerifier::create) + .consumeNextWith(actual -> { + assertThat(actual.getRequiredData()).containsEntry("array", expected); + }).verifyComplete(); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultIntegrationTestConfiguration.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultIntegrationTestConfiguration.java index f7d5a4eb..28499cf5 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultIntegrationTestConfiguration.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultIntegrationTestConfiguration.java @@ -29,7 +29,8 @@ import org.springframework.vault.util.Settings; * @author Mark Paluch */ @Configuration -public class VaultIntegrationTestConfiguration extends AbstractReactiveVaultConfiguration { +public class VaultIntegrationTestConfiguration + extends AbstractReactiveVaultConfiguration { @Override public VaultEndpoint vaultEndpoint() { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultKeyValueTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultKeyValueTemplateIntegrationTests.java index 1f563378..7c481c5f 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultKeyValueTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultKeyValueTemplateIntegrationTests.java @@ -36,8 +36,8 @@ import static org.assertj.core.api.Assertions.assertThat; */ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = VaultIntegrationTestConfiguration.class) -class VaultKeyValueTemplateIntegrationTests extends - AbstractVaultKeyValueTemplateIntegrationTests { +class VaultKeyValueTemplateIntegrationTests + extends AbstractVaultKeyValueTemplateIntegrationTests { VaultKeyValueTemplateIntegrationTests() { super("secret", KeyValueBackend.unversioned()); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultKeyValueTemplateVersionedIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultKeyValueTemplateVersionedIntegrationTests.java index fe6f4b63..26d9faa2 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultKeyValueTemplateVersionedIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultKeyValueTemplateVersionedIntegrationTests.java @@ -29,8 +29,8 @@ import org.springframework.vault.core.VaultKeyValueOperationsSupport.KeyValueBac */ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = VaultIntegrationTestConfiguration.class) -class VaultKeyValueTemplateVersionedIntegrationTests extends - AbstractVaultKeyValueTemplateIntegrationTests { +class VaultKeyValueTemplateVersionedIntegrationTests + extends AbstractVaultKeyValueTemplateIntegrationTests { VaultKeyValueTemplateVersionedIntegrationTests() { super("versioned", KeyValueBackend.versioned()); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java index 817d3f98..75d3d8c6 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java @@ -78,13 +78,14 @@ class VaultPkiTemplateIntegrationTests extends IntegrationTestSupport { } File workDir = findWorkDir(new File(System.getProperty("user.dir"))); - String cert = Files.contentOf( - new File(workDir, "ca/certs/intermediate.cert.pem"), "US-ASCII"); - String key = Files.contentOf(new File(workDir, - "ca/private/intermediate.decrypted.key.pem"), "US-ASCII"); + String cert = Files.contentOf(new File(workDir, "ca/certs/intermediate.cert.pem"), + "US-ASCII"); + String key = Files.contentOf( + new File(workDir, "ca/private/intermediate.decrypted.key.pem"), + "US-ASCII"); - Map pembundle = Collections - .singletonMap("pem_bundle", cert + key); + Map pembundle = Collections.singletonMap("pem_bundle", + cert + key); vaultOperations.write("pki/config/ca", pembundle); @@ -104,8 +105,8 @@ class VaultPkiTemplateIntegrationTests extends IntegrationTestSupport { VaultCertificateRequest request = VaultCertificateRequest .create("hello.example.com"); - VaultCertificateResponse certificateResponse = pkiOperations.issueCertificate( - "testrole", request); + VaultCertificateResponse certificateResponse = pkiOperations + .issueCertificate("testrole", request); CertificateBundle data = certificateResponse.getRequiredData(); @@ -124,16 +125,16 @@ class VaultPkiTemplateIntegrationTests extends IntegrationTestSupport { VaultCertificateRequest request = VaultCertificateRequest.builder() .ttl(Duration.ofHours(48)).commonName("hello.example.com").build(); - VaultCertificateResponse certificateResponse = pkiOperations.issueCertificate( - "testrole", request); + VaultCertificateResponse certificateResponse = pkiOperations + .issueCertificate("testrole", request); X509Certificate certificate = certificateResponse.getRequiredData() .getX509Certificate(); Instant now = Instant.now(); - assertThat(certificate.getNotAfter()).isAfter( - Date.from(now.plus(40, ChronoUnit.HOURS))).isBefore( - Date.from(now.plus(50, ChronoUnit.HOURS))); + assertThat(certificate.getNotAfter()) + .isAfter(Date.from(now.plus(40, ChronoUnit.HOURS))) + .isBefore(Date.from(now.plus(50, ChronoUnit.HOURS))); } @Test @@ -178,8 +179,8 @@ class VaultPkiTemplateIntegrationTests extends IntegrationTestSupport { VaultCertificateRequest request = VaultCertificateRequest.create("not.supported"); - assertThatExceptionOfType(VaultException.class).isThrownBy( - () -> pkiOperations.issueCertificate("testrole", request)); + assertThatExceptionOfType(VaultException.class) + .isThrownBy(() -> pkiOperations.issueCertificate("testrole", request)); } @Test @@ -188,8 +189,8 @@ class VaultPkiTemplateIntegrationTests extends IntegrationTestSupport { VaultCertificateRequest request = VaultCertificateRequest .create("foo.example.com"); - VaultCertificateResponse certificateResponse = pkiOperations.issueCertificate( - "testrole", request); + VaultCertificateResponse certificateResponse = pkiOperations + .issueCertificate("testrole", request); BigInteger serial = new BigInteger(certificateResponse.getRequiredData() .getSerialNumber().replaceAll("\\:", ""), 16); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java index ec5667d3..880fc6eb 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java @@ -29,10 +29,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.vault.support.Policy; +import org.springframework.vault.support.Policy.Rule; import org.springframework.vault.support.VaultMount; import org.springframework.vault.support.VaultResponse; import org.springframework.vault.support.VaultUnsealStatus; -import org.springframework.vault.support.Policy.Rule; import org.springframework.vault.util.IntegrationTestSupport; import org.springframework.vault.util.RequiresVaultVersion; import org.springframework.vault.util.VaultInitializer; @@ -156,8 +156,7 @@ class VaultSysTemplateIntegrationTests extends IntegrationTestSupport { versionedOperations.put("secret/mykey", Collections.singletonMap("key", "value")); assertThat(versionedOperations.get("secret/mykey").getRequiredData()) - .containsEntry( - "key", "value"); + .containsEntry("key", "value"); } @Test @@ -224,8 +223,8 @@ class VaultSysTemplateIntegrationTests extends IntegrationTestSupport { @RequiresVaultVersion("0.6.1") void shouldReadDefaultPolicy() { - assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy( - () -> adminOperations.getPolicy("default")); + assertThatExceptionOfType(UnsupportedOperationException.class) + .isThrownBy(() -> adminOperations.getPolicy("default")); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTemplateGenericIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTemplateGenericIntegrationTests.java index 044b479d..c8f2f2f0 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTemplateGenericIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTemplateGenericIntegrationTests.java @@ -71,18 +71,17 @@ class VaultTemplateGenericIntegrationTests extends IntegrationTestSupport { @Test void readShouldReturnNestedPropertiesKey() throws Exception { - Map map = OBJECT_MAPPER - .readValue( - "{ \"hello.array[0]\":\"array-value0\", \"hello.array[1]\":\"array-value1\" }", - Map.class); + Map map = OBJECT_MAPPER.readValue( + "{ \"hello.array[0]\":\"array-value0\", \"hello.array[1]\":\"array-value1\" }", + Map.class); vaultOperations.write("secret/mykey", map); VaultResponse read = vaultOperations.read("secret/mykey"); assertThat(read).isNotNull(); - assertThat(read.getRequiredData()) - .containsEntry("hello.array[0]", "array-value0"); - assertThat(read.getRequiredData()) - .containsEntry("hello.array[1]", "array-value1"); + assertThat(read.getRequiredData()).containsEntry("hello.array[0]", + "array-value0"); + assertThat(read.getRequiredData()).containsEntry("hello.array[1]", + "array-value1"); } @Test @@ -95,8 +94,7 @@ class VaultTemplateGenericIntegrationTests extends IntegrationTestSupport { VaultResponse read = vaultOperations.read("secret/mykey"); assertThat(read).isNotNull(); - assertThat(read.getRequiredData()).containsEntry( - "array", + assertThat(read.getRequiredData()).containsEntry("array", Arrays.asList(Collections.singletonMap("hello", "world"), Collections.singletonMap("hello1", "world1"))); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTemplateTransitIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTemplateTransitIntegrationTests.java index 93ef5b4a..f580bc71 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTemplateTransitIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTemplateTransitIntegrationTests.java @@ -101,8 +101,7 @@ class VaultTemplateTransitIntegrationTests extends IntegrationTestSupport { @Test void shouldEncrypt() { - VaultResponse response = vaultOperations.write( - "transit/encrypt/mykey", + VaultResponse response = vaultOperations.write("transit/encrypt/mykey", Collections.singletonMap("plaintext", Base64.encodeBase64String("that message is secret".getBytes()))); @@ -112,13 +111,11 @@ class VaultTemplateTransitIntegrationTests extends IntegrationTestSupport { @Test void shouldEncryptAndDecrypt() { - VaultResponse response = vaultOperations.write( - "transit/encrypt/mykey", + VaultResponse response = vaultOperations.write("transit/encrypt/mykey", Collections.singletonMap("plaintext", Base64.encodeBase64String("that message is secret".getBytes()))); - VaultResponse decrypted = vaultOperations.write( - "transit/decrypt/mykey", + VaultResponse decrypted = vaultOperations.write("transit/decrypt/mykey", Collections.singletonMap("ciphertext", response.getRequiredData().get("ciphertext"))); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTokenTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTokenTemplateIntegrationTests.java index ecffdd15..c53dfdf0 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTokenTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTokenTemplateIntegrationTests.java @@ -133,8 +133,8 @@ class VaultTokenTemplateIntegrationTests extends IntegrationTestSupport { VaultTokenResponse tokenResponse = tokenOperations.create(); - assertThatExceptionOfType(VaultException.class).isThrownBy( - () -> tokenOperations.renew(tokenResponse.getToken())); + assertThatExceptionOfType(VaultException.class) + .isThrownBy(() -> tokenOperations.renew(tokenResponse.getToken())); } @Test @@ -164,15 +164,14 @@ class VaultTokenTemplateIntegrationTests extends IntegrationTestSupport { @SuppressWarnings("ConstantConditions") private ResponseEntity lookupSelf(final VaultTokenResponse tokenResponse) { - return vaultOperations - .doWithVault(restOperations -> { - HttpHeaders headers = new HttpHeaders(); - headers.add(VaultHttpHeaders.VAULT_TOKEN, tokenResponse.getToken() - .getToken()); + return vaultOperations.doWithVault(restOperations -> { + HttpHeaders headers = new HttpHeaders(); + headers.add(VaultHttpHeaders.VAULT_TOKEN, + tokenResponse.getToken().getToken()); - return restOperations.exchange("auth/token/lookup-self", - HttpMethod.GET, new HttpEntity<>(headers), String.class); - }); + return restOperations.exchange("auth/token/lookup-self", HttpMethod.GET, + new HttpEntity<>(headers), String.class); + }); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java index 6c2e0d7e..95834668 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultTransitTemplateIntegrationTests.java @@ -103,8 +103,8 @@ class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport { private void deleteKey(String keyName) { try { - transitOperations.configureKey(keyName, VaultTransitKeyConfiguration - .builder().deletionAllowed(true).build()); + transitOperations.configureKey(keyName, + VaultTransitKeyConfiguration.builder().deletionAllowed(true).build()); } catch (Exception e) { } @@ -261,8 +261,8 @@ class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport { void deleteKeyShouldDeleteKey() { transitOperations.createKey("mykey"); - transitOperations.configureKey("mykey", VaultTransitKeyConfiguration.builder() - .deletionAllowed(true).build()); + transitOperations.configureKey("mykey", + VaultTransitKeyConfiguration.builder().deletionAllowed(true).build()); transitOperations.deleteKey("mykey"); assertThat(transitOperations.getKey("mykey")).isNull(); @@ -620,8 +620,8 @@ class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport { VaultHmacRequest request = VaultHmacRequest.builder() .plaintext(Plaintext.of("hello-world")).algorithm("blah-512").build(); - assertThatExceptionOfType(VaultException.class).isThrownBy( - () -> transitOperations.getHmac(keyName, request)); + assertThatExceptionOfType(VaultException.class) + .isThrownBy(() -> transitOperations.getHmac(keyName, request)); } @Test @@ -630,8 +630,8 @@ class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport { String keyName = createEcdsaP256Key(); - Signature signature = transitOperations - .sign(keyName, Plaintext.of("hello-world")); + Signature signature = transitOperations.sign(keyName, + Plaintext.of("hello-world")); assertThat(signature.getSignature()).isNotEmpty(); } @@ -711,11 +711,11 @@ class VaultTransitTemplateIntegrationTests extends IntegrationTestSupport { Signature signature = transitOperations.sign(keyName, request); VaultSignatureVerificationRequest verificationRequest = VaultSignatureVerificationRequest - .builder().algorithm("sha2-512").plaintext(plaintext) - .signature(signature).build(); + .builder().algorithm("sha2-512").plaintext(plaintext).signature(signature) + .build(); - SignatureValidation valid = transitOperations - .verify(keyName, verificationRequest); + SignatureValidation valid = transitOperations.verify(keyName, + verificationRequest); assertThat(valid).isEqualTo(SignatureValidation.valid()); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultVersionedKeyValueTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultVersionedKeyValueTemplateIntegrationTests.java index 9d6e7570..02213190 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultVersionedKeyValueTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultVersionedKeyValueTemplateIntegrationTests.java @@ -99,11 +99,10 @@ class VaultVersionedKeyValueTemplateIntegrationTests extends IntegrationTestSupp versionedOperations.put(key, Versioned.create(secret, Version.unversioned())); // this should fail - assertThatThrownBy( - () -> versionedOperations.put(key, - Versioned.create(secret, Version.unversioned()))) - .isExactlyInstanceOf(VaultException.class).hasMessageContaining( - "check-and-set parameter did not match the current version"); + assertThatThrownBy(() -> versionedOperations.put(key, + Versioned.create(secret, Version.unversioned()))) + .isExactlyInstanceOf(VaultException.class).hasMessageContaining( + "check-and-set parameter did not match the current version"); } @Test @@ -162,8 +161,8 @@ class VaultVersionedKeyValueTemplateIntegrationTests extends IntegrationTestSupp assertThat(versioned.getData()).isNull(); assertThat(versioned.getVersion()).isEqualTo(Version.from(2)); assertThat(versioned.getRequiredMetadata().isDestroyed()).isFalse(); - assertThat(versioned.getRequiredMetadata().getDeletedAt()).isBetween( - Instant.now().minusSeconds(60), Instant.now().plusSeconds(60)); + assertThat(versioned.getRequiredMetadata().getDeletedAt()) + .isBetween(Instant.now().minusSeconds(60), Instant.now().plusSeconds(60)); } @Test @@ -179,8 +178,8 @@ class VaultVersionedKeyValueTemplateIntegrationTests extends IntegrationTestSupp Versioned> versioned = versionedOperations.get(key); - assertThat(versioned.getRequiredData()).isEqualTo( - Collections.singletonMap("key", "v2")); + assertThat(versioned.getRequiredData()) + .isEqualTo(Collections.singletonMap("key", "v2")); assertThat(versioned.getVersion()).isEqualTo(Version.from(2)); assertThat(versioned.getRequiredMetadata().isDestroyed()).isFalse(); assertThat(versioned.getRequiredMetadata().getDeletedAt()).isNull(); @@ -202,8 +201,8 @@ class VaultVersionedKeyValueTemplateIntegrationTests extends IntegrationTestSupp assertThat(versioned.getData()).isNull(); assertThat(versioned.getVersion()).isEqualTo(Version.from(1)); assertThat(versioned.getRequiredMetadata().isDestroyed()).isFalse(); - assertThat(versioned.getRequiredMetadata().getDeletedAt()).isBetween( - Instant.now().minusSeconds(60), Instant.now().plusSeconds(60)); + assertThat(versioned.getRequiredMetadata().getDeletedAt()) + .isBetween(Instant.now().minusSeconds(60), Instant.now().plusSeconds(60)); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java index 99b1f1cf..2ea5058a 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java @@ -109,8 +109,8 @@ class VaultWrappingTemplateIntegrationTests extends IntegrationTestSupport { Map map = Collections.singletonMap("key", "value"); WrappedMetadata metadata = wrappingOperations.wrap(map, Duration.ofSeconds(100)); - VaultResponseSupport response = wrappingOperations.read( - metadata.getToken(), Secret.class); + VaultResponseSupport response = wrappingOperations + .read(metadata.getToken(), Secret.class); assertThat(response.getRequiredData()).isEqualTo(new Secret("value")); } @@ -147,8 +147,8 @@ class VaultWrappingTemplateIntegrationTests extends IntegrationTestSupport { @Test void shouldRewrapAbsentSecret() { - assertThatExceptionOfType(VaultException.class).isThrownBy( - () -> wrappingOperations.rewrap(VaultToken.of("foo"))); + assertThatExceptionOfType(VaultException.class) + .isThrownBy(() -> wrappingOperations.rewrap(VaultToken.of("foo"))); } static final class Secret { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/env/VaultPropertySourceUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/env/VaultPropertySourceUnitTests.java index e790ebbb..91042263 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/env/VaultPropertySourceUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/env/VaultPropertySourceUnitTests.java @@ -45,17 +45,17 @@ class VaultPropertySourceUnitTests { @Test void shouldRejectEmptyPath() { - assertThatIllegalArgumentException().isThrownBy( - () -> new VaultPropertySource("hello", vaultTemplate, "", + assertThatIllegalArgumentException() + .isThrownBy(() -> new VaultPropertySource("hello", vaultTemplate, "", PropertyTransformers.noop())); } @Test void shouldRejectPathStartingWithSlash() { - assertThatIllegalArgumentException().isThrownBy( - () -> new VaultPropertySource("hello", vaultTemplate, "/secret", - PropertyTransformers.noop())); + assertThatIllegalArgumentException() + .isThrownBy(() -> new VaultPropertySource("hello", vaultTemplate, + "/secret", PropertyTransformers.noop())); } @Test @@ -87,8 +87,8 @@ class VaultPropertySourceUnitTests { assertThat(vaultPropertySource.getProperty("database.key")).isEqualTo("value"); assertThat(vaultPropertySource.getProperty("key")).isNull(); assertThat(vaultPropertySource.getProperty("database.integer")).isEqualTo(1); - assertThat(vaultPropertySource.getProperty("database.complex.key")).isEqualTo( - "value"); + assertThat(vaultPropertySource.getProperty("database.complex.key")) + .isEqualTo("value"); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/env/VersionedKeyValueBackendIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/env/VersionedKeyValueBackendIntegrationTests.java index e44793b4..6012ab26 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/env/VersionedKeyValueBackendIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/env/VersionedKeyValueBackendIntegrationTests.java @@ -61,9 +61,8 @@ class VersionedKeyValueBackendIntegrationTests extends IntegrationTestSupport { PrepareVault prepare = initializer.prepare(); - VaultKeyValueOperations versionedKv = prepare.getVaultOperations() - .opsForKeyValue("versioned", - VaultKeyValueOperationsSupport.KeyValueBackend.versioned()); + VaultKeyValueOperations versionedKv = prepare.getVaultOperations().opsForKeyValue( + "versioned", VaultKeyValueOperationsSupport.KeyValueBackend.versioned()); versionedKv.put("my/path", Collections.singletonMap("my-key", "my-value")); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/lease/RotatingGenericSecretsIntegrationTestConfiguration.java b/spring-vault-core/src/test/java/org/springframework/vault/core/lease/RotatingGenericSecretsIntegrationTestConfiguration.java index 9a703435..bc966802 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/lease/RotatingGenericSecretsIntegrationTestConfiguration.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/lease/RotatingGenericSecretsIntegrationTestConfiguration.java @@ -38,7 +38,7 @@ public class RotatingGenericSecretsIntegrationTestConfiguration { * Utility class which will give our tests a reference to the * {@link LeaseAwareVaultPropertySource} which holds our secrets. */ - @VaultPropertySource(propertyNamePrefix = "generic.rotating.", value = "secret/rotating", renewal = VaultPropertySource.Renewal.ROTATE ) + @VaultPropertySource(propertyNamePrefix = "generic.rotating.", value = "secret/rotating", renewal = VaultPropertySource.Renewal.ROTATE) public static class PropertySourceHolder implements InitializingBean { @Autowired @@ -52,7 +52,7 @@ public class RotatingGenericSecretsIntegrationTestConfiguration { * testing. * * @throws Exception if bad things happen (for example, if the property source - * does not exist). + * does not exist). */ @Override public void afterPropertiesSet() throws Exception { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/util/KeyValueDelegateUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/util/KeyValueDelegateUnitTests.java index b6932a26..37218ab1 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/util/KeyValueDelegateUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/util/KeyValueDelegateUnitTests.java @@ -51,31 +51,28 @@ class KeyValueDelegateUnitTests { @Test void shouldConsiderKeyValueVersion() { - assertThat( - MountInfo.from("foo", Collections.singletonMap("version", "1")) - .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)) - .isTrue(); + assertThat(MountInfo.from("foo", Collections.singletonMap("version", "1")) + .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)) + .isTrue(); - assertThat( - MountInfo.from("foo", Collections.singletonMap("version", 1)).isKeyValue( - VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)).isTrue(); + assertThat(MountInfo.from("foo", Collections.singletonMap("version", 1)) + .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)) + .isTrue(); - assertThat( - MountInfo.from("foo", Collections.singletonMap("version", "2")) - .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_2)) - .isTrue(); + assertThat(MountInfo.from("foo", Collections.singletonMap("version", "2")) + .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_2)) + .isTrue(); - assertThat( - MountInfo.from("foo", Collections.singletonMap("version", 2)).isKeyValue( - VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)).isFalse(); + assertThat(MountInfo.from("foo", Collections.singletonMap("version", 2)) + .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)) + .isFalse(); - assertThat( - MountInfo.from("foo", Collections.singletonMap("version", "2")) - .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)) - .isFalse(); + assertThat(MountInfo.from("foo", Collections.singletonMap("version", "2")) + .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)) + .isFalse(); - assertThat( - MountInfo.from("foo", Collections.emptyMap()).isKeyValue( - VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)).isFalse(); + assertThat(MountInfo.from("foo", Collections.emptyMap()) + .isKeyValue(VaultKeyValueOperationsSupport.KeyValueBackend.KV_1)) + .isFalse(); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/util/PropertyTransformersUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/util/PropertyTransformersUnitTests.java index 1990a8f5..d2ec8ab6 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/util/PropertyTransformersUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/util/PropertyTransformersUnitTests.java @@ -43,8 +43,8 @@ class PropertyTransformersUnitTests { void propertyNamePrefixChaining() { PropertyTransformer propertyTransformer = PropertyTransformers - .propertyNamePrefix("my-prefix.").andThen( - PropertyTransformers.propertyNamePrefix("foo-bar.")); + .propertyNamePrefix("my-prefix.") + .andThen(PropertyTransformers.propertyNamePrefix("foo-bar.")); assertThat(propertyTransformer.transformProperties(properties)).hasSize(1) .containsEntry("foo-bar.my-prefix.key", "value"); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/demo/SecurePropertyUsage.java b/spring-vault-core/src/test/java/org/springframework/vault/demo/SecurePropertyUsage.java index b68bf0a3..1a3434bf 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/demo/SecurePropertyUsage.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/demo/SecurePropertyUsage.java @@ -63,8 +63,8 @@ public class SecurePropertyUsage { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( Config.class); - System.out.println(context.getEnvironment().getProperty( - "my-property-that-references-vault")); + System.out.println(context.getEnvironment() + .getProperty("my-property-that-references-vault")); System.out.println(context.getEnvironment().getProperty("encrypted")); System.out.println(context.getBean(Client.class).myValue); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java index 2bc31d08..2152db15 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/MultipleSpringDataModulesIntegrationTests.java @@ -22,9 +22,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; -import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.data.map.repository.config.EnableMapRepositories; import org.springframework.data.repository.CrudRepository; import org.springframework.test.context.ContextConfiguration; @@ -49,11 +49,11 @@ class MultipleSpringDataModulesIntegrationTests extends IntegrationTestSupport { @Configuration @EnableMapRepositories(considerNestedRepositories = true, // - excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = VaultRepository.class)) + excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = VaultRepository.class)) @EnableVaultRepositories(considerNestedRepositories = true, // - excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = MapRepository.class)) - static class MultipleModulesActiveTestConfiguration extends - VaultIntegrationTestConfiguration { + excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = MapRepository.class)) + static class MultipleModulesActiveTestConfiguration + extends VaultIntegrationTestConfiguration { } @Autowired diff --git a/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java index a28a62c3..a152e876 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/VaultRepositoryIntegrationTests.java @@ -50,8 +50,8 @@ class VaultRepositoryIntegrationTests extends IntegrationTestSupport { @Configuration @EnableVaultRepositories(considerNestedRepositories = true) - static class VaultRepositoryTestConfiguration extends - VaultIntegrationTestConfiguration { + static class VaultRepositoryTestConfiguration + extends VaultIntegrationTestConfiguration { } @Autowired @@ -115,10 +115,10 @@ class VaultRepositoryIntegrationTests extends IntegrationTestSupport { vaultRepository.save(skyler); - assertThat(vaultRepository.findAllByOrderByFirstnameAsc()).containsSequence( - skyler, walter); - assertThat(vaultRepository.findAllByOrderByFirstnameDesc()).containsSequence( - walter, skyler); + assertThat(vaultRepository.findAllByOrderByFirstnameAsc()) + .containsSequence(skyler, walter); + assertThat(vaultRepository.findAllByOrderByFirstnameDesc()) + .containsSequence(walter, skyler); } @Test @@ -136,14 +136,14 @@ class VaultRepositoryIntegrationTests extends IntegrationTestSupport { vaultRepository.save(skyler); - assertThat(vaultRepository.findTop1By(Sort.by(asc("firstname")))).containsOnly( - skyler); + assertThat(vaultRepository.findTop1By(Sort.by(asc("firstname")))) + .containsOnly(skyler); } @Test void shouldFailForNonIdCriteria() { - assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy( - () -> vaultRepository.findInvalidByFirstname("foo")); + assertThatExceptionOfType(InvalidDataAccessApiUsageException.class) + .isThrownBy(() -> vaultRepository.findInvalidByFirstname("foo")); } interface VaultRepository extends CrudRepository { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java index d9666c44..0afcc8de 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java @@ -87,8 +87,8 @@ class DefaultVaultTypeMapperUnitTests { readsTypeFromField( Collections.singletonMap(DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, "1"), String.class); - readsTypeFromField(Collections.singletonMap( - DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, "unmapped"), null); + readsTypeFromField(Collections + .singletonMap(DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, "unmapped"), null); } @Test @@ -101,8 +101,9 @@ class DefaultVaultTypeMapperUnitTests { readsTypeFromField( Collections.singletonMap(DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, "1"), String.class); - readsTypeFromField(Collections.singletonMap( - DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, Object.class.getName()), + readsTypeFromField( + Collections.singletonMap(DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, + Object.class.getName()), Object.class); } @@ -128,8 +129,9 @@ class DefaultVaultTypeMapperUnitTests { @Test void readsTypeFromDefaultKeyByDefault() { - readsTypeFromField(Collections.singletonMap( - DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, String.class.getName()), + readsTypeFromField( + Collections.singletonMap(DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, + String.class.getName()), String.class); } @@ -151,8 +153,8 @@ class DefaultVaultTypeMapperUnitTests { @Test void returnsNullIfClassCannotBeLoaded() { - readsTypeFromField(Collections.singletonMap( - DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, "fooBar"), null); + readsTypeFromField(Collections + .singletonMap(DefaultVaultTypeMapper.DEFAULT_TYPE_KEY, "fooBar"), null); } @Test @@ -179,7 +181,8 @@ class DefaultVaultTypeMapperUnitTests { .isFalse(); } - private void readsTypeFromField(Map document, @Nullable Class type) { + private void readsTypeFromField(Map document, + @Nullable Class type) { TypeInformation typeInfo = typeMapper.readType(document); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/MappingVaultConverterUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/MappingVaultConverterUnitTests.java index 91d98d5a..806104b2 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/MappingVaultConverterUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/convert/MappingVaultConverterUnitTests.java @@ -121,8 +121,8 @@ class MappingVaultConverterUnitTests { @Test void shouldReadEntityWithList() { - SecretDocument document = new SecretDocument(Collections.singletonMap( - "usernames", Arrays.asList("walter", "heisenberg"))); + SecretDocument document = new SecretDocument(Collections.singletonMap("usernames", + Arrays.asList("walter", "heisenberg"))); EntityWithListOfStrings entity = converter.read(EntityWithListOfStrings.class, document); @@ -137,8 +137,8 @@ class MappingVaultConverterUnitTests { keyVersions.put("foo", 1); keyVersions.put("bar", 2); - SecretDocument document = new SecretDocument(Collections.singletonMap( - "keyVersions", keyVersions)); + SecretDocument document = new SecretDocument( + Collections.singletonMap("keyVersions", keyVersions)); EntityWithMap entity = converter.read(EntityWithMap.class, document); @@ -155,8 +155,8 @@ class MappingVaultConverterUnitTests { SecretDocument document = new SecretDocument(); document.put("nested", walter); - EntityWithNestedType entity = converter - .read(EntityWithNestedType.class, document); + EntityWithNestedType entity = converter.read(EntityWithNestedType.class, + document); assertThat(entity.getNested()).isEqualTo(new NestedType("heisenberg", "hb")); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/repository/mapping/VaultMappingContextUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/mapping/VaultMappingContextUnitTests.java index 0e226936..e0ce8054 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/repository/mapping/VaultMappingContextUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/mapping/VaultMappingContextUnitTests.java @@ -48,7 +48,7 @@ class VaultMappingContextUnitTests { assertThat( context.getRequiredPersistentEntity(Credentials.class).getSecretBackend()) - .isEqualTo("shared"); + .isEqualTo("shared"); assertThat(context.getRequiredPersistentEntity(Credentials.class).getKeySpace()) .isEqualTo("shared/Email"); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/repository/query/VaultQueryCreatorUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/repository/query/VaultQueryCreatorUnitTests.java index b5166b73..e9f52be4 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/repository/query/VaultQueryCreatorUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/repository/query/VaultQueryCreatorUnitTests.java @@ -185,20 +185,19 @@ class VaultQueryCreatorUnitTests { @Test void failsForNonIdProperties() { - assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy( - () -> createQuery("findByName", "")); + assertThatExceptionOfType(InvalidDataAccessApiUsageException.class) + .isThrownBy(() -> createQuery("findByName", "")); } VaultQuery createQuery(String methodName, String value) { - DefaultParameters defaultParameters = new DefaultParameters( - ReflectionUtils.findMethod(dummy.class, "someUnrelatedMethod", - String.class)); + DefaultParameters defaultParameters = new DefaultParameters(ReflectionUtils + .findMethod(dummy.class, "someUnrelatedMethod", String.class)); PartTree partTree = new PartTree(methodName, Credentials.class); - VaultQueryCreator queryCreator = new VaultQueryCreator( - partTree, - new ParametersParameterAccessor(defaultParameters, new Object[] { value }), + VaultQueryCreator queryCreator = new VaultQueryCreator(partTree, + new ParametersParameterAccessor(defaultParameters, + new Object[] { value }), mappingContext); return queryCreator.createQuery().getCriteria(); @@ -206,14 +205,13 @@ class VaultQueryCreatorUnitTests { VaultQuery createQuery(String methodName, List value) { - DefaultParameters defaultParameters = new DefaultParameters( - ReflectionUtils - .findMethod(dummy.class, "someUnrelatedMethod", List.class)); + DefaultParameters defaultParameters = new DefaultParameters(ReflectionUtils + .findMethod(dummy.class, "someUnrelatedMethod", List.class)); PartTree partTree = new PartTree(methodName, Credentials.class); - VaultQueryCreator queryCreator = new VaultQueryCreator( - partTree, - new ParametersParameterAccessor(defaultParameters, new Object[] { value }), + VaultQueryCreator queryCreator = new VaultQueryCreator(partTree, + new ParametersParameterAccessor(defaultParameters, + new Object[] { value }), mappingContext); return queryCreator.createQuery().getCriteria(); @@ -227,8 +225,9 @@ class VaultQueryCreatorUnitTests { PartTree partTree = new PartTree(methodName, Credentials.class); VaultQueryCreator queryCreator = new VaultQueryCreator(partTree, - new ParametersParameterAccessor(defaultParameters, new Object[] { value, - anotherValue }), mappingContext); + new ParametersParameterAccessor(defaultParameters, + new Object[] { value, anotherValue }), + mappingContext); return queryCreator.createQuery().getCriteria(); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/security/VaultBytesEncryptorIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/security/VaultBytesEncryptorIntegrationTests.java index 917f4917..f6fdf378 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/security/VaultBytesEncryptorIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/security/VaultBytesEncryptorIntegrationTests.java @@ -68,8 +68,8 @@ class VaultBytesEncryptorIntegrationTests extends IntegrationTestSupport { private void deleteKey(String keyName) { try { - transit.configureKey(keyName, VaultTransitKeyConfiguration.builder() - .deletionAllowed(true).build()); + transit.configureKey(keyName, + VaultTransitKeyConfiguration.builder().deletionAllowed(true).build()); } catch (Exception e) { } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/security/VaultBytesKeyGeneratorIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/security/VaultBytesKeyGeneratorIntegrationTests.java index 9c101bed..0a87f373 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/security/VaultBytesKeyGeneratorIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/security/VaultBytesKeyGeneratorIntegrationTests.java @@ -42,8 +42,8 @@ class VaultBytesKeyGeneratorIntegrationTests extends IntegrationTestSupport { @Test void shouldGenerateRandomBytes() { - VaultBytesKeyGenerator generator = new VaultBytesKeyGenerator(prepare() - .getVaultOperations(), "transit", 16); + VaultBytesKeyGenerator generator = new VaultBytesKeyGenerator( + prepare().getVaultOperations(), "transit", 16); assertThat(generator.generateKey()).hasSize(16); assertThat(generator.getKeyLength()).isEqualTo(16); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/support/CertificateBundleUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/support/CertificateBundleUnitTests.java index 1dbf29db..c3cbd533 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/support/CertificateBundleUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/support/CertificateBundleUnitTests.java @@ -40,8 +40,8 @@ class CertificateBundleUnitTests { @SuppressWarnings("unchecked") @BeforeEach void before() throws Exception { - Map data = OBJECT_MAPPER.readValue( - getClass().getResource("/certificate.json"), Map.class); + Map data = OBJECT_MAPPER + .readValue(getClass().getResource("/certificate.json"), Map.class); certificateBundle = CertificateBundle.of(data.get("serial_number"), data.get("certificate"), data.get("issuing_ca"), data.get("private_key")); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/support/CertificateUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/support/CertificateUnitTests.java index 6a4dbca8..b0922a39 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/support/CertificateUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/support/CertificateUnitTests.java @@ -39,8 +39,8 @@ class CertificateUnitTests { @SuppressWarnings("unchecked") @BeforeEach void before() throws Exception { - Map data = OBJECT_MAPPER.readValue( - getClass().getResource("/certificate.json"), Map.class); + Map data = OBJECT_MAPPER + .readValue(getClass().getResource("/certificate.json"), Map.class); certificate = Certificate.of(data.get("serial_number"), data.get("certificate"), data.get("issuing_ca")); @@ -51,8 +51,8 @@ class CertificateUnitTests { X509Certificate x509Certificate = certificate.getX509Certificate(); - assertThat(x509Certificate.getSubjectDN().getName()).isEqualTo( - "CN=hello.example.com"); + assertThat(x509Certificate.getSubjectDN().getName()) + .isEqualTo("CN=hello.example.com"); } @Test @@ -60,8 +60,8 @@ class CertificateUnitTests { X509Certificate x509Certificate = certificate.getX509IssuerCertificate(); - assertThat(x509Certificate.getSubjectDN().getName()).startsWith( - "CN=Intermediate CA Certificate"); + assertThat(x509Certificate.getSubjectDN().getName()) + .startsWith("CN=Intermediate CA Certificate"); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/support/JsonMapFlattenerUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/support/JsonMapFlattenerUnitTests.java index 803207b7..d4bde45c 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/support/JsonMapFlattenerUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/support/JsonMapFlattenerUnitTests.java @@ -36,16 +36,16 @@ class JsonMapFlattenerUnitTests { @Test void shouldPreserveFlatMap() { - Map result = JsonMapFlattener.flatten(Collections.singletonMap( - "key", "value")); + Map result = JsonMapFlattener + .flatten(Collections.singletonMap("key", "value")); assertThat(result).containsEntry("key", "value"); } @Test void shouldFlattenNestedObject() throws Exception { - Map map = OBJECT_MAPPER.readValue( - "{\"key\": { \"nested\":true} }", Map.class); + Map map = OBJECT_MAPPER + .readValue("{\"key\": { \"nested\":true} }", Map.class); Map result = JsonMapFlattener.flatten(map); assertThat(result).containsEntry("key.nested", true); @@ -70,8 +70,8 @@ class JsonMapFlattenerUnitTests { Map result = JsonMapFlattener.flatten(map); assertThat(result).containsEntry("key[0]", "one").containsEntry("key[1]", "two"); - assertThat(result).containsEntry("dotted.key[0]", "one").containsEntry( - "dotted.key[1]", "two"); + assertThat(result).containsEntry("dotted.key[0]", "one") + .containsEntry("dotted.key[1]", "two"); } @Test @@ -82,20 +82,19 @@ class JsonMapFlattenerUnitTests { Map.class); Map result = JsonMapFlattener.flatten(map); - assertThat(result).containsEntry("key[0].nested", "value").containsEntry( - "key[1].nested", "other-value"); + assertThat(result).containsEntry("key[0].nested", "value") + .containsEntry("key[1].nested", "other-value"); } @Test void shouldFlattenDeeplyNestedListOfComplexObject() throws Exception { - Map map = OBJECT_MAPPER - .readValue( - "{\"key\": { \"level1\": [{ \"nested\":\"value\"}, { \"nested\":\"other-value\"}]} }", - Map.class); + Map map = OBJECT_MAPPER.readValue( + "{\"key\": { \"level1\": [{ \"nested\":\"value\"}, { \"nested\":\"other-value\"}]} }", + Map.class); Map result = JsonMapFlattener.flatten(map); - assertThat(result).containsEntry("key.level1[0].nested", "value").containsEntry( - "key.level1[1].nested", "other-value"); + assertThat(result).containsEntry("key.level1[0].nested", "value") + .containsEntry("key.level1[1].nested", "other-value"); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/support/PolicySerializationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/support/PolicySerializationUnitTests.java index 5466afc5..aaffa054 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/support/PolicySerializationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/support/PolicySerializationUnitTests.java @@ -49,9 +49,8 @@ class PolicySerializationUnitTests { Rule another = Rule.builder().path("secret/foo") .capabilities("create", "read", "update", "delete", "list") - .minWrappingTtl(Duration.ofMinutes(1)) - .maxWrappingTtl(Duration.ofHours(1)).allowedParameter("ttl", "1h", "2h") - .deniedParameter("password").build(); + .minWrappingTtl(Duration.ofMinutes(1)).maxWrappingTtl(Duration.ofHours(1)) + .allowedParameter("ttl", "1h", "2h").deniedParameter("password").build(); Policy policy = Policy.of(rule, another); @@ -72,9 +71,9 @@ class PolicySerializationUnitTests { Rule another = Rule.builder().path("secret/foo") .capabilities("create", "read", "update", "delete", "list") - .minWrappingTtl(Duration.ofMinutes(1)) - .maxWrappingTtl(Duration.ofHours(1)).allowedParameter("ttl", "1h", "2h") - .allowedParameter("ttl", "1h", "2h").deniedParameter("password").build(); + .minWrappingTtl(Duration.ofMinutes(1)).maxWrappingTtl(Duration.ofHours(1)) + .allowedParameter("ttl", "1h", "2h").allowedParameter("ttl", "1h", "2h") + .deniedParameter("password").build(); Policy expected = Policy.of(rule, another); @@ -88,23 +87,23 @@ class PolicySerializationUnitTests { assertThat(secretAll.getPath()).isEqualTo(rule.getPath()); assertThat(secretAll.getCapabilities()).isEqualTo(rule.getCapabilities()); - assertThat(secretAll.getAllowedParameters()).isEqualTo( - rule.getAllowedParameters()); - assertThat(secretAll.getDeniedParameters()).isEqualTo( - rule.getDeniedParameters()); + assertThat(secretAll.getAllowedParameters()) + .isEqualTo(rule.getAllowedParameters()); + assertThat(secretAll.getDeniedParameters()) + .isEqualTo(rule.getDeniedParameters()); Rule secretFoo = actual.getRule("secret/foo"); assertThat(secretFoo.getPath()).isEqualTo(another.getPath()); assertThat(secretFoo.getCapabilities()).isEqualTo(another.getCapabilities()); - assertThat(secretFoo.getMinWrappingTtl()).isEqualTo( - another.getMinWrappingTtl()); - assertThat(secretFoo.getMaxWrappingTtl()).isEqualTo( - another.getMaxWrappingTtl()); - assertThat(secretFoo.getAllowedParameters()).isEqualTo( - another.getAllowedParameters()); - assertThat(secretFoo.getDeniedParameters()).isEqualTo( - another.getDeniedParameters()); + assertThat(secretFoo.getMinWrappingTtl()) + .isEqualTo(another.getMinWrappingTtl()); + assertThat(secretFoo.getMaxWrappingTtl()) + .isEqualTo(another.getMaxWrappingTtl()); + assertThat(secretFoo.getAllowedParameters()) + .isEqualTo(another.getAllowedParameters()); + assertThat(secretFoo.getDeniedParameters()) + .isEqualTo(another.getDeniedParameters()); } } @@ -117,10 +116,8 @@ class PolicySerializationUnitTests { @Test void shouldRejectUnknownFieldNames() throws Exception { - assertThatIllegalArgumentException() - .isThrownBy( - () -> OBJECT_MAPPER.readValue("{\"foo\":1, \"path\": {} }", - Policy.class)); + assertThatIllegalArgumentException().isThrownBy(() -> OBJECT_MAPPER + .readValue("{\"foo\":1, \"path\": {} }", Policy.class)); assertThatIllegalArgumentException().isThrownBy( () -> OBJECT_MAPPER.readValue("{\"foo\":\"bar\"}", Policy.class)); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/support/SslConfigurationUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/support/SslConfigurationUnitTests.java index d26ac41e..9ea3be41 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/support/SslConfigurationUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/support/SslConfigurationUnitTests.java @@ -51,16 +51,16 @@ class SslConfigurationUnitTests { @Test void shouldCreateConfiguration() { - KeyStoreConfiguration keystore = KeyStoreConfiguration.of(new ClassPathResource( - "certificate.json")); + KeyStoreConfiguration keystore = KeyStoreConfiguration + .of(new ClassPathResource("certificate.json")); SslConfiguration ksConfig = SslConfiguration.unconfigured() .withKeyStore(keystore); assertThat(ksConfig.getKeyStoreConfiguration()).isSameAs(keystore); assertThat(ksConfig.getTrustStoreConfiguration().isPresent()).isFalse(); - SslConfiguration tsConfig = SslConfiguration.unconfigured().withTrustStore( - keystore); + SslConfiguration tsConfig = SslConfiguration.unconfigured() + .withTrustStore(keystore); assertThat(tsConfig.getTrustStoreConfiguration()).isSameAs(keystore); assertThat(tsConfig.getKeyStoreConfiguration().isPresent()).isFalse(); diff --git a/spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java index a7736222..ad21adb5 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/support/VaultCertificateRequestUnitTests.java @@ -29,8 +29,8 @@ class VaultCertificateRequestUnitTests { @Test void shouldRejectUnconfiguredBuilder() { - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy( - () -> VaultCertificateRequest.builder().build()); + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> VaultCertificateRequest.builder().build()); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/support/VaultTransitContextUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/support/VaultTransitContextUnitTests.java index 1d747271..01daaa2a 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/support/VaultTransitContextUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/support/VaultTransitContextUnitTests.java @@ -29,8 +29,8 @@ class VaultTransitContextUnitTests { @Test void rejectsNullContext() { - assertThatIllegalArgumentException().isThrownBy( - () -> VaultTransitContext.fromContext(null)); + assertThatIllegalArgumentException() + .isThrownBy(() -> VaultTransitContext.fromContext(null)); } @Test @@ -46,8 +46,8 @@ class VaultTransitContextUnitTests { @Test void rejectsNullNonce() { - assertThatIllegalArgumentException().isThrownBy( - () -> VaultTransitContext.fromNonce(null)); + assertThatIllegalArgumentException() + .isThrownBy(() -> VaultTransitContext.fromNonce(null)); } @Test diff --git a/spring-vault-core/src/test/java/org/springframework/vault/util/PrepareVault.java b/spring-vault-core/src/test/java/org/springframework/vault/util/PrepareVault.java index f1aaaaa3..281f8dbb 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/util/PrepareVault.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/util/PrepareVault.java @@ -28,9 +28,9 @@ import org.springframework.vault.support.VaultInitializationResponse; import org.springframework.vault.support.VaultMount; import org.springframework.vault.support.VaultToken; import org.springframework.vault.support.VaultTokenRequest; +import org.springframework.vault.support.VaultTokenRequest.VaultTokenRequestBuilder; import org.springframework.vault.support.VaultTokenResponse; import org.springframework.vault.support.VaultUnsealStatus; -import org.springframework.vault.support.VaultTokenRequest.VaultTokenRequestBuilder; import org.springframework.web.client.RestTemplate; import org.springframework.web.reactive.function.client.WebClient; @@ -76,13 +76,13 @@ public class PrepareVault { int createKeys = 2; int requiredKeys = 2; - VaultInitializationResponse initialized = vaultOperations.opsForSys().initialize( - VaultInitializationRequest.create(createKeys, requiredKeys)); + VaultInitializationResponse initialized = vaultOperations.opsForSys() + .initialize(VaultInitializationRequest.create(createKeys, requiredKeys)); for (int i = 0; i < requiredKeys; i++) { - VaultUnsealStatus unsealStatus = vaultOperations.opsForSys().unseal( - initialized.getKeys().get(i)); + VaultUnsealStatus unsealStatus = vaultOperations.opsForSys() + .unseal(initialized.getKeys().get(i)); if (!unsealStatus.isSealed()) { break; @@ -107,8 +107,8 @@ public class PrepareVault { builder.withPolicy(policy); } - VaultTokenResponse vaultTokenResponse = vaultOperations.opsForToken().create( - builder.build()); + VaultTokenResponse vaultTokenResponse = vaultOperations.opsForToken() + .create(builder.build()); return vaultTokenResponse.getToken(); } @@ -162,7 +162,8 @@ public class PrepareVault { * @param path must not be {@literal null} or empty. * @param config must not be {@literal null}. */ - private void mountSecret(String secretBackend, String path, Map config) { + private void mountSecret(String secretBackend, String path, + Map config) { Assert.hasText(secretBackend, "SecretBackend must not be empty"); Assert.hasText(path, "Mount path must not be empty"); @@ -223,10 +224,8 @@ public class PrepareVault { public void mountVersionedKvBackend() { mountSecret("kv", "versioned", Collections.emptyMap()); - vaultOperations.write( - "sys/mounts/versioned/tune", - Collections.singletonMap("options", - Collections.singletonMap("version", "2"))); + vaultOperations.write("sys/mounts/versioned/tune", Collections + .singletonMap("options", Collections.singletonMap("version", "2"))); } public VaultOperations getVaultOperations() { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java b/spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java index 40b630da..cdf27b84 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java @@ -35,8 +35,9 @@ public class Settings { File workDir = findWorkDir(); - return SslConfiguration.forTrustStore(new FileSystemResource(new File(workDir, - "keystore.jks")), "changeit".toCharArray()); + return SslConfiguration.forTrustStore( + new FileSystemResource(new File(workDir, "keystore.jks")), + "changeit".toCharArray()); } /** @@ -78,7 +79,8 @@ public class Settings { * @return the token to use during tests. */ public static VaultToken token() { - return VaultToken.of(System.getProperty("vault.token", - "00000000-0000-0000-0000-000000000000").toCharArray()); + return VaultToken.of( + System.getProperty("vault.token", "00000000-0000-0000-0000-000000000000") + .toCharArray()); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/util/TestWebClientFactory.java b/spring-vault-core/src/test/java/org/springframework/vault/util/TestWebClientFactory.java index cb880e31..ba255001 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/util/TestWebClientFactory.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/util/TestWebClientFactory.java @@ -44,8 +44,8 @@ public class TestWebClientFactory { Assert.notNull(sslConfiguration, "SslConfiguration must not be null!"); try { - ClientHttpConnector connector = ClientHttpConnectorFactory.create( - new ClientOptions(), sslConfiguration); + ClientHttpConnector connector = ClientHttpConnectorFactory + .create(new ClientOptions(), sslConfiguration); return ReactiveVaultClients.createWebClient(TEST_VAULT_ENDPOINT, connector); } catch (Exception e) { diff --git a/spring-vault-core/src/test/java/org/springframework/vault/util/VaultInitializer.java b/spring-vault-core/src/test/java/org/springframework/vault/util/VaultInitializer.java index 6347bdea..f33dcb1f 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/util/VaultInitializer.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/util/VaultInitializer.java @@ -66,7 +66,8 @@ public class VaultInitializer { * @param sslConfiguration must not be {@literal null}. * @param vaultEndpoint must not be {@literal null}. */ - public VaultInitializer(SslConfiguration sslConfiguration, VaultEndpoint vaultEndpoint) { + public VaultInitializer(SslConfiguration sslConfiguration, + VaultEndpoint vaultEndpoint) { Assert.notNull(sslConfiguration, "SslConfiguration must not be null"); Assert.notNull(vaultEndpoint, "VaultEndpoint must not be null"); @@ -93,8 +94,8 @@ public class VaultInitializer { this.token = prepareVault.initializeVault(); this.prepareVault.createToken(Settings.token().getToken(), "root"); - if (this.prepareVault.getVersion().isGreaterThanOrEqualTo( - VERSIONING_INTRODUCED_WITH)) { + if (this.prepareVault.getVersion() + .isGreaterThanOrEqualTo(VERSIONING_INTRODUCED_WITH)) { this.prepareVault.disableGenericVersioning(); this.prepareVault.mountVersionedKvBackend(); } @@ -109,10 +110,9 @@ public class VaultInitializer { vaultEndpoint.getPort())); } catch (Exception ex) { - throw new IllegalStateException( - String.format( - "Vault is not running on localhost:%d which is required to run a test using @Rule %s", - vaultEndpoint.getPort(), getClass().getSimpleName())); + throw new IllegalStateException(String.format( + "Vault is not running on localhost:%d which is required to run a test using @Rule %s", + vaultEndpoint.getPort(), getClass().getSimpleName())); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/util/VaultVersionExtension.java b/spring-vault-core/src/test/java/org/springframework/vault/util/VaultVersionExtension.java index a2bb0902..c82b291c 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/util/VaultVersionExtension.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/util/VaultVersionExtension.java @@ -39,10 +39,11 @@ class VaultVersionExtension implements ExecutionCondition { .enabled("@VaultVersion is not present"); @Override - public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + public ConditionEvaluationResult evaluateExecutionCondition( + ExtensionContext context) { - Optional optional = AnnotationUtils.findAnnotation( - context.getElement(), RequiresVaultVersion.class); + Optional optional = AnnotationUtils + .findAnnotation(context.getElement(), RequiresVaultVersion.class); if (!optional.isPresent()) { return ENABLED_BY_DEFAULT; diff --git a/spring-vault-core/src/test/java/org/springframework/vault/util/Version.java b/spring-vault-core/src/test/java/org/springframework/vault/util/Version.java index fb2d4f3f..6ac57024 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/util/Version.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/util/Version.java @@ -85,8 +85,8 @@ public class Version implements Comparable { intParts[i] = Integer.parseInt(input); } catch (IllegalArgumentException o_O) { - throw new IllegalArgumentException(String.format(VERSION_PARSE_ERROR, - input, version), o_O); + throw new IllegalArgumentException( + String.format(VERSION_PARSE_ERROR, input, version), o_O); } } }