Merge pull request #462 from Adyen/feature/AD-297

AD-297 Rework AdyenSubscription Extension to Align with New Architecture

adyenv6subscription/resources/adyenv6subscription-spring.xml

@@ -10,17 +10,6 @@
 
             http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
-    <alias name="subscriptionAdyenPaymentServiceFactory" alias="adyenPaymentServiceFactory" />
-    <bean id="subscriptionAdyenPaymentServiceFactory" class="com.adyen.v6.factory.SubscriptionAdyenPaymentServiceFactory">
-        <constructor-arg name="adyenRequestFactory" ref="adyenRequestFactory"/>
-        <constructor-arg name="adyenMerchantAccountStrategy" ref="adyenMerchantStrategy"/>
-    </bean>
-
-    <alias name="subscriptionRequestFactory" alias="adyenRequestFactory" />
-    <bean id="subscriptionRequestFactory" class="com.adyen.v6.factory.SubscriptionPaymentRequestFactory">
-        <property name="cartFacade" ref="cartFacade" />
-    </bean>
-
     <bean id="subscriptionRepository" class="com.adyen.v6.repository.SubscriptionRepository" >
         <property name="flexibleSearchService" ref="flexibleSearchService" />
     </bean>
@@ -36,7 +25,6 @@
         <property name="baseStoreService" ref="baseStoreService" />
         <property name="modelService" ref="modelService" />
         <property name="keyGenerator" ref="orderCodeGenerator" />
-        <property name="subscriptionAdyenPaymentServiceFactory" ref="subscriptionAdyenPaymentServiceFactory" />
     </bean>
 
     <alias alias="subscriptionCommercePlaceOrderMethodHook" name="adyenSubscriptionCommercePlaceOrderMethodHook"/>

adyenv6subscription/src/com/adyen/v6/service/impl/SubscriptionOrderExecutor.java

@@ -2,7 +2,6 @@
 
 import com.adyen.model.checkout.PaymentResponse;
 import com.adyen.v6.factory.AdyenPaymentServiceFactory;
-import com.adyen.v6.factory.SubscriptionAdyenPaymentServiceFactory;
 import com.adyen.v6.model.RequestInfo;
 import com.adyen.v6.service.AdyenTransactionService;
 import de.hybris.platform.commercefacades.order.data.CartData;
@@ -42,8 +41,6 @@ public class SubscriptionOrderExecutor implements ImpersonationService.Executor<
     private KeyGenerator keyGenerator;
     private final AbstractOrderModel subscriptionOrder;
 
-    private SubscriptionAdyenPaymentServiceFactory subscriptionAdyenPaymentServiceFactory;
-
     public SubscriptionOrderExecutor(final AbstractOrderModel subscriptionOrder)
     {
         this.subscriptionOrder = subscriptionOrder;
@@ -58,7 +55,7 @@ public OrderModel execute() throws Exception {
         try {
 
             final RequestInfo request = new RequestInfo();
-            final PaymentResponse paymentResponse = subscriptionAdyenPaymentServiceFactory
+            final PaymentResponse paymentResponse = adyenPaymentServiceFactory
                     .createAdyenCheckoutApiService(baseStoreService.getCurrentBaseStore())
                     .authorisePayment(cartConverter.convert(cart), request, (CustomerModel) cart.getUser());
 
@@ -159,7 +156,4 @@ public void setKeyGenerator(KeyGenerator keyGenerator) {
         this.keyGenerator = keyGenerator;
     }
 
-    public void setSubscriptionAdyenPaymentServiceFactory(SubscriptionAdyenPaymentServiceFactory subscriptionAdyenPaymentServiceFactory) {
-        this.subscriptionAdyenPaymentServiceFactory = subscriptionAdyenPaymentServiceFactory;
-    }
 }