Split requestBody method (#318)

Author: jderusse

src/Input/AddLayerVersionPermissionRequest.php

@@ -150,8 +150,12 @@ public function request(): Request
         $uri['VersionNumber'] = $this->VersionNumber ?? '';
         $uriString = "/2018-10-31/layers/{$uri['LayerName']}/versions/{$uri['VersionNumber']}/policy";
 
+        // Prepare Body
+        $bodyPayload = $this->requestBody();
+        $body = empty($bodyPayload) ? '{}' : json_encode($bodyPayload);
+
         // Return the Request
-        return new Request('POST', $uriString, $query, $headers, StreamFactory::create($this->requestBody()));
+        return new Request('POST', $uriString, $query, $headers, StreamFactory::create($body));
     }
 
     public function setAction(?string $value): self
@@ -226,7 +230,10 @@ public function validate(): void
         }
     }
 
-    private function requestBody(): string
+    /**
+     * @internal
+     */
+    private function requestBody(): array
     {
         $payload = [];
 
@@ -237,6 +244,6 @@ private function requestBody(): string
             $payload['OrganizationId'] = $v;
         }
 
-        return json_encode($payload);
+        return $payload;
     }
 }

src/Input/InvocationRequest.php

@@ -143,8 +143,11 @@ public function request(): Request
         $uri['FunctionName'] = $this->FunctionName ?? '';
         $uriString = "/2015-03-31/functions/{$uri['FunctionName']}/invocations";
 
+        // Prepare Body
+        $body = $this->Payload ?? '';
+
         // Return the Request
-        return new Request('POST', $uriString, $query, $headers, StreamFactory::create($this->requestBody()));
+        return new Request('POST', $uriString, $query, $headers, StreamFactory::create($body));
     }
 
     public function setClientContext(?string $value): self
@@ -213,9 +216,4 @@ public function validate(): void
             }
         }
     }
-
-    private function requestBody(): string
-    {
-        return $this->Payload ?? '';
-    }
 }

src/Input/ListLayerVersionsRequest.php

@@ -108,8 +108,11 @@ public function request(): Request
         $uri['LayerName'] = $this->LayerName ?? '';
         $uriString = "/2018-10-31/layers/{$uri['LayerName']}/versions";
 
+        // Prepare Body
+        $body = '';
+
         // Return the Request
-        return new Request('GET', $uriString, $query, $headers, StreamFactory::create(null));
+        return new Request('GET', $uriString, $query, $headers, StreamFactory::create($body));
     }
 
     /**

src/Input/PublishLayerVersionRequest.php

@@ -118,8 +118,12 @@ public function request(): Request
         $uri['LayerName'] = $this->LayerName ?? '';
         $uriString = "/2018-10-31/layers/{$uri['LayerName']}/versions";
 
+        // Prepare Body
+        $bodyPayload = $this->requestBody();
+        $body = empty($bodyPayload) ? '{}' : json_encode($bodyPayload);
+
         // Return the Request
-        return new Request('POST', $uriString, $query, $headers, StreamFactory::create($this->requestBody()));
+        return new Request('POST', $uriString, $query, $headers, StreamFactory::create($body));
     }
 
     /**
@@ -178,45 +182,30 @@ public function validate(): void
         }
     }
 
-    private function requestBody(): string
+    /**
+     * @internal
+     */
+    private function requestBody(): array
     {
         $payload = [];
-        $indices = new \stdClass();
+
         if (null !== $v = $this->Description) {
             $payload['Description'] = $v;
         }
+        if (null !== $v = $this->Content) {
+            $payload['Content'] = $v->requestBody();
+        }
 
-        if (null !== $this->Content) {
-            (static function (LayerVersionContentInput $input) use (&$payload) {
-                if (null !== $v = $input->getS3Bucket()) {
-                    $payload['Content']['S3Bucket'] = $v;
-                }
-
-                if (null !== $v = $input->getS3Key()) {
-                    $payload['Content']['S3Key'] = $v;
-                }
-
-                if (null !== $v = $input->getS3ObjectVersion()) {
-                    $payload['Content']['S3ObjectVersion'] = $v;
-                }
-
-                if (null !== $v = $input->getZipFile()) {
-                    $payload['Content']['ZipFile'] = base64_encode($v);
-                }
-            })($this->Content);
+        $index = -1;
+        foreach ($this->CompatibleRuntimes as $mapValue) {
+            ++$index;
+            $payload['CompatibleRuntimes'][$index] = $mapValue;
         }
 
-        (static function (array $input) use (&$payload, $indices) {
-            $indices->kea6f923 = -1;
-            foreach ($input as $value) {
-                ++$indices->kea6f923;
-                $payload['CompatibleRuntimes'][$indices->kea6f923] = $value;
-            }
-        })($this->CompatibleRuntimes);
         if (null !== $v = $this->LicenseInfo) {
             $payload['LicenseInfo'] = $v;
         }
 
-        return json_encode($payload);
+        return $payload;
     }
 }

src/ValueObject/LayerVersionContentInput.php

@@ -65,6 +65,28 @@ public function getZipFile(): ?string
         return $this->ZipFile;
     }
 
+    /**
+     * @internal
+     */
+    public function requestBody(): array
+    {
+        $payload = [];
+        if (null !== $v = $this->S3Bucket) {
+            $payload['S3Bucket'] = $v;
+        }
+        if (null !== $v = $this->S3Key) {
+            $payload['S3Key'] = $v;
+        }
+        if (null !== $v = $this->S3ObjectVersion) {
+            $payload['S3ObjectVersion'] = $v;
+        }
+        if (null !== $v = $this->ZipFile) {
+            $payload['ZipFile'] = base64_encode($v);
+        }
+
+        return $payload;
+    }
+
     public function validate(): void
     {
         // There are no required properties