From baf625f9598d16b593b142b97faa1a79934b91bf Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Mon, 15 Aug 2022 15:03:26 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-16

---
 .../service/cud/MoneyMarketSecurityService.java    |  3 +--
 .../logic/functional/BuilderConsumerStep.java      |  2 +-
 .../logic/functional/BuilderDestinationStep.java   |  4 ++--
 .../logic/functional/ConsumerSpecificClass.java    | 14 +++-----------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
index 1b40a25f5..f52510eb6 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
@@ -30,8 +30,7 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial
     public void afterPropertiesSet() {
         callback(MoneyMarketSecurityNewRequest.class)
                 .setConsumer(this::newMoneyMarket)
-                .setDestination(Consts.DESTINATION_MONEY_MARKET_SECURITY_NEW, callbacks::put)
-                .build();
+                .forDestination(Consts.DESTINATION_MONEY_MARKET_SECURITY_NEW, callbacks::put);
         init();
     }
 
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/BuilderConsumerStep.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/BuilderConsumerStep.java
index 3fd881ecc..2a844b086 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/BuilderConsumerStep.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/BuilderConsumerStep.java
@@ -3,5 +3,5 @@ package ru.spcex.clearing.platform.messaging.logic.functional;
 import java.util.function.Consumer;
 
 public interface BuilderConsumerStep<T1> {
-    BuilderDestinationStep<T1> setConsumer(Consumer<T1> consumer);
+    BuilderDestinationStep setConsumer(Consumer<T1> consumer);
 }
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/BuilderDestinationStep.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/BuilderDestinationStep.java
index d5b38d6af..34a18b0d7 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/BuilderDestinationStep.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/BuilderDestinationStep.java
@@ -2,6 +2,6 @@ package ru.spcex.clearing.platform.messaging.logic.functional;
 
 import java.util.function.BiConsumer;
 
-public interface BuilderDestinationStep<T1> {
-    Builder<T1> setDestination(String destination, BiConsumer<String, ConsumerSpecificClass<?>> mappingFun);
+public interface BuilderDestinationStep {
+    void forDestination(String destination, BiConsumer<String, ConsumerSpecificClass<?>> mappingFun);
 }
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/ConsumerSpecificClass.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/ConsumerSpecificClass.java
index 3ffe10b30..c96f94f2a 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/ConsumerSpecificClass.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/logic/functional/ConsumerSpecificClass.java
@@ -3,7 +3,7 @@ package ru.spcex.clearing.platform.messaging.logic.functional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-public class ConsumerSpecificClass<T> implements BuilderConsumerStep<T>, BuilderDestinationStep<T>, Builder<T> {
+public class ConsumerSpecificClass<T> implements BuilderConsumerStep<T>, BuilderDestinationStep {
     private Class<T> clazz;
     private java.util.function.Consumer<T> consumer;
 
@@ -11,9 +11,8 @@ public class ConsumerSpecificClass<T> implements BuilderConsumerStep<T>, Builder
         this.clazz = clazz;
     }
 
-    public Builder<T> setDestination(String destination, BiConsumer<String, ConsumerSpecificClass<?>> fun) {
+    public void forDestination(String destination, BiConsumer<String, ConsumerSpecificClass<?>> fun) {
         fun.accept(destination, this);
-        return this;
     }
 
     public void accept(T obj) {
@@ -33,15 +32,8 @@ public class ConsumerSpecificClass<T> implements BuilderConsumerStep<T>, Builder
     }
 
     @Override
-    public BuilderDestinationStep<T> setConsumer(Consumer<T> consumer) {
+    public BuilderDestinationStep setConsumer(Consumer<T> consumer) {
         this.consumer = consumer;
         return this;
     }
-
-    @Override
-    public ConsumerSpecificClass<T> build() {
-        return this;
-    }
-
-
 }