Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Request field added to FeignException #1039

Merged
merged 3 commits into from
Aug 26, 2019
Merged

Request field added to FeignException #1039

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eb0d59
#845 Request field added to FeignException
finnetrolle Aug 18, 2019
e9b1954
#845 Previous constructors for FeignException returned, new construct…
finnetrolle Aug 21, 2019
b1a4881
#845 Tests to check null instead of request, null message updated
finnetrolle Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 113 additions & 62 deletions core/src/main/java/feign/FeignException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package feign;

import static feign.Util.UTF_8;
import static feign.Util.checkNotNull;
import static java.lang.String.format;
import java.io.IOException;

Expand All @@ -25,27 +26,59 @@ public class FeignException extends RuntimeException {
private static final long serialVersionUID = 0;
private int status;
private byte[] content;
private Request request;

protected FeignException(int status, String message, Throwable cause) {
super(message, cause);
this.status = status;
this.request = null;
}

protected FeignException(int status, String message, Throwable cause, byte[] content) {
super(message, cause);
this.status = status;
this.content = content;
this.request = null;
}

protected FeignException(int status, String message) {
super(message);
this.status = status;
this.request = null;
}

protected FeignException(int status, String message, byte[] content) {
super(message);
this.status = status;
this.content = content;
this.request = null;
}

protected FeignException(int status, String message, Request request, Throwable cause) {
super(message, cause);
this.status = status;
this.request = checkNotNull(request, "request");
}

protected FeignException(int status, String message, Request request, Throwable cause,
byte[] content) {
super(message, cause);
this.status = status;
this.content = content;
this.request = checkNotNull(request, "request");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should have a real message here. This will result in an NPE with a message of "request". Can you change to read something like "request is required"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just grep project to check how checkNotNull invokes and made same. But ok, changed! )

}

protected FeignException(int status, String message, Request request) {
super(message);
this.status = status;
this.request = checkNotNull(request, "request");
}

protected FeignException(int status, String message, Request request, byte[] content) {
super(message);
this.status = status;
this.content = content;
this.request = checkNotNull(request, "request");
}

