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

improve indentation, update dependencies (#2521)

Browse Source
This commit is contained in:
William Cheng 2019-03-27 23:02:03 +08:00 committed by GitHub
parent 1313cff93a
commit 3a0d520c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,11 +57,15 @@ public class ApiClient {
{{#hasAuthMethods}} {{#hasAuthMethods}}
RequestInterceptor auth; RequestInterceptor auth;
{{#authMethods}}if ("{{name}}".equals(authName)) { {{#authMethods}}if ("{{name}}".equals(authName)) {
{{#isBasic}}{{#isBasicBasic}} {{#isBasic}}
{{#isBasicBasic}}
auth = new HttpBasicAuth(); auth = new HttpBasicAuth();
{{/isBasicBasic}}{{^isBasicBasic}} {{/isBasicBasic}}
{{^isBasicBasic}}
auth = new HttpBearerAuth("{{scheme}}"); auth = new HttpBearerAuth("{{scheme}}");
{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}} {{/isBasicBasic}}
{{/isBasic}}
{{#isApiKey}}
auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"); auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");
{{/isApiKey}} {{/isApiKey}}
{{#isOAuth}} {{#isOAuth}}

4
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache vendored
View File

@ -289,14 +289,14 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.3</gson-fire-version> <gson-fire-version>1.8.3</gson-fire-version>
<swagger-core-version>1.5.21</swagger-core-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> <gson-version>2.8.5</gson-version>
<commons-lang3-version>3.8.1</commons-lang3-version> <commons-lang3-version>3.8.1</commons-lang3-version>
{{#joda}} {{#joda}}
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.8</threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

12
modules/openapi-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache vendored
View File

@ -58,13 +58,17 @@ public class ApiClient {
{{#hasAuthMethods}} {{#hasAuthMethods}}
Interceptor auth; Interceptor auth;
{{#authMethods}}if ("{{name}}".equals(authName)) { {{#authMethods}}if ("{{name}}".equals(authName)) {
{{#isBasic}}{{#isBasicBasic}} {{#isBasic}}
{{#isBasicBasic}}
auth = new HttpBasicAuth(); auth = new HttpBasicAuth();
{{/isBasicBasic}}{{^isBasicBasic}} {{/isBasicBasic}}
{{^isBasicBasic}}
auth = new HttpBearerAuth("{{scheme}}"); auth = new HttpBearerAuth("{{scheme}}");
{{/isBasicBasic}}{{/isBasic}} {{/isBasicBasic}}
{{/isBasic}}
{{#isApiKey}} {{#isApiKey}}
auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");{{/isApiKey}} auth = new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}");
{{/isApiKey}}
{{#isOAuth}} {{#isOAuth}}
auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}"); auth = new OAuth(OAuthFlow.{{flow}}, "{{authorizationUrl}}", "{{tokenUrl}}", "{{#scopes}}{{scope}}{{#hasMore}}, {{/hasMore}}{{/scopes}}");
{{/isOAuth}} {{/isOAuth}}

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

@ -351,7 +351,7 @@
<java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version> <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.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <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> <swagger-annotations-version>1.5.21</swagger-annotations-version>
{{#usePlayWS}} {{#usePlayWS}}
<jackson-databind-version>2.8.11.3</jackson-databind-version> <jackson-databind-version>2.8.11.3</jackson-databind-version>
@ -379,7 +379,7 @@
<jodatime-version>2.9.9</jodatime-version> <jodatime-version>2.9.9</jodatime-version>
{{/joda}} {{/joda}}
{{#threetenbp}} {{#threetenbp}}
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.8</threetenbp-version>
{{/threetenbp}} {{/threetenbp}}
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

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

@ -44,13 +44,10 @@ public class ApiClient {
for(String authName : authNames) { for(String authName : authNames) {
RequestInterceptor auth; RequestInterceptor auth;
if ("api_key".equals(authName)) { if ("api_key".equals(authName)) {
auth = new ApiKeyAuth("header", "api_key"); auth = new ApiKeyAuth("header", "api_key");
} else if ("api_key_query".equals(authName)) { } else if ("api_key_query".equals(authName)) {
auth = new ApiKeyAuth("query", "api_key_query"); auth = new ApiKeyAuth("query", "api_key_query");
} else if ("http_basic_test".equals(authName)) { } else if ("http_basic_test".equals(authName)) {
auth = new HttpBasicAuth(); auth = new HttpBasicAuth();
} else if ("petstore_auth".equals(authName)) { } else if ("petstore_auth".equals(authName)) {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");

3
samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -44,13 +44,10 @@ public class ApiClient {
for(String authName : authNames) { for(String authName : authNames) {
RequestInterceptor auth; RequestInterceptor auth;
if ("api_key".equals(authName)) { if ("api_key".equals(authName)) {
auth = new ApiKeyAuth("header", "api_key"); auth = new ApiKeyAuth("header", "api_key");
} else if ("api_key_query".equals(authName)) { } else if ("api_key_query".equals(authName)) {
auth = new ApiKeyAuth("query", "api_key_query"); auth = new ApiKeyAuth("query", "api_key_query");
} else if ("http_basic_test".equals(authName)) { } else if ("http_basic_test".equals(authName)) {
auth = new HttpBasicAuth(); auth = new HttpBasicAuth();
} else if ("petstore_auth".equals(authName)) { } else if ("petstore_auth".equals(authName)) {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");

4
samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
View File

@ -247,10 +247,10 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.3</gson-fire-version> <gson-fire-version>1.8.3</gson-fire-version>
<swagger-core-version>1.5.21</swagger-core-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> <gson-version>2.8.5</gson-version>
<commons-lang3-version>3.8.1</commons-lang3-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> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

4
samples/client/petstore/java/okhttp-gson/pom.xml
View File

@ -240,10 +240,10 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.3</gson-fire-version> <gson-fire-version>1.8.3</gson-fire-version>
<swagger-core-version>1.5.21</swagger-core-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> <gson-version>2.8.5</gson-version>
<commons-lang3-version>3.8.1</commons-lang3-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> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

7
samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -55,19 +55,12 @@ public class ApiClient {
for(String authName : authNames) { for(String authName : authNames) {
Interceptor auth; Interceptor auth;
if ("api_key".equals(authName)) { if ("api_key".equals(authName)) {
auth = new ApiKeyAuth("header", "api_key"); auth = new ApiKeyAuth("header", "api_key");
} else if ("api_key_query".equals(authName)) { } else if ("api_key_query".equals(authName)) {
auth = new ApiKeyAuth("query", "api_key_query"); auth = new ApiKeyAuth("query", "api_key_query");
} else if ("http_basic_test".equals(authName)) { } else if ("http_basic_test".equals(authName)) {
auth = new HttpBasicAuth(); auth = new HttpBasicAuth();
} else if ("petstore_auth".equals(authName)) { } else if ("petstore_auth".equals(authName)) {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
} else { } else {
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");

2
samples/client/petstore/java/retrofit2-play24/pom.xml
View File

@ -266,7 +266,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <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> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-databind-version>2.8.11.3</jackson-databind-version> <jackson-databind-version>2.8.11.3</jackson-databind-version>
<jackson-version>2.6.6</jackson-version> <jackson-version>2.6.6</jackson-version>

4
samples/client/petstore/java/retrofit2-play25/pom.xml
View File

@ -271,13 +271,13 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <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> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-databind-version>2.8.11.3</jackson-databind-version> <jackson-databind-version>2.8.11.3</jackson-databind-version>
<jackson-version>2.7.8</jackson-version> <jackson-version>2.7.8</jackson-version>
<play-version>2.5.15</play-version> <play-version>2.5.15</play-version>
<retrofit-version>2.5.0</retrofit-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> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/retrofit2-play26/pom.xml
View File

@ -276,13 +276,13 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <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> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-databind-version>2.8.11.3</jackson-databind-version> <jackson-databind-version>2.8.11.3</jackson-databind-version>
<jackson-version>2.8.11</jackson-version> <jackson-version>2.8.11</jackson-version>
<play-version>2.6.7</play-version> <play-version>2.6.7</play-version>
<retrofit-version>2.5.0</retrofit-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> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/retrofit2/pom.xml
View File

@ -240,10 +240,10 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <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> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-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> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/retrofit2rx/pom.xml
View File

@ -250,11 +250,11 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <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> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<rxjava-version>1.3.0</rxjava-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> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

4
samples/client/petstore/java/retrofit2rx2/pom.xml
View File

@ -250,11 +250,11 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <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> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<rxjava-version>2.1.1</rxjava-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> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>