jlengrand/openapi-generator
1
0
Fork 0
mirror of https://github.com/jlengrand/openapi-generator.git synced 2026-05-11 08:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java][Feign] Add support for Feign 10 (#977) (#988)

Browse Source
This commit is contained in:
Ilya Hrankoŭski
2018-09-09 13:11:59 +03:00
committed by William Cheng
parent 825404a1df
commit aa29219f8c
10 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/client/petstore/java/feign/build.gradle
View File

@@ -97,7 +97,7 @@ ext {
swagger_annotations_version = "1.5.21"
jackson_version = "2.8.7"
threepane_version = "2.6.4"
feign_version = "9.4.0"
feign_version = "10.0.1"
feign_form_version = "2.1.0"
junit_version = "4.12"
oltu_version = "1.0.1"

6
samples/client/petstore/java/feign/build.sbt
View File

@@ -10,9 +10,9 @@ lazy val root = (project in file(".")).
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"io.github.openfeign" % "feign-core" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-core" % "10.0.1" % "compile",
"io.github.openfeign" % "feign-jackson" % "10.0.1" % "compile",
"io.github.openfeign" % "feign-slf4j" % "10.0.1" % "compile",
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",

2
samples/client/petstore/java/feign/pom.xml
View File

@@ -267,7 +267,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<feign-version>9.4.0</feign-version>
<feign-version>10.0.1</feign-version>
<feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.8.9</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>

3
samples/client/petstore/java/feign/src/main/java/org/openapitools/client/auth/OAuth.java
View File

@@ -19,6 +19,7 @@ import org.apache.oltu.oauth2.common.message.types.GrantType;
import org.apache.oltu.oauth2.common.token.BasicOAuthToken;
import feign.Client;
import feign.Request.HttpMethod;
import feign.Request.Options;
import feign.RequestInterceptor;
import feign.RequestTemplate;
@@ -92,7 +93,7 @@ public class OAuth implements RequestInterceptor {
try {
accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
} catch (Exception e) {
throw new RetryableException(e.getMessage(), e,null);
throw new RetryableException(e.getMessage(), HttpMethod.POST, e, null);
}
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());