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.

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

feat: Added decodeVoid feature #2131

Merged
merged 5 commits into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion core/src/main/java/feign/AsyncFeign.java
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ public AsyncBuilder<C> doNotCloseAfterDecode() {
return super.doNotCloseAfterDecode();
}

@Override
public AsyncBuilder<C> decodeVoid() {
return super.decodeVoid();
}

public AsyncBuilder<C> defaultContextSupplier(AsyncContextSupplier<C> supplier) {
this.defaultContextSupplier = supplier;
return this;
Expand Down Expand Up @@ -196,7 +201,7 @@ public AsyncFeign<C> build() {
decoder,
errorDecoder,
dismiss404,
closeAfterDecode, responseInterceptor),
closeAfterDecode, decodeVoid, responseInterceptor),
AsyncResponseHandler.class,
capabilities);

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/feign/AsyncResponseHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ class AsyncResponseHandler {
private final ResponseHandler responseHandler;

AsyncResponseHandler(Level logLevel, Logger logger, Decoder decoder,
ErrorDecoder errorDecoder, boolean dismiss404, boolean closeAfterDecode,
ErrorDecoder errorDecoder, boolean dismiss404, boolean closeAfterDecode, boolean decodeVoid,
ResponseInterceptor responseInterceptor) {
this.responseHandler = new ResponseHandler(
logLevel, logger, decoder,
errorDecoder, dismiss404, closeAfterDecode,
errorDecoder, dismiss404, closeAfterDecode, decodeVoid,
responseInterceptor);
}

Expand Down
6 changes: 6 additions & 0 deletions core/src/main/java/feign/BaseBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public abstract class BaseBuilder<B extends BaseBuilder<B>> {
protected Encoder encoder = new Encoder.Default();
protected Decoder decoder = new Decoder.Default();
protected boolean closeAfterDecode = true;
protected boolean decodeVoid = false;
protected QueryMapEncoder queryMapEncoder = new FieldQueryMapEncoder();
protected ErrorDecoder errorDecoder = new ErrorDecoder.Default();
protected Options options = new Options();
Expand Down Expand Up @@ -106,6 +107,11 @@ public B doNotCloseAfterDecode() {
return thisB;
}

public B decodeVoid() {
this.decodeVoid = true;
return thisB;
}

public B queryMapEncoder(QueryMapEncoder queryMapEncoder) {
this.queryMapEncoder = queryMapEncoder;
return thisB;
Expand Down
7 changes: 6 additions & 1 deletion core/src/main/java/feign/Feign.java
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,11 @@ public Builder doNotCloseAfterDecode() {
return super.doNotCloseAfterDecode();
}

@Override
public Builder decodeVoid() {
return super.decodeVoid();
}

@Override
public Builder exceptionPropagationPolicy(ExceptionPropagationPolicy propagationPolicy) {
return super.exceptionPropagationPolicy(propagationPolicy);
Expand All @@ -201,7 +206,7 @@ public Feign build() {

final ResponseHandler responseHandler =
new ResponseHandler(logLevel, logger, decoder, errorDecoder,
dismiss404, closeAfterDecode, responseInterceptor);
dismiss404, closeAfterDecode, decodeVoid, responseInterceptor);
MethodHandler.Factory<Object> methodHandlerFactory =
new SynchronousMethodHandler.Factory(client, retryer, requestInterceptors,
responseHandler, logger, logLevel, propagationPolicy,
Expand Down
7 changes: 5 additions & 2 deletions core/src/main/java/feign/ResponseHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@ public class ResponseHandler {
private final boolean dismiss404;
private final boolean closeAfterDecode;

private final boolean decodeVoid;

private final ResponseInterceptor responseInterceptor;

public ResponseHandler(Level logLevel, Logger logger, Decoder decoder,
ErrorDecoder errorDecoder, boolean dismiss404, boolean closeAfterDecode,
ErrorDecoder errorDecoder, boolean dismiss404, boolean closeAfterDecode, boolean decodeVoid,
ResponseInterceptor responseInterceptor) {
super();
this.logLevel = logLevel;
Expand All @@ -50,6 +52,7 @@ public ResponseHandler(Level logLevel, Logger logger, Decoder decoder,
this.dismiss404 = dismiss404;
this.closeAfterDecode = closeAfterDecode;
this.responseInterceptor = responseInterceptor;
this.decodeVoid = decodeVoid;
}

public Object handleResponse(String configKey,
Expand Down Expand Up @@ -113,7 +116,7 @@ private static Response disconnectResponseBodyIfNeeded(Response response) throws
}

private Object decode(Response response, Type type) throws IOException {
if (isVoidType(type)) {
if (isVoidType(type) && !decodeVoid) {
ensureClosed(response.body());
return null;
}
Expand Down