diff --git a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java index 30b0bab..84c0c2f 100644 --- a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java +++ b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java @@ -86,14 +86,14 @@ public class HTTPVaultConnector implements VaultConnector { */ HTTPVaultConnector(final HTTPVaultConnectorBuilder builder) { this.request = new RequestHelper( - ((builder.isWithTLS()) ? "https" : "http") + "://" + - builder.getHost() + - ((builder.getPort() != null) ? ":" + builder.getPort() : "") + - builder.getPrefix(), - builder.getNumberOfRetries(), - builder.getTimeout(), - builder.getTlsVersion(), - builder.getTrustedCA() + ((builder.isWithTLS()) ? "https" : "http") + "://" + + builder.getHost() + + ((builder.getPort() != null) ? ":" + builder.getPort() : "") + + builder.getPrefix(), + builder.getNumberOfRetries(), + builder.getTimeout(), + builder.getTlsVersion(), + builder.getTrustedCA() ); } @@ -150,8 +150,8 @@ public class HTTPVaultConnector implements VaultConnector { @Override public final SealResponse unseal(final String key, final Boolean reset) throws VaultConnectorException { Map param = mapOfStrings( - "key", key, - "reset", reset + "key", key, + "reset", reset ); return request.put(PATH_UNSEAL, param, token, SealResponse.class); @@ -161,15 +161,15 @@ public class HTTPVaultConnector implements VaultConnector { public HealthResponse getHealth() throws VaultConnectorException { return request.get( - PATH_HEALTH, - // Force status code to be 200, so we don't need to modify the request sequence. - Map.of( - "standbycode", "200", // Default: 429. - "sealedcode", "200", // Default: 503. - "uninitcode", "200" // Default: 501. - ), - token, - HealthResponse.class + PATH_HEALTH, + // Force status code to be 200, so we don't need to modify the request sequence. + Map.of( + "standbycode", "200", // Default: 429. + "sealedcode", "200", // Default: 503. + "uninitcode", "200" // Default: 501. + ), + token, + HealthResponse.class ); } @@ -199,7 +199,7 @@ public class HTTPVaultConnector implements VaultConnector { @Override public final AuthResponse authUserPass(final String username, final String password) - throws VaultConnectorException { + throws VaultConnectorException { final Map payload = singletonMap("password", password); return queryAuth(PATH_AUTH_USERPASS + username, payload); } @@ -207,8 +207,8 @@ public class HTTPVaultConnector implements VaultConnector { @Override public final AuthResponse authAppRole(final String roleID, final String secretID) throws VaultConnectorException { final Map payload = mapOfStrings( - "role_id", roleID, - "secret_id", secretID + "role_id", roleID, + "secret_id", secretID ); return queryAuth(PATH_AUTH_APPROLE + PATH_LOGIN, payload); } @@ -222,7 +222,7 @@ public class HTTPVaultConnector implements VaultConnector { * @throws VaultConnectorException on errors */ private AuthResponse queryAuth(final String path, final Map payload) - throws VaultConnectorException { + throws VaultConnectorException { /* Issue request and parse response */ AuthResponse auth = request.post(path, payload, token, AuthResponse.class); /* verify response */ @@ -249,10 +249,10 @@ public class HTTPVaultConnector implements VaultConnector { requireAuth(); /* Request HTTP response and parse Secret */ return request.get( - String.format(PATH_AUTH_APPROLE_ROLE, roleName, ""), - emptyMap(), - token, - AppRoleResponse.class + String.format(PATH_AUTH_APPROLE_ROLE, roleName, ""), + emptyMap(), + token, + AppRoleResponse.class ); } @@ -271,10 +271,10 @@ public class HTTPVaultConnector implements VaultConnector { requireAuth(); /* Issue request, parse response and extract Role ID */ return request.get( - String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/role-id"), - emptyMap(), - token, - RawDataResponse.class + String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/role-id"), + emptyMap(), + token, + RawDataResponse.class ).getData().get("role_id").toString(); } @@ -284,9 +284,9 @@ public class HTTPVaultConnector implements VaultConnector { /* Issue request and expect code 204 with empty response */ request.postWithoutResponse( - String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/role-id"), - singletonMap("role_id", roleID), - token + String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/role-id"), + singletonMap("role_id", roleID), + token ); return true; @@ -294,49 +294,49 @@ public class HTTPVaultConnector implements VaultConnector { @Override public final AppRoleSecretResponse createAppRoleSecret(final String roleName, final AppRoleSecret secret) - throws VaultConnectorException { + throws VaultConnectorException { requireAuth(); if (secret.getId() != null && !secret.getId().isEmpty()) { return request.post( - String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/custom-secret-id"), - secret, - token, - AppRoleSecretResponse.class + String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/custom-secret-id"), + secret, + token, + AppRoleSecretResponse.class ); } else { return request.post( - String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/secret-id"), - secret, token, - AppRoleSecretResponse.class + String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/secret-id"), + secret, token, + AppRoleSecretResponse.class ); } } @Override public final AppRoleSecretResponse lookupAppRoleSecret(final String roleName, final String secretID) - throws VaultConnectorException { + throws VaultConnectorException { requireAuth(); /* Issue request and parse secret response */ return request.post( - String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/secret-id/lookup"), - new AppRoleSecret(secretID), - token, - AppRoleSecretResponse.class + String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/secret-id/lookup"), + new AppRoleSecret(secretID), + token, + AppRoleSecretResponse.class ); } @Override public final boolean destroyAppRoleSecret(final String roleName, final String secretID) - throws VaultConnectorException { + throws VaultConnectorException { requireAuth(); /* Issue request and expect code 204 with empty response */ request.postWithoutResponse( - String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/secret-id/destroy"), - new AppRoleSecret(secretID), - token); + String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/secret-id/destroy"), + new AppRoleSecret(secretID), + token); return true; } @@ -346,10 +346,10 @@ public class HTTPVaultConnector implements VaultConnector { requireAuth(); SecretListResponse secrets = request.get( - PATH_AUTH_APPROLE + "/role?list=true", - emptyMap(), - token, - SecretListResponse.class + PATH_AUTH_APPROLE + "/role?list=true", + emptyMap(), + token, + SecretListResponse.class ); return secrets.getKeys(); @@ -360,10 +360,10 @@ public class HTTPVaultConnector implements VaultConnector { requireAuth(); SecretListResponse secrets = request.get( - String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/secret-id?list=true"), - emptyMap(), - token, - SecretListResponse.class + String.format(PATH_AUTH_APPROLE_ROLE, roleName, "/secret-id?list=true"), + emptyMap(), + token, + SecretListResponse.class ); return secrets.getKeys(); @@ -378,7 +378,7 @@ public class HTTPVaultConnector implements VaultConnector { @Override public final SecretResponse readSecretVersion(final String mount, final String key, final Integer version) - throws VaultConnectorException { + throws VaultConnectorException { requireAuth(); /* Request HTTP response and parse secret metadata */ Map args = mapOfStrings("version", version); @@ -388,7 +388,7 @@ public class HTTPVaultConnector implements VaultConnector { @Override public final MetadataResponse readSecretMetadata(final String mount, final String key) - throws VaultConnectorException { + throws VaultConnectorException { requireAuth(); /* Request HTTP response and parse secret metadata */ @@ -403,8 +403,8 @@ public class HTTPVaultConnector implements VaultConnector { requireAuth(); Map payload = mapOf( - "max_versions", maxVersions, - "cas_required", casRequired + "max_versions", maxVersions, + "cas_required", casRequired ); write(mount + PATH_METADATA + key, payload); @@ -426,13 +426,13 @@ public class HTTPVaultConnector implements VaultConnector { /* Issue request and parse metadata response */ return request.post( - mount + PATH_DATA + key, - Map.of( - "data", data, - "options", options - ), - token, - SecretVersionResponse.class + mount + PATH_DATA + key, + Map.of( + "data", data, + "options", options + ), + token, + SecretVersionResponse.class ); } @@ -447,7 +447,7 @@ public class HTTPVaultConnector implements VaultConnector { @Override public final void write(final String key, final Map data, final Map options) - throws VaultConnectorException { + throws VaultConnectorException { requireAuth(); if (key == null || key.isEmpty()) { @@ -460,8 +460,8 @@ public class HTTPVaultConnector implements VaultConnector { // If options are given, split payload in two parts. if (options != null) { payload = Map.of( - "data", data, - "options", options + "data", data, + "options", options ); } @@ -489,19 +489,19 @@ public class HTTPVaultConnector implements VaultConnector { @Override public final void deleteSecretVersions(final String mount, final String key, final int... versions) - throws VaultConnectorException { + throws VaultConnectorException { handleSecretVersions(mount, PATH_DELETE, key, versions); } @Override public final void undeleteSecretVersions(final String mount, final String key, final int... versions) - throws VaultConnectorException { + throws VaultConnectorException { handleSecretVersions(mount, PATH_UNDELETE, key, versions); } @Override public final void destroySecretVersions(final String mount, final String key, final int... versions) - throws VaultConnectorException { + throws VaultConnectorException { handleSecretVersions(mount, PATH_DESTROY, key, versions); } @@ -541,8 +541,8 @@ public class HTTPVaultConnector implements VaultConnector { requireAuth(); Map payload = mapOfStrings( - "lease_id", leaseID, - "increment", increment + "lease_id", leaseID, + "increment", increment ); /* Issue request and parse secret response */ @@ -599,10 +599,10 @@ public class HTTPVaultConnector implements VaultConnector { /* Request HTTP response and parse Secret */ return request.get( - PATH_AUTH_TOKEN + PATH_LOOKUP, - singletonMap("token", token), - token, - TokenResponse.class + PATH_AUTH_TOKEN + PATH_LOOKUP, + singletonMap("token", token), + token, + TokenResponse.class ); } diff --git a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnectorBuilder.java b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnectorBuilder.java index 1339ad9..45931dc 100644 --- a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnectorBuilder.java +++ b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnectorBuilder.java @@ -100,9 +100,9 @@ public final class HTTPVaultConnectorBuilder { path = DEFAULT_PREFIX; } return withTLS(!("http".equalsIgnoreCase(baseURL.getScheme()))) - .withHost(baseURL.getHost()) - .withPort(baseURL.getPort()) - .withPrefix(path); + .withHost(baseURL.getHost()) + .withPort(baseURL.getPort()) + .withPrefix(path); } /** diff --git a/src/main/java/de/stklcode/jvault/connector/VaultConnector.java b/src/main/java/de/stklcode/jvault/connector/VaultConnector.java index 3a673a4..6d883e3 100644 --- a/src/main/java/de/stklcode/jvault/connector/VaultConnector.java +++ b/src/main/java/de/stklcode/jvault/connector/VaultConnector.java @@ -191,7 +191,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.4.0 */ default boolean createAppRole(final String roleName, final List policies, final String roleID) - throws VaultConnectorException { + throws VaultConnectorException { return createAppRole(AppRole.builder(roleName).withTokenPolicies(policies).withId(roleID).build()); } @@ -257,7 +257,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.4.0 */ default AppRoleSecretResponse createAppRoleSecret(final String roleName, final String secretID) - throws VaultConnectorException { + throws VaultConnectorException { return createAppRoleSecret(roleName, new AppRoleSecret(secretID)); } @@ -271,7 +271,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.4.0 */ AppRoleSecretResponse createAppRoleSecret(final String roleName, final AppRoleSecret secret) - throws VaultConnectorException; + throws VaultConnectorException; /** * Lookup an AppRole secret. @@ -283,7 +283,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.4.0 */ AppRoleSecretResponse lookupAppRoleSecret(final String roleName, final String secretID) - throws VaultConnectorException; + throws VaultConnectorException; /** * Destroy an AppRole secret. @@ -398,7 +398,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.8 */ SecretResponse readSecretVersion(final String mount, final String key, final Integer version) - throws VaultConnectorException; + throws VaultConnectorException; /** * Retrieve secret metadata from Vault. @@ -476,7 +476,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.8 {@code options} parameter added */ void write(final String key, final Map data, final Map options) - throws VaultConnectorException; + throws VaultConnectorException; /** * Delete key from Vault. @@ -524,7 +524,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.8 */ void deleteSecretVersions(final String mount, final String key, final int... versions) - throws VaultConnectorException; + throws VaultConnectorException; /** * Undelete (restore) secret versions from Vault. @@ -537,7 +537,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.8 */ void undeleteSecretVersions(final String mount, final String key, final int... versions) - throws VaultConnectorException; + throws VaultConnectorException; /** * Destroy secret versions from Vault. @@ -550,7 +550,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.8 */ void destroySecretVersions(final String mount, final String key, final int... versions) - throws VaultConnectorException; + throws VaultConnectorException; /** * Revoke given lease immediately. @@ -724,8 +724,8 @@ public interface VaultConnector extends AutoCloseable, Serializable { * Hash data via transit engine from Vault. * * @param algorithm Specifies the hash algorithm to use - * @param input Data to hash (Base64 encoded) - * @param format Specifies the output encoding (hex/base64) + * @param input Data to hash (Base64 encoded) + * @param format Specifies the output encoding (hex/base64) * @return Transit response * @throws VaultConnectorException on error * @since 1.5.0 @@ -813,7 +813,7 @@ public interface VaultConnector extends AutoCloseable, Serializable { * @since 0.5.0 */ default CredentialsResponse readDbCredentials(final String role, final String mount) - throws VaultConnectorException { + throws VaultConnectorException { return (CredentialsResponse) read(mount + "/creds/" + role); } } diff --git a/src/main/java/de/stklcode/jvault/connector/internal/RequestHelper.java b/src/main/java/de/stklcode/jvault/connector/internal/RequestHelper.java index 84ef815..1b4df5c 100644 --- a/src/main/java/de/stklcode/jvault/connector/internal/RequestHelper.java +++ b/src/main/java/de/stklcode/jvault/connector/internal/RequestHelper.java @@ -66,9 +66,9 @@ public final class RequestHelper implements Serializable { this.tlsVersion = tlsVersion; this.trustedCaCert = trustedCaCert; this.jsonMapper = new ObjectMapper() - .registerModule(new JavaTimeModule()) - .enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) - .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); + .registerModule(new JavaTimeModule()) + .enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); } /** @@ -115,7 +115,7 @@ public final class RequestHelper implements Serializable { * @since 0.8 */ public T post(final String path, final Object payload, final String token, final Class target) - throws VaultConnectorException { + throws VaultConnectorException { try { String response = post(path, payload, token); return jsonMapper.readValue(response, target); @@ -134,7 +134,7 @@ public final class RequestHelper implements Serializable { * @since 0.8 */ public void postWithoutResponse(final String path, final Object payload, final String token) - throws VaultConnectorException { + throws VaultConnectorException { if (!post(path, payload, token).isEmpty()) { throw new InvalidResponseException(Error.UNEXPECTED_RESPONSE); } @@ -151,7 +151,7 @@ public final class RequestHelper implements Serializable { * @since 0.8 Added {@code token} parameter. */ public String put(final String path, final Map payload, final String token) - throws VaultConnectorException { + throws VaultConnectorException { // Initialize PUT. var req = HttpRequest.newBuilder(URI.create(baseURL + path)); @@ -185,7 +185,7 @@ public final class RequestHelper implements Serializable { * @since 0.8 */ public T put(final String path, final Map payload, final String token, final Class target) - throws VaultConnectorException { + throws VaultConnectorException { try { String response = put(path, payload, token); return jsonMapper.readValue(response, target); @@ -204,7 +204,7 @@ public final class RequestHelper implements Serializable { * @since 0.8 */ public void putWithoutResponse(final String path, final Map payload, final String token) - throws VaultConnectorException { + throws VaultConnectorException { if (!put(path, payload, token).isEmpty()) { throw new InvalidResponseException(Error.UNEXPECTED_RESPONSE); } @@ -256,15 +256,15 @@ public final class RequestHelper implements Serializable { * @since 0.8 Added {@code token} parameter. */ public String get(final String path, final Map payload, final String token) - throws VaultConnectorException { + throws VaultConnectorException { // Add parameters to URI. var uriBuilder = new StringBuilder(baseURL + path); if (!payload.isEmpty()) { uriBuilder.append("?").append( - payload.entrySet().stream().map(par -> - URLEncoder.encode(par.getKey(), UTF_8) + "=" + URLEncoder.encode(par.getValue(), UTF_8) - ).collect(Collectors.joining("&")) + payload.entrySet().stream().map(par -> + URLEncoder.encode(par.getKey(), UTF_8) + "=" + URLEncoder.encode(par.getValue(), UTF_8) + ).collect(Collectors.joining("&")) ); } @@ -297,7 +297,7 @@ public final class RequestHelper implements Serializable { * @since 0.8 */ public T get(final String path, final Map payload, final String token, final Class target) - throws VaultConnectorException { + throws VaultConnectorException { try { String response = get(path, payload, token); return jsonMapper.readValue(response, target); @@ -333,8 +333,8 @@ public final class RequestHelper implements Serializable { // Execute request. try { HttpResponse response = client.sendAsync( - requestBuilder.build(), - HttpResponse.BodyHandlers.ofInputStream() + requestBuilder.build(), + HttpResponse.BodyHandlers.ofInputStream() ).join(); /* Check if response is valid */ diff --git a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java index 40608ac..c9d1c40 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java +++ b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java @@ -331,28 +331,28 @@ public final class AppRole implements Serializable { } AppRole appRole = (AppRole) o; return Objects.equals(name, appRole.name) && - Objects.equals(id, appRole.id) && - Objects.equals(bindSecretId, appRole.bindSecretId) && - Objects.equals(secretIdBoundCidrs, appRole.secretIdBoundCidrs) && - Objects.equals(secretIdNumUses, appRole.secretIdNumUses) && - Objects.equals(secretIdTtl, appRole.secretIdTtl) && - Objects.equals(localSecretIds, appRole.localSecretIds) && - Objects.equals(tokenTtl, appRole.tokenTtl) && - Objects.equals(tokenMaxTtl, appRole.tokenMaxTtl) && - Objects.equals(tokenPolicies, appRole.tokenPolicies) && - Objects.equals(tokenBoundCidrs, appRole.tokenBoundCidrs) && - Objects.equals(tokenExplicitMaxTtl, appRole.tokenExplicitMaxTtl) && - Objects.equals(tokenNoDefaultPolicy, appRole.tokenNoDefaultPolicy) && - Objects.equals(tokenNumUses, appRole.tokenNumUses) && - Objects.equals(tokenPeriod, appRole.tokenPeriod) && - Objects.equals(tokenType, appRole.tokenType); + Objects.equals(id, appRole.id) && + Objects.equals(bindSecretId, appRole.bindSecretId) && + Objects.equals(secretIdBoundCidrs, appRole.secretIdBoundCidrs) && + Objects.equals(secretIdNumUses, appRole.secretIdNumUses) && + Objects.equals(secretIdTtl, appRole.secretIdTtl) && + Objects.equals(localSecretIds, appRole.localSecretIds) && + Objects.equals(tokenTtl, appRole.tokenTtl) && + Objects.equals(tokenMaxTtl, appRole.tokenMaxTtl) && + Objects.equals(tokenPolicies, appRole.tokenPolicies) && + Objects.equals(tokenBoundCidrs, appRole.tokenBoundCidrs) && + Objects.equals(tokenExplicitMaxTtl, appRole.tokenExplicitMaxTtl) && + Objects.equals(tokenNoDefaultPolicy, appRole.tokenNoDefaultPolicy) && + Objects.equals(tokenNumUses, appRole.tokenNumUses) && + Objects.equals(tokenPeriod, appRole.tokenPeriod) && + Objects.equals(tokenType, appRole.tokenType); } @Override public int hashCode() { return Objects.hash(name, id, bindSecretId, secretIdBoundCidrs, secretIdNumUses, secretIdTtl, - localSecretIds, tokenTtl, tokenMaxTtl, tokenPolicies, tokenBoundCidrs, tokenExplicitMaxTtl, - tokenNoDefaultPolicy, tokenNumUses, tokenPeriod, tokenType); + localSecretIds, tokenTtl, tokenMaxTtl, tokenPolicies, tokenBoundCidrs, tokenExplicitMaxTtl, + tokenNoDefaultPolicy, tokenNumUses, tokenPeriod, tokenType); } diff --git a/src/main/java/de/stklcode/jvault/connector/model/AppRoleSecret.java b/src/main/java/de/stklcode/jvault/connector/model/AppRoleSecret.java index 3609310..e6dec23 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/AppRoleSecret.java +++ b/src/main/java/de/stklcode/jvault/connector/model/AppRoleSecret.java @@ -181,19 +181,19 @@ public final class AppRoleSecret implements Serializable { } AppRoleSecret that = (AppRoleSecret) o; return Objects.equals(id, that.id) && - Objects.equals(accessor, that.accessor) && - Objects.equals(metadata, that.metadata) && - Objects.equals(cidrList, that.cidrList) && - Objects.equals(creationTime, that.creationTime) && - Objects.equals(expirationTime, that.expirationTime) && - Objects.equals(lastUpdatedTime, that.lastUpdatedTime) && - Objects.equals(numUses, that.numUses) && - Objects.equals(ttl, that.ttl); + Objects.equals(accessor, that.accessor) && + Objects.equals(metadata, that.metadata) && + Objects.equals(cidrList, that.cidrList) && + Objects.equals(creationTime, that.creationTime) && + Objects.equals(expirationTime, that.expirationTime) && + Objects.equals(lastUpdatedTime, that.lastUpdatedTime) && + Objects.equals(numUses, that.numUses) && + Objects.equals(ttl, that.ttl); } @Override public int hashCode() { return Objects.hash(id, accessor, metadata, cidrList, creationTime, expirationTime, lastUpdatedTime, numUses, - ttl); + ttl); } } diff --git a/src/main/java/de/stklcode/jvault/connector/model/Token.java b/src/main/java/de/stklcode/jvault/connector/model/Token.java index 9e9c316..1df9a6b 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/Token.java +++ b/src/main/java/de/stklcode/jvault/connector/model/Token.java @@ -227,24 +227,24 @@ public final class Token implements Serializable { } Token token = (Token) o; return Objects.equals(id, token.id) && - Objects.equals(type, token.type) && - Objects.equals(displayName, token.displayName) && - Objects.equals(noParent, token.noParent) && - Objects.equals(noDefaultPolicy, token.noDefaultPolicy) && - Objects.equals(ttl, token.ttl) && - Objects.equals(explicitMaxTtl, token.explicitMaxTtl) && - Objects.equals(numUses, token.numUses) && - Objects.equals(policies, token.policies) && - Objects.equals(meta, token.meta) && - Objects.equals(renewable, token.renewable) && - Objects.equals(period, token.period) && - Objects.equals(entityAlias, token.entityAlias); + Objects.equals(type, token.type) && + Objects.equals(displayName, token.displayName) && + Objects.equals(noParent, token.noParent) && + Objects.equals(noDefaultPolicy, token.noDefaultPolicy) && + Objects.equals(ttl, token.ttl) && + Objects.equals(explicitMaxTtl, token.explicitMaxTtl) && + Objects.equals(numUses, token.numUses) && + Objects.equals(policies, token.policies) && + Objects.equals(meta, token.meta) && + Objects.equals(renewable, token.renewable) && + Objects.equals(period, token.period) && + Objects.equals(entityAlias, token.entityAlias); } @Override public int hashCode() { return Objects.hash(id, type, displayName, noParent, noDefaultPolicy, ttl, explicitMaxTtl, numUses, policies, - meta, renewable, period, entityAlias); + meta, renewable, period, entityAlias); } /** diff --git a/src/main/java/de/stklcode/jvault/connector/model/TokenRole.java b/src/main/java/de/stklcode/jvault/connector/model/TokenRole.java index 6a2b972..ffd1b54 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/TokenRole.java +++ b/src/main/java/de/stklcode/jvault/connector/model/TokenRole.java @@ -245,27 +245,27 @@ public final class TokenRole implements Serializable { } TokenRole tokenRole = (TokenRole) o; return Objects.equals(name, tokenRole.name) && - Objects.equals(allowedPolicies, tokenRole.allowedPolicies) && - Objects.equals(allowedPoliciesGlob, tokenRole.allowedPoliciesGlob) && - Objects.equals(disallowedPolicies, tokenRole.disallowedPolicies) && - Objects.equals(disallowedPoliciesGlob, tokenRole.disallowedPoliciesGlob) && - Objects.equals(orphan, tokenRole.orphan) && - Objects.equals(renewable, tokenRole.renewable) && - Objects.equals(pathSuffix, tokenRole.pathSuffix) && - Objects.equals(allowedEntityAliases, tokenRole.allowedEntityAliases) && - Objects.equals(tokenBoundCidrs, tokenRole.tokenBoundCidrs) && - Objects.equals(tokenExplicitMaxTtl, tokenRole.tokenExplicitMaxTtl) && - Objects.equals(tokenNoDefaultPolicy, tokenRole.tokenNoDefaultPolicy) && - Objects.equals(tokenNumUses, tokenRole.tokenNumUses) && - Objects.equals(tokenPeriod, tokenRole.tokenPeriod) && - Objects.equals(tokenType, tokenRole.tokenType); + Objects.equals(allowedPolicies, tokenRole.allowedPolicies) && + Objects.equals(allowedPoliciesGlob, tokenRole.allowedPoliciesGlob) && + Objects.equals(disallowedPolicies, tokenRole.disallowedPolicies) && + Objects.equals(disallowedPoliciesGlob, tokenRole.disallowedPoliciesGlob) && + Objects.equals(orphan, tokenRole.orphan) && + Objects.equals(renewable, tokenRole.renewable) && + Objects.equals(pathSuffix, tokenRole.pathSuffix) && + Objects.equals(allowedEntityAliases, tokenRole.allowedEntityAliases) && + Objects.equals(tokenBoundCidrs, tokenRole.tokenBoundCidrs) && + Objects.equals(tokenExplicitMaxTtl, tokenRole.tokenExplicitMaxTtl) && + Objects.equals(tokenNoDefaultPolicy, tokenRole.tokenNoDefaultPolicy) && + Objects.equals(tokenNumUses, tokenRole.tokenNumUses) && + Objects.equals(tokenPeriod, tokenRole.tokenPeriod) && + Objects.equals(tokenType, tokenRole.tokenType); } @Override public int hashCode() { return Objects.hash(name, allowedPolicies, allowedPoliciesGlob, disallowedPolicies, disallowedPoliciesGlob, - orphan, renewable, pathSuffix, allowedEntityAliases, tokenBoundCidrs, tokenExplicitMaxTtl, - tokenNoDefaultPolicy, tokenNumUses, tokenPeriod, tokenType); + orphan, renewable, pathSuffix, allowedEntityAliases, tokenBoundCidrs, tokenExplicitMaxTtl, + tokenNoDefaultPolicy, tokenNumUses, tokenPeriod, tokenType); } /** diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java index 37987ff..07b09cf 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java @@ -187,19 +187,19 @@ public final class HealthResponse implements VaultResponse { } HealthResponse that = (HealthResponse) o; return Objects.equals(clusterID, that.clusterID) && - Objects.equals(clusterName, that.clusterName) && - Objects.equals(version, that.version) && - Objects.equals(serverTimeUTC, that.serverTimeUTC) && - Objects.equals(standby, that.standby) && - Objects.equals(sealed, that.sealed) && - Objects.equals(initialized, that.initialized) && - Objects.equals(replicationPerfMode, that.replicationPerfMode) && - Objects.equals(replicationDrMode, that.replicationDrMode) && - Objects.equals(performanceStandby, that.performanceStandby) && - Objects.equals(echoDurationMs, that.echoDurationMs) && - Objects.equals(clockSkewMs, that.clockSkewMs) && - Objects.equals(replicationPrimaryCanaryAgeMs, that.replicationPrimaryCanaryAgeMs) && - Objects.equals(enterprise, that.enterprise); + Objects.equals(clusterName, that.clusterName) && + Objects.equals(version, that.version) && + Objects.equals(serverTimeUTC, that.serverTimeUTC) && + Objects.equals(standby, that.standby) && + Objects.equals(sealed, that.sealed) && + Objects.equals(initialized, that.initialized) && + Objects.equals(replicationPerfMode, that.replicationPerfMode) && + Objects.equals(replicationDrMode, that.replicationDrMode) && + Objects.equals(performanceStandby, that.performanceStandby) && + Objects.equals(echoDurationMs, that.echoDurationMs) && + Objects.equals(clockSkewMs, that.clockSkewMs) && + Objects.equals(replicationPrimaryCanaryAgeMs, that.replicationPrimaryCanaryAgeMs) && + Objects.equals(enterprise, that.enterprise); } @Override diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/SealResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/SealResponse.java index 45f2787..22fb0c8 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/SealResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/SealResponse.java @@ -191,24 +191,24 @@ public final class SealResponse implements VaultResponse { } SealResponse that = (SealResponse) o; return sealed == that.sealed && - initialized == that.initialized && - Objects.equals(type, that.type) && - Objects.equals(threshold, that.threshold) && - Objects.equals(numberOfShares, that.numberOfShares) && - Objects.equals(progress, that.progress) && - Objects.equals(version, that.version) && - Objects.equals(buildDate, that.buildDate) && - Objects.equals(nonce, that.nonce) && - Objects.equals(clusterName, that.clusterName) && - Objects.equals(clusterId, that.clusterId) && - Objects.equals(migration, that.migration) && - Objects.equals(recoverySeal, that.recoverySeal) && - Objects.equals(storageType, that.storageType); + initialized == that.initialized && + Objects.equals(type, that.type) && + Objects.equals(threshold, that.threshold) && + Objects.equals(numberOfShares, that.numberOfShares) && + Objects.equals(progress, that.progress) && + Objects.equals(version, that.version) && + Objects.equals(buildDate, that.buildDate) && + Objects.equals(nonce, that.nonce) && + Objects.equals(clusterName, that.clusterName) && + Objects.equals(clusterId, that.clusterId) && + Objects.equals(migration, that.migration) && + Objects.equals(recoverySeal, that.recoverySeal) && + Objects.equals(storageType, that.storageType); } @Override public int hashCode() { return Objects.hash(type, sealed, initialized, threshold, numberOfShares, progress, version, buildDate, nonce, - clusterName, clusterId, migration, recoverySeal, storageType); + clusterName, clusterId, migration, recoverySeal, storageType); } } diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/SecretResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/SecretResponse.java index fcfb742..705b953 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/SecretResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/SecretResponse.java @@ -86,9 +86,9 @@ public abstract class SecretResponse extends VaultDataResponse { return type.cast(rawValue); } else { var om = new ObjectMapper() - .registerModule(new JavaTimeModule()) - .enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) - .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); + .registerModule(new JavaTimeModule()) + .enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); if (rawValue instanceof String) { return om.readValue((String) rawValue, type); diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/TransitResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/TransitResponse.java index d7869f7..00ef5c5 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/TransitResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/TransitResponse.java @@ -16,11 +16,11 @@ package de.stklcode.jvault.connector.model.response; +import com.fasterxml.jackson.annotation.JsonSetter; + import java.util.Map; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonSetter; - /** * Response entity for transit operations. * diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/VaultDataResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/VaultDataResponse.java index 367a46e..9e0ce4c 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/VaultDataResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/VaultDataResponse.java @@ -115,6 +115,7 @@ public abstract class VaultDataResponse implements VaultResponse { public final String getMountType() { return mountType; } + @Override public boolean equals(Object o) { if (this == o) { @@ -124,13 +125,13 @@ public abstract class VaultDataResponse implements VaultResponse { } VaultDataResponse that = (VaultDataResponse) o; return renewable == that.renewable && - Objects.equals(requestId, that.requestId) && - Objects.equals(leaseId, that.leaseId) && - Objects.equals(leaseDuration, that.leaseDuration) && - Objects.equals(warnings, that.warnings) && - Objects.equals(wrapInfo, that.wrapInfo) && - Objects.equals(auth, that.auth) && - Objects.equals(mountType, that.mountType); + Objects.equals(requestId, that.requestId) && + Objects.equals(leaseId, that.leaseId) && + Objects.equals(leaseDuration, that.leaseDuration) && + Objects.equals(warnings, that.warnings) && + Objects.equals(wrapInfo, that.wrapInfo) && + Objects.equals(auth, that.auth) && + Objects.equals(mountType, that.mountType); } @Override diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthData.java b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthData.java index a8261a8..15e2529 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthData.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthData.java @@ -171,22 +171,22 @@ public final class AuthData implements Serializable { } AuthData authData = (AuthData) o; return renewable == authData.renewable && - orphan == authData.orphan && - Objects.equals(clientToken, authData.clientToken) && - Objects.equals(accessor, authData.accessor) && - Objects.equals(policies, authData.policies) && - Objects.equals(tokenPolicies, authData.tokenPolicies) && - Objects.equals(metadata, authData.metadata) && - Objects.equals(leaseDuration, authData.leaseDuration) && - Objects.equals(entityId, authData.entityId) && - Objects.equals(tokenType, authData.tokenType) && - Objects.equals(numUses, authData.numUses) && - Objects.equals(mfaRequirement, authData.mfaRequirement); + orphan == authData.orphan && + Objects.equals(clientToken, authData.clientToken) && + Objects.equals(accessor, authData.accessor) && + Objects.equals(policies, authData.policies) && + Objects.equals(tokenPolicies, authData.tokenPolicies) && + Objects.equals(metadata, authData.metadata) && + Objects.equals(leaseDuration, authData.leaseDuration) && + Objects.equals(entityId, authData.entityId) && + Objects.equals(tokenType, authData.tokenType) && + Objects.equals(numUses, authData.numUses) && + Objects.equals(mfaRequirement, authData.mfaRequirement); } @Override public int hashCode() { return Objects.hash(clientToken, accessor, policies, tokenPolicies, metadata, leaseDuration, renewable, - entityId, tokenType, orphan, numUses, mfaRequirement); + entityId, tokenType, orphan, numUses, mfaRequirement); } } diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthMethod.java b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthMethod.java index e464ee5..45fc04c 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthMethod.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/AuthMethod.java @@ -202,19 +202,19 @@ public final class AuthMethod implements Serializable { } AuthMethod that = (AuthMethod) o; return local == that.local && - type == that.type && - externalEntropyAccess == that.externalEntropyAccess && - sealWrap == that.sealWrap && - Objects.equals(rawType, that.rawType) && - Objects.equals(accessor, that.accessor) && - Objects.equals(deprecationStatus, that.deprecationStatus) && - Objects.equals(description, that.description) && - Objects.equals(config, that.config) && - Objects.equals(options, that.options) && - Objects.equals(pluginVersion, that.pluginVersion) && - Objects.equals(runningPluginVersion, that.runningPluginVersion) && - Objects.equals(runningSha256, that.runningSha256) && - Objects.equals(uuid, that.uuid); + type == that.type && + externalEntropyAccess == that.externalEntropyAccess && + sealWrap == that.sealWrap && + Objects.equals(rawType, that.rawType) && + Objects.equals(accessor, that.accessor) && + Objects.equals(deprecationStatus, that.deprecationStatus) && + Objects.equals(description, that.description) && + Objects.equals(config, that.config) && + Objects.equals(options, that.options) && + Objects.equals(pluginVersion, that.pluginVersion) && + Objects.equals(runningPluginVersion, that.runningPluginVersion) && + Objects.equals(runningSha256, that.runningSha256) && + Objects.equals(uuid, that.uuid); } @Override diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/SecretMetadata.java b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/SecretMetadata.java index aa0ebb5..03d63e2 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/SecretMetadata.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/SecretMetadata.java @@ -138,14 +138,14 @@ public final class SecretMetadata implements Serializable { } SecretMetadata that = (SecretMetadata) o; return Objects.equals(createdTime, that.createdTime) && - Objects.equals(currentVersion, that.currentVersion) && - Objects.equals(maxVersions, that.maxVersions) && - Objects.equals(oldestVersion, that.oldestVersion) && - Objects.equals(updatedTime, that.updatedTime) && - Objects.equals(versions, that.versions) && - Objects.equals(casRequired, that.casRequired) && - Objects.equals(customMetadata, that.customMetadata) && - Objects.equals(deleteVersionAfter, that.deleteVersionAfter); + Objects.equals(currentVersion, that.currentVersion) && + Objects.equals(maxVersions, that.maxVersions) && + Objects.equals(oldestVersion, that.oldestVersion) && + Objects.equals(updatedTime, that.updatedTime) && + Objects.equals(versions, that.versions) && + Objects.equals(casRequired, that.casRequired) && + Objects.equals(customMetadata, that.customMetadata) && + Objects.equals(deleteVersionAfter, that.deleteVersionAfter); } @Override diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java index 50c4747..11c5e06 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java @@ -222,27 +222,27 @@ public final class TokenData implements Serializable { } TokenData tokenData = (TokenData) o; return orphan == tokenData.orphan && - renewable == tokenData.renewable && - Objects.equals(accessor, tokenData.accessor) && - Objects.equals(creationTime, tokenData.creationTime) && - Objects.equals(creationTtl, tokenData.creationTtl) && - Objects.equals(name, tokenData.name) && - Objects.equals(entityId, tokenData.entityId) && - Objects.equals(expireTime, tokenData.expireTime) && - Objects.equals(explicitMaxTtl, tokenData.explicitMaxTtl) && - Objects.equals(id, tokenData.id) && - Objects.equals(issueTime, tokenData.issueTime) && - Objects.equals(meta, tokenData.meta) && - Objects.equals(numUses, tokenData.numUses) && - Objects.equals(path, tokenData.path) && - Objects.equals(policies, tokenData.policies) && - Objects.equals(ttl, tokenData.ttl) && - Objects.equals(type, tokenData.type); + renewable == tokenData.renewable && + Objects.equals(accessor, tokenData.accessor) && + Objects.equals(creationTime, tokenData.creationTime) && + Objects.equals(creationTtl, tokenData.creationTtl) && + Objects.equals(name, tokenData.name) && + Objects.equals(entityId, tokenData.entityId) && + Objects.equals(expireTime, tokenData.expireTime) && + Objects.equals(explicitMaxTtl, tokenData.explicitMaxTtl) && + Objects.equals(id, tokenData.id) && + Objects.equals(issueTime, tokenData.issueTime) && + Objects.equals(meta, tokenData.meta) && + Objects.equals(numUses, tokenData.numUses) && + Objects.equals(path, tokenData.path) && + Objects.equals(policies, tokenData.policies) && + Objects.equals(ttl, tokenData.ttl) && + Objects.equals(type, tokenData.type); } @Override public int hashCode() { return Objects.hash(accessor, creationTime, creationTtl, name, entityId, expireTime, explicitMaxTtl, id, - issueTime, meta, numUses, orphan, path, policies, renewable, ttl, type); + issueTime, meta, numUses, orphan, path, policies, renewable, ttl, type); } } diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/VersionMetadata.java b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/VersionMetadata.java index 82679f5..0625184 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/VersionMetadata.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/VersionMetadata.java @@ -96,10 +96,10 @@ public final class VersionMetadata implements Serializable { } VersionMetadata that = (VersionMetadata) o; return destroyed == that.destroyed && - Objects.equals(createdTime, that.createdTime) && - Objects.equals(deletionTime, that.deletionTime) && - Objects.equals(version, that.version) && - Objects.equals(customMetadata, that.customMetadata); + Objects.equals(createdTime, that.createdTime) && + Objects.equals(deletionTime, that.deletionTime) && + Objects.equals(version, that.version) && + Objects.equals(customMetadata, that.customMetadata); } @Override diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/WrapInfo.java b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/WrapInfo.java index 8060f9a..c8afb71 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/WrapInfo.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/WrapInfo.java @@ -80,9 +80,9 @@ public class WrapInfo implements Serializable { } WrapInfo that = (WrapInfo) o; return Objects.equals(token, that.token) && - Objects.equals(ttl, that.ttl) && - Objects.equals(creationTime, that.creationTime) && - Objects.equals(creationPath, that.creationPath); + Objects.equals(ttl, that.ttl) && + Objects.equals(creationTime, that.creationTime) && + Objects.equals(creationPath, that.creationPath); } @Override