modules/openapi-generator/src
main
java/org/openapitools/codegen/languages
JavaClientCodegen.java +5 -3
resources/Java/libraries/okhttp-gson
auth
DefaultApi20Impl.mustache +65 -0
OAuthAuthorizationCodeGrant.mustache +105 -0
OAuthClientCredentialsGrant.mustache +64 -0
OAuthOkHttpClient.mustache +0 -70
OAuthPasswordGrant.mustache +80 -0
RetryingOAuth.mustache +0 -184
ApiClient.mustache +64 -51
build.gradle.mustache +2 -1
build.sbt.mustache +2 -1
pom.mustache +8 -3
test/java/org/openapitools/codegen
DefaultGeneratorTest.java +1 -1
samples/client
others/java/…/…/…/…/…/…/client
ApiClient.java +1 -5
petstore/java
okhttp-gson
.openapi-generator
FILES +4 -2
src
main/java/org/openapitools/client
auth
DefaultApi20Impl.java +63 -0
OAuthAuthorizationCodeGrant.java +103 -0
OAuthClientCredentialsGrant.java +62 -0
OAuthOkHttpClient.java +0 -68
OAuthPasswordGrant.java +78 -0
RetryingOAuth.java +0 -182
ApiClient.java +62 -45
test/java/org/openapitools/client
api
PetApiTest.java +0 -4
auth
OAuthAuthorizationCodeGrantTest.java +96 -0
OAuthClientCredentialsGrantTest.java +73 -0
OAuthPasswordGrantTest.java +76 -0
RetryingOAuthTest.java +0 -123
build.gradle +2 -1
build.sbt +2 -1
pom.xml +8 -3
okhttp-gson-dynamicOperations
.openapi-generator
FILES +4 -2
src/main/java/org/openapitools/client
auth
DefaultApi20Impl.java +63 -0
OAuthAuthorizationCodeGrant.java +103 -0
OAuthClientCredentialsGrant.java +62 -0
OAuthPasswordGrant.java +78 -0
ApiClient.java +62 -45
build.gradle +2 -1
build.sbt +2 -1
pom.xml +8 -3
okhttp-gson-parcelableModel
.openapi-generator
FILES +4 -2
src/main/java/org/openapitools/client
auth
DefaultApi20Impl.java +63 -0
OAuthAuthorizationCodeGrant.java +103 -0
OAuthClientCredentialsGrant.java +62 -0
OAuthPasswordGrant.java +78 -0
ApiClient.java +62 -45
build.gradle +2 -1
build.sbt +2 -1
pom.xml +8 -3
+ 5
- 3
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -635,9 +635,11 @@ public class JavaClientCodegen extends AbstractJavaCodegen
+ 65
- 0
\ No newline at end of file
+ 105
- 0
\ No newline at end of file
+ 64
- 0
\ No newline at end of file
+ 0
- 70
Conflict: This file was removed in the source branch, but modified in the target branch.
Ask someone with write access to resolve it.