Squashed commit of the following:

commit c5a0d0f7394aa742fa336fff7e7c1d3049761868
Merge: 8c4991ba3e f8ff8c8760
Author: William Cheng <wing328hk@gmail.com>
Date:   Tue Aug 17 18:28:12 2021 +0800

    Merge branch 'mustache-linting' of https://github.com/NathanBaulch/openapi-generator into NathanBaulch-mustache-linting

commit f8ff8c8760
Author: Nathan Baulch <nathan.baulch@gmail.com>
Date:   Thu Aug 5 14:12:47 2021 +1000

    Reorder tags that handle missing values

commit f5d8a33709
Author: Nathan Baulch <nathan.baulch@gmail.com>
Date:   Thu Aug 5 14:08:59 2021 +1000

    Use dot notation where possible

commit 493d14921e
Author: Nathan Baulch <nathan.baulch@gmail.com>
Date:   Thu Aug 5 14:10:49 2021 +1000

    Remove empty tags

commit 32480dc53f
Author: Nathan Baulch <nathan.baulch@gmail.com>
Date:   Thu Aug 5 10:41:58 2021 +1000

    Remove redundant sections

commit a8edabd722
Author: Nathan Baulch <nathan.baulch@gmail.com>
Date:   Wed Aug 4 22:02:22 2021 +1000

    Trim extra EOF new lines

commit e89bd7458e
Author: Nathan Baulch <nathan.baulch@gmail.com>
Date:   Wed Aug 4 21:59:26 2021 +1000

    Trim trailing whitespace
This commit is contained in:
William Cheng
2021-08-17 18:37:51 +08:00
parent 7edddb6531
commit 0204bf4ae2
2184 changed files with 6677 additions and 7219 deletions

View File

@@ -54,7 +54,7 @@ And to use the api you can follow the examples bellow:
ApiClient apiClient = new ApiClient("oauth_password");
apiClient.setBasePath("https://localhost:8243/petstore/1/");
apiClient.setOauthPassword("username", "password", "client_id", "client_secret");
//Oauth client credentials flow
ApiClient apiClient = new ApiClient("oauth_client_credentials");
apiClient.setBasePath("https://localhost:8243/petstore/1/");
@@ -62,7 +62,7 @@ And to use the api you can follow the examples bellow:
PetApi petApi = apiClient.buildClient(PetApi.class);
Pet petById = petApi.getPetById(12345L);
System.out.println(petById);
}
```

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -218,7 +218,7 @@
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<!-- HTTP client: Netflix Feign -->
<dependency>
<groupId>io.github.openfeign</groupId>

View File

@@ -217,7 +217,7 @@ public class ApiClient {
}
/**
* Helper method to configure the client credentials for Oauth
* Helper method to configure the client credentials for Oauth
* @param username Username
* @param password Password
*/

View File

@@ -11,7 +11,7 @@ public class HttpBasicAuth implements RequestInterceptor {
private String username;
private String password;
public String getUsername() {
return username;
}

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -54,7 +54,7 @@ And to use the api you can follow the examples bellow:
ApiClient apiClient = new ApiClient("oauth_password");
apiClient.setBasePath("https://localhost:8243/petstore/1/");
apiClient.setOauthPassword("username", "password", "client_id", "client_secret");
//Oauth client credentials flow
ApiClient apiClient = new ApiClient("oauth_client_credentials");
apiClient.setBasePath("https://localhost:8243/petstore/1/");
@@ -62,7 +62,7 @@ And to use the api you can follow the examples bellow:
PetApi petApi = apiClient.buildClient(PetApi.class);
Pet petById = petApi.getPetById(12345L);
System.out.println(petById);
}
```

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -218,7 +218,7 @@
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<!-- HTTP client: Netflix Feign -->
<dependency>
<groupId>io.github.openfeign</groupId>

View File

@@ -224,7 +224,7 @@ public class ApiClient {
}
/**
* Helper method to configure the client credentials for Oauth
* Helper method to configure the client credentials for Oauth
* @param username Username
* @param password Password
*/

View File

