Skip to content

[JAVA][Client] New object instead of null for empty POST request #7551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bmordue wants to merge 3 commits into from
Closed

[JAVA][Client] New object instead of null for empty POST request #7551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
694c9a9
new Object() for empty request body
bmordue Jan 22, 2018
b15efea
Ran bin/java-petstore-all.sh
bmordue May 15, 2018
b4c6e51
Merge branch 'master' into new-object-empty-request
bmordue Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/Java/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class {{classname}} {
@Deprecated
{{/isDeprecated}}
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}new Object(){{/bodyParam}};
{{#allParams}}{{#required}}
// verify the required parameter '{{paramName}}' is set
if ({{paramName}} == null) {
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public class {{classname}} {
@Deprecated
{{/isDeprecated}}
public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}new Object(){{/bodyParam}};
{{#allParams}}{{#required}}
// verify the required parameter '{{paramName}}' is set
if ({{paramName}} == null) {
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public class {{classname}} {
@Deprecated
{{/isDeprecated}}
public com.squareup.okhttp.Call {{operationId}}Call({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}new Object(){{/bodyParam}};

// create path and map variables
String {{localVariablePrefix}}localVarPath = "{{{path}}}"{{#pathParams}}
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class {{classname}} {
@Deprecated
{{/isDeprecated}}
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
Object {{localVariablePrefix}}localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}new Object(){{/bodyParam}};
{{#allParams}}{{#required}}
// verify the required parameter '{{paramName}}' is set
if ({{paramName}} == null) {
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}null{{/bodyParam}};
Object {{localVariablePrefix}}postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}new Object(){{/bodyParam}};
{{#allParams}}{{#required}}
// verify the required parameter '{{paramName}}' is set
if ({{paramName}} == null) {
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public Client testClientModel(Client body) throws ApiException {
* @throws ApiException if fails to make API call
*/
public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'number' is set
if (number == null) {
Expand Down Expand Up @@ -402,7 +402,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
* @throws ApiException if fails to make API call
*/
public void testEnumParameters(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/fake";
Expand Down Expand Up @@ -493,7 +493,7 @@ public void testInlineAdditionalProperties(Object param) throws ApiException {
* @throws ApiException if fails to make API call
*/
public void testJsonFormData(String param, String param2) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'param' is set
if (param == null) {
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void addPet(Pet body) throws ApiException {
* @throws ApiException if fails to make API call
*/
public void deletePet(Long petId, String apiKey) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'petId' is set
if (petId == null) {
Expand Down Expand Up @@ -144,7 +144,7 @@ public void deletePet(Long petId, String apiKey) throws ApiException {
* @throws ApiException if fails to make API call
*/
public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'status' is set
if (status == null) {
Expand Down Expand Up @@ -189,7 +189,7 @@ public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
*/
@Deprecated
public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'tags' is set
if (tags == null) {
Expand Down Expand Up @@ -232,7 +232,7 @@ public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
* @throws ApiException if fails to make API call
*/
public Pet getPetById(Long petId) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'petId' is set
if (petId == null) {
Expand Down Expand Up @@ -317,7 +317,7 @@ public void updatePet(Pet body) throws ApiException {
* @throws ApiException if fails to make API call
*/
public void updatePetWithForm(Long petId, String name, String status) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'petId' is set
if (petId == null) {
Expand Down Expand Up @@ -366,7 +366,7 @@ public void updatePetWithForm(Long petId, String name, String status) throws Api
* @throws ApiException if fails to make API call
*/
public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'petId' is set
if (petId == null) {
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/StoreApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void setApiClient(ApiClient apiClient) {
* @throws ApiException if fails to make API call
*/
public void deleteOrder(String orderId) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'orderId' is set
if (orderId == null) {
Expand Down Expand Up @@ -97,7 +97,7 @@ public void deleteOrder(String orderId) throws ApiException {
* @throws ApiException if fails to make API call
*/
public Map<String, Integer> getInventory() throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/store/inventory";
Expand Down Expand Up @@ -134,7 +134,7 @@ public Map<String, Integer> getInventory() throws ApiException {
* @throws ApiException if fails to make API call
*/
public Order getOrderById(Long orderId) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'orderId' is set
if (orderId == null) {
Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/UserApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public void createUsersWithListInput(List<User> body) throws ApiException {
* @throws ApiException if fails to make API call
*/
public void deleteUser(String username) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'username' is set
if (username == null) {
Expand Down Expand Up @@ -221,7 +221,7 @@ public void deleteUser(String username) throws ApiException {
* @throws ApiException if fails to make API call
*/
public User getUserByName(String username) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'username' is set
if (username == null) {
Expand Down Expand Up @@ -265,7 +265,7 @@ public User getUserByName(String username) throws ApiException {
* @throws ApiException if fails to make API call
*/
public String loginUser(String username, String password) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// verify the required parameter 'username' is set
if (username == null) {
Expand Down Expand Up @@ -312,7 +312,7 @@ public String loginUser(String username, String password) throws ApiException {
* @throws ApiException if fails to make API call
*/
public void logoutUser() throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/user/logout";
Expand Down
6 changes: 3 additions & 3 deletions ...etstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/fake";
Expand Down Expand Up @@ -1007,7 +1007,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call testEnumParametersCall(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/fake";
Expand Down Expand Up @@ -1276,7 +1276,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call testJsonFormDataCall(String param, String param2, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/fake/jsonFormData";
Expand Down
12 changes: 6 additions & 6 deletions ...petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call deletePetCall(Long petId, String apiKey, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/pet/{petId}"
Expand Down Expand Up @@ -308,7 +308,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call findPetsByStatusCall(List<String> status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/pet/findByStatus";
Expand Down Expand Up @@ -434,7 +434,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
*/
@Deprecated
public com.squareup.okhttp.Call findPetsByTagsCall(List<String> tags, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/pet/findByTags";
Expand Down Expand Up @@ -565,7 +565,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call getPetByIdCall(Long petId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/pet/{petId}"
Expand Down Expand Up @@ -808,7 +808,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call updatePetWithFormCall(Long petId, String name, String status, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/pet/{petId}"
Expand Down Expand Up @@ -939,7 +939,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call uploadFileCall(Long petId, String additionalMetadata, File file, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/pet/{petId}/uploadImage"
Expand Down
6 changes: 3 additions & 3 deletions ...tstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/api/StoreApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void setApiClient(ApiClient apiClient) {
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call deleteOrderCall(String orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/store/order/{order_id}"
Expand Down Expand Up @@ -181,7 +181,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call getInventoryCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/store/inventory";
Expand Down Expand Up @@ -295,7 +295,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call getOrderByIdCall(Long orderId, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/store/order/{order_id}"
Expand Down
8 changes: 4 additions & 4 deletions ...etstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/api/UserApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call deleteUserCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/user/{username}"
Expand Down Expand Up @@ -536,7 +536,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call getUserByNameCall(String username, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/user/{username}"
Expand Down Expand Up @@ -660,7 +660,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call loginUserCall(String username, String password, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/user/login";
Expand Down Expand Up @@ -793,7 +793,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
* @throws ApiException If fail to serialize the request body object
*/
public com.squareup.okhttp.Call logoutUserCall(final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
Object localVarPostBody = null;
Object localVarPostBody = new Object();

// create path and map variables
String localVarPath = "/user/logout";
Expand Down
Loading