bump damsel (#75)

* bump damsel

* fix review

* fix review 2

Author: ggmaleva

pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.4</version>
     </parent>
 
     <properties>

src/main/java/dev/vality/hooker/configuration/HgConfig.java

@@ -1,17 +1,13 @@
 package dev.vality.hooker.configuration;
 
-import dev.vality.damsel.payment_processing.CustomerManagementSrv;
 import dev.vality.damsel.payment_processing.InvoicingSrv;
-import dev.vality.hooker.configuration.meta.UserIdentityIdExtensionKit;
-import dev.vality.hooker.configuration.meta.UserIdentityRealmExtensionKit;
 import dev.vality.woody.thrift.impl.http.THSpawnClientBuilder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 
 import java.io.IOException;
-import java.util.List;
 
 @Configuration
 public class HgConfig {
@@ -23,16 +19,4 @@ public InvoicingSrv.Iface invoicingClient(@Value("${service.invoicing.url}") Res
                 .withNetworkTimeout(networkTimeout)
                 .withAddress(resource.getURI()).build(InvoicingSrv.Iface.class);
     }
-
-    @Bean
-    public CustomerManagementSrv.Iface customerClient(@Value("${service.customer.url}") Resource resource,
-                                                      @Value("${service.customer.networkTimeout}") int networkTimeout)
-            throws IOException {
-        return new THSpawnClientBuilder()
-                .withMetaExtensions(List.of(
-                        UserIdentityIdExtensionKit.INSTANCE,
-                        UserIdentityRealmExtensionKit.INSTANCE))
-                .withNetworkTimeout(networkTimeout)
-                .withAddress(resource.getURI()).build(CustomerManagementSrv.Iface.class);
-    }
 }

src/main/java/dev/vality/hooker/configuration/KafkaConfig.java

@@ -35,8 +35,6 @@ public class KafkaConfig {
 
     @Value("${kafka.topics.invoice.concurrency}")
     private int invoicingConcurrency;
-    @Value("${kafka.topics.customer.concurrency}")
-    private int customerConcurrency;
 
     private final KafkaProperties kafkaProperties;
 
@@ -68,21 +66,6 @@ public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String,
         return factory;
     }
 
-    @Bean
-    @SuppressWarnings("LineLength")
-    public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String, MachineEvent>> customerListenerContainerFactory(
-            ConsumerFactory<String, MachineEvent> consumerFactory
-    ) {
-        ConcurrentKafkaListenerContainerFactory<String, MachineEvent> factory =
-                new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory);
-        factory.setBatchListener(false);
-        factory.getContainerProperties().setAckMode(ContainerProperties.AckMode.MANUAL);
-        factory.setCommonErrorHandler(ExponentialBackOffDefaultErrorHandlerFactory.create());
-        factory.setConcurrency(customerConcurrency);
-        return factory;
-    }
-
     @Bean
     public BinaryDeserializer<EventPayload> paymentEventPayloadDeserializer() {
         return new PaymentEventPayloadDeserializer();

src/main/java/dev/vality/hooker/configuration/KafkaConsumerConfig.java

@@ -1,6 +1,5 @@
 package dev.vality.hooker.configuration;
 
-import dev.vality.hooker.listener.CustomerEventKafkaListener;
 import dev.vality.hooker.listener.InvoicingEventKafkaListener;
 import dev.vality.hooker.listener.MachineEventHandler;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -17,10 +16,4 @@ public class KafkaConsumerConfig {
     public InvoicingEventKafkaListener paymentEventsKafkaListener(MachineEventHandler invoicingMachineEventHandler) {
         return new InvoicingEventKafkaListener(invoicingMachineEventHandler);
     }
-
-    @Bean
-    @ConditionalOnProperty(value = "kafka.topics.customer.enabled", havingValue = "true")
-    public CustomerEventKafkaListener customerEventsKafkaListener(MachineEventHandler customerMachineEventHandler) {
-        return new CustomerEventKafkaListener(customerMachineEventHandler);
-    }
 }

src/main/java/dev/vality/hooker/configuration/RowMapperConfig.java

@@ -1,7 +1,6 @@
 package dev.vality.hooker.configuration;
 
 import dev.vality.hooker.dao.rowmapper.WebhookModelRowMapper;
-import dev.vality.hooker.model.CustomerMessage;
 import dev.vality.hooker.model.InvoicingMessage;
 import dev.vality.hooker.model.WebhookMessageModel;
 import org.springframework.context.annotation.Bean;
@@ -10,11 +9,6 @@
 
 @Configuration
 public class RowMapperConfig {
-    @Bean
-    public RowMapper<WebhookMessageModel<CustomerMessage>> customerWebhookRowMapper(
-            RowMapper<CustomerMessage> customerRowMapper) {
-        return new WebhookModelRowMapper<>(customerRowMapper);
-    }
 
     @Bean
     public RowMapper<WebhookMessageModel<InvoicingMessage>> invoicingWebhookRowMapper(

src/main/java/dev/vality/hooker/configuration/ServiceConfig.java

@@ -2,7 +2,6 @@
 
 import dev.vality.hooker.converter.WebhookMessageBuilder;
 import dev.vality.hooker.dao.MessageDao;
-import dev.vality.hooker.model.CustomerMessage;
 import dev.vality.hooker.model.InvoicingMessage;
 import dev.vality.hooker.service.EventService;
 import dev.vality.hooker.service.MessageService;
@@ -19,13 +18,4 @@ public MessageService<InvoicingMessage> invoicingService(MessageDao<InvoicingMes
                                                              WebhookKafkaProducerService webhookKafkaProducerService) {
         return new MessageService<>(messageDao, eventService, webhookMessageBuilder, webhookKafkaProducerService);
     }
-
-    @Bean
-    public MessageService<CustomerMessage> customerService(MessageDao<CustomerMessage> messageDao,
-                                                           EventService<CustomerMessage> eventService,
-                                                           WebhookMessageBuilder webhookMessageBuilder,
-                                                           WebhookKafkaProducerService webhookKafkaProducerService) {
-        return new MessageService<>(messageDao, eventService, webhookMessageBuilder, webhookKafkaProducerService);
-    }
-
 }

src/main/java/dev/vality/hooker/converter/CustomerBindingConverter.java

@@ -50,8 +50,6 @@ public ExpandedPayment convert(InvoicePayment sourceWrapper, Invoice invoice) {
 
         if (source.getPayer().isSetPaymentResource()) {
             setResourcePaymentTool(source, target);
-        } else if (source.getPayer().isSetCustomer()) {
-            setCustomerPaymentTool(source, target);
         } else if (source.getPayer().isSetRecurrent()) {
             setRecurrentPaymentTool(source, target);
         }
@@ -132,17 +130,6 @@ private void setRecurrentPaymentTool(dev.vality.damsel.domain.InvoicePayment sou
                         .phoneNumber(recurrentParentOrigin.getContactInfo().getPhoneNumber()));
     }
 
-    private void setCustomerPaymentTool(dev.vality.damsel.domain.InvoicePayment source, Payment target) {
-        dev.vality.damsel.domain.CustomerPayer customerPayerOrigin = source.getPayer().getCustomer();
-        target.paymentToolToken(PaymentToolUtils.getPaymentToolToken(customerPayerOrigin.getPaymentTool()))
-                .contactInfo(new PaymentContactInfo()
-                        .email(customerPayerOrigin.getContactInfo().getEmail())
-                        .phoneNumber(customerPayerOrigin.getContactInfo().getPhoneNumber()))
-                .payer(new CustomerPayer()
-                        .customerID(source.getPayer().getCustomer().getCustomerId())
-                        .payerType(Payer.PayerTypeEnum.CUSTOMER_PAYER));
-    }
-
     private boolean isSetAdditionalInfo(InvoicePayment sourceWrapper) {
         return (!sourceWrapper.getSessions().isEmpty())
                 && sourceWrapper.getSessions().get(0).isSetTransactionInfo()