From dda8ccf68bc241839c3312bba44bd3cdf114a019 Mon Sep 17 00:00:00 2001
From: PJaneta <p.janeta@reply.com>
Date: Mon, 8 Jul 2024 09:50:22 +0200
Subject: [PATCH] AD-282 Improve Error Handling and User Guidance for Payment
 Transactions

---
 .../occ/v2/adyenocc/web/spring/adyenocc-web-spring.xml       | 1 +
 .../exceptionhandler/AdyenOCCControllerExceptionHandler.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/adyenocc/resources/occ/v2/adyenocc/web/spring/adyenocc-web-spring.xml b/adyenocc/resources/occ/v2/adyenocc/web/spring/adyenocc-web-spring.xml
index 733bae4e..e4ee2e97 100644
--- a/adyenocc/resources/occ/v2/adyenocc/web/spring/adyenocc-web-spring.xml
+++ b/adyenocc/resources/occ/v2/adyenocc/web/spring/adyenocc-web-spring.xml
@@ -11,5 +11,6 @@
            http://www.springframework.org/schema/context/spring-context.xsd">
 
     <context:component-scan base-package="com.adyen.commerce.controllers"/>
+    <context:component-scan base-package="com.adyen.commerce.exceptionhandler"/>
 
 </beans>
diff --git a/adyenocc/src/com/adyen/commerce/exceptionhandler/AdyenOCCControllerExceptionHandler.java b/adyenocc/src/com/adyen/commerce/exceptionhandler/AdyenOCCControllerExceptionHandler.java
index ac4c792b..e88447b6 100644
--- a/adyenocc/src/com/adyen/commerce/exceptionhandler/AdyenOCCControllerExceptionHandler.java
+++ b/adyenocc/src/com/adyen/commerce/exceptionhandler/AdyenOCCControllerExceptionHandler.java
@@ -1,6 +1,7 @@
 package com.adyen.commerce.exceptionhandler;
 
 import com.adyen.commerce.exception.AdyenControllerException;
+import com.adyen.commerce.response.ErrorResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -9,7 +10,7 @@
 public class AdyenOCCControllerExceptionHandler {
 
     @ExceptionHandler(value = AdyenControllerException.class)
-    public ResponseEntity<Void> handleAdyenControllerException(AdyenControllerException exception) {
-        return ResponseEntity.badRequest().build();
+    public ResponseEntity<ErrorResponse> handleAdyenControllerException(AdyenControllerException exception) {
+        return ResponseEntity.badRequest().body(exception.getErrorResponse());
     }
 }
\ No newline at end of file