Feature/ad 507

adyencheckoutaddonapi/acceleratoraddon/web/src/com/adyen/commerce/api/controllers/api/AdyenAddressController.java

@@ -11,7 +11,7 @@
 import de.hybris.platform.commercefacades.user.data.AddressData;
 import de.hybris.platform.commerceservices.address.AddressVerificationDecision;
 import de.hybris.platform.commerceservices.strategies.CheckoutCustomerStrategy;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -20,7 +20,7 @@
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
 
@@ -30,10 +30,10 @@
 @RequestMapping(value = "/api/account")
 public class AdyenAddressController {
 
-    @Autowired
+    @Resource(name = "userFacade")
     private UserFacade userFacade;
 
-    @Autowired
+    @Resource(name = "addressVerificationFacade")
     private AddressVerificationFacade addressVerificationFacade;
 
     @Resource(name = "addressValidator")
@@ -42,7 +42,7 @@ public class AdyenAddressController {
     @Resource(name = "addressDataUtil")
     private AddressDataUtil addressDataUtil;
 
-    @Autowired
+    @Resource(name = "checkoutFacade")
     private CheckoutFacade checkoutFacade;
 
     @Resource(name = "checkoutCustomerStrategy")

adyencheckoutaddonapi/acceleratoraddon/web/src/com/adyen/commerce/api/controllers/api/AdyenDeliveryAddressContoller.java

@@ -6,16 +6,17 @@
 import de.hybris.platform.commercefacades.order.CheckoutFacade;
 import de.hybris.platform.commercefacades.user.UserFacade;
 import de.hybris.platform.commercefacades.user.data.AddressData;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 @Controller
 @RequestMapping(value = "/api/checkout")
@@ -27,9 +28,10 @@ public class AdyenDeliveryAddressContoller {
     @Resource(name = "userFacade")
     private UserFacade userFacade;
 
-    @PostMapping(value = "/delivery-address")
+    @PostMapping(value = "/delivery-address", consumes = MediaType.APPLICATION_JSON_VALUE)
     @RequireHardLogIn
-    public ResponseEntity<Void> doSelectDeliveryAddress(@RequestBody final String selectedAddressCode) {
+    public ResponseEntity<Void> doSelectDeliveryAddress(@RequestBody final AddressSelectionRequest request) {
+        final String selectedAddressCode = request.getAddressId();
         if (StringUtils.isNotBlank(selectedAddressCode)) {
             final AddressData selectedAddressData = getCheckoutFacade().getDeliveryAddressForCode(selectedAddressCode);
             final boolean hasSelectedAddressData = selectedAddressData != null;
@@ -82,4 +84,16 @@ public CheckoutFacade getCheckoutFacade() {
     public void setCheckoutFacade(CheckoutFacade checkoutFacade) {
         this.checkoutFacade = checkoutFacade;
     }
+
+    public static class AddressSelectionRequest {
+        private String addressId;
+
+        public String getAddressId() {
+            return addressId;
+        }
+
+        public void setAddressId(String addressId) {
+            this.addressId = addressId;
+        }
+    }
 }

adyencheckoutaddonapi/acceleratoraddon/web/src/com/adyen/commerce/api/controllers/api/AdyenDeliveryMethodsController.java

@@ -4,9 +4,10 @@
 import de.hybris.platform.acceleratorstorefrontcommons.annotations.RequireHardLogIn;
 import de.hybris.platform.commercefacades.order.CheckoutFacade;
 import de.hybris.platform.commercefacades.order.data.DeliveryModeData;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,8 +32,9 @@ public ResponseEntity<List<? extends DeliveryModeData>> getAllDeliveryMethods()
     }
 
     @RequireHardLogIn
-    @PostMapping(value = "/select-delivery-method")
-    public ResponseEntity selectDeliveryMethod(@RequestBody String deliveryMethodCode) {
+    @PostMapping(value = "/select-delivery-method", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity selectDeliveryMethod(@RequestBody DeliveryMethodSelectionRequest request) {
+        final String deliveryMethodCode = request.getDeliveryMethodCode();
         if (StringUtils.isNotEmpty(deliveryMethodCode)) {
             checkoutFacade.setDeliveryMode(deliveryMethodCode);
             return ResponseEntity.ok(checkoutFacade.getCheckoutCart());
@@ -41,4 +43,16 @@ public ResponseEntity selectDeliveryMethod(@RequestBody String deliveryMethodCod
         }
     }
 
+    public static class DeliveryMethodSelectionRequest {
+        private String deliveryMethodCode;
+
+        public String getDeliveryMethodCode() {
+            return deliveryMethodCode;
+        }
+
+        public void setDeliveryMethodCode(String deliveryMethodCode) {
+            this.deliveryMethodCode = deliveryMethodCode;
+        }
+    }
+
 }

adyencheckoutaddonapi/acceleratoraddon/web/src/com/adyen/commerce/api/controllers/api/AdyenPlaceOrderController.java

@@ -10,22 +10,24 @@
 import com.adyen.v6.service.AdyenPartialPaymentService;
 import de.hybris.platform.acceleratorfacades.flow.CheckoutFlowFacade;
 import de.hybris.platform.acceleratorservices.urlresolver.SiteBaseUrlResolutionService;
-import de.hybris.platform.acceleratorstorefrontcommons.annotations.RequireHardLogIn;
+
 import de.hybris.platform.basecommerce.model.site.BaseSiteModel;
 import de.hybris.platform.commercefacades.order.CartFacade;
 import de.hybris.platform.commerceservices.strategies.CheckoutCustomerStrategy;
 import de.hybris.platform.order.InvalidCartException;
 import de.hybris.platform.order.exceptions.CalculationException;
 import de.hybris.platform.site.BaseSiteService;
+import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import de.hybris.platform.acceleratorstorefrontcommons.annotations.RequireHardLogIn;
+
+import jakarta.servlet.http.HttpServletRequest;
 
 import static com.adyen.commerce.constants.AdyenwebcommonsConstants.ADYEN_CHECKOUT_API_PREFIX;
 import static com.adyen.commerce.constants.AdyenwebcommonsConstants.AUTHORISE_3D_SECURE_PAYMENT_URL;

adyencheckoutaddonapi/acceleratoraddon/web/src/com/adyen/commerce/api/controllers/api/AdyenRedirectResponseController.java

@@ -6,15 +6,15 @@
 import de.hybris.platform.acceleratorstorefrontcommons.annotations.RequireHardLogIn;
 import de.hybris.platform.commercefacades.order.data.OrderData;
 import de.hybris.platform.commerceservices.strategies.CheckoutCustomerStrategy;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Base64;
 
 import static com.adyen.commerce.constants.AdyencheckoutaddonapiWebConstants.*;

adyencheckoutaddonapi/project.properties

@@ -1,4 +1,4 @@
-#Wed, 27 Mar 2024 10:38:50 +0100
+#Tue, 16 Dec 2025 18:55:12 +0100
 # -----------------------------------------------------------------------
 # Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
 # -----------------------------------------------------------------------

adyencheckoutaddonspa/acceleratoraddon/web/src/com/adyen/commerce/spa/controllers/checkout/AdyenPageCheckoutStepController.java

@@ -12,7 +12,7 @@
 import de.hybris.platform.cms2.exceptions.CMSItemNotFoundException;
 import de.hybris.platform.cms2.model.pages.ContentPageModel;
 import de.hybris.platform.commercefacades.order.data.CartData;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

adyencheckoutaddonspa/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/service/addressService.ts

@@ -32,9 +32,9 @@ export class AddressService {
     }
 
     static async selectDeliveryAddress(addressId: string) {
-        return adyenAxios.post(urlContextPath + '/api/checkout/delivery-address', addressId, {
+        return adyenAxios.post(urlContextPath + '/api/checkout/delivery-address', { addressId: addressId }, {
             headers: {
-                'Content-Type': 'text/plain',
+                'Content-Type': 'application/json',
                 'CSRFToken': CSRFToken
             }
         })

adyencheckoutaddonspa/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/service/shippingMethodService.ts

@@ -32,9 +32,9 @@ export class ShippingMethodService {
 
 
     static selectShippingMethod(shippingMethodId: string) {
-        return adyenAxios.post(urlContextPath + '/api/checkout/select-delivery-method', shippingMethodId, {
+        return adyenAxios.post(urlContextPath + '/api/checkout/select-delivery-method', { deliveryMethodCode: shippingMethodId }, {
             headers: {
-                'Content-Type': 'text/plain',
+                'Content-Type': 'application/json',
                 'CSRFToken': CSRFToken
             }
         })

adyencheckoutaddonspa/project.properties

@@ -1,4 +1,4 @@
-#Wed, 27 Mar 2024 10:39:01 +0100
+#Wed, 17 Dec 2025 06:55:54 +0100
 # -----------------------------------------------------------------------
 # Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
 # -----------------------------------------------------------------------

adyenocc/resources/adyenocc-spring.xml

@@ -13,7 +13,8 @@
            http://www.springframework.org/schema/context/spring-context.xsd">
 
     <context:annotation-config/>
-	<context:component-scan base-package="com.adyen.commerce.occ.controllers"/>
+ <context:component-scan base-package="com.adyen.commerce.occ.controllers"/>
+ <context:component-scan base-package="com.adyen.commerce.occ.validators"/>
 
 
 	<bean id="adyenOccAddressValidator"

adyenocc/src/com/adyen/commerce/occ/api/AdyenPlaceOrderApi.java

@@ -13,7 +13,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Tag(name = "Adyen")
 public interface AdyenPlaceOrderApi {

adyenocc/src/com/adyen/commerce/occ/api/RedirectApi.java

@@ -6,7 +6,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Tag(name = "Adyen")
 public interface RedirectApi {

adyenocc/src/com/adyen/commerce/occ/api/expresscheclout/ApplePayExpressCheckoutApi.java

@@ -14,7 +14,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Tag(name = "Adyen")
 public interface ApplePayExpressCheckoutApi {

adyenocc/src/com/adyen/commerce/occ/api/expresscheclout/GooglePayExpressCheckoutApi.java

@@ -12,7 +12,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Tag(name = "Adyen")
 public interface GooglePayExpressCheckoutApi {

adyenocc/src/com/adyen/commerce/occ/api/expresscheclout/PayPalExpressCheckoutApi.java

@@ -14,12 +14,12 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 @Tag(name = "Adyen")
 public interface PayPalExpressCheckoutApi {

adyenocc/src/com/adyen/commerce/occ/controllers/AdyenCartAddressesController.java

@@ -23,7 +23,7 @@
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static com.adyen.commerce.constants.AdyenoccConstants.ADYEN_USER_CART_PREFIX;
 

adyenocc/src/com/adyen/commerce/occ/controllers/PlaceOrderController.java

@@ -26,8 +26,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 
 @RestController
 @ApiVersion("v2")

adyenocc/src/com/adyen/commerce/occ/controllers/RedirectController.java

@@ -21,8 +21,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Base64;
 
 import static com.adyen.commerce.constants.AdyenwebcommonsConstants.REDIRECT_PREFIX;

adyenocc/src/com/adyen/commerce/occ/controllers/expresscheckout/ApplePayExpressCheckoutController.java

@@ -21,7 +21,7 @@
  import org.springframework.web.bind.annotation.RequestMapping;
  import org.springframework.web.bind.annotation.RestController;
 
- import javax.servlet.http.HttpServletRequest;
+ import jakarta.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping(value = AdyenoccConstants.ADYEN_USER_CART_PREFIX + "/express-checkout/apple")

adyenocc/src/com/adyen/commerce/occ/controllers/expresscheckout/ExpressCheckoutControllerBase.java

@@ -13,10 +13,10 @@
 import de.hybris.platform.commercefacades.order.CartFacade;
 import de.hybris.platform.commercefacades.user.data.AddressData;
 import de.hybris.platform.commerceservices.strategies.CheckoutCustomerStrategy;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.log4j.Logger;
 
-import javax.servlet.http.HttpServletRequest;
 
 import static com.adyen.commerce.constants.AdyenwebcommonsConstants.CHECKOUT_ERROR_AUTHORIZATION_FAILED;
 import static com.adyen.commerce.util.ErrorMessageUtil.getErrorMessageByRefusalReason;

adyenocc/src/com/adyen/commerce/occ/controllers/expresscheckout/GooglePayExpressCheckoutController.java

@@ -21,7 +21,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping(value = AdyenoccConstants.ADYEN_USER_CART_PREFIX + "/express-checkout/google")

adyenocc/src/com/adyen/commerce/occ/controllers/expresscheckout/PayPalExpressCheckoutController.java

@@ -15,6 +15,8 @@
 import de.hybris.platform.commercefacades.order.CartFacade;
 import de.hybris.platform.commerceservices.request.mapping.annotation.ApiVersion;
 import de.hybris.platform.commerceservices.strategies.CheckoutCustomerStrategy;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -24,8 +26,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 @RestController
 @ApiVersion("v2")

adyensapdigitalpayment/src/com/adyen/client/AdyenSapDigitalPaymentClient.java

@@ -6,8 +6,8 @@
 import de.hybris.platform.cissapdigitalpayment.client.*;
 import rx.*;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.*;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.*;
 
 /*
  *Client to connect to SAP Digital Payment Addon using Charon API.

adyensapdigitalpayment/src/com/adyen/service/AdyenSapDigitalPaymentService.java

@@ -3,7 +3,7 @@
 import de.hybris.platform.cissapdigitalpayment.model.SAPDigitalPaymentConfigurationModel;
 import de.hybris.platform.cissapdigitalpayment.service.CisSapDigitalPaymentService;
 
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.PathParam;
 
 import com.adyen.model.DigitalGetPaymentCardList;
 import com.adyen.model.DigitalPaymentGetAuthorizationList;

adyensapdigitalpaymentbackoffice/backoffice/src/com/adyen/sapdigitalpaymentbackoffice/widgets/actions/RegisterCaptureWithDPA.java

@@ -25,7 +25,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import com.adyen.model.DPAOperationResultModel;
 import com.adyen.model.DigitalPaymentGetCapture;