Skip to content

Commit f38b385

Browse files
committed
Generate java examples in 'samples/client/petstore/java/'
1 parent f4acdc4 commit f38b385

File tree

1,283 files changed

+32608
-29149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,283 files changed

+32608
-29149
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1-SNAPSHOT
1+
3.0.0-SNAPSHOT

samples/client/petstore/java/feign/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ After the client library is installed/deployed, you can use it in your Maven pro
3434

3535
## Recommendation
3636

37-
It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issue.
37+
It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.
3838

3939
## Author
4040

samples/client/petstore/java/feign/build.gradle

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ if(hasProperty('target') && target == 'android') {
3232
targetSdkVersion 25
3333
}
3434
compileOptions {
35-
sourceCompatibility JavaVersion.VERSION_1_7
36-
targetCompatibility JavaVersion.VERSION_1_7
35+
36+
sourceCompatibility JavaVersion.VERSION_1_8
37+
targetCompatibility JavaVersion.VERSION_1_8
38+
39+
3740
}
3841

3942
// Rename the aar correctly
@@ -78,8 +81,8 @@ if(hasProperty('target') && target == 'android') {
7881
apply plugin: 'java'
7982
apply plugin: 'maven'
8083

81-
sourceCompatibility = JavaVersion.VERSION_1_7
82-
targetCompatibility = JavaVersion.VERSION_1_7
84+
sourceCompatibility = JavaVersion.VERSION_1_8
85+
targetCompatibility = JavaVersion.VERSION_1_8
8386

8487
install {
8588
repositories.mavenInstaller {
@@ -96,23 +99,31 @@ if(hasProperty('target') && target == 'android') {
9699
ext {
97100
swagger_annotations_version = "1.5.9"
98101
jackson_version = "2.8.7"
102+
99103
threepane_version = "2.6.4"
104+
100105
feign_version = "9.4.0"
101106
feign_form_version = "2.1.0"
102107
junit_version = "4.12"
103-
oltu_version = "1.0.1"
108+
oltu_version = "1.0.2"
104109
}
105110

106111
dependencies {
107112
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
108-
compile "io.github.openfeign:feign-core:$feign_version"
109-
compile "io.github.openfeign:feign-jackson:$feign_version"
110-
compile "io.github.openfeign:feign-slf4j:$feign_version"
113+
compile "com.netflix.feign:feign-core:$feign_version"
114+
compile "com.netflix.feign:feign-jackson:$feign_version"
115+
compile "com.netflix.feign:feign-slf4j:$feign_version"
111116
compile "io.github.openfeign.form:feign-form:$feign_form_version"
112117
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
113118
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
114119
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
120+
121+
122+
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
123+
124+
115125
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
126+
116127
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
117128
compile "com.brsanthu:migbase64:2.2"
118129
testCompile "junit:junit:$junit_version"

samples/client/petstore/java/feign/build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ lazy val root = (project in file(".")).
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.5.9" % "compile",
13-
"io.github.openfeign" % "feign-core" % "9.4.0" % "compile",
14-
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
15-
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
13+
"com.netflix.feign" % "feign-core" % "9.4.0" % "compile",
14+
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
15+
"com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
1616
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
1717
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
1818
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",
1919
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.7" % "compile",
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.7" % "compile",
21-
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
20+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.7" % "compile",
21+
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2" % "compile",
2222
"com.brsanthu" % "migbase64" % "2.2" % "compile",
2323
"junit" % "junit" % "4.12" % "test",
2424
"com.novocode" % "junit-interface" % "0.10" % "test"

samples/client/petstore/java/feign/docs/AdditionalPropertiesClass.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

samples/client/petstore/java/feign/docs/Animal.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

samples/client/petstore/java/feign/docs/AnimalFarm.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

samples/client/petstore/java/feign/docs/ArrayOfArrayOfNumberOnly.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

samples/client/petstore/java/feign/docs/ArrayOfNumberOnly.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

samples/client/petstore/java/feign/docs/ArrayTest.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)