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

[Java][Client][RestTemplate] Do not create new Object for empty body (#605)

Browse Source 
#513 Fixed error that causes exception when trying to perform HTTP requests without a body and an empty Object is used as body instead. In these cases an exception is thrown indicating that it is not possible to find a message converter for java.lang.Object and application/json.
This commit is contained in:
Rubén Martínez 2018-07-20 17:49:12 +02:00 committed by Jérémie Bresson
parent af9d57e4b9
commit 0da55081c9
9 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache
View File

@ -61,7 +61,7 @@ public class {{classname}} {
{{/externalDocs}}
*/
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws RestClientException {
Object {{localVariablePrefix}}postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}new Object(){{/bodyParam}};
Object {{localVariablePrefix}}postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
{{#allParams}}{{#required}}
// verify the required parameter '{{paramName}}' is set
if ({{paramName}} == null) {

6
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -300,7 +300,7 @@ public class FakeApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'number' is set
if (number == null) {
@ -385,7 +385,7 @@ public class FakeApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
@ -462,7 +462,7 @@ public class FakeApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void testJsonFormData(String param, String param2) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'param' is set
if (param == null) {

14
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -89,7 +89,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void deletePet(Long petId, String apiKey) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {
@ -128,7 +128,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public List<Pet> findPetsByStatus(List<String> status) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'status' is set
if (status == null) {
@ -165,7 +165,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'tags' is set
if (tags == null) {
@ -203,7 +203,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public Pet getPetById(Long petId) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {
@ -276,7 +276,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void updatePetWithForm(Long petId, String name, String status) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {
@ -320,7 +320,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {
@ -366,7 +366,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {

6
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -54,7 +54,7 @@ public class StoreApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void deleteOrder(String orderId) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'orderId' is set
if (orderId == null) {
@ -88,7 +88,7 @@ public class StoreApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public Map<String, Integer> getInventory() throws RestClientException {
Object postBody = new Object();
Object postBody = null;
String path = UriComponentsBuilder.fromPath("/store/inventory").build().toUriString();
@ -119,7 +119,7 @@ public class StoreApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public Order getOrderById(Long orderId) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'orderId' is set
if (orderId == null) {

8
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java
View File

@ -147,7 +147,7 @@ public class UserApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void deleteUser(String username) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'username' is set
if (username == null) {
@ -184,7 +184,7 @@ public class UserApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public User getUserByName(String username) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'username' is set
if (username == null) {
@ -223,7 +223,7 @@ public class UserApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public String loginUser(String username, String password) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'username' is set
if (username == null) {
@ -263,7 +263,7 @@ public class UserApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void logoutUser() throws RestClientException {
Object postBody = new Object();
Object postBody = null;
String path = UriComponentsBuilder.fromPath("/user/logout").build().toUriString();

6
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -300,7 +300,7 @@ public class FakeApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'number' is set
if (number == null) {
@ -385,7 +385,7 @@ public class FakeApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
String path = UriComponentsBuilder.fromPath("/fake").build().toUriString();
@ -462,7 +462,7 @@ public class FakeApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void testJsonFormData(String param, String param2) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'param' is set
if (param == null) {

14
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -89,7 +89,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void deletePet(Long petId, String apiKey) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {
@ -128,7 +128,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public List<Pet> findPetsByStatus(List<String> status) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'status' is set
if (status == null) {
@ -165,7 +165,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public List<Pet> findPetsByTags(List<String> tags) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'tags' is set
if (tags == null) {
@ -203,7 +203,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public Pet getPetById(Long petId) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {
@ -276,7 +276,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void updatePetWithForm(Long petId, String name, String status) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {
@ -320,7 +320,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {
@ -366,7 +366,7 @@ public class PetApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'petId' is set
if (petId == null) {

6
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -54,7 +54,7 @@ public class StoreApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void deleteOrder(String orderId) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'orderId' is set
if (orderId == null) {
@ -88,7 +88,7 @@ public class StoreApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public Map<String, Integer> getInventory() throws RestClientException {
Object postBody = new Object();
Object postBody = null;
String path = UriComponentsBuilder.fromPath("/store/inventory").build().toUriString();
@ -119,7 +119,7 @@ public class StoreApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public Order getOrderById(Long orderId) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'orderId' is set
if (orderId == null) {

8
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java
View File

@ -147,7 +147,7 @@ public class UserApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void deleteUser(String username) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'username' is set
if (username == null) {
@ -184,7 +184,7 @@ public class UserApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public User getUserByName(String username) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'username' is set
if (username == null) {
@ -223,7 +223,7 @@ public class UserApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public String loginUser(String username, String password) throws RestClientException {
Object postBody = new Object();
Object postBody = null;
// verify the required parameter 'username' is set
if (username == null) {
@ -263,7 +263,7 @@ public class UserApi {
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void logoutUser() throws RestClientException {
Object postBody = new Object();
Object postBody = null;
String path = UriComponentsBuilder.fromPath("/user/logout").build().toUriString();