From ce28b8eb60ca42a523f1d521e7413771b915bf33 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Tue, 8 Jun 2021 18:24:19 +0200 Subject: [PATCH] use local variable type inference where reasonable Local variables with obvious type on both sides of their declaration use type inference now for more concise code. Some variable names are given a more precise name though. --- .../builder/HTTPVaultConnectorBuilder.java | 5 ++-- .../connector/internal/RequestHelper.java | 30 +++++++++---------- .../model/response/AppRoleResponse.java | 2 +- .../model/response/AppRoleSecretResponse.java | 2 +- .../model/response/AuthMethodsResponse.java | 2 +- .../model/response/AuthResponse.java | 2 +- .../model/response/MetadataResponse.java | 2 +- .../model/response/SecretResponse.java | 2 +- .../model/response/SecretVersionResponse.java | 2 +- .../model/response/TokenResponse.java | 2 +- .../model/response/TokenRoleResponse.java | 2 +- 11 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/main/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilder.java b/src/main/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilder.java index bec6243..4adf80c 100644 --- a/src/main/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilder.java +++ b/src/main/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilder.java @@ -22,7 +22,6 @@ import de.stklcode.jvault.connector.exception.TlsException; import de.stklcode.jvault.connector.exception.VaultConnectorException; import java.io.IOException; -import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.nio.file.Files; @@ -213,7 +212,7 @@ public final class HTTPVaultConnectorBuilder implements VaultConnectorBuilder { /* Parse URL from environment variable */ if (System.getenv(ENV_VAULT_ADDR) != null && !System.getenv(ENV_VAULT_ADDR).trim().isEmpty()) { try { - URL url = new URL(System.getenv(ENV_VAULT_ADDR)); + var url = new URL(System.getenv(ENV_VAULT_ADDR)); this.host = url.getHost(); this.port = url.getPort(); this.tls = url.getProtocol().equals("https"); @@ -289,7 +288,7 @@ public final class HTTPVaultConnectorBuilder implements VaultConnectorBuilder { * @since 0.4.0 */ private X509Certificate certificateFromFile(final Path certFile) throws TlsException { - try (InputStream is = Files.newInputStream(certFile)) { + try (var is = Files.newInputStream(certFile)) { return (X509Certificate) CertificateFactory.getInstance("X.509").generateCertificate(is); } catch (IOException | CertificateException e) { throw new TlsException("Unable to read certificate.", e); 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 0dfb0e0..367f27e 100644 --- a/src/main/java/de/stklcode/jvault/connector/internal/RequestHelper.java +++ b/src/main/java/de/stklcode/jvault/connector/internal/RequestHelper.java @@ -77,7 +77,7 @@ public final class RequestHelper implements Serializable { */ public String post(final String path, final Object payload, final String token) throws VaultConnectorException { // Initialize POST. - HttpRequest.Builder req = HttpRequest.newBuilder(URI.create(baseURL + path)); + var req = HttpRequest.newBuilder(URI.create(baseURL + path)); // Generate JSON from payload. try { @@ -145,7 +145,7 @@ public final class RequestHelper implements Serializable { */ public String put(final String path, final Map payload, final String token) throws VaultConnectorException { // Initialize PUT. - HttpRequest.Builder req = HttpRequest.newBuilder(URI.create(baseURL + path)); + var req = HttpRequest.newBuilder(URI.create(baseURL + path)); // Generate JSON from payload. try { @@ -250,7 +250,7 @@ public final class RequestHelper implements Serializable { public String get(final String path, final Map payload, final String token) throws VaultConnectorException { // Add parameters to URI. - StringBuilder uriBuilder = new StringBuilder(baseURL + path); + var uriBuilder = new StringBuilder(baseURL + path); if (!payload.isEmpty()) { uriBuilder.append("?").append( @@ -262,7 +262,7 @@ public final class RequestHelper implements Serializable { // Initialize GET. try { - HttpRequest.Builder req = HttpRequest.newBuilder(new URI(uriBuilder.toString())); + var req = HttpRequest.newBuilder(new URI(uriBuilder.toString())); // Set X-Vault-Token header. if (token != null) { @@ -310,7 +310,7 @@ public final class RequestHelper implements Serializable { // Set JSON Header. requestBuilder.setHeader("accept", "application/json"); - HttpClient.Builder clientBuilder = HttpClient.newBuilder(); + var clientBuilder = HttpClient.newBuilder(); // Set custom timeout, if defined. if (this.timeout != null) { @@ -369,23 +369,23 @@ public final class RequestHelper implements Serializable { private SSLContext createSSLContext() throws TlsException { try { // Create context. - SSLContext context = SSLContext.getInstance(tlsVersion); + var sslContext = SSLContext.getInstance(tlsVersion); if (trustedCaCert != null) { // Create Keystore with trusted certificate. - KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); + var keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); keyStore.load(null, null); keyStore.setCertificateEntry("trustedCert", trustedCaCert); // Initialize TrustManager. - TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + var tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); tmf.init(keyStore); - context.init(null, tmf.getTrustManagers(), null); + sslContext.init(null, tmf.getTrustManagers(), null); } else { - context.init(null, null, null); + sslContext.init(null, null, null); } - return context; + return sslContext; } catch (CertificateException | NoSuchAlgorithmException | KeyStoreException | IOException | KeyManagementException e) { throw new TlsException(Error.INIT_SSL_CONTEXT, e); } @@ -399,8 +399,8 @@ public final class RequestHelper implements Serializable { * @throws InvalidResponseException on reading errors */ private String handleResult(final HttpResponse response) throws InvalidResponseException { - try (BufferedReader br = new BufferedReader(new InputStreamReader(response.body()))) { - return br.lines().collect(Collectors.joining("\n")); + try (var reader = new BufferedReader(new InputStreamReader(response.body()))) { + return reader.lines().collect(Collectors.joining("\n")); } catch (IOException ignored) { throw new InvalidResponseException(Error.READ_RESPONSE, 200); } @@ -414,8 +414,8 @@ public final class RequestHelper implements Serializable { */ private void handleError(final HttpResponse response) throws VaultConnectorException { if (response.body() != null) { - try (BufferedReader br = new BufferedReader(new InputStreamReader(response.body()))) { - String responseString = br.lines().collect(Collectors.joining("\n")); + try (var reader = new BufferedReader(new InputStreamReader(response.body()))) { + var responseString = reader.lines().collect(Collectors.joining("\n")); ErrorResponse er = jsonMapper.readValue(responseString, ErrorResponse.class); /* Check for "permission denied" response */ if (!er.getErrors().isEmpty() && er.getErrors().get(0).equals("permission denied")) { diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleResponse.java index 6c8582b..9af4239 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleResponse.java @@ -37,7 +37,7 @@ public final class AppRoleResponse extends VaultDataResponse { @Override public void setData(final Map data) throws InvalidResponseException { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); try { /* null empty strings on list objects */ Map filteredData = new HashMap<>(data.size(), 1); diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleSecretResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleSecretResponse.java index 6707e22..e7cdd18 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleSecretResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/AppRoleSecretResponse.java @@ -37,7 +37,7 @@ public final class AppRoleSecretResponse extends VaultDataResponse { @Override public void setData(final Map data) throws InvalidResponseException { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); try { /* null empty strings on list objects */ Map filteredData = new HashMap<>(data.size(), 1); diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponse.java index 64fffd4..d8089e5 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponse.java @@ -44,7 +44,7 @@ public final class AuthMethodsResponse extends VaultDataResponse { @Override public void setData(final Map data) throws InvalidResponseException { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); for (Map.Entry entry : data.entrySet()) { try { this.supportedMethods.put(entry.getKey(), diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/AuthResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/AuthResponse.java index 4759b37..4ead4d1 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/AuthResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/AuthResponse.java @@ -45,7 +45,7 @@ public final class AuthResponse extends VaultDataResponse { */ @JsonProperty("auth") public void setAuth(final Map auth) throws InvalidResponseException { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); try { this.auth = mapper.readValue(mapper.writeValueAsString(auth), AuthData.class); } catch (IOException e) { diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/MetadataResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/MetadataResponse.java index 53601b2..ea94451 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/MetadataResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/MetadataResponse.java @@ -37,7 +37,7 @@ public class MetadataResponse extends VaultDataResponse { @Override public final void setData(final Map data) throws InvalidResponseException { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); try { this.metadata = mapper.readValue(mapper.writeValueAsString(data), SecretMetadata.class); } catch (IOException e) { 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 690ce5f..e0b189a 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 @@ -44,7 +44,7 @@ public class SecretResponse extends VaultDataResponse { if (data.size() == 2 && data.containsKey(KEY_DATA) && data.get(KEY_DATA) instanceof Map && data.containsKey(KEY_METADATA) && data.get(KEY_METADATA) instanceof Map) { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); try { // This is apparently a KV v2 value. this.data = (Map) data.get(KEY_DATA); diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/SecretVersionResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/SecretVersionResponse.java index 1c08cb4..4867cb2 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/SecretVersionResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/SecretVersionResponse.java @@ -37,7 +37,7 @@ public class SecretVersionResponse extends VaultDataResponse { @Override public final void setData(final Map data) throws InvalidResponseException { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); try { this.metadata = mapper.readValue(mapper.writeValueAsString(data), VersionMetadata.class); } catch (IOException e) { diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/TokenResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/TokenResponse.java index b19a1ad..b0772b4 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/TokenResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/TokenResponse.java @@ -46,7 +46,7 @@ public final class TokenResponse extends VaultDataResponse { */ @Override public void setData(final Map data) throws InvalidResponseException { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); try { this.data = mapper.readValue(mapper.writeValueAsString(data), TokenData.class); } catch (IOException e) { diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/TokenRoleResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/TokenRoleResponse.java index 0ef3efa..2101a4e 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/TokenRoleResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/TokenRoleResponse.java @@ -43,7 +43,7 @@ public final class TokenRoleResponse extends VaultDataResponse { */ @Override public void setData(final Map data) throws InvalidResponseException { - ObjectMapper mapper = new ObjectMapper(); + var mapper = new ObjectMapper(); try { this.data = mapper.readValue(mapper.writeValueAsString(data), TokenRole.class); } catch (IOException e) {