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

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

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

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-generators</artifactId>
<version>1.0.56</version>
<version>1.0.57-SNAPSHOT</version>
Copy link
Author

Choose a reason for hiding this comment

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

Not sure if I should have bumped it here, let me know if I should revert

<packaging>jar</packaging>

<build>
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/handlebars/Java/libraries/feign/auth/OAuth.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
{{/java8}}
import java.util.Date;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -99,7 +100,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 src/main/resources/handlebars/Java/libraries/feign/build.gradle.java11.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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.2"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/handlebars/Java/libraries/feign/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
{{^useOas2}}
<swagger-core-version>2.0.0</swagger-core-version>
{{/useOas2}}
<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