Merge pull request #421 from Adyen/feature/AD-275-

feature/AD-275-
Adyen · Jun 28, 2024 · 53e6698 · 53e6698
2 parents 9e4155d + 329d7ff
commit 53e6698
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/adyenocc/src/com/adyen/commerce/controllers/PlaceOrderController.java b/adyenocc/src/com/adyen/commerce/controllers/PlaceOrderController.java
@@ -7,6 +7,7 @@
 import com.adyen.commerce.response.PlaceOrderResponse;
 import com.adyen.model.checkout.PaymentDetailsRequest;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import de.hybris.platform.acceleratorfacades.flow.CheckoutFlowFacade;
 import de.hybris.platform.acceleratorservices.urlresolver.SiteBaseUrlResolutionService;
 import de.hybris.platform.commercefacades.order.CartFacade;
@@ -53,10 +54,11 @@ public class PlaceOrderController extends PlaceOrderControllerBase {
     @Operation(operationId = "placeOrder", summary = "Handle place order request", description =
             "Places order based on request data")
     @ApiBaseSiteIdUserIdAndCartIdParam
-    public ResponseEntity<PlaceOrderResponse> onPlaceOrder(@RequestBody PlaceOrderRequest placeOrderRequest, HttpServletRequest request) throws Exception {
+    public ResponseEntity<String> onPlaceOrder(@RequestBody String placeOrderStringRequest, HttpServletRequest request) throws Exception {
+        PlaceOrderRequest placeOrderRequest = objectMapper.readValue(placeOrderStringRequest, PlaceOrderRequest.class);
         PlaceOrderResponse placeOrderResponse = super.placeOrder(placeOrderRequest, request);
-
-        return ResponseEntity.ok(placeOrderResponse);
+        String response = objectMapper.writeValueAsString(placeOrderResponse);
+        return ResponseEntity.ok(response);
     }
 
     @Secured({"ROLE_CUSTOMERGROUP", "ROLE_CLIENT", "ROLE_CUSTOMERMANAGERGROUP", "ROLE_TRUSTED_CLIENT"})

diff --git a/adyenwebcommons/src/com/adyen/commerce/controllerbase/PlaceOrderControllerBase.java b/adyenwebcommons/src/com/adyen/commerce/controllerbase/PlaceOrderControllerBase.java
@@ -9,6 +9,7 @@
 import com.adyen.model.checkout.PaymentResponse;
 import com.adyen.service.exception.ApiException;
 import com.adyen.v6.exceptions.AdyenNonAuthorizedPaymentException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.hybris.platform.acceleratorfacades.flow.CheckoutFlowFacade;
 import de.hybris.platform.acceleratorservices.urlresolver.SiteBaseUrlResolutionService;
@@ -38,6 +39,10 @@ public abstract class PlaceOrderControllerBase {
     private static final String GET_TYPE = "getType";
 
 
+    public PlaceOrderControllerBase() {
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
     public PlaceOrderResponse placeOrder(PlaceOrderRequest placeOrderRequest, HttpServletRequest request) {
 
         String adyenPaymentMethodType = extractPaymentMethodType(placeOrderRequest);