diff --git a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java b/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java index 420fa88..c35da2d 100644 --- a/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java +++ b/fpi-framework-core/src/main/java/com/abavilla/fpi/fw/exceptions/handler/ApiRepoExHandler.java @@ -51,15 +51,15 @@ public ApiSvcEx toThrowable(Response response) { // exception is ignored } - if (response.getStatus() != RestResponse.StatusCode.UNAUTHORIZED || - response.getStatus() != RestResponse.StatusCode.FORBIDDEN) { - return new ApiSvcEx("Rest Client encountered an exception!", response.getStatus(), getBody(response), + if (response.getStatus() == RestResponse.StatusCode.UNAUTHORIZED || + response.getStatus() == RestResponse.StatusCode.FORBIDDEN) { + return new AuthApiSvcEx("Rest Client was unable to access the resource!", response.getStatus(), getBody(response), String.valueOf(response.getLocation()), response.getStringHeaders().entrySet().stream().collect(Collectors.toUnmodifiableMap( Map.Entry::getKey, e -> StringUtils.join(e.getValue(), FWConst.COMMA_SEP) ))); } else { - return new AuthApiSvcEx("Rest Client was unable to access the resource!", response.getStatus(), getBody(response), + return new ApiSvcEx("Rest Client encountered an exception!", response.getStatus(), getBody(response), String.valueOf(response.getLocation()), response.getStringHeaders().entrySet().stream().collect(Collectors.toUnmodifiableMap( Map.Entry::getKey, e -> StringUtils.join(e.getValue(), FWConst.COMMA_SEP)