various improvements to java okhttp-gson client (#13794)

Author: wing328

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache

@@ -179,7 +179,6 @@ public class ApiClient {
             this.basePath = basePath;
         }
 
-{{#hasOAuthMethods}}
         String tokenUrl = "{{{tokenUrl}}}";
         if (!"".equals(tokenUrl) && !URI.create(tokenUrl).isAbsolute()) {
             URI uri = URI.create(getBasePath());
@@ -196,7 +195,6 @@ public class ApiClient {
                 retryingOAuth
         );
         initHttpClient(Collections.<Interceptor>singletonList(retryingOAuth));
-{{/hasOAuthMethods}}
         // Setup authentications (key: authentication name, value: authentication).{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
         authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{^isBasicBasic}}
         authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBasic}}{{/isBasic}}{{#isApiKey}}

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache

@@ -9,6 +9,10 @@
   /**
    * Set the additional (undeclared) property with the specified name and value.
    * If the property does not already exist, create it otherwise replace it.
+   *
+   * @param key name of the property
+   * @param value value of the property
+   * @return the {{classname}} instance itself
    */
   public {{classname}} putAdditionalProperty(String key, Object value) {
     if (this.additionalProperties == null) {
@@ -20,13 +24,18 @@
 
   /**
    * Return the additional (undeclared) property.
+   *
+   * @return a map of objects
    */
   public Map<String, Object> getAdditionalProperties() {
     return additionalProperties;
   }
 
   /**
    * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key name of the property
+   * @return an object
    */
   public Object getAdditionalProperty(String key) {
     if (this.additionalProperties == null) {

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache

@@ -193,15 +193,19 @@ public class {{classname}} {
 
         {{/dynamicOperations}}
         final String[] localVarAccepts = {
-            {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}
+            {{#produces}}
+            "{{{mediaType}}}"{{^-last}},{{/-last}}
+            {{/produces}}
         };
         final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
         if (localVarAccept != null) {
             localVarHeaderParams.put("Accept", localVarAccept);
         }
 
         final String[] localVarContentTypes = {
-            {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}
+            {{#consumes}}
+            "{{{mediaType}}}"{{^-last}},{{/-last}}
+            {{/consumes}}
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -218,15 +222,16 @@ public class {{classname}} {
     @SuppressWarnings("rawtypes")
     private okhttp3.Call {{operationId}}ValidateBeforeCall({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ApiCallback _callback) throws ApiException {
         {{^performBeanValidation}}
-        {{#allParams}}{{#required}}
+        {{#allParams}}
+        {{#required}}
         // verify the required parameter '{{paramName}}' is set
         if ({{paramName}} == null) {
             throw new ApiException("Missing the required parameter '{{paramName}}' when calling {{operationId}}(Async)");
         }
-        {{/required}}{{/allParams}}
 
-        okhttp3.Call localVarCall = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}_callback);
-        return localVarCall;
+        {{/required}}
+        {{/allParams}}
+        return {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}_callback);
 
         {{/performBeanValidation}}
         {{#performBeanValidation}}
@@ -240,9 +245,7 @@ public class {{classname}} {
                     parameterValues);
 
             if (violations.size() == 0) {
-                okhttp3.Call localVarCall = {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}_callback);
-                return localVarCall;
-
+                return {{operationId}}Call({{#allParams}}{{paramName}}, {{/allParams}}_callback);
             } else {
                 throw new BeanValidationException((Set) violations);
             }
@@ -253,7 +256,6 @@ public class {{classname}} {
             e.printStackTrace();
             throw new ApiException(e.getMessage());
         }
-
         {{/performBeanValidation}}
     }
 

samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/api/PingApi.java

@@ -133,15 +133,12 @@ private okhttp3.Call getPingCall(Long petId, String name, String status, final A
 
     @SuppressWarnings("rawtypes")
     private okhttp3.Call getPingValidateBeforeCall(Long petId, String name, String status, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'petId' is set
         if (petId == null) {
             throw new ApiException("Missing the required parameter 'petId' when calling getPing(Async)");
         }
-        
 
-        okhttp3.Call localVarCall = getPingCall(petId, name, status, _callback);
-        return localVarCall;
+        return getPingCall(petId, name, status, _callback);
 
     }
 
@@ -321,10 +318,7 @@ public okhttp3.Call postPingCall(SomeObj someObj, final ApiCallback _callback) t
 
     @SuppressWarnings("rawtypes")
     private okhttp3.Call postPingValidateBeforeCall(SomeObj someObj, final ApiCallback _callback) throws ApiException {
-        
-
-        okhttp3.Call localVarCall = postPingCall(someObj, _callback);
-        return localVarCall;
+        return postPingCall(someObj, _callback);
 
     }
 

samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -143,15 +143,12 @@ public okhttp3.Call call123testSpecialTagsCall(Client body, final ApiCallback _c
 
     @SuppressWarnings("rawtypes")
     private okhttp3.Call call123testSpecialTagsValidateBeforeCall(Client body, final ApiCallback _callback) throws ApiException {
-        
         // verify the required parameter 'body' is set
         if (body == null) {
             throw new ApiException("Missing the required parameter 'body' when calling call123testSpecialTags(Async)");
         }
-        
 
-        okhttp3.Call localVarCall = call123testSpecialTagsCall(body, _callback);
-        return localVarCall;
+        return call123testSpecialTagsCall(body, _callback);
 
     }