stklcode/jvaultconnector
stklcode/jvaultconnector
1
0
Fork 0
Code Issues Actions Releases 33 Wiki Activity

Extracted nested try-blocks from response handling into new methods.

Browse Source
This commit is contained in:
Stefan Kalscheuer 2017-10-03 17:29:11 +02:00
parent 061c1e9743
commit 007b523295
1 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java
View File

@ -831,12 +831,7 @@ public class HTTPVaultConnector implements VaultConnector {
switch (response.getStatusLine().getStatusCode()) { switch (response.getStatusLine().getStatusCode()) {
case 200: case 200:
try (BufferedReader br = new BufferedReader( return handleResult(response);
new InputStreamReader(response.getEntity().getContent()))) {
return br.lines().collect(Collectors.joining("\n"));
} catch (IOException ignored) {
throw new InvalidResponseException(Error.PARSE_RESPONSE, 200);
}
case 204: case 204:
return ""; return "";
case 403: case 403:
@ -848,20 +843,9 @@ public class HTTPVaultConnector implements VaultConnector {
return request(base, retries - 1); return request(base, retries - 1);
} else { } else {
/* Fail on different error code and/or no retries left */ /* Fail on different error code and/or no retries left */
if (response.getEntity() != null) { handleError(response);
try (BufferedReader br = new BufferedReader(
new InputStreamReader(response.getEntity().getContent()))) { /* Throw exception withoud details, if response entity is empty. */
String responseString = br.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"))
throw new PermissionDeniedException();
throw new InvalidResponseException(Error.RESPONSE_CODE,
response.getStatusLine().getStatusCode(), er.toString());
} catch (IOException ignored) {
// Exception ignored.
}
}
throw new InvalidResponseException(Error.RESPONSE_CODE, throw new InvalidResponseException(Error.RESPONSE_CODE,
response.getStatusLine().getStatusCode()); response.getStatusLine().getStatusCode());
} }
@ -878,6 +862,45 @@ public class HTTPVaultConnector implements VaultConnector {
} }
} }
/**
* Handle successful result.
*
* @param response The raw HTTP response (assuming status code 200)
* @return Complete response body as String
* @throws InvalidResponseException on reading errors
*/
private String handleResult(final HttpResponse response) throws InvalidResponseException {
try (BufferedReader br = new BufferedReader(
new InputStreamReader(response.getEntity().getContent()))) {
return br.lines().collect(Collectors.joining("\n"));
} catch (IOException ignored) {
throw new InvalidResponseException(Error.READ_RESPONSE, 200);
}
}
/**
* Handle unsuccessful response. Throw detailed exception if possible.
*
* @param response The raw HTTP response (assuming status code 5xx)
* @throws VaultConnectorException Expected exception with details to throw
*/
private void handleError(final HttpResponse response) throws VaultConnectorException {
if (response.getEntity() != null) {
try (BufferedReader br = new BufferedReader(
new InputStreamReader(response.getEntity().getContent()))) {
String responseString = br.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"))
throw new PermissionDeniedException();
throw new InvalidResponseException(Error.RESPONSE_CODE,
response.getStatusLine().getStatusCode(), er.toString());
} catch (IOException ignored) {
// Exception ignored.
}
}
}
/** /**
* Inner class to bundle common error messages. * Inner class to bundle common error messages.
*/ */