From 542b8c7e58c3853b7852e80c51a82d3e3845e0c0 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Tue, 18 Apr 2023 17:13:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B2?= =?UTF-8?q?=D1=8B=D1=80=D0=B0=D0=B2=D0=BD=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../securities/component/ListingBuilder.java | 18 ++++++++++-------- .../MoneyMarketSecurityServiceTest.java | 7 ++++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/component/ListingBuilder.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/component/ListingBuilder.java index a0cf43bea..dba5c2768 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/component/ListingBuilder.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/component/ListingBuilder.java @@ -26,9 +26,11 @@ public class ListingBuilder { public static ListingBuilder builder() { return new ListingBuilder(); } - private ListingBuilder(){} - public ListingBuilder append(MoneyMarketSecurity mms){ + private ListingBuilder() { + } + + public ListingBuilder append(MoneyMarketSecurity mms) { this.created = mms.getCreated(); this.securityId = mms.getId(); this.symbolCode = mms.getSecuritySymbol(); @@ -37,12 +39,12 @@ public class ListingBuilder { return this; } - public ListingBuilder append(MoneyMarketSecurityNewRequest mmsReq){ + public ListingBuilder append(MoneyMarketSecurityNewRequest mmsReq) { this.lotSize = mmsReq.getLotSize(); return this; } - public ListingBuilder append(EquitySecurity equitySecurity){ + public ListingBuilder append(EquitySecurity equitySecurity) { this.created = equitySecurity.getCreated(); this.securityId = equitySecurity.getId(); this.symbolCode = equitySecurity.getSecuritySymbol(); @@ -50,12 +52,12 @@ public class ListingBuilder { return this; } - public ListingBuilder append(EquitySecurityNewRequest request){ + public ListingBuilder append(EquitySecurityNewRequest request) { this.lotSize = request.getLotSize(); return this; } - public ListingBuilder append(FixedIncomeSecurity fixedIncomeSecurity){ + public ListingBuilder append(FixedIncomeSecurity fixedIncomeSecurity) { this.created = fixedIncomeSecurity.getCreated(); this.securityId = fixedIncomeSecurity.getId(); this.symbolCode = fixedIncomeSecurity.getSecuritySymbol(); @@ -64,12 +66,12 @@ public class ListingBuilder { return this; } - public ListingBuilder append(FixedIncomeSecurityNewRequest request){ + public ListingBuilder append(FixedIncomeSecurityNewRequest request) { this.lotSize = request.getLotSize(); return this; } - public Listing build(){ + public Listing build() { Listing listing = new Listing(); listing.setCreated(this.created); listing.setSecurityId(this.securityId); diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityServiceTest.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityServiceTest.java index 73ca5c1e0..9f6be8296 100644 --- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityServiceTest.java +++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityServiceTest.java @@ -25,13 +25,14 @@ import java.util.Map; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.test.TestUtils.*; -public class MoneyMarketSecurityServiceTest extends AbstractServiceTest{ +public class MoneyMarketSecurityServiceTest extends AbstractServiceTest { private static final MatcherFactory.Matcher MONEY_MARKET_SECURITY_MATCHER = usingIgnoringFieldsComparator("created", "updated"); private final long ID = currentId.getAndIncrement(); private final int PARTITION = 0; private MoneyMarketSecurityFactory moneyMarketSecurityFactory; @Autowired private MoneyMarketSecurityService moneyMarketSecurityService; + @PostConstruct protected void init() { super.init(); @@ -57,7 +58,7 @@ public class MoneyMarketSecurityServiceTest extends AbstractServiceTest{ * {@link MoneyMarketSecurityNewRequest#fullName} - "estat"
*/ @Test - public void testNewMoneyMarketSecurity(){ + public void testNewMoneyMarketSecurity() { clearAllInImdg(moneyMarketSecurityMap); final String TOPIC = Consts.DESTINATION_MONEY_MARKET_SECURITY_NEW; @@ -94,7 +95,7 @@ public class MoneyMarketSecurityServiceTest extends AbstractServiceTest{ * {@link CommonDeleteRequest#id} - Идентификатор записи
*/ @Test - public void testDeleteMoneyMarket(){ + public void testDeleteMoneyMarket() { clearAllInImdg(moneyMarketSecurityMap); final String TOPIC = Consts.DESTINATION_MONEY_MARKET_SECURITY_DELETE;