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 { - BuilderDestinationStep setConsumer(Consumer consumer); + BuilderDestinationStep setConsumer(Consumer 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 { - Builder setDestination(String destination, BiConsumer> mappingFun); +public interface BuilderDestinationStep { + void forDestination(String destination, BiConsumer> 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 implements BuilderConsumerStep, BuilderDestinationStep, Builder { +public class ConsumerSpecificClass implements BuilderConsumerStep, BuilderDestinationStep { private Class clazz; private java.util.function.Consumer consumer; @@ -11,9 +11,8 @@ public class ConsumerSpecificClass implements BuilderConsumerStep, Builder this.clazz = clazz; } - public Builder setDestination(String destination, BiConsumer> fun) { + public void forDestination(String destination, BiConsumer> fun) { fun.accept(destination, this); - return this; } public void accept(T obj) { @@ -33,15 +32,8 @@ public class ConsumerSpecificClass implements BuilderConsumerStep, Builder } @Override - public BuilderDestinationStep setConsumer(Consumer consumer) { + public BuilderDestinationStep setConsumer(Consumer consumer) { this.consumer = consumer; return this; } - - @Override - public ConsumerSpecificClass build() { - return this; - } - - }