Skip to content

Minor improvements to Java API clients (feign, okhttp, retrofit, retrofit2) #2521

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

Merged
wing328 merged 1 commit into from
Mar 27, 2019
Merged

Minor improvements to Java API clients (feign, okhttp, retrofit, retrofit2) #2521

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
improve indentation, update dependencies
  • Loading branch information
@wing328
wing328 committed Mar 27, 2019
commit d57c3c760fbba1ee086980122d03522bb682c53b
10 changes: 7 additions & 3 deletions modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,15 @@ public class ApiClient {
{{#hasAuthMethods}}
RequestInterceptor auth;
{{#authMethods}}if ("{{name}}".equals(authName)) {
{{#isBasic}}{{#isBasicBasic}}
{{#isBasic}}
{{#isBasicBasic}}
auth = new HttpBasicAuth();
{{/isBasicBasic}}{{^isBasicBasic}}
{{/isBasicBasic}}
{{^isBasicBasic}}
auth = new HttpBearerAuth("{{scheme}}");
{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}}
{{/isBasicBasic}}
{{/isBasic}}
{{#isApiKey}}
auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");
{{/isApiKey}}
{{#isOAuth}}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,14 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-core-version>1.5.21</swagger-core-version>
<okhttp-version>3.13.1</okhttp-version>
<okhttp-version>3.14.0</okhttp-version>
<gson-version>2.8.5</gson-version>
<commons-lang3-version>3.8.1</commons-lang3-version>
{{#joda}}
<jodatime-version>2.9.9</jodatime-version>
{{/joda}}
{{#threetenbp}}
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
{{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
Expand Down
16 changes: 10 additions & 6 deletions modules/openapi-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,17 @@ public class ApiClient {
{{#hasAuthMethods}}
Interceptor auth;
{{#authMethods}}if ("{{name}}".equals(authName)) {
{{#isBasic}}{{#isBasicBasic}}
auth = new HttpBasicAuth();
{{/isBasicBasic}}{{^isBasicBasic}}
auth = new HttpBearerAuth("{{scheme}}");
{{/isBasicBasic}}{{/isBasic}}
{{#isBasic}}
{{#isBasicBasic}}
auth = new HttpBasicAuth();
{{/isBasicBasic}}
{{^isBasicBasic}}
auth = new HttpBearerAuth("{{scheme}}");
{{/isBasicBasic}}
{{/isBasic}}
{{#isApiKey}}
auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");{{/isApiKey}}
auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");
{{/isApiKey}}
{{#isOAuth}}
auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}");
{{/isOAuth}}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
<java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
{{#usePlayWS}}
<jackson-databind-version>2.8.11.3</jackson-databind-version>
Expand Down Expand Up @@ -379,7 +379,7 @@
<jodatime-version>2.9.9</jodatime-version>
{{/joda}}
{{#threetenbp}}
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
{{/threetenbp}}
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
Expand Down
7 changes: 2 additions & 5 deletions samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,13 @@ public ApiClient(String[] authNames) {
for(String authName : authNames) {
RequestInterceptor auth;
if ("api_key".equals(authName)) {

auth = new ApiKeyAuth("header", "api_key");
} else if ("api_key_query".equals(authName)) {

auth = new ApiKeyAuth("query", "api_key_query");
} else if ("http_basic_test".equals(authName)) {

auth = new HttpBasicAuth();
} else if ("petstore_auth".equals(authName)) {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
} else if ("petstore_auth".equals(authName)) {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
} else {
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
}
Expand Down
7 changes: 2 additions & 5 deletions samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,13 @@ public ApiClient(String[] authNames) {
for(String authName : authNames) {
RequestInterceptor auth;
if ("api_key".equals(authName)) {

auth = new ApiKeyAuth("header", "api_key");
} else if ("api_key_query".equals(authName)) {

auth = new ApiKeyAuth("query", "api_key_query");
} else if ("http_basic_test".equals(authName)) {

auth = new HttpBasicAuth();
} else if ("petstore_auth".equals(authName)) {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
} else if ("petstore_auth".equals(authName)) {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
} else {
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,10 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-core-version>1.5.21</swagger-core-version>
<okhttp-version>3.13.1</okhttp-version>
<okhttp-version>3.14.0</okhttp-version>
<gson-version>2.8.5</gson-version>
<commons-lang3-version>3.8.1</commons-lang3-version>
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/okhttp-gson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-core-version>1.5.21</swagger-core-version>
<okhttp-version>3.13.1</okhttp-version>
<okhttp-version>3.14.0</okhttp-version>
<gson-version>2.8.5</gson-version>
<commons-lang3-version>3.8.1</commons-lang3-version>
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
9 changes: 1 addition & 8 deletions samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,12 @@ public ApiClient(String[] authNames) {
for(String authName : authNames) {
Interceptor auth;
if ("api_key".equals(authName)) {

auth = new ApiKeyAuth("header", "api_key");
} else if ("api_key_query".equals(authName)) {

auth = new ApiKeyAuth("query", "api_key_query");
} else if ("http_basic_test".equals(authName)) {

auth = new HttpBasicAuth();


auth = new HttpBasicAuth();
} else if ("petstore_auth".equals(authName)) {


auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
} else {
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play24/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-databind-version>2.8.11.3</jackson-databind-version>
<jackson-version>2.6.6</jackson-version>
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/retrofit2-play25/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,13 @@
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-databind-version>2.8.11.3</jackson-databind-version>
<jackson-version>2.7.8</jackson-version>
<play-version>2.5.15</play-version>
<retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/retrofit2-play26/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,13 @@
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-databind-version>2.8.11.3</jackson-databind-version>
<jackson-version>2.8.11</jackson-version>
<play-version>2.6.7</play-version>
<retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/retrofit2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@
<java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/retrofit2rx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@
<java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version>
<rxjava-version>1.3.0</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/retrofit2rx2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@
<java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<gson-fire-version>1.8.3</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version>
<rxjava-version>2.1.1</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version>
<threetenbp-version>1.3.8</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
</properties>
Expand Down