Skip to content

[Java] [Feign] Add support for Feign 13 #12525

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Java] [Feign] Add support for Feign 13 #12525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package {{invokerPackage}}.auth;

import java.io.IOException;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
import java.util.Map.Entry;

Expand Down Expand Up @@ -92,7 +93,7 @@ public class OAuth implements RequestInterceptor {
try {
accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
} catch (Exception e) {
throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, null, template.request());
throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, (Date) null, template.request());
}
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.java11.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ext {
{{#threetenbp}}
threepane_version = "2.6.4"
{{/threetenbp}}
feign_version = "11.6"
feign_version = "13.5"
feign_form_version = "3.8.0"
junit_version = "4.13.1"
oltu_version = "1.0.1"
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.24</swagger-core-version>
<feign-version>11.6</feign-version>
<feign-version>13.5</feign-version>
<feign-form-version>3.8.0</feign-form-version>
<jackson-version>2.15.2</jackson-version>
{{#threetenbp}}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/feign/.swagger-codegen/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.38-SNAPSHOT
2.4.44
2 changes: 1 addition & 1 deletion samples/client/petstore/java/feign/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.24</swagger-core-version>
<feign-version>11.6</feign-version>
<feign-version>13.5</feign-version>
<feign-form-version>3.8.0</feign-form-version>
<jackson-version>2.15.2</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
Expand Down
3 changes: 2 additions & 1 deletion samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.IOException;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
import java.util.Map.Entry;

Expand Down Expand Up @@ -92,7 +93,7 @@ public synchronized void updateAccessToken(RequestTemplate template) {
try {
accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
} catch (Exception e) {
throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, null, template.request());
throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, (Date) null, template.request());
}
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
Expand Down