@@ -11,7 +11,7 @@ public class HttpBasicAuth implements RequestInterceptor {
private String username;
private String password;
public String getUsername() {
return username;
}

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -24,7 +24,7 @@ if(hasProperty('target') && target == 'android') {
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
android {
compileSdkVersion 23
buildToolsVersion '23.0.2'
@@ -36,7 +36,7 @@ if(hasProperty('target') && target == 'android') {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
// Rename the aar correctly
libraryVariants.all { variant ->
variant.outputs.each { output ->
@@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') {
provided 'javax.annotation:jsr250-api:1.0'
}
}
afterEvaluate {
android.libraryVariants.all { variant ->
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -64,12 +64,12 @@ if(hasProperty('target') && target == 'android') {
artifacts.add('archives', task);
}
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
artifacts {
archives sourcesJar
}
@@ -87,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
pom.artifactId = 'petstore-google-api-client'
}
}
task execute(type:JavaExec) {
main = System.getProperty('mainClass')
classpath = sourceSets.main.runtimeClasspath

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
main = System.getProperty('mainClass')
classpath = sourceSets.main.runtimeClasspath
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
@@ -136,4 +136,3 @@ dependencies {
implementation 'javax.annotation:javax.annotation-api:1.3.2'
testImplementation "junit:junit:$junit_version"
}

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -112,7 +112,7 @@
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>

View File

@@ -120,4 +120,3 @@ public interface PetApi {
@Produces({ "application/json" })
public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment fileDetail) throws ApiException, ProcessingException;
}

View File

@@ -79,4 +79,3 @@ public interface StoreApi {
@Produces({ "application/xml", "application/json" })
public Order placeOrder(Order body) throws ApiException, ProcessingException;
}

View File

@@ -110,4 +110,3 @@ public interface UserApi {
@Path("/{username}")
public void updateUser(@PathParam("username") String username, User body) throws ApiException, ProcessingException;
}

View File

@@ -35,7 +35,7 @@ public class Category {
@JsonbProperty("name")
private String name;
/**
* Get id
* @return id

View File

@@ -38,7 +38,7 @@ public class ModelApiResponse {
@JsonbProperty("message")
private String message;
/**
* Get code
* @return code

View File

@@ -47,7 +47,7 @@ public class Order {
@JsonbTypeDeserializer(StatusEnum.Deserializer.class)
public enum StatusEnum {
PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
String value;
@@ -93,7 +93,7 @@ public class Order {
@JsonbProperty("complete")
private Boolean complete = false;
/**
* Get id
* @return id

View File

@@ -53,7 +53,7 @@ public class Pet {
@JsonbTypeDeserializer(StatusEnum.Deserializer.class)
public enum StatusEnum {
AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
String value;
@@ -96,7 +96,7 @@ public class Pet {
**/
@JsonbProperty("status")
private StatusEnum status;
/**
* Get id
* @return id

View File

@@ -35,7 +35,7 @@ public class Tag {
@JsonbProperty("name")
private String name;
/**
* Get id
* @return id

View File

@@ -56,7 +56,7 @@ public class User {
**/
@JsonbProperty("userStatus")
private Integer userStatus;
/**
* Get id
* @return id

View File

@@ -12,5 +12,5 @@ script:
- mvn test
# uncomment below to test using gradle
# - gradle test
# uncomment below to test using sbt
# uncomment below to test using sbt
# - sbt test

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -378,7 +378,7 @@ public class ApiClient {
this.readTimeout = readTimeout;
return this;
}
/**
* Get the read timeout that was set.
*

View File

@@ -12,5 +12,5 @@ script:
- mvn test
# uncomment below to test using gradle
# - gradle test
# uncomment below to test using sbt
# uncomment below to test using sbt
# - sbt test

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -378,7 +378,7 @@ public class ApiClient {
this.readTimeout = readTimeout;
return this;
}
/**
* Get the read timeout that was set.
*

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -68,5 +68,3 @@ public class ProgressResponseBody extends ResponseBody {
};
}
}

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -68,5 +68,3 @@ public class ProgressResponseBody extends ResponseBody {
};
}
}

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -68,5 +68,3 @@ public class ProgressResponseBody extends ResponseBody {
};
}
}

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -40,4 +40,3 @@ It's recommended to create an instance of `ApiClient` per thread in a multithrea

View File

@@ -24,7 +24,7 @@ if(hasProperty('target') && target == 'android') {
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
android {
compileSdkVersion 23
buildToolsVersion '23.0.2'
@@ -36,7 +36,7 @@ if(hasProperty('target') && target == 'android') {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
// Rename the aar correctly
libraryVariants.all { variant ->
variant.outputs.each { output ->
@@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') {
provided 'javax.annotation:jsr250-api:1.0'
}
}
afterEvaluate {
android.libraryVariants.all { variant ->
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -64,12 +64,12 @@ if(hasProperty('target') && target == 'android') {
artifacts.add('archives', task);
}
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
artifacts {
archives sourcesJar
}
@@ -87,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
pom.artifactId = 'petstore-rest-assured-jackson'
}
}
task execute(type:JavaExec) {
main = System.getProperty('mainClass')
classpath = sourceSets.main.runtimeClasspath

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -7,7 +7,7 @@ import javax.validation.ValidationException;
public class BeanValidationException extends ValidationException {
/**
*
*
*/
private static final long serialVersionUID = -5294733947409491364L;
Set<ConstraintViolation<Object>> violations;

View File

@@ -40,4 +40,3 @@ It's recommended to create an instance of `ApiClient` per thread in a multithrea

View File

@@ -24,7 +24,7 @@ if(hasProperty('target') && target == 'android') {
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
android {
compileSdkVersion 23
buildToolsVersion '23.0.2'
@@ -36,7 +36,7 @@ if(hasProperty('target') && target == 'android') {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
// Rename the aar correctly
libraryVariants.all { variant ->
variant.outputs.each { output ->
@@ -52,7 +52,7 @@ if(hasProperty('target') && target == 'android') {
provided 'javax.annotation:jsr250-api:1.0'
}
}
afterEvaluate {
android.libraryVariants.all { variant ->
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -64,12 +64,12 @@ if(hasProperty('target') && target == 'android') {
artifacts.add('archives', task);
}
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
artifacts {
archives sourcesJar
}
@@ -87,7 +87,7 @@ if(hasProperty('target') && target == 'android') {
pom.artifactId = 'petstore-rest-assured'
}
}
task execute(type:JavaExec) {
main = System.getProperty('mainClass')
classpath = sourceSets.main.runtimeClasspath

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -7,7 +7,7 @@ import javax.validation.ValidationException;
public class BeanValidationException extends ValidationException {
/**
*
*
*/
private static final long serialVersionUID = -5294733947409491364L;
Set<ConstraintViolation<Object>> violations;

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -818,4 +818,3 @@ public class ApiClient extends JavaTimeFormatter {
}
}
}

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -805,4 +805,3 @@ public class ApiClient extends JavaTimeFormatter {
}
}
}

View File

@@ -36,4 +36,3 @@ After the client library is installed/deployed, you can use it in your Maven pro

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -36,4 +36,3 @@ After the client library is installed/deployed, you can use it in your Maven pro

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -315,7 +315,7 @@ public class ApiClient {
throw new RuntimeException("The ApiClient was created with a built OkHttpClient so it's not possible to add an authorization interceptor to it");
}
okBuilder.addInterceptor(authorization);
return this;
}

View File

@@ -12,7 +12,7 @@ public class HttpBasicAuth implements Interceptor {
private String username;
private String password;
public String getUsername() {
return username;
}

View File

@@ -66,7 +66,7 @@ public class OAuth implements Interceptor {
break;
default:
break;
}
}
}
@Override
@@ -133,7 +133,7 @@ public class OAuth implements Interceptor {
* Returns true if the access token has been updated
*/
public synchronized boolean updateAccessToken(String requestAccessToken) throws IOException {
if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
try {
OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage());
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -56,7 +56,7 @@ public class OAuthOkHttpClient implements HttpClient {
try {
Response response = client.newCall(requestBuilder.build()).execute();
return OAuthClientResponseFactory.createCustomResponse(
response.body().string(),
response.body().string(),
response.body().contentType().toString(),
response.code(),
responseClass);

View File

@@ -36,4 +36,3 @@ After the client library is installed/deployed, you can use it in your Maven pro

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -317,7 +317,7 @@ public class ApiClient {
throw new RuntimeException("The ApiClient was created with a built OkHttpClient so it's not possible to add an authorization interceptor to it");
}
okBuilder.addInterceptor(authorization);
return this;
}

View File

@@ -12,7 +12,7 @@ public class HttpBasicAuth implements Interceptor {
private String username;
private String password;
public String getUsername() {
return username;
}

View File

@@ -66,7 +66,7 @@ public class OAuth implements Interceptor {
break;
default:
break;
}
}
}
@Override
@@ -133,7 +133,7 @@ public class OAuth implements Interceptor {
* Returns true if the access token has been updated
*/
public synchronized boolean updateAccessToken(String requestAccessToken) throws IOException {
if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
try {
OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage());
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -56,7 +56,7 @@ public class OAuthOkHttpClient implements HttpClient {
try {
Response response = client.newCall(requestBuilder.build()).execute();
return OAuthClientResponseFactory.createCustomResponse(
response.body().string(),
response.body().string(),
response.body().contentType().toString(),
response.code(),
responseClass);

View File

@@ -36,4 +36,3 @@ After the client library is installed/deployed, you can use it in your Maven pro

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -317,7 +317,7 @@ public class ApiClient {
throw new RuntimeException("The ApiClient was created with a built OkHttpClient so it's not possible to add an authorization interceptor to it");
}
okBuilder.addInterceptor(authorization);
return this;
}

View File

@@ -12,7 +12,7 @@ public class HttpBasicAuth implements Interceptor {
private String username;
private String password;
public String getUsername() {
return username;
}

View File

@@ -66,7 +66,7 @@ public class OAuth implements Interceptor {
break;
default:
break;
}
}
}
@Override
@@ -133,7 +133,7 @@ public class OAuth implements Interceptor {
* Returns true if the access token has been updated
*/
public synchronized boolean updateAccessToken(String requestAccessToken) throws IOException {
if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
if (getAccessToken() == null || getAccessToken().equals(requestAccessToken)) {
try {
OAuthJSONAccessTokenResponse accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage());
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {

View File

@@ -16,7 +16,7 @@ package org.openapitools.client.auth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public enum OAuthFlow {
accessCode, //called authorizationCode in OpenAPI 3.0
implicit,
implicit,
password,
application //called clientCredentials in OpenAPI 3.0
}

View File

@@ -56,7 +56,7 @@ public class OAuthOkHttpClient implements HttpClient {
try {
Response response = client.newCall(requestBuilder.build()).execute();
return OAuthClientResponseFactory.createCustomResponse(
response.body().string(),
response.body().string(),
response.body().contentType().toString(),
response.code(),
responseClass);

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -211,7 +211,7 @@
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<!-- Vertx -->
<dependency>
<groupId>io.vertx</groupId>

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -211,7 +211,7 @@
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<!-- Vertx -->
<dependency>
<groupId>io.vertx</groupId>

View File

@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
main = System.getProperty('mainClass')
classpath = sourceSets.main.runtimeClasspath
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
@@ -138,4 +138,3 @@ dependencies {
implementation "javax.annotation:javax.annotation-api:$javax_annotation_version"
testImplementation "junit:junit:$junit_version"
}

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -64,7 +64,7 @@
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
</dependency>
<!-- @Nullable annotation -->
<dependency>
<groupId>com.google.code.findbugs</groupId>

View File

@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
main = System.getProperty('mainClass')
classpath = sourceSets.main.runtimeClasspath
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
@@ -138,4 +138,3 @@ dependencies {
implementation "javax.annotation:javax.annotation-api:$javax_annotation_version"
testImplementation "junit:junit:$junit_version"
}

View File

@@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

View File

@@ -64,7 +64,7 @@
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
</dependency>
<!-- @Nullable annotation -->
<dependency>
<groupId>com.google.code.findbugs</groupId>