Merge pull request #729 from dpash/json-bodies

Update requests with a Json body
jlevers · Jun 10, 2024 · 108349c · 108349c
2 parents 9d29ce3 + d3a3cde
commit 108349c
Show file tree

Hide file tree

Showing 38 changed files with 216 additions and 102 deletions.
diff --git a/resources/models/seller/orders/v0.json b/resources/models/seller/orders/v0.json
@@ -5232,4 +5232,4 @@
         }
     },
     "x-original-swagger-version": "2.0"
-}
+}
diff --git a/src/Generator/Generators/RequestGenerator.php b/src/Generator/Generators/RequestGenerator.php
@@ -37,8 +37,7 @@ protected function generateRequestClass(Endpoint $endpoint): PhpFile
         $classType->setExtends($baseRequestClass)
             ->setComment($endpoint->name);
 
-        // TODO: We assume JSON body if post/patch, make these assumptions configurable in the future.
-        if ($endpoint->method->isPost() || $endpoint->method->isPatch()) {
+        if ($endpoint->bodySchema?->bodyContentType === 'application/json' && ($endpoint->method->isPut() || $endpoint->method->isPost() || $endpoint->method->isPatch())) {
             $classType
                 ->addImplement(HasBody::class)
                 ->addTrait(HasJsonBody::class);

diff --git a/src/Seller/APlusContentV20201101/Requests/PostContentDocumentApprovalSubmission.php b/src/Seller/APlusContentV20201101/Requests/PostContentDocumentApprovalSubmission.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\APlusContentV20201101\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\APlusContentV20201101\Responses\ErrorList;
 use SellingPartnerApi\Seller\APlusContentV20201101\Responses\PostContentDocumentApprovalSubmissionResponse;
 
 /**
  * postContentDocumentApprovalSubmission
  */
-class PostContentDocumentApprovalSubmission extends Request implements HasBody
+class PostContentDocumentApprovalSubmission extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/APlusContentV20201101/Requests/PostContentDocumentSuspendSubmission.php b/src/Seller/APlusContentV20201101/Requests/PostContentDocumentSuspendSubmission.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\APlusContentV20201101\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\APlusContentV20201101\Responses\ErrorList;
 use SellingPartnerApi\Seller\APlusContentV20201101\Responses\PostContentDocumentSuspendSubmissionResponse;
 
 /**
  * postContentDocumentSuspendSubmission
  */
-class PostContentDocumentSuspendSubmission extends Request implements HasBody
+class PostContentDocumentSuspendSubmission extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/ApplicationManagementV20231130/Requests/RotateApplicationClientSecret.php b/src/Seller/ApplicationManagementV20231130/Requests/RotateApplicationClientSecret.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\ApplicationManagementV20231130\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\EmptyResponse;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\ApplicationManagementV20231130\Responses\ErrorList;
 
 /**
  * rotateApplicationClientSecret
  */
-class RotateApplicationClientSecret extends Request implements HasBody
+class RotateApplicationClientSecret extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     public function resolveEndpoint(): string

diff --git a/src/Seller/FBAInboundV0/Requests/ConfirmTransport.php b/src/Seller/FBAInboundV0/Requests/ConfirmTransport.php
@@ -11,20 +11,16 @@
 namespace SellingPartnerApi\Seller\FBAInboundV0\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV0\Responses\ConfirmTransportResponse;
 
 /**
  * confirmTransport
  */
-class ConfirmTransport extends Request implements HasBody
+class ConfirmTransport extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV0/Requests/EstimateTransport.php b/src/Seller/FBAInboundV0/Requests/EstimateTransport.php
@@ -11,20 +11,16 @@
 namespace SellingPartnerApi\Seller\FBAInboundV0\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV0\Responses\EstimateTransportResponse;
 
 /**
  * estimateTransport
  */
-class EstimateTransport extends Request implements HasBody
+class EstimateTransport extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV0/Requests/PutTransportDetails.php b/src/Seller/FBAInboundV0/Requests/PutTransportDetails.php
@@ -11,17 +11,21 @@
 namespace SellingPartnerApi\Seller\FBAInboundV0\Requests;
 
 use Exception;
+use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
+use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV0\Dto\PutTransportDetailsRequest;
 use SellingPartnerApi\Seller\FBAInboundV0\Responses\PutTransportDetailsResponse;
 
 /**
  * putTransportDetails
  */
-class PutTransportDetails extends Request
+class PutTransportDetails extends Request implements HasBody
 {
+    use HasJsonBody;
+
     protected Method $method = Method::PUT;
 
     /**

diff --git a/src/Seller/FBAInboundV0/Requests/UpdateInboundShipment.php b/src/Seller/FBAInboundV0/Requests/UpdateInboundShipment.php
@@ -11,17 +11,21 @@
 namespace SellingPartnerApi\Seller\FBAInboundV0\Requests;
 
 use Exception;
+use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
+use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV0\Dto\InboundShipmentRequest;
 use SellingPartnerApi\Seller\FBAInboundV0\Responses\InboundShipmentResponse;
 
 /**
  * updateInboundShipment
  */
-class UpdateInboundShipment extends Request
+class UpdateInboundShipment extends Request implements HasBody
 {
+    use HasJsonBody;
+
     protected Method $method = Method::PUT;
 
     /**

diff --git a/src/Seller/FBAInboundV0/Requests/VoidTransport.php b/src/Seller/FBAInboundV0/Requests/VoidTransport.php
@@ -11,20 +11,16 @@
 namespace SellingPartnerApi\Seller\FBAInboundV0\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV0\Responses\VoidTransportResponse;
 
 /**
  * voidTransport
  */
-class VoidTransport extends Request implements HasBody
+class VoidTransport extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV20240320/Requests/CancelSelfShipAppointment.php b/src/Seller/FBAInboundV20240320/Requests/CancelSelfShipAppointment.php
@@ -11,8 +11,10 @@
 namespace SellingPartnerApi\Seller\FBAInboundV20240320\Requests;
 
 use Exception;
+use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
+use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Dto\CancelSelfShipAppointmentRequest;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\CancelSelfShipAppointmentResponse;
@@ -21,8 +23,10 @@
 /**
  * cancelSelfShipAppointment
  */
-class CancelSelfShipAppointment extends Request
+class CancelSelfShipAppointment extends Request implements HasBody
 {
+    use HasJsonBody;
+
     protected Method $method = Method::PUT;
 
     /**

diff --git a/src/Seller/FBAInboundV20240320/Requests/ConfirmDeliveryWindowOptions.php b/src/Seller/FBAInboundV20240320/Requests/ConfirmDeliveryWindowOptions.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\FBAInboundV20240320\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ConfirmDeliveryWindowOptionsResponse;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ErrorList;
 
 /**
  * confirmDeliveryWindowOptions
  */
-class ConfirmDeliveryWindowOptions extends Request implements HasBody
+class ConfirmDeliveryWindowOptions extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV20240320/Requests/ConfirmPackingOption.php b/src/Seller/FBAInboundV20240320/Requests/ConfirmPackingOption.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\FBAInboundV20240320\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ConfirmPackingOptionResponse;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ErrorList;
 
 /**
  * confirmPackingOption
  */
-class ConfirmPackingOption extends Request implements HasBody
+class ConfirmPackingOption extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV20240320/Requests/ConfirmPlacementOption.php b/src/Seller/FBAInboundV20240320/Requests/ConfirmPlacementOption.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\FBAInboundV20240320\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ConfirmPlacementOptionResponse;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ErrorList;
 
 /**
  * confirmPlacementOption
  */
-class ConfirmPlacementOption extends Request implements HasBody
+class ConfirmPlacementOption extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV20240320/Requests/ConfirmShipmentContentUpdatePreview.php b/src/Seller/FBAInboundV20240320/Requests/ConfirmShipmentContentUpdatePreview.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\FBAInboundV20240320\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ConfirmShipmentContentUpdatePreviewResponse;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ErrorList;
 
 /**
  * confirmShipmentContentUpdatePreview
  */
-class ConfirmShipmentContentUpdatePreview extends Request implements HasBody
+class ConfirmShipmentContentUpdatePreview extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV20240320/Requests/GenerateDeliveryWindowOptions.php b/src/Seller/FBAInboundV20240320/Requests/GenerateDeliveryWindowOptions.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\FBAInboundV20240320\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ErrorList;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\GenerateDeliveryWindowOptionsResponse;
 
 /**
  * generateDeliveryWindowOptions
  */
-class GenerateDeliveryWindowOptions extends Request implements HasBody
+class GenerateDeliveryWindowOptions extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV20240320/Requests/GeneratePackingOptions.php b/src/Seller/FBAInboundV20240320/Requests/GeneratePackingOptions.php
@@ -11,21 +11,17 @@
 namespace SellingPartnerApi\Seller\FBAInboundV20240320\Requests;
 
 use Exception;
-use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
-use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\ErrorList;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Responses\GeneratePackingOptionsResponse;
 
 /**
  * generatePackingOptions
  */
-class GeneratePackingOptions extends Request implements HasBody
+class GeneratePackingOptions extends Request
 {
-    use HasJsonBody;
-
     protected Method $method = Method::POST;
 
     /**

diff --git a/src/Seller/FBAInboundV20240320/Requests/UpdateInboundPlanName.php b/src/Seller/FBAInboundV20240320/Requests/UpdateInboundPlanName.php
@@ -11,8 +11,10 @@
 namespace SellingPartnerApi\Seller\FBAInboundV20240320\Requests;
 
 use Exception;
+use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Response;
+use Saloon\Traits\Body\HasJsonBody;
 use SellingPartnerApi\EmptyResponse;
 use SellingPartnerApi\Request;
 use SellingPartnerApi\Seller\FBAInboundV20240320\Dto\UpdateInboundPlanNameRequest;
@@ -21,8 +23,10 @@
 /**
  * updateInboundPlanName
  */
-class UpdateInboundPlanName extends Request
+class UpdateInboundPlanName extends Request implements HasBody
 {
+    use HasJsonBody;
+
     protected Method $method = Method::PUT;
 
     /**