valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-06 10:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update feign to the latest stable version (#2999)

Browse Source
This commit is contained in:
William Cheng 2019-05-27 15:11:02 +08:00 committed by GitHub
parent e4f56d5906
commit 5c6824f569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache vendored
View File

@ -96,7 +96,7 @@ public class OAuth implements RequestInterceptor {
accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
} catch (Exception e) {
{{#useFeign10}}
throw new RetryableException(e.getMessage(), HttpMethod.POST, e, null);
throw new RetryableException(0, e.getMessage(), HttpMethod.POST, e, null);
{{/useFeign10}}
{{^useFeign10}}
throw new RetryableException(e.getMessage(), e,null);

2
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache vendored
View File

@ -125,7 +125,7 @@ ext {
{{#threetenbp}}
threepane_version = "2.6.4"
{{/threetenbp}}
feign_version = "{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}"
feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}"
feign_form_version = "2.1.0"
junit_version = "4.12"
oltu_version = "1.0.1"

8
modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache vendored
View File

@ -10,14 +10,14 @@ lazy val root = (project in file(".")).
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.22" % "compile",
"io.github.openfeign" % "feign-core" % "{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}" % "compile",
"io.github.openfeign" % "feign-jackson" % "{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}" % "compile",
"io.github.openfeign" % "feign-slf4j" % "{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}" % "compile",
"io.github.openfeign" % "feign-core" % "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
"io.github.openfeign" % "feign-jackson" % "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
"io.github.openfeign" % "feign-slf4j" % "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile",
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.8.7" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.9" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",

2
modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache vendored
View File

@ -300,7 +300,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>{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}</feign-version>
<feign-version>{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}</feign-version>
<feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.9.9</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version>

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

@ -99,7 +99,7 @@ ext {
jackson_version = "2.9.9"
jackson_databind_version = "2.9.9"
threepane_version = "2.6.4"
feign_version = "9.4.0"
feign_version = "9.7.0"
feign_form_version = "2.1.0"
junit_version = "4.12"
oltu_version = "1.0.1"

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

@ -10,14 +10,14 @@ lazy val root = (project in file(".")).
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.22" % "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" % "9.7.0" % "compile",
"io.github.openfeign" % "feign-jackson" % "9.7.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.7.0" % "compile",
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.7" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "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>9.7.0</feign-version>
<feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.9.9</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version>

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

@ -99,7 +99,7 @@ ext {
jackson_version = "2.9.9"
jackson_databind_version = "2.9.9"
threepane_version = "2.6.4"
feign_version = "10.0.1"
feign_version = "10.2.3"
feign_form_version = "2.1.0"
junit_version = "4.12"
oltu_version = "1.0.1"

8
samples/client/petstore/java/feign10x/build.sbt
View File

@ -10,14 +10,14 @@ lazy val root = (project in file(".")).
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.22" % "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" % "feign-core" % "10.2.3" % "compile",
"io.github.openfeign" % "feign-jackson" % "10.2.3" % "compile",
"io.github.openfeign" % "feign-slf4j" % "10.2.3" % "compile",
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.7" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",

2
samples/client/petstore/java/feign10x/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>10.0.1</feign-version>
<feign-version>10.2.3</feign-version>
<feign-form-version>2.1.0</feign-form-version>
<jackson-version>2.9.9</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version>

2
samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java
View File

@ -93,7 +93,7 @@ public class OAuth implements RequestInterceptor {
try {
accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
} catch (Exception e) {
throw new RetryableException(e.getMessage(), HttpMethod.POST, e, null);
throw new RetryableException(0, e.getMessage(), HttpMethod.POST, e, null);
}
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());