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;