loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into 6.3.x

Browse Source
This commit is contained in:
William Cheng
2022-11-01 17:42:59 +08:00
parent 3bd2a611bf b0ce532bdc
commit 2947d147b4
1972 changed files with 36976 additions and 6630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,9 +102,9 @@ test {
ext {
swagger_annotations_version = "1.5.24"
jackson_version = "2.12.6.1"
jackson_databind_version = "2.12.6.1"
jackson_databind_nullable_version = "0.2.3"
jackson_version = "2.13.4"
jackson_databind_version = "2.13.4.2"
jackson_databind_nullable_version = "0.2.4"
jakarta_annotation_version = "1.3.5"
feign_version = "10.11"
feign_form_version = "3.8.0"

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

@@ -16,9 +16,9 @@ lazy val root = (project in file(".")).
"io.github.openfeign" % "feign-slf4j" % "10.11" % "compile",
"io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile",
"io.github.openfeign" % "feign-okhttp" % "10.11" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.12.6.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.6.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile",

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

@@ -330,9 +330,9 @@
<swagger-annotations-version>1.5.24</swagger-annotations-version>
<feign-version>10.11</feign-version>
<feign-form-version>3.8.0</feign-form-version>
<jackson-version>2.12.5</jackson-version>
<jackson-databind-nullable-version>0.2.3</jackson-databind-nullable-version>
<jackson-databind-version>2.12.6.1</jackson-databind-version>
<jackson-version>2.13.4</jackson-version>
<jackson-databind-nullable-version>0.2.4</jackson-databind-nullable-version>
<jackson-databind-version>2.13.4.2</jackson-databind-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<junit-version>5.7.0</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>

2
samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ServerConfiguration.java
View File

@@ -42,7 +42,7 @@ public class ServerConfiguration {
throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + ".");
}
}
url = url.replaceAll("\\{" + name + "\\}", value);
url = url.replace("{" + name + "}", value);
}
return url;
}