public int status() {
Expand All @@ -56,6 +89,14 @@ public byte[] content() {
return this.content;
}

public Request request() {
return this.request;
}

public boolean hasRequest() {
return (this.request != null);
}

public String contentUTF8() {
if (content != null) {
return new String(content, UTF_8);
Expand All @@ -68,6 +109,7 @@ static FeignException errorReading(Request request, Response response, IOExcepti
return new FeignException(
response.status(),
format("%s reading %s %s", cause.getMessage(), request.httpMethod(), request.url()),
request,
cause,
request.requestBody().asBytes());
}
Expand All @@ -83,70 +125,79 @@ public static FeignException errorStatus(String methodKey, Response response) {
} catch (IOException ignored) { // NOPMD
}

return errorStatus(response.status(), message, body);
return errorStatus(response.status(), message, response.request(), body);
}

private static FeignException errorStatus(int status, String message, byte[] body) {
private static FeignException errorStatus(int status,
String message,
Request request,
byte[] body) {
if (isClientError(status)) {
return clientErrorStatus(status, message, body);
return clientErrorStatus(status, message, request, body);
}
if (isServerError(status)) {
return serverErrorStatus(status, message, body);
return serverErrorStatus(status, message, request, body);
}
return new FeignException(status, message, body);
return new FeignException(status, message, request, body);
}

private static boolean isClientError(int status) {
return status >= 400 && status < 500;
}

private static FeignClientException clientErrorStatus(int status, String message, byte[] body) {
private static FeignClientException clientErrorStatus(int status,
String message,
Request request,
byte[] body) {
switch (status) {
case 400:
return new BadRequest(message, body);
return new BadRequest(message, request, body);
case 401:
return new Unauthorized(message, body);
return new Unauthorized(message, request, body);
case 403:
return new Forbidden(message, body);
return new Forbidden(message, request, body);
case 404:
return new NotFound(message, body);
return new NotFound(message, request, body);
case 405:
return new MethodNotAllowed(message, body);
return new MethodNotAllowed(message, request, body);
case 406:
return new NotAcceptable(message, body);
return new NotAcceptable(message, request, body);
case 409:
return new Conflict(message, body);
return new Conflict(message, request, body);
case 410:
return new Gone(message, body);
return new Gone(message, request, body);
case 415:
return new UnsupportedMediaType(message, body);
return new UnsupportedMediaType(message, request, body);
case 429:
return new TooManyRequests(message, body);
return new TooManyRequests(message, request, body);
case 422:
return new UnprocessableEntity(message, body);
return new UnprocessableEntity(message, request, body);
default:
return new FeignClientException(status, message, body);
return new FeignClientException(status, message, request, body);
}
}

private static boolean isServerError(int status) {
return status >= 500 && status <= 599;
}

private static FeignServerException serverErrorStatus(int status, String message, byte[] body) {
private static FeignServerException serverErrorStatus(int status,
String message,
Request request,
byte[] body) {
switch (status) {
case 500:
return new InternalServerError(message, body);
return new InternalServerError(message, request, body);
case 501:
return new NotImplemented(message, body);
return new NotImplemented(message, request, body);
case 502:
return new BadGateway(message, body);
return new BadGateway(message, request, body);
case 503:
return new ServiceUnavailable(message, body);
return new ServiceUnavailable(message, request, body);
case 504:
return new GatewayTimeout(message, body);
return new GatewayTimeout(message, request, body);
default:
return new FeignServerException(status, message, body);
return new FeignServerException(status, message, request, body);
}
}

Expand All @@ -156,114 +207,114 @@ static FeignException errorExecuting(Request request, IOException cause) {
format("%s executing %s %s", cause.getMessage(), request.httpMethod(), request.url()),
request.httpMethod(),
cause,
null);
null, request);
}

public static class FeignClientException extends FeignException {
public FeignClientException(int status, String message, byte[] body) {
super(status, message, body);
public FeignClientException(int status, String message, Request request, byte[] body) {
super(status, message, request, body);
}
}

public static class BadRequest extends FeignClientException {
public BadRequest(String message, byte[] body) {
super(400, message, body);
public BadRequest(String message, Request request, byte[] body) {
super(400, message, request, body);
}
}

public static class Unauthorized extends FeignClientException {
public Unauthorized(String message, byte[] body) {
super(401, message, body);
public Unauthorized(String message, Request request, byte[] body) {
super(401, message, request, body);
}
}

public static class Forbidden extends FeignClientException {
public Forbidden(String message, byte[] body) {
super(403, message, body);
public Forbidden(String message, Request request, byte[] body) {
super(403, message, request, body);
}
}

public static class NotFound extends FeignClientException {
public NotFound(String message, byte[] body) {
super(404, message, body);
public NotFound(String message, Request request, byte[] body) {
super(404, message, request, body);
}
}

public static class MethodNotAllowed extends FeignClientException {
public MethodNotAllowed(String message, byte[] body) {
super(405, message, body);
public MethodNotAllowed(String message, Request request, byte[] body) {
super(405, message, request, body);
}
}

public static class NotAcceptable extends FeignClientException {
public NotAcceptable(String message, byte[] body) {
super(406, message, body);
public NotAcceptable(String message, Request request, byte[] body) {
super(406, message, request, body);
}
}

public static class Conflict extends FeignClientException {
public Conflict(String message, byte[] body) {
super(409, message, body);
public Conflict(String message, Request request, byte[] body) {
super(409, message, request, body);
}
}

public static class Gone extends FeignClientException {
public Gone(String message, byte[] body) {
super(410, message, body);
public Gone(String message, Request request, byte[] body) {
super(410, message, request, body);
}
}

public static class UnsupportedMediaType extends FeignClientException {
public UnsupportedMediaType(String message, byte[] body) {
super(415, message, body);
public UnsupportedMediaType(String message, Request request, byte[] body) {
super(415, message, request, body);
}
}

public static class TooManyRequests extends FeignClientException {
public TooManyRequests(String message, byte[] body) {
super(429, message, body);
public TooManyRequests(String message, Request request, byte[] body) {
super(429, message, request, body);
}
}

public static class UnprocessableEntity extends FeignClientException {
public UnprocessableEntity(String message, byte[] body) {
super(422, message, body);
public UnprocessableEntity(String message, Request request, byte[] body) {
super(422, message, request, body);
}
}

public static class FeignServerException extends FeignException {
public FeignServerException(int status, String message, byte[] body) {
super(status, message, body);
public FeignServerException(int status, String message, Request request, byte[] body) {
super(status, message, request, body);
}
}

public static class InternalServerError extends FeignServerException {
public InternalServerError(String message, byte[] body) {
super(500, message, body);
public InternalServerError(String message, Request request, byte[] body) {
super(500, message, request, body);
}
}

public static class NotImplemented extends FeignServerException {
public NotImplemented(String message, byte[] body) {
super(501, message, body);
public NotImplemented(String message, Request request, byte[] body) {
super(501, message, request, body);
}
}

public static class BadGateway extends FeignServerException {
public BadGateway(String message, byte[] body) {
super(502, message, body);
public BadGateway(String message, Request request, byte[] body) {
super(502, message, request, body);
}
}

public static class ServiceUnavailable extends FeignServerException {
public ServiceUnavailable(String message, byte[] body) {
super(503, message, body);
public ServiceUnavailable(String message, Request request, byte[] body) {
super(503, message, request, body);
}
}

public static class GatewayTimeout extends FeignServerException {
public GatewayTimeout(String message, byte[] body) {
super(504, message, body);
public GatewayTimeout(String message, Request request, byte[] body) {
super(504, message, request, body);
}
}
}
10 changes: 5 additions & 5 deletions core/src/main/java/feign/Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,11 @@ public void close() throws IOException {

@Override
public String toString() {
try {
return new String(toByteArray(inputStream), UTF_8);
} catch (Exception e) {
return super.toString();
}
try {
return new String(toByteArray(inputStream), UTF_8);
} catch (Exception e) {
return super.toString();
}
}
}

Expand Down
9 changes: 5 additions & 4 deletions core/src/main/java/feign/RetryableException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,18 @@ public class RetryableException extends FeignException {
* @param retryAfter usually corresponds to the {@link feign.Util#RETRY_AFTER} header.
*/
public RetryableException(int status, String message, HttpMethod httpMethod, Throwable cause,
Date retryAfter) {
super(status, message, cause);
Date retryAfter, Request request) {
super(status, message, request, cause);
this.httpMethod = httpMethod;
this.retryAfter = retryAfter != null ? retryAfter.getTime() : null;
}

/**
* @param retryAfter usually corresponds to the {@link feign.Util#RETRY_AFTER} header.
*/
public RetryableException(int status, String message, HttpMethod httpMethod, Date retryAfter) {
super(status, message);
public RetryableException(int status, String message, HttpMethod httpMethod, Date retryAfter,
Request request) {
super(status, message, request);
this.httpMethod = httpMethod;
this.retryAfter = retryAfter != null ? retryAfter.getTime() : null;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/feign/SynchronousMethodHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ Object decode(Response response) throws Throwable {
} catch (FeignException e) {
throw e;
} catch (RuntimeException e) {
throw new DecodeException(response.status(), e.getMessage(), e);
throw new DecodeException(response.status(), e.getMessage(), response.request(), e);
}
}

Expand Down
Loading