Merge branch 'master' into java-client-endpoint-servers

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

@@ -150,12 +150,8 @@ public class {{classname}} {
 
     String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
 
-    {{#returnType}}
-    GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {};
-    return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-    {{/returnType}}{{^returnType}}
-    return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
-    {{/returnType}}
+    {{#returnType}}GenericType<{{{returnType}}}> localVarReturnType = new GenericType<{{{returnType}}}>() {};{{/returnType}}
+    return apiClient.invokeAPI("{{classname}}.{{operationId}}", localVarPath, "{{httpMethod}}", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, {{#returnType}}localVarReturnType{{/returnType}}{{^returnType}}null{{/returnType}});
   }
   {{#vendorExtensions.x-group-parameters}}
 

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -97,5 +97,5 @@ public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throw
 
     GenericType<Client> localVarReturnType = new GenericType<Client>() {};
     return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeApi.java

@@ -102,7 +102,7 @@ public ApiResponse<Void> createXmlItemWithHttpInfo(XmlItem xmlItem) throws ApiEx
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("FakeApi.createXmlItem", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -163,7 +163,7 @@ public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body)
 
     GenericType<Boolean> localVarReturnType = new GenericType<Boolean>() {};
     return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * 
    * Test serialization of object with outer number type
@@ -222,7 +222,7 @@ public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(Outer
 
     GenericType<OuterComposite> localVarReturnType = new GenericType<OuterComposite>() {};
     return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * 
    * Test serialization of outer number types
@@ -281,7 +281,7 @@ public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal b
 
     GenericType<BigDecimal> localVarReturnType = new GenericType<BigDecimal>() {};
     return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * 
    * Test serialization of outer string types
@@ -340,7 +340,7 @@ public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) thr
 
     GenericType<String> localVarReturnType = new GenericType<String>() {};
     return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * 
    * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
@@ -401,7 +401,7 @@ public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -472,7 +472,7 @@ public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(String query, User
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -538,7 +538,7 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiEx
 
     GenericType<Client> localVarReturnType = new GenericType<Client>() {};
     return apiClient.invokeAPI("FakeApi.testClientModel", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
    * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -670,7 +670,7 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
 
     String[] localVarAuthNames = new String[] { "http_basic_test" };
 
-
+    
     return apiClient.invokeAPI("FakeApi.testEndpointParameters", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -756,7 +756,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderS
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("FakeApi.testEnumParameters", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
 
@@ -811,7 +811,7 @@ private ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredString
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("FakeApi.testGroupParameters", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
 
@@ -998,7 +998,7 @@ public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(Map<String,
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -1072,7 +1072,7 @@ public ApiResponse<Void> testJsonFormDataWithHttpInfo(String param, String param
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("FakeApi.testJsonFormData", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -1168,7 +1168,7 @@ public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(List<Str
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

@@ -97,5 +97,5 @@ public ApiResponse<Client> testClassnameWithHttpInfo(Client body) throws ApiExce
 
     GenericType<Client> localVarReturnType = new GenericType<Client>() {};
     return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/PetApi.java

@@ -98,7 +98,7 @@ public ApiResponse<Void> addPetWithHttpInfo(Pet body) throws ApiException {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-
+    
     return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -168,7 +168,7 @@ public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-
+    
     return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -237,7 +237,7 @@ public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status)
 
     GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
     return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * Finds Pets by tags
    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -308,7 +308,7 @@ public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) thro
 
     GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
     return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * Find pet by ID
    * Returns a single pet
@@ -377,7 +377,7 @@ public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
 
     GenericType<Pet> localVarReturnType = new GenericType<Pet>() {};
     return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * Update an existing pet
    * 
@@ -444,7 +444,7 @@ public ApiResponse<Void> updatePetWithHttpInfo(Pet body) throws ApiException {
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-
+    
     return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -516,7 +516,7 @@ public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name,
 
     String[] localVarAuthNames = new String[] { "petstore_auth" };
 
-
+    
     return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -591,7 +591,7 @@ public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String a
 
     GenericType<ModelApiResponse> localVarReturnType = new GenericType<ModelApiResponse>() {};
     return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * uploads an image (required)
    * 
@@ -669,5 +669,5 @@ public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long
 
     GenericType<ModelApiResponse> localVarReturnType = new GenericType<ModelApiResponse>() {};
     return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/StoreApi.java

@@ -97,7 +97,7 @@ public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiExcep
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -156,7 +156,7 @@ public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiEx
 
     GenericType<Map<String, Integer>> localVarReturnType = new GenericType<Map<String, Integer>>() {};
     return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * Find purchase order by ID
    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
@@ -225,7 +225,7 @@ public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiExcep
 
     GenericType<Order> localVarReturnType = new GenericType<Order>() {};
     return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * Place an order for a pet
    * 
@@ -291,5 +291,5 @@ public ApiResponse<Order> placeOrderWithHttpInfo(Order body) throws ApiException
 
     GenericType<Order> localVarReturnType = new GenericType<Order>() {};
     return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/UserApi.java

@@ -94,7 +94,7 @@ public ApiResponse<Void> createUserWithHttpInfo(User body) throws ApiException {
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -157,7 +157,7 @@ public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> body)
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -220,7 +220,7 @@ public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> body) t
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -286,7 +286,7 @@ public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiExcep
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -357,7 +357,7 @@ public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiEx
 
     GenericType<User> localVarReturnType = new GenericType<User>() {};
     return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * Logs user into the system
    * 
@@ -432,7 +432,7 @@ public ApiResponse<String> loginUserWithHttpInfo(String username, String passwor
 
     GenericType<String> localVarReturnType = new GenericType<String>() {};
     return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
   /**
    * Logs out current logged in user session
    * 
@@ -486,7 +486,7 @@ public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
   /**
@@ -559,7 +559,7 @@ public ApiResponse<Void> updateUserWithHttpInfo(String username, User body) thro
 
     String[] localVarAuthNames = new String[] {  };
 
-
+    
     return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, null);
   }
 }

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -97,5 +97,5 @@ public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client body) throw
 
     GenericType<Client> localVarReturnType = new GenericType<Client>() {};
     return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
-      }
+  }
 }