A container for SSL-related configuration options, meant to be stored within a {@link VaultConfig} instance.
@@ -444,13 +443,13 @@ public SslConfig build() throws VaultException { this.environmentLoader = new EnvironmentLoader(); } if (this.verifyObject == null && environmentLoader.loadVariable(VAULT_SSL_VERIFY) != null) { - this.verify = Boolean.valueOf(environmentLoader.loadVariable(VAULT_SSL_VERIFY)); + this.verify = Boolean.parseBoolean(environmentLoader.loadVariable(VAULT_SSL_VERIFY)); } else if (this.verifyObject != null) { this.verify = verifyObject; } else { this.verify = true; } - if (this.verify == true && this.pemUTF8 == null && environmentLoader.loadVariable(VAULT_SSL_CERT) != null) { + if (this.verify && this.pemUTF8 == null && environmentLoader.loadVariable(VAULT_SSL_CERT) != null) { final File pemFile = new File(environmentLoader.loadVariable(VAULT_SSL_CERT)); try (final InputStream input = new FileInputStream(pemFile)) { this.pemUTF8 = inputStreamToUTF8(input); @@ -487,7 +486,7 @@ protected String getPemUTF8() { * @throws VaultException */ private void buildSsl() throws VaultException { - if (verify == true) { + if (verify) { if (keyStore != null || trustStore != null) { this.sslContext = buildSslContextFromJks(); } else if (pemUTF8 != null || clientPemUTF8 != null || clientKeyPemUTF8 != null) { @@ -625,7 +624,7 @@ private KeyStore inputStreamToKeyStore(final InputStream inputStream, final Stri */ private static String inputStreamToUTF8(final InputStream input) throws IOException { final BufferedReader in = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8)); - final StringBuilder utf8 = new StringBuilder(""); + final StringBuilder utf8 = new StringBuilder(); String str; while ((str = in.readLine()) != null) { // String concatenation is less efficient, but for some reason the line-breaks (which are necessary diff --git a/src/main/java/com/bettercloud/vault/Vault.java b/src/main/java/com/bettercloud/vault/Vault.java index 436cd17a..479bb09a 100644 --- a/src/main/java/com/bettercloud/vault/Vault.java +++ b/src/main/java/com/bettercloud/vault/Vault.java @@ -14,7 +14,6 @@ import com.bettercloud.vault.rest.Rest; import com.bettercloud.vault.rest.RestException; import com.bettercloud.vault.rest.RestResponse; - import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/bettercloud/vault/VaultConfig.java b/src/main/java/com/bettercloud/vault/VaultConfig.java index 9ba58ef2..85ed7034 100644 --- a/src/main/java/com/bettercloud/vault/VaultConfig.java +++ b/src/main/java/com/bettercloud/vault/VaultConfig.java @@ -146,14 +146,14 @@ public VaultConfig secretsEnginePathMap(final MapSets the secrets Engine version be used by Vault for the provided path.
* * @param path the path to use for accessing Vault secrets. * Example "/secret/foo" * @param version The key-value engine version used for this path. - * @return This object, with a new entry in the secrets paths map, ready for additional builder-pattern method calls or else finalization with + * @return This object, with a new entry in the secrets paths map, ready for additional builder-pattern method calls or else finalization with * the build() method */ public VaultConfig putSecretsEngineVersionForPath(String path, String version) { diff --git a/src/main/java/com/bettercloud/vault/api/Auth.java b/src/main/java/com/bettercloud/vault/api/Auth.java index 3f166e73..4b31de8e 100644 --- a/src/main/java/com/bettercloud/vault/api/Auth.java +++ b/src/main/java/com/bettercloud/vault/api/Auth.java @@ -10,7 +10,6 @@ import com.bettercloud.vault.response.LookupResponse; import com.bettercloud.vault.rest.Rest; import com.bettercloud.vault.rest.RestResponse; - import java.io.Serializable; import java.nio.charset.StandardCharsets; import java.util.List; @@ -252,7 +251,10 @@ public AuthResponse createToken(final TokenRequest tokenRequest, final String to if (tokenRequest.numUses != null) jsonObject.add("num_uses", tokenRequest.numUses); final String requestJson = jsonObject.toString(); - final StringBuilder urlBuilder = new StringBuilder(config.getAddress()).append("/v1/auth/" + mount + "/create");//NOPMD + final StringBuilder urlBuilder = new StringBuilder(config.getAddress())//NOPMD + .append("/v1/auth/") + .append(mount) + .append("/create"); if (tokenRequest.role != null) { urlBuilder.append("/").append(tokenRequest.role); } @@ -1228,7 +1230,7 @@ public LookupResponse lookupSelf(final String tokenAuthMount) throws VaultExcept throw new VaultException("Vault responded with HTTP status code: " + restResponse.getStatus(), restResponse.getStatus()); } final String mimeType = restResponse.getMimeType(); - if (mimeType == null || !"application/json".equals(mimeType)) { + if (!"application/json".equals(mimeType)) { throw new VaultException("Vault responded with MIME type: " + mimeType, restResponse.getStatus()); } return new LookupResponse(restResponse, retryCount); @@ -1291,7 +1293,7 @@ public LogicalResponse lookupWrap() throws VaultException { restResponse.getStatus()); } final String mimeType = restResponse.getMimeType(); - if (mimeType == null || !"application/json".equals(mimeType)) { + if (!"application/json".equals(mimeType)) { throw new VaultException("Vault responded with MIME type: " + mimeType, restResponse.getStatus()); } return new LogicalResponse(restResponse, retryCount, Logical.logicalOperations.authentication); diff --git a/src/main/java/com/bettercloud/vault/api/Debug.java b/src/main/java/com/bettercloud/vault/api/Debug.java index d735b53b..c0bab26c 100644 --- a/src/main/java/com/bettercloud/vault/api/Debug.java +++ b/src/main/java/com/bettercloud/vault/api/Debug.java @@ -6,7 +6,6 @@ import com.bettercloud.vault.rest.Rest; import com.bettercloud.vault.rest.RestException; import com.bettercloud.vault.rest.RestResponse; - import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/bettercloud/vault/api/Leases.java b/src/main/java/com/bettercloud/vault/api/Leases.java index 494a864f..bf1c8cae 100644 --- a/src/main/java/com/bettercloud/vault/api/Leases.java +++ b/src/main/java/com/bettercloud/vault/api/Leases.java @@ -6,7 +6,6 @@ import com.bettercloud.vault.response.VaultResponse; import com.bettercloud.vault.rest.Rest; import com.bettercloud.vault.rest.RestResponse; - import java.nio.charset.StandardCharsets; diff --git a/src/main/java/com/bettercloud/vault/api/Logical.java b/src/main/java/com/bettercloud/vault/api/Logical.java index e1db77f0..1edb3937 100644 --- a/src/main/java/com/bettercloud/vault/api/Logical.java +++ b/src/main/java/com/bettercloud/vault/api/Logical.java @@ -1,11 +1,5 @@ package com.bettercloud.vault.api; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import com.bettercloud.vault.VaultConfig; import com.bettercloud.vault.VaultException; import com.bettercloud.vault.json.Json; @@ -15,8 +9,19 @@ import com.bettercloud.vault.rest.Rest; import com.bettercloud.vault.rest.RestException; import com.bettercloud.vault.rest.RestResponse; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; -import static com.bettercloud.vault.api.LogicalUtilities.*; +import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForDelete; +import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForList; +import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForReadOrWrite; +import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionDelete; +import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionDestroy; +import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionUnDelete; +import static com.bettercloud.vault.api.LogicalUtilities.jsonObjectToWriteFromEngineVersion; /** @@ -300,13 +305,13 @@ private LogicalResponse write(final String path, final MapA container for options returned by mounts endpoints on the Secret Engine backend. This class is * meant for use with a builder pattern style. Example usage:
- * + * *
* {@code
* final Mount options = new Mount()
@@ -15,7 +15,7 @@
*
*/
public class Mount implements Serializable {
-
+
private static final long serialVersionUID = 45748211702309181L;
private MountType type;
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/MountConfig.java b/src/main/java/com/bettercloud/vault/api/mounts/MountConfig.java
index 7a2627f5..4715dd95 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/MountConfig.java
+++ b/src/main/java/com/bettercloud/vault/api/mounts/MountConfig.java
@@ -7,10 +7,10 @@
/**
* A container for options returned by mounts endpoints on the Secret Engine backend. This class is * meant for use with a builder pattern style. Example usage:
- * + * *Most of the time this will be wrapped inside Mount object rather than directly sent to Vault backend
* or back to the user.
* {@code
* final MountConfig config = new MountConfig()
@@ -76,9 +76,7 @@ public List getAuditNonHmacRequestKeys() {
if (auditNonHmacRequestKeys == null) {
return null;
} else {
- final List clone = new ArrayList<>();
- clone.addAll(auditNonHmacRequestKeys);
- return clone;
+ return new ArrayList<>(auditNonHmacRequestKeys);
}
}
@@ -86,9 +84,7 @@ public List getAuditNonHmacResponseKeys() {
if (auditNonHmacResponseKeys == null) {
return null;
} else {
- final List clone = new ArrayList<>();
- clone.addAll(auditNonHmacResponseKeys);
- return clone;
+ return new ArrayList<>(auditNonHmacResponseKeys);
}
}
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/MountPayload.java b/src/main/java/com/bettercloud/vault/api/mounts/MountPayload.java
index df002b58..96782fd0 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/MountPayload.java
+++ b/src/main/java/com/bettercloud/vault/api/mounts/MountPayload.java
@@ -1,17 +1,15 @@
package com.bettercloud.vault.api.mounts;
+import com.bettercloud.vault.json.Json;
+import com.bettercloud.vault.json.JsonObject;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
-
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
/**
* A container for options sent to mounts endpoints on the Secret Engine backend as REST payload. This class is
* meant for use with a builder pattern style. Example usage:
- *
+ *
*
* {@code
* final MountPayload payload = new MountPayload()
@@ -89,9 +87,7 @@ public List getAuditNonHmacRequestKeys() {
if (auditNonHmacRequestKeys == null) {
return null;
} else {
- final List clone = new ArrayList<>();
- clone.addAll(auditNonHmacRequestKeys);
- return clone;
+ return new ArrayList<>(auditNonHmacRequestKeys);
}
}
@@ -99,9 +95,7 @@ public List getAuditNonHmacResponseKeys() {
if (auditNonHmacResponseKeys == null) {
return null;
} else {
- final List clone = new ArrayList<>();
- clone.addAll(auditNonHmacResponseKeys);
- return clone;
+ return new ArrayList<>(auditNonHmacResponseKeys);
}
}
@@ -132,11 +126,11 @@ public JsonObject toTuneJson() {
jsonObject.addIfNotNull("description", this.description);
if (this.auditNonHmacRequestKeys != null && this.auditNonHmacRequestKeys.size() > 0) {
- jsonObject.addIfNotNull("audit_non_hmac_request_keys", this.auditNonHmacRequestKeys.stream().collect(Collectors.joining(",")));
+ jsonObject.addIfNotNull("audit_non_hmac_request_keys", String.join(",", this.auditNonHmacRequestKeys));
}
if (this.auditNonHmacResponseKeys != null && this.auditNonHmacResponseKeys.size() > 0) {
- jsonObject.addIfNotNull("audit_non_hmac_response_keys", this.auditNonHmacResponseKeys.stream().collect(Collectors.joining(",")));
+ jsonObject.addIfNotNull("audit_non_hmac_response_keys", String.join(",", this.auditNonHmacResponseKeys));
}
return jsonObject;
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/MountType.java b/src/main/java/com/bettercloud/vault/api/mounts/MountType.java
index 3b7bc3d6..6e434bb3 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/MountType.java
+++ b/src/main/java/com/bettercloud/vault/api/mounts/MountType.java
@@ -1,7 +1,6 @@
package com.bettercloud.vault.api.mounts;
import java.util.Arrays;
-import java.util.function.Predicate;
/**
* A representation of different available secret engine mount points
@@ -37,7 +36,7 @@ public enum MountType {
private final String value;
- private MountType(final String value) {
+ MountType(final String value) {
this.value = value;
}
@@ -47,9 +46,9 @@ public String value() {
/**
* Get the MountType instance from the provided value string.
- *
+ *
* @param value The mount type value to use to lookup.
- *
+ *
* @return an instance of MountType or null
*/
public static MountType of(final String value) {
@@ -57,13 +56,8 @@ public static MountType of(final String value) {
return null;
}
- return Arrays.asList(MountType.values())
- .stream()
- .filter(new Predicate() {
- public boolean test(MountType type) {
- return type.value.equals(value);
- }
- })
+ return Arrays.stream(MountType.values())
+ .filter(type -> type.value.equals(value))
.findFirst()
.orElse(null);
}
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/Mounts.java b/src/main/java/com/bettercloud/vault/api/mounts/Mounts.java
index 92c1ea65..902f894b 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/Mounts.java
+++ b/src/main/java/com/bettercloud/vault/api/mounts/Mounts.java
@@ -5,6 +5,7 @@
import com.bettercloud.vault.response.MountResponse;
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestResponse;
+import java.nio.charset.StandardCharsets;
/**
* The implementing class for operations on Vault's /v1/sys/mounts/* REST endpoints.
@@ -35,9 +36,9 @@ public Mounts(final VaultConfig config) {
* final Map mounts = response.getMounts();
* }
*
- *
+ *
* @return A container for the information returned by Vault
- *
+ *
* @throws VaultException If any error occurs or unexpected response is received from Vault
*/
public MountResponse list() throws VaultException {
@@ -87,7 +88,7 @@ public MountResponse list() throws VaultException {
*
* This method accepts a MountConfig parameter, containing optional settings for the mount
* creation operation. Example usage:
- *
+ *
* A successful operation will return a 204 HTTP status. A VaultException will be thrown if
* mount point already exists, or if any other problem occurs. Example usage:
*
@@ -95,14 +96,14 @@ public MountResponse list() throws VaultException {
* {@code
* final VaultConfig config = new VaultConfig.address(...).token(...).build();
* final Vault vault = new Vault(config);
- *
+ *
* final MountPayload payload = new MountPayload()
* .defaultLeaseTtl(TimeToLive.of(86400, TimeUnit.SECONDS))
* .maxLeaseTtl(TimeToLive.of(86400, TimeUnit.SECONDS))
* .description("description for pki engine");
- *
+ *
* final MountResponse response = vault.mounts().enable("pki/mount/point/path", MountType.PKI, payload);
- *
+ *
* assertEquals(204, response.getRestResponse().getStatus();
* }
*
@@ -110,9 +111,9 @@ public MountResponse list() throws VaultException {
* @param path The path to enable secret engine on.
* @param type The type of secret engine to enable.
* @param payload The MountPayload instance to use to create secret engine.
- *
+ *
* @return A container for the information returned by Vault
- *
+ *
* @throws VaultException If any error occurs or unexpected response is received from Vault
*/
public MountResponse enable(final String path, final MountType type, final MountPayload payload) throws VaultException {
@@ -133,7 +134,7 @@ public MountResponse enable(final String path, final MountType type, final Mount
final RestResponse restResponse = new Rest()//NOPMD
.url(String.format("%s/v1/sys/mounts/%s", config.getAddress(), path))
.header("X-Vault-Token", config.getToken())
- .body(requestJson.getBytes("UTF-8"))
+ .body(requestJson.getBytes(StandardCharsets.UTF_8))
.connectTimeoutSeconds(config.getOpenTimeout())
.readTimeoutSeconds(config.getReadTimeout())
.sslVerification(config.getSslConfig().isVerify())
@@ -179,17 +180,17 @@ public MountResponse enable(final String path, final MountType type, final Mount
* {@code
* final VaultConfig config = new VaultConfig.address(...).token(...).build();
* final Vault vault = new Vault(config);
- *
+ *
* final MountResponse response = vault.mounts().disable("pki/mount/point/path");
- *
+ *
* assertEquals(204, response.getRestResponse().getStatus();
* }
*
*
* @param path The path to disable secret engine on.
- *
+ *
* @return A container for the information returned by Vault
- *
+ *
* @throws VaultException If any error occurs or unexpected response is received from Vault
*/
public MountResponse disable(final String path) throws VaultException {
@@ -245,7 +246,7 @@ public MountResponse disable(final String path) throws VaultException {
* {@code
* final VaultConfig config = new VaultConfig.address(...).token(...).build();
* final Vault vault = new Vault(config);
- *
+ *
* final MountResponse response = vault.mounts().read("pki/mount/point/path");
* final Mount mount = response.getMount();
* final MountConfig mountConfig = mount.getConfig();
@@ -253,9 +254,9 @@ public MountResponse disable(final String path) throws VaultException {
*
*
* @param path The path to read secret engine's configuration from.
- *
+ *
* @return A container for the information returned by Vault
- *
+ *
* @throws VaultException If any error occurs or unexpected response is received from Vault
*/
public MountResponse read(final String path) throws VaultException {
@@ -306,7 +307,7 @@ public MountResponse read(final String path) throws VaultException {
*
* This the method accepts a MountConfig parameter, containing optional settings for the mount
* tune operation. Example usage:
- *
+ *
* A successful operation will return a 204 HTTP status. A VaultException will be thrown if
* the mount point not exist, or if any other problem occurs. Example usage:
*
@@ -314,23 +315,23 @@ public MountResponse read(final String path) throws VaultException {
* {@code
* final VaultConfig config = new VaultConfig.address(...).token(...).build();
* final Vault vault = new Vault(config);
- *
+ *
* final MountPayload payload = new MountPayload()
* .defaultLeaseTtl(TimeToLive.of(12, TimeUnit.HOURS))
* .maxLeaseTtl(TimeToLive.of(12, TimeUnit.HOURS))
* .description("description of pki");
- *
+ *
* final MountResponse response = vault.mounts().tune("pki/mount/point/path", configs);
- *
+ *
* assertEquals(204, response.getRestResponse().getStatus();
* }
*
*
* @param path The path to tune secret engine's configuration on.
* @param payload The MountPayload instance to use to tune secret engine.
- *
+ *
* @return A container for the information returned by Vault
- *
+ *
* @throws VaultException If any error occurs or unexpected response is received from Vault
*/
public MountResponse tune(final String path, final MountPayload payload) throws VaultException {
@@ -347,7 +348,7 @@ public MountResponse tune(final String path, final MountPayload payload) throws
final RestResponse restResponse = new Rest()//NOPMD
.url(String.format("%s/v1/sys/mounts/%s/tune", config.getAddress(), path))
.header("X-Vault-Token", config.getToken())
- .body(requestJson.getBytes("UTF-8"))
+ .body(requestJson.getBytes(StandardCharsets.UTF_8))
.connectTimeoutSeconds(config.getOpenTimeout())
.readTimeoutSeconds(config.getReadTimeout())
.sslVerification(config.getSslConfig().isVerify())
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/TimeToLive.java b/src/main/java/com/bettercloud/vault/api/mounts/TimeToLive.java
index 0901b780..83f94914 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/TimeToLive.java
+++ b/src/main/java/com/bettercloud/vault/api/mounts/TimeToLive.java
@@ -6,15 +6,15 @@
* A container for Time To Live information sent to mounts endpoints on the Secret Engine backend as REST payload.
* This class is meant for use with a static TimeToLive.of(int, TimeUnit) method pattern style. Example
* usage:
- *
+ *
*
* {@code
* TimeToLive.of(1, TimeUnit.HOURS);
* }
*
- *
+ *
* Note that the only accepted TimeUnit which Vault backend understands are:
- *
+ *
* TimeUnit.SECONDSTimeUnit.MINUTESint value of the member with the specified name in this object. If
* this object does not contain a member with this name, the given default value is returned. If
@@ -636,7 +634,7 @@ public Long getLong(String name) {
JsonValue value = get(name);
return value != null ? value.asLong() : null;
}
-
+
/**
* Returns the long value of the member with the specified name in this object. If
* this object does not contain a member with this name, the given default value is returned. If
@@ -672,7 +670,7 @@ public Float getFloat(String name) {
JsonValue value = get(name);
return value != null ? value.asFloat() : null;
}
-
+
/**
* Returns the float value of the member with the specified name in this object. If
* this object does not contain a member with this name, the given default value is returned. If
@@ -708,7 +706,7 @@ public Double getDouble(String name) {
JsonValue value = get(name);
return value != null ? value.asDouble() : null;
}
-
+
/**
* Returns the double value of the member with the specified name in this object. If
* this object does not contain a member with this name, the given default value is returned. If
@@ -744,7 +742,7 @@ public Boolean getBoolean(String name) {
JsonValue value = get(name);
return value != null ? value.asBoolean() : null;
}
-
+
/**
* Returns the boolean value of the member with the specified name in this object. If
* this object does not contain a member with this name, the given default value is returned. If
@@ -779,7 +777,7 @@ public String getString(String name) {
JsonValue value = get(name);
return value != null ? value.asString() : null;
}
-
+
/**
* Returns the String value of the member with the specified name in this object. If
* this object does not contain a member with this name, the given default value is returned. If
diff --git a/src/main/java/com/bettercloud/vault/json/JsonValue.java b/src/main/java/com/bettercloud/vault/json/JsonValue.java
index 7746bb9e..0d8855fc 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonValue.java
+++ b/src/main/java/com/bettercloud/vault/json/JsonValue.java
@@ -22,7 +22,6 @@
package com.bettercloud.vault.json;
import java.io.IOException;
-import java.io.Reader;
import java.io.Serializable;
import java.io.StringWriter;
import java.io.Writer;
diff --git a/src/main/java/com/bettercloud/vault/response/AuthResponse.java b/src/main/java/com/bettercloud/vault/response/AuthResponse.java
index 761b9e82..2c1167f8 100644
--- a/src/main/java/com/bettercloud/vault/response/AuthResponse.java
+++ b/src/main/java/com/bettercloud/vault/response/AuthResponse.java
@@ -6,7 +6,6 @@
import com.bettercloud.vault.json.JsonValue;
import com.bettercloud.vault.json.ParseException;
import com.bettercloud.vault.rest.RestResponse;
-
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/com/bettercloud/vault/response/DatabaseResponse.java b/src/main/java/com/bettercloud/vault/response/DatabaseResponse.java
index b8e9a42d..d099ceb7 100644
--- a/src/main/java/com/bettercloud/vault/response/DatabaseResponse.java
+++ b/src/main/java/com/bettercloud/vault/response/DatabaseResponse.java
@@ -6,7 +6,6 @@
import com.bettercloud.vault.json.JsonArray;
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.rest.RestResponse;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/com/bettercloud/vault/response/HealthResponse.java b/src/main/java/com/bettercloud/vault/response/HealthResponse.java
index 87fe0ab4..6e96514a 100644
--- a/src/main/java/com/bettercloud/vault/response/HealthResponse.java
+++ b/src/main/java/com/bettercloud/vault/response/HealthResponse.java
@@ -4,7 +4,6 @@
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.rest.RestResponse;
-
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/bettercloud/vault/response/LogicalResponse.java b/src/main/java/com/bettercloud/vault/response/LogicalResponse.java
index 21a47d7b..93f3fb8d 100644
--- a/src/main/java/com/bettercloud/vault/response/LogicalResponse.java
+++ b/src/main/java/com/bettercloud/vault/response/LogicalResponse.java
@@ -2,12 +2,14 @@
import com.bettercloud.vault.api.Logical;
import com.bettercloud.vault.json.Json;
+import com.bettercloud.vault.json.JsonArray;
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.json.JsonValue;
import com.bettercloud.vault.rest.RestResponse;
-
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -17,6 +19,7 @@
public class LogicalResponse extends VaultResponse {
private MapA simple client for issuing HTTP requests. Supports the HTTP verbs:
@@ -147,6 +146,7 @@ public Rest body(final byte[] body) { * @return This object, with a parameter added, ready for other builder-pattern config methods or an HTTP verb method * @throws RestException If any error occurs, or unexpected response received from Vault */ + @SuppressWarnings("CharsetObjectCanBeUsed") // Using Charset constant requires Java and above public Rest parameter(final String name, final String value) throws RestException { try { this.parameters.put(URLEncoder.encode(name, "UTF-8"), URLEncoder.encode(value, "UTF-8")); @@ -402,7 +402,7 @@ private RestResponse postOrPutImpl(final boolean doPost) throws RestException { } else if (!parameters.isEmpty()) { connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8"); final OutputStream outputStream = connection.getOutputStream(); - outputStream.write(parametersToQueryString().getBytes("UTF-8")); + outputStream.write(parametersToQueryString().getBytes(StandardCharsets.UTF_8)); outputStream.close(); } @@ -444,15 +444,10 @@ private URLConnection initURLConnection(final String urlString, final String met // SSL settings, if applicable if (connection instanceof HttpsURLConnection) { final HttpsURLConnection httpsURLConnection = (HttpsURLConnection) connection; - if (sslVerification != null && !sslVerification.booleanValue()) { + if (sslVerification != null && !sslVerification) { // SSL verification disabled httpsURLConnection.setSSLSocketFactory(DISABLED_SSL_CONTEXT.getSocketFactory()); - httpsURLConnection.setHostnameVerifier(new HostnameVerifier() { - @Override - public boolean verify(final String s, final SSLSession sslSession) { - return true; - } - }); + httpsURLConnection.setHostnameVerifier((s, sslSession) -> true); } else if (sslContext != null) { // Cert file supplied httpsURLConnection.setSSLSocketFactory(sslContext.getSocketFactory()); @@ -470,7 +465,7 @@ public boolean verify(final String s, final SSLSession sslSession) { } catch (Exception e) { throw new RestException(e); } finally { - if (connection != null && connection instanceof HttpURLConnection) { + if (connection instanceof HttpURLConnection) { ((HttpURLConnection) connection).disconnect(); } } @@ -484,7 +479,7 @@ public boolean verify(final String s, final SSLSession sslSession) { */ private String parametersToQueryString() { final StringBuilder queryString = new StringBuilder(); - final List/v1/pki/* REST endpoints.
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendTokenTests.java b/src/test-integration/java/com/bettercloud/vault/api/AuthBackendTokenTests.java
index c3197e81..3d76d359 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendTokenTests.java
+++ b/src/test-integration/java/com/bettercloud/vault/api/AuthBackendTokenTests.java
@@ -6,13 +6,12 @@
import com.bettercloud.vault.response.AuthResponse;
import com.bettercloud.vault.response.LookupResponse;
import com.bettercloud.vault.util.VaultContainer;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendUserPassTests.java b/src/test-integration/java/com/bettercloud/vault/api/AuthBackendUserPassTests.java
index dd869bdb..2ac3086f 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendUserPassTests.java
+++ b/src/test-integration/java/com/bettercloud/vault/api/AuthBackendUserPassTests.java
@@ -4,12 +4,11 @@
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.response.AuthResponse;
import com.bettercloud.vault.util.VaultContainer;
+import java.io.IOException;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import java.io.IOException;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/DebugTests.java b/src/test-integration/java/com/bettercloud/vault/api/DebugTests.java
index 3c01bca5..26223730 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/DebugTests.java
+++ b/src/test-integration/java/com/bettercloud/vault/api/DebugTests.java
@@ -4,14 +4,17 @@
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.response.HealthResponse;
import com.bettercloud.vault.util.VaultContainer;
+import java.io.IOException;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import java.io.IOException;
-
-import static junit.framework.TestCase.*;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
/**
* Integration tests for the debug-related operations on the Vault HTTP API's.
diff --git a/src/test-integration/java/com/bettercloud/vault/api/LeasesTests.java b/src/test-integration/java/com/bettercloud/vault/api/LeasesTests.java index 0bc119c4..f753f189 100644 --- a/src/test-integration/java/com/bettercloud/vault/api/LeasesTests.java +++ b/src/test-integration/java/com/bettercloud/vault/api/LeasesTests.java @@ -1,18 +1,16 @@ package com.bettercloud.vault.api; -import static junit.framework.TestCase.assertEquals; - +import com.bettercloud.vault.Vault; +import com.bettercloud.vault.VaultException; import com.bettercloud.vault.response.VaultResponse; import com.bettercloud.vault.util.VaultContainer; +import java.io.IOException; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import com.bettercloud.vault.Vault; -import com.bettercloud.vault.VaultException; - -import java.io.IOException; +import static junit.framework.TestCase.assertEquals; /** *Integration tests for the basic (i.e. "sys") Vault API operations.
diff --git a/src/test-integration/java/com/bettercloud/vault/api/LogicalTests.java b/src/test-integration/java/com/bettercloud/vault/api/LogicalTests.java index acd56158..63f8b6ac 100644 --- a/src/test-integration/java/com/bettercloud/vault/api/LogicalTests.java +++ b/src/test-integration/java/com/bettercloud/vault/api/LogicalTests.java @@ -1,22 +1,21 @@ package com.bettercloud.vault.api; +import com.bettercloud.vault.Vault; +import com.bettercloud.vault.VaultConfig; +import com.bettercloud.vault.VaultException; +import com.bettercloud.vault.response.AuthResponse; +import com.bettercloud.vault.response.LogicalResponse; +import com.bettercloud.vault.util.VaultContainer; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; - -import com.bettercloud.vault.VaultConfig; -import com.bettercloud.vault.response.AuthResponse; -import com.bettercloud.vault.util.VaultContainer; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; - -import com.bettercloud.vault.Vault; -import com.bettercloud.vault.VaultException; import org.junit.rules.ExpectedException; import static junit.framework.TestCase.assertEquals; @@ -165,7 +164,7 @@ public void testList() throws VaultException { testMap.put("value", "world"); vault.logical().write("secret/hello", testMap); - final List/v1/sys/mounts/* REST endpoints. */
public class MountsTests {
@@ -144,8 +142,8 @@ public void testRead() throws VaultException {
assertEquals(200, response.getRestResponse().getStatus());
- assertEquals(new Integer(21600), config.getDefaultLeaseTtl());
- assertEquals(new Integer(21600), config.getMaxLeaseTtl());
+ assertEquals(Integer.valueOf(21600), config.getDefaultLeaseTtl());
+ assertEquals(Integer.valueOf(21600), config.getMaxLeaseTtl());
}
@Test
@@ -180,8 +178,8 @@ public void testTune() throws VaultException {
final Mount mount = response.getMount();
final MountConfig config = mount.getConfig();
- assertEquals(new Integer(43200), config.getDefaultLeaseTtl());
- assertEquals(new Integer(43200), config.getMaxLeaseTtl());
+ assertEquals(Integer.valueOf(43200), config.getDefaultLeaseTtl());
+ assertEquals(Integer.valueOf(43200), config.getMaxLeaseTtl());
}
@Test
diff --git a/src/test-integration/java/com/bettercloud/vault/api/SealTests.java b/src/test-integration/java/com/bettercloud/vault/api/SealTests.java
index 473755a0..b1d45b3c 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/SealTests.java
+++ b/src/test-integration/java/com/bettercloud/vault/api/SealTests.java
@@ -3,12 +3,11 @@
import com.bettercloud.vault.VaultException;
import com.bettercloud.vault.response.SealResponse;
import com.bettercloud.vault.util.VaultContainer;
+import java.io.IOException;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import java.io.IOException;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/VaultAgentTests.java b/src/test-integration/java/com/bettercloud/vault/api/VaultAgentTests.java
index d63849be..34777e89 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/VaultAgentTests.java
+++ b/src/test-integration/java/com/bettercloud/vault/api/VaultAgentTests.java
@@ -6,15 +6,14 @@
import com.bettercloud.vault.response.LogicalResponse;
import com.bettercloud.vault.util.VaultAgentContainer;
import com.bettercloud.vault.util.VaultContainer;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import static junit.framework.TestCase.assertEquals;
import static org.apache.commons.io.FileUtils.writeStringToFile;
@@ -25,6 +24,7 @@ public class VaultAgentTests {
public static final VaultContainer container = new VaultContainer();
@ClassRule
public static final TemporaryFolder temp = new TemporaryFolder();
+ @ClassRule
public static VaultAgentContainer vaultAgentContainer;
@BeforeClass
@@ -49,6 +49,7 @@ public static void setupClass() throws IOException, InterruptedException, VaultE
writeStringToFile(role_id, appRoleId);
writeStringToFile(secret_id, secretId);
vaultAgentContainer = new VaultAgentContainer(role_id.toPath(), secret_id.toPath());
+ vaultAgentContainer.start();
}
@Test
@@ -67,5 +68,4 @@ public void testWriteAndReadFromAgent() throws VaultException {
final String valueRead = vault.logical().read(pathToRead).getData().get("value");
assertEquals(value, valueRead);
}
-
}
diff --git a/src/test-integration/java/com/bettercloud/vault/util/DbContainer.java b/src/test-integration/java/com/bettercloud/vault/util/DbContainer.java
index 570a20e1..365c6293 100644
--- a/src/test-integration/java/com/bettercloud/vault/util/DbContainer.java
+++ b/src/test-integration/java/com/bettercloud/vault/util/DbContainer.java
@@ -1,35 +1,34 @@
package com.bettercloud.vault.util;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-import org.testcontainers.containers.Container;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.HostPortWaitStrategy;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
+import org.testcontainers.lifecycle.TestDescription;
+import org.testcontainers.lifecycle.TestLifecycleAware;
-import java.io.IOException;
+import static org.junit.Assume.assumeTrue;
-public class DbContainer implements TestRule, TestConstants {
+public class DbContainer extends GenericContainerAlso constructs a JKS keystore, with a client certificate to use for authentication with Vault's TLS * Certificate auth backend. Stores this cert as a PEM file as well, so that can be registered with Vault - * as a recognized certificate in {@link VaultContainer#setupBackendCert()}.
+ * as a recognized certificate in {@link VaultContainer#setupBackendCert(String)}. * *This method must be called AFTER {@link VaultContainer#initAndUnsealVault()}, and BEFORE - * {@link VaultContainer#setupBackendCert()}.
+ * {@link VaultContainer#setupBackendCert(String)}. * - * @throws KeyStoreException - * @throws IOException - * @throws CertificateException - * @throws NoSuchAlgorithmException + * @throws IOException When certificate was not created + * @return */ - public static void createClientCertAndKey() throws KeyStoreException, IOException, CertificateException, - NoSuchAlgorithmException, NoSuchProviderException, InvalidKeyException, SignatureException, - OperatorCreationException { + public static HashMapThis method initializes the Vault server, capturing the unseal key and root token that are displayed on the
@@ -102,16 +84,15 @@ public Statement apply(final Statement base, final Description description) {
* @throws InterruptedException
*/
public void initAndUnsealVault() throws IOException, InterruptedException {
- final Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
- container.followOutput(logConsumer);
+
// Initialize the Vault server
final Container.ExecResult initResult = runCommand("vault", "operator", "init", "-ca-cert=" +
- CONTAINER_CERT_PEMFILE, "-key-shares=1", "-key-threshold=1");
- final String stdout = initResult.getStdout().replaceAll(System.lineSeparator(), "").split("Vault initialized")[0];
- final String[] tokens = stdout.split("Initial Root Token: ");
- this.unsealKey = tokens[0].replace("Unseal Key 1: ", "");
- this.rootToken = tokens[1];
+ CONTAINER_CERT_PEMFILE, "-key-shares=1", "-key-threshold=1", "-format=json");
+ final String stdout = initResult.getStdout().replaceAll("\\r?\\n", "");
+ JsonObject initJson = Json.parse(stdout).asObject();
+ this.unsealKey = initJson.get("unseal_keys_b64").asArray().get(0).asString();
+ this.rootToken = initJson.get("root_token").asString();
System.out.println("Root token: " + rootToken);
@@ -193,10 +174,11 @@ public void setupBackendPki() throws IOException, InterruptedException {
*
* @throws IOException
* @throws InterruptedException
+ * @param cert
*/
- public void setupBackendCert() throws IOException, InterruptedException {
+ public void setupBackendCert(String cert) throws IOException, InterruptedException {
runCommand("vault", "login", "-ca-cert=" + CONTAINER_CERT_PEMFILE, rootToken);
-
+ runCommand("sh", "-c", "cat < Unit tests for the Vault driver, having no dependency on an actual Vault server instance being available. The
diff --git a/src/test/java/com/bettercloud/vault/SSLTests.java b/src/test/java/com/bettercloud/vault/SSLTests.java
index 1ea4977e..5f64073f 100644
--- a/src/test/java/com/bettercloud/vault/SSLTests.java
+++ b/src/test/java/com/bettercloud/vault/SSLTests.java
@@ -3,9 +3,6 @@
import com.bettercloud.vault.response.LogicalResponse;
import com.bettercloud.vault.vault.VaultTestUtils;
import com.bettercloud.vault.vault.mock.MockVault;
-import org.eclipse.jetty.server.Server;
-import org.junit.Test;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
@@ -13,6 +10,8 @@
import java.io.InputStreamReader;
import java.security.KeyStore;
import java.util.HashMap;
+import org.eclipse.jetty.server.Server;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -173,13 +172,13 @@ public void testSslPem_UTF8() throws Exception {
final BufferedReader in = new BufferedReader(new InputStreamReader(this.getClass().getResourceAsStream("/cert.pem")));
final StringBuilder builder = new StringBuilder();
- String utf8 = "";
+ StringBuilder utf8 = new StringBuilder();
String str;
while ((str = in.readLine()) != null) {
- utf8 += str + System.lineSeparator();//NOPMD
+ utf8.append(str).append(System.lineSeparator());//NOPMD
}
in.close();
- final String pemUTF8 = utf8;
+ final String pemUTF8 = utf8.toString();
final VaultConfig vaultConfig = new VaultConfig()
.address("https://127.0.0.1:9998")
diff --git a/src/test/java/com/bettercloud/vault/VaultConfigTests.java b/src/test/java/com/bettercloud/vault/VaultConfigTests.java
index 230445e2..3a49a45b 100644
--- a/src/test/java/com/bettercloud/vault/VaultConfigTests.java
+++ b/src/test/java/com/bettercloud/vault/VaultConfigTests.java
@@ -1,8 +1,5 @@
package com.bettercloud.vault;
-import org.junit.Assert;
-import org.junit.Test;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -14,6 +11,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.Assert;
+import org.junit.Test;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertTrue;
@@ -217,6 +216,7 @@ public void testConfigBuilder_FailToLoad() throws VaultException {
new VaultConfig().build();
}
+ @SuppressWarnings("CharsetObjectCanBeUsed") // Requires Java 10 and above
@Test
public void testConfigBuilder_LoadTokenFromHomedir() throws IOException, VaultException {
final String mockHomeDirectory = System.getProperty("java.io.tmpdir") + File.separatorChar + UUID.randomUUID().toString();
diff --git a/src/test/java/com/bettercloud/vault/VaultTests.java b/src/test/java/com/bettercloud/vault/VaultTests.java
index 502fe86b..ad52f4bf 100644
--- a/src/test/java/com/bettercloud/vault/VaultTests.java
+++ b/src/test/java/com/bettercloud/vault/VaultTests.java
@@ -3,15 +3,12 @@
import com.bettercloud.vault.response.LogicalResponse;
import com.bettercloud.vault.vault.VaultTestUtils;
import com.bettercloud.vault.vault.mock.MockVault;
+import java.util.HashMap;
+import java.util.Map;
import org.eclipse.jetty.server.Server;
import org.junit.Assert;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Map;
-
-import static junit.framework.TestCase.assertEquals;
-
/**
* Unit tests for the various This class is used for inspecting the request inputs to ensure they were properly
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/MockVault.java b/src/test/java/com/bettercloud/vault/vault/mock/MockVault.java
index 7df77a40..ea395137 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/MockVault.java
+++ b/src/test/java/com/bettercloud/vault/vault/mock/MockVault.java
@@ -1,19 +1,17 @@
package com.bettercloud.vault.vault.mock;
-import static com.bettercloud.vault.vault.VaultTestUtils.readRequestBody;
-import static com.bettercloud.vault.vault.VaultTestUtils.readRequestHeaders;
-
+import com.bettercloud.vault.json.JsonObject;
import java.io.IOException;
import java.util.Map;
import java.util.Optional;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
-import com.bettercloud.vault.json.JsonObject;
+import static com.bettercloud.vault.vault.VaultTestUtils.readRequestBody;
+import static com.bettercloud.vault.vault.VaultTestUtils.readRequestHeaders;
/**
* This class is used to mock out a Vault server in unit tests involving retry logic. As it extends Jetty's
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/OpenTimeoutsMockVault.java b/src/test/java/com/bettercloud/vault/vault/mock/OpenTimeoutsMockVault.java
index 9e0a1a55..8b9e0f19 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/OpenTimeoutsMockVault.java
+++ b/src/test/java/com/bettercloud/vault/vault/mock/OpenTimeoutsMockVault.java
@@ -1,11 +1,10 @@
package com.bettercloud.vault.vault.mock;
-import org.eclipse.jetty.server.Request;
-
+import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.eclipse.jetty.server.Request;
/**
* This class is used to mock out a Vault server in unit tests involving open timeouts (i.e. delays before an
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/ReadTimeoutsMockVault.java b/src/test/java/com/bettercloud/vault/vault/mock/ReadTimeoutsMockVault.java
index f408cdb0..2da9f3d0 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/ReadTimeoutsMockVault.java
+++ b/src/test/java/com/bettercloud/vault/vault/mock/ReadTimeoutsMockVault.java
@@ -1,11 +1,10 @@
package com.bettercloud.vault.vault.mock;
-import org.eclipse.jetty.server.Request;
-
+import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.eclipse.jetty.server.Request;
/**
* This class is used to mock out a Vault server in unit tests involving read timeouts (i.e. delays between an
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/RetriesMockVault.java b/src/test/java/com/bettercloud/vault/vault/mock/RetriesMockVault.java
index 54bc3d13..356116ec 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/RetriesMockVault.java
+++ b/src/test/java/com/bettercloud/vault/vault/mock/RetriesMockVault.java
@@ -1,11 +1,9 @@
package com.bettercloud.vault.vault.mock;
-import org.eclipse.jetty.server.Request;
-
-import javax.servlet.ServletException;
+import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.eclipse.jetty.server.Request;
/**
* This class is used to mock out a Vault server in unit tests involving retry logic. As it extends Jetty's
Vault constructors.
@@ -112,4 +109,4 @@ public void testConfigBuiler_WithInvalidRequestAsNonError() throws Exception {
Assert.assertEquals(403, response.getRestResponse().getStatus());
Assert.assertEquals(0, response.getRetries());
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/bettercloud/vault/api/pki/CredentialTests.java b/src/test/java/com/bettercloud/vault/api/pki/CredentialTests.java
index 4cc2486a..4b947c36 100644
--- a/src/test/java/com/bettercloud/vault/api/pki/CredentialTests.java
+++ b/src/test/java/com/bettercloud/vault/api/pki/CredentialTests.java
@@ -1,6 +1,5 @@
package com.bettercloud.vault.api.pki;
-import com.bettercloud.vault.api.pki.Credential;
import org.junit.Assert;
import org.junit.Test;
diff --git a/src/test/java/com/bettercloud/vault/api/pki/RoleOptionsTests.java b/src/test/java/com/bettercloud/vault/api/pki/RoleOptionsTests.java
index 44560bfb..57361f3c 100644
--- a/src/test/java/com/bettercloud/vault/api/pki/RoleOptionsTests.java
+++ b/src/test/java/com/bettercloud/vault/api/pki/RoleOptionsTests.java
@@ -1,10 +1,9 @@
package com.bettercloud.vault.api.pki;
+import java.util.ArrayList;
import org.junit.Assert;
import org.junit.Test;
-import java.util.ArrayList;
-
public class RoleOptionsTests {
@Test
@@ -12,7 +11,7 @@ public void RoleOptionsTests() {
RoleOptions roleOptions = new RoleOptions();
Assert.assertNotNull(roleOptions);
- Assert.assertEquals(roleOptions.getAllowedDomains(), null);
+ Assert.assertNull(roleOptions.getAllowedDomains());
roleOptions.allowAnyName(true);
roleOptions.allowBareDomains(true);
diff --git a/src/test/java/com/bettercloud/vault/json/JsonArray_Test.java b/src/test/java/com/bettercloud/vault/json/JsonArray_Test.java
index f1e51033..1a20e1a1 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonArray_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/JsonArray_Test.java
@@ -21,22 +21,23 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static com.bettercloud.vault.json.TestUtil.assertException;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-
import java.io.IOException;
-import java.io.StringReader;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+
@SuppressWarnings("PMD")
public class JsonArray_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/JsonLiteral_Test.java b/src/test/java/com/bettercloud/vault/json/JsonLiteral_Test.java
index 371082ea..a2677722 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonLiteral_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/JsonLiteral_Test.java
@@ -21,14 +21,23 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static com.bettercloud.vault.json.Json.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
import java.io.IOException;
-
import org.junit.Test;
+import static com.bettercloud.vault.json.Json.FALSE;
+import static com.bettercloud.vault.json.Json.NULL;
+import static com.bettercloud.vault.json.Json.TRUE;
+import static com.bettercloud.vault.json.Json.value;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
@SuppressWarnings("PMD")
public class JsonLiteral_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/JsonNumber_Test.java b/src/test/java/com/bettercloud/vault/json/JsonNumber_Test.java
index 04f578ba..21923cf4 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonNumber_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/JsonNumber_Test.java
@@ -21,15 +21,16 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static org.junit.Assert.*;
-
import java.io.IOException;
import java.io.StringWriter;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
@SuppressWarnings("PMD")
public class JsonNumber_Test {
@@ -45,11 +46,7 @@ public void setUp() {
@Test
public void constructor_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "string is null", new Runnable() {
- public void run() {
- new JsonNumber(null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "string is null", (Runnable) () -> new JsonNumber(null));
}
@Test
diff --git a/src/test/java/com/bettercloud/vault/json/JsonObject_Test.java b/src/test/java/com/bettercloud/vault/json/JsonObject_Test.java
index 1ec3a78e..a0018f16 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonObject_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/JsonObject_Test.java
@@ -21,22 +21,25 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-
+import com.bettercloud.vault.json.JsonObject.HashIndexTable;
+import com.bettercloud.vault.json.JsonObject.Member;
import java.io.IOException;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-
import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
-import com.bettercloud.vault.json.JsonObject.HashIndexTable;
-import com.bettercloud.vault.json.JsonObject.Member;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
@SuppressWarnings("PMD")
diff --git a/src/test/java/com/bettercloud/vault/json/JsonParser_Test.java b/src/test/java/com/bettercloud/vault/json/JsonParser_Test.java
index 77e14e26..a9514bdc 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonParser_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/JsonParser_Test.java
@@ -21,15 +21,16 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static com.bettercloud.vault.json.TestUtil.assertException;
-import static org.junit.Assert.*;
-
import java.io.IOException;
import java.io.StringReader;
-
import org.hamcrest.core.StringStartsWith;
import org.junit.Test;
+import static com.bettercloud.vault.json.TestUtil.assertException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+
@SuppressWarnings("PMD")
public class JsonParser_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/JsonString_Test.java b/src/test/java/com/bettercloud/vault/json/JsonString_Test.java
index 72cec838..a6b49f4f 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonString_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/JsonString_Test.java
@@ -21,15 +21,16 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static org.junit.Assert.*;
-
import java.io.IOException;
import java.io.StringWriter;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
@SuppressWarnings("PMD")
public class JsonString_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/JsonValue_Test.java b/src/test/java/com/bettercloud/vault/json/JsonValue_Test.java
index 25dd31e4..9fb8eb8a 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonValue_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/JsonValue_Test.java
@@ -21,15 +21,17 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
-
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
@SuppressWarnings("PMD")
public class JsonValue_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/JsonWriter_Test.java b/src/test/java/com/bettercloud/vault/json/JsonWriter_Test.java
index acf53ea2..7c6bc43d 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonWriter_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/JsonWriter_Test.java
@@ -21,14 +21,13 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static org.junit.Assert.assertEquals;
-
import java.io.IOException;
import java.io.StringWriter;
-
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
@SuppressWarnings("PMD")
public class JsonWriter_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/Json_Test.java b/src/test/java/com/bettercloud/vault/json/Json_Test.java
index d8455f83..2390945f 100644
--- a/src/test/java/com/bettercloud/vault/json/Json_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/Json_Test.java
@@ -21,16 +21,16 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static com.bettercloud.vault.json.TestUtil.assertException;
-import static org.junit.Assert.*;
-
+import com.bettercloud.vault.json.TestUtil.RunnableEx;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-
import org.junit.Test;
-import com.bettercloud.vault.json.TestUtil.RunnableEx;
+import static com.bettercloud.vault.json.TestUtil.assertException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
@SuppressWarnings("PMD")
@@ -77,21 +77,13 @@ public void value_float_cutsOffPointZero() {
@Test
public void value_float_failsWithInfinity() {
String message = "Infinite and NaN values not permitted in JSON";
- assertException(IllegalArgumentException.class, message, new Runnable() {
- public void run() {
- Json.value(Float.POSITIVE_INFINITY);
- }
- });
+ assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Float.POSITIVE_INFINITY));
}
@Test
public void value_float_failsWithNaN() {
String message = "Infinite and NaN values not permitted in JSON";
- assertException(IllegalArgumentException.class, message, new Runnable() {
- public void run() {
- Json.value(Float.NaN);
- }
- });
+ assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Float.NaN));
}
@Test
@@ -112,21 +104,13 @@ public void value_double_cutsOffPointZero() {
@Test
public void value_double_failsWithInfinity() {
String message = "Infinite and NaN values not permitted in JSON";
- assertException(IllegalArgumentException.class, message, new Runnable() {
- public void run() {
- Json.value(Double.POSITIVE_INFINITY);
- }
- });
+ assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Double.POSITIVE_INFINITY));
}
@Test
public void value_double_failsWithNaN() {
String message = "Infinite and NaN values not permitted in JSON";
- assertException(IllegalArgumentException.class, message, new Runnable() {
- public void run() {
- Json.value(Double.NaN);
- }
- });
+ assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Double.NaN));
}
@Test
@@ -160,11 +144,7 @@ public void array_int() {
@Test
public void array_int_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "values is null", new Runnable() {
- public void run() {
- Json.array((int[]) null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "values is null", (Runnable) () -> Json.array((int[]) null));
}
@Test
@@ -175,11 +155,7 @@ public void array_long() {
@Test
public void array_long_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "values is null", new Runnable() {
- public void run() {
- Json.array((long[]) null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "values is null", (Runnable) () -> Json.array((long[]) null));
}
@Test
@@ -190,11 +166,7 @@ public void array_float() {
@Test
public void array_float_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "values is null", new Runnable() {
- public void run() {
- Json.array((float[]) null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "values is null", (Runnable) () -> Json.array((float[]) null));
}
@Test
@@ -205,11 +177,7 @@ public void array_double() {
@Test
public void array_double_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "values is null", new Runnable() {
- public void run() {
- Json.array((double[]) null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "values is null", (Runnable) () -> Json.array((double[]) null));
}
@Test
@@ -220,11 +188,7 @@ public void array_boolean() {
@Test
public void array_boolean_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "values is null", new Runnable() {
- public void run() {
- Json.array((boolean[]) null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "values is null", (Runnable) () -> Json.array((boolean[]) null));
}
@Test
@@ -235,11 +199,7 @@ public void array_string() {
@Test
public void array_string_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "values is null", new Runnable() {
- public void run() {
- Json.array((String[]) null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "values is null", (Runnable) () -> Json.array((String[]) null));
}
@Test
@@ -254,11 +214,7 @@ public void parse_string() {
@Test
public void parse_string_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "string is null", new Runnable() {
- public void run() {
- Json.parse((String) null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "string is null", (Runnable) () -> Json.parse((String) null));
}
@Test
@@ -270,11 +226,7 @@ public void parse_reader() throws IOException {
@Test
public void parse_reader_failsWithNull() {
- TestUtil.assertException(NullPointerException.class, "reader is null", new RunnableEx() {
- public void run() throws IOException {
- Json.parse((Reader) null);
- }
- });
+ TestUtil.assertException(NullPointerException.class, "reader is null", (RunnableEx) () -> Json.parse((Reader) null));
}
}
diff --git a/src/test/java/com/bettercloud/vault/json/ParseException_Test.java b/src/test/java/com/bettercloud/vault/json/ParseException_Test.java
index 0bd7ba6f..e4730a4b 100644
--- a/src/test/java/com/bettercloud/vault/json/ParseException_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/ParseException_Test.java
@@ -21,10 +21,10 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
@SuppressWarnings("PMD")
public class ParseException_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/PrettyPrint_Test.java b/src/test/java/com/bettercloud/vault/json/PrettyPrint_Test.java
index a12017b3..310793d2 100644
--- a/src/test/java/com/bettercloud/vault/json/PrettyPrint_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/PrettyPrint_Test.java
@@ -21,18 +21,22 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static com.bettercloud.vault.json.PrettyPrint.*;
-import static java.util.Locale.US;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
-
import org.junit.Before;
import org.junit.Test;
+import static com.bettercloud.vault.json.PrettyPrint.indentWithSpaces;
+import static com.bettercloud.vault.json.PrettyPrint.indentWithTabs;
+import static com.bettercloud.vault.json.PrettyPrint.singleLine;
+import static java.util.Locale.US;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
@SuppressWarnings("PMD")
public class PrettyPrint_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/TestUtil.java b/src/test/java/com/bettercloud/vault/json/TestUtil.java
index 8ffd4af4..a13e9b5c 100644
--- a/src/test/java/com/bettercloud/vault/json/TestUtil.java
+++ b/src/test/java/com/bettercloud/vault/json/TestUtil.java
@@ -21,15 +21,15 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
@SuppressWarnings("PMD")
class TestUtil {
diff --git a/src/test/java/com/bettercloud/vault/json/WritingBuffer_Test.java b/src/test/java/com/bettercloud/vault/json/WritingBuffer_Test.java
index 9c64cbcf..f9fd5403 100644
--- a/src/test/java/com/bettercloud/vault/json/WritingBuffer_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/WritingBuffer_Test.java
@@ -21,15 +21,14 @@
******************************************************************************/
package com.bettercloud.vault.json;
-import static org.junit.Assert.assertEquals;
-
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
-
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
@SuppressWarnings("PMD")
public class WritingBuffer_Test {
diff --git a/src/test/java/com/bettercloud/vault/json/test/mocking/Mocking_Test.java b/src/test/java/com/bettercloud/vault/json/test/mocking/Mocking_Test.java
index 0aee974c..9a6862c6 100644
--- a/src/test/java/com/bettercloud/vault/json/test/mocking/Mocking_Test.java
+++ b/src/test/java/com/bettercloud/vault/json/test/mocking/Mocking_Test.java
@@ -21,15 +21,14 @@
******************************************************************************/
package com.bettercloud.vault.json.test.mocking;
-import static org.junit.Assert.assertNotNull;
-
import com.bettercloud.vault.json.JsonArray;
-import org.junit.Test;
-import org.mockito.Mockito;
-
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.json.JsonValue;
import com.bettercloud.vault.json.ParseException;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.junit.Assert.assertNotNull;
/**
diff --git a/src/test/java/com/bettercloud/vault/rest/DeleteTests.java b/src/test/java/com/bettercloud/vault/rest/DeleteTests.java
index 02bd416d..0c44ec1f 100644
--- a/src/test/java/com/bettercloud/vault/rest/DeleteTests.java
+++ b/src/test/java/com/bettercloud/vault/rest/DeleteTests.java
@@ -4,11 +4,10 @@
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.vault.VaultTestUtils;
import com.bettercloud.vault.vault.mock.EchoInputMockVault;
+import java.io.UnsupportedEncodingException;
import org.eclipse.jetty.server.Server;
import org.junit.Test;
-import java.io.UnsupportedEncodingException;
-
import static junit.framework.TestCase.assertEquals;
import static org.junit.Assert.assertNull;
diff --git a/src/test/java/com/bettercloud/vault/rest/GetTests.java b/src/test/java/com/bettercloud/vault/rest/GetTests.java
index d94f5ae8..e54edb99 100644
--- a/src/test/java/com/bettercloud/vault/rest/GetTests.java
+++ b/src/test/java/com/bettercloud/vault/rest/GetTests.java
@@ -2,11 +2,12 @@
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
-import org.junit.Test;
-
import java.nio.charset.StandardCharsets;
+import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
* Unit tests relating the REST client processing of GET requests.
diff --git a/src/test/java/com/bettercloud/vault/rest/PostTests.java b/src/test/java/com/bettercloud/vault/rest/PostTests.java
index 7cadb910..e50b0a56 100644
--- a/src/test/java/com/bettercloud/vault/rest/PostTests.java
+++ b/src/test/java/com/bettercloud/vault/rest/PostTests.java
@@ -2,11 +2,11 @@
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
-import org.junit.Test;
-
import java.nio.charset.StandardCharsets;
+import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
/**
* Unit tests relating the REST client processing of POST requests.
diff --git a/src/test/java/com/bettercloud/vault/rest/PutTests.java b/src/test/java/com/bettercloud/vault/rest/PutTests.java
index 48c038a8..169a9af3 100644
--- a/src/test/java/com/bettercloud/vault/rest/PutTests.java
+++ b/src/test/java/com/bettercloud/vault/rest/PutTests.java
@@ -2,9 +2,8 @@
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
-import org.junit.Test;
-
import java.nio.charset.StandardCharsets;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
diff --git a/src/test/java/com/bettercloud/vault/vault/VaultTestUtils.java b/src/test/java/com/bettercloud/vault/vault/VaultTestUtils.java
index 5a1ae8e8..066b721b 100644
--- a/src/test/java/com/bettercloud/vault/vault/VaultTestUtils.java
+++ b/src/test/java/com/bettercloud/vault/vault/VaultTestUtils.java
@@ -3,6 +3,11 @@
import com.bettercloud.vault.json.Json;
import com.bettercloud.vault.json.JsonObject;
import com.bettercloud.vault.vault.mock.MockVault;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import javax.servlet.http.HttpServletRequest;
import org.apache.commons.io.IOUtils;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
@@ -13,12 +18,6 @@
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.ssl.SslContextFactory;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toMap;
@@ -39,7 +38,7 @@ public static Server initHttpMockVault(final MockVault mock) {
public static Server initHttpsMockVault(final MockVault mock) {
final Server server = new Server();
- final SslContextFactory sslContextFactory = new SslContextFactory();
+ final SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStorePath(VaultTestUtils.class.getResource("/keystore.jks").toExternalForm());
sslContextFactory.setKeyStorePassword("password");
sslContextFactory.setKeyManagerPassword("password");
diff --git a/src/test/java/com/bettercloud/vault/vault/api/AuthBackendAwsTests.java b/src/test/java/com/bettercloud/vault/vault/api/AuthBackendAwsTests.java
index d3d14d63..431f055b 100644
--- a/src/test/java/com/bettercloud/vault/vault/api/AuthBackendAwsTests.java
+++ b/src/test/java/com/bettercloud/vault/vault/api/AuthBackendAwsTests.java
@@ -7,12 +7,11 @@
import com.bettercloud.vault.response.AuthResponse;
import com.bettercloud.vault.vault.VaultTestUtils;
import com.bettercloud.vault.vault.mock.AuthRequestValidatingMockVault;
+import java.util.function.Predicate;
+import javax.servlet.http.HttpServletRequest;
import org.eclipse.jetty.server.Server;
import org.junit.Test;
-import javax.servlet.http.HttpServletRequest;
-import java.util.function.Predicate;
-
import static com.bettercloud.vault.vault.VaultTestUtils.readRequestBody;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/com/bettercloud/vault/vault/api/AuthLookupTest.java b/src/test/java/com/bettercloud/vault/vault/api/AuthLookupTest.java
index b1aa2462..3a9385ce 100644
--- a/src/test/java/com/bettercloud/vault/vault/api/AuthLookupTest.java
+++ b/src/test/java/com/bettercloud/vault/vault/api/AuthLookupTest.java
@@ -7,13 +7,12 @@
import com.bettercloud.vault.response.LookupResponse;
import com.bettercloud.vault.vault.VaultTestUtils;
import com.bettercloud.vault.vault.mock.MockVault;
+import java.util.Optional;
import org.eclipse.jetty.server.Server;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.util.Optional;
-
import static org.junit.Assert.assertEquals;
public class AuthLookupTest {
diff --git a/src/test/java/com/bettercloud/vault/vault/api/AuthLookupWrapTest.java b/src/test/java/com/bettercloud/vault/vault/api/AuthLookupWrapTest.java
index 6b49fc91..868c30f5 100644
--- a/src/test/java/com/bettercloud/vault/vault/api/AuthLookupWrapTest.java
+++ b/src/test/java/com/bettercloud/vault/vault/api/AuthLookupWrapTest.java
@@ -6,13 +6,12 @@
import com.bettercloud.vault.response.LogicalResponse;
import com.bettercloud.vault.vault.VaultTestUtils;
import com.bettercloud.vault.vault.mock.MockVault;
+import java.util.Optional;
import org.eclipse.jetty.server.Server;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.util.Optional;
-
import static org.junit.Assert.assertEquals;
public class AuthLookupWrapTest {
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/AuthRequestValidatingMockVault.java b/src/test/java/com/bettercloud/vault/vault/mock/AuthRequestValidatingMockVault.java
index 687d9333..e1599a8f 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/AuthRequestValidatingMockVault.java
+++ b/src/test/java/com/bettercloud/vault/vault/mock/AuthRequestValidatingMockVault.java
@@ -1,36 +1,14 @@
package com.bettercloud.vault.vault.mock;
-import org.eclipse.jetty.server.Request;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.function.Predicate;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.server.Request;
public class AuthRequestValidatingMockVault extends MockVault {
private Predicate