fix !GET method body

Author: shortcuts

clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/ApiClient.java

@@ -244,7 +244,8 @@ public RequestBody serialize(Object obj) throws AlgoliaRuntimeException {
         throw new AlgoliaRuntimeException(e);
       }
     } else {
-      content = null;
+      // An empty body is defaulted to "{}" to match an empty JSON object
+      content = "{}";
     }
 
     return RequestBody.create(content, MediaType.parse(this.contentType));
@@ -345,14 +346,6 @@ public Request buildRequest(
     RequestBody reqBody;
     if (!HttpMethod.permitsRequestBody(method)) {
       reqBody = null;
-    } else if (body == null) {
-      if ("DELETE".equals(method)) {
-        // allow calling DELETE without sending a request body
-        reqBody = null;
-      } else {
-        // use an empty request body (for POST, PUT and PATCH)
-        reqBody = RequestBody.create("", MediaType.parse(this.contentType));
-      }
     } else {
       reqBody = serialize(body);
     }

clients/algoliasearch-client-php/lib/RetryStrategy/ApiWrapper.php

@@ -280,7 +280,7 @@ private function createRequest(
             // Send an empty body instead of "[]" in case there are
             // no content/params to send
             if (empty($body)) {
-                $body = '';
+                $body = '{}';
             } else {
                 $body = \json_encode($body, $this->jsonOptions);
                 if (JSON_ERROR_NONE !== json_last_error()) {

generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java

@@ -60,6 +60,13 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
         test.put("method", operationId);
         test.put("testName", req.testName == null ? operationId : req.testName);
         test.put("testIndex", i);
+
+        // We've defaulted the body to be an empty object for all methods
+        // but `GET` methods does not have a body.
+        if (req.request.method.equals("GET")) {
+          req.request.body = null;
+        }
+
         test.put("request", req.request);
         test.put("hasParameters", req.parameters.size() != 0);
 

templates/java/tests/requests/requests.mustache

@@ -66,7 +66,6 @@ class {{client}}RequestsTests {
 
         assertEquals(req.path, "{{{request.path}}}");
         assertEquals(req.method, "{{{request.method}}}");
-
         {{#request.body}}
         assertDoesNotThrow(() -> {
             JSONAssert.assertEquals("{{#lambda.escapeQuotes}}{{{request.body}}}{{/lambda.escapeQuotes}}", req.body, JSONCompareMode.STRICT);

templates/javascript/tests/requests/requests.mustache

@@ -21,7 +21,7 @@ describe('{{operationId}}', () => {
 
     expect(req.path).toEqual('{{{request.path}}}');
     expect(req.method).toEqual('{{{request.method}}}');
-    expect(req.data).toEqual({{{request.body}}});
+    expect(req.data).toEqual({{#request.body}}{{{.}}}{{/request.body}}{{^request.body}}undefined{{/request.body}});
     expect(req.searchParams).toStrictEqual({{#request.queryParameters}}{{{.}}}{{/request.queryParameters}}{{^request.queryParameters}}undefined{{/request.queryParameters}});
     {{#request.headers}}
     expect(req.headers).toEqual(

templates/php/tests/requests/requests.mustache

@@ -115,7 +115,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface
                 "path" => "{{{request.path}}}",
                 "method" => "{{{request.method}}}",
                 {{#request.body}}
-                "body" => json_decode("{{#lambda.escapeQuotes}}{{{request.body}}}{{/lambda.escapeQuotes}}"),
+                "body" => json_decode("{{#lambda.escapeQuotes}}{{{.}}}{{/lambda.escapeQuotes}}"),
                 {{/request.body}}
                 {{#request.queryParameters}}
                 "queryParameters" => json_decode("{{#lambda.escapeQuotes}}{{{request.queryParameters}}}{{/lambda.escapeQuotes}}", true),