use immutable Map.of() for fixed-size payloads
This commit is contained in:
parent
8dfcf02a0a
commit
60d94fc5bb
@ -246,13 +246,18 @@ public class HTTPVaultConnector implements VaultConnector {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HealthResponse getHealth() throws VaultConnectorException {
|
public HealthResponse getHealth() throws VaultConnectorException {
|
||||||
/* Force status code to be 200, so we don't need to modify the request sequence. */
|
|
||||||
Map<String, String> param = new HashMap<>(3, 1);
|
|
||||||
param.put("standbycode", "200"); // Default: 429.
|
|
||||||
param.put("sealedcode", "200"); // Default: 503.
|
|
||||||
param.put("uninitcode", "200"); // Default: 501.
|
|
||||||
|
|
||||||
return request.get(PATH_HEALTH, param, token, HealthResponse.class);
|
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
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -289,10 +294,13 @@ public class HTTPVaultConnector implements VaultConnector {
|
|||||||
@Override
|
@Override
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public final AuthResponse authAppId(final String appID, final String userID) throws VaultConnectorException {
|
public final AuthResponse authAppId(final String appID, final String userID) throws VaultConnectorException {
|
||||||
final Map<String, String> payload = new HashMap<>(2, 1);
|
return queryAuth(
|
||||||
payload.put("app_id", appID);
|
PATH_AUTH_APPID + "login",
|
||||||
payload.put("user_id", userID);
|
Map.of(
|
||||||
return queryAuth(PATH_AUTH_APPID + "login", payload);
|
"app_id", appID,
|
||||||
|
"user_id", userID
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -330,12 +338,16 @@ public class HTTPVaultConnector implements VaultConnector {
|
|||||||
public final boolean registerAppId(final String appID, final String policy, final String displayName)
|
public final boolean registerAppId(final String appID, final String policy, final String displayName)
|
||||||
throws VaultConnectorException {
|
throws VaultConnectorException {
|
||||||
requireAuth();
|
requireAuth();
|
||||||
Map<String, String> payload = new HashMap<>(2, 1);
|
|
||||||
payload.put("value", policy);
|
|
||||||
payload.put("display_name", displayName);
|
|
||||||
|
|
||||||
/* Issue request and expect code 204 with empty response */
|
/* Issue request and expect code 204 with empty response */
|
||||||
request.postWithoutResponse(PATH_AUTH_APPID + "map/app-id/" + appID, payload, token);
|
request.postWithoutResponse(
|
||||||
|
PATH_AUTH_APPID + "map/app-id/" + appID,
|
||||||
|
Map.of(
|
||||||
|
"value", policy,
|
||||||
|
"display_name", displayName
|
||||||
|
),
|
||||||
|
token
|
||||||
|
);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -540,17 +552,23 @@ public class HTTPVaultConnector implements VaultConnector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add CAS value to options map if present.
|
// Add CAS value to options map if present.
|
||||||
Map<String, Object> options = new HashMap<>(1, 1);
|
Map<String, Object> options;
|
||||||
if (cas != null) {
|
if (cas != null) {
|
||||||
options.put("cas", cas);
|
options = singletonMap("cas", cas);
|
||||||
|
} else {
|
||||||
|
options = emptyMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, Object> payload = new HashMap<>(2, 1);
|
|
||||||
payload.put("data", data);
|
|
||||||
payload.put("options", options);
|
|
||||||
|
|
||||||
/* Issue request and parse metadata response */
|
/* Issue request and parse metadata response */
|
||||||
return request.post(mount + PATH_DATA + key, payload, token, SecretVersionResponse.class);
|
return request.post(
|
||||||
|
mount + PATH_DATA + key,
|
||||||
|
Map.of(
|
||||||
|
"data", data,
|
||||||
|
"options", options
|
||||||
|
),
|
||||||
|
token,
|
||||||
|
SecretVersionResponse.class
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -575,10 +593,10 @@ public class HTTPVaultConnector implements VaultConnector {
|
|||||||
|
|
||||||
// If options are given, split payload in two parts.
|
// If options are given, split payload in two parts.
|
||||||
if (options != null) {
|
if (options != null) {
|
||||||
Map<String, Object> payloadMap = new HashMap<>(2, 1);
|
payload = Map.of(
|
||||||
payloadMap.put("data", data);
|
"data", data,
|
||||||
payloadMap.put("options", options);
|
"options", options
|
||||||
payload = payloadMap;
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Issue request and expect code 204 with empty response */
|
/* Issue request and expect code 204 with empty response */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user