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 376c068d2..e8a65395c 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 @@ -10,15 +10,14 @@ import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSe import ru.spcex.platform.enumeration.Market; import ru.spcex.platform.enumeration.Status; -import java.math.BigDecimal; - public class ListingBuilder { private final String market = Market.mkrs.getKey(); + public Listing byNewMms(MoneyMarketSecurity mms, MoneyMarketSecurityNewRequest mmsReq) { Listing listing = new Listing(); listing.setCreated(mms.getCreated()); listing.setSecurityId(mms.getId()); - listing.setLotSize(BigDecimal.valueOf(mmsReq.getLotSize())); + listing.setLotSize(mmsReq.getLotSize()); listing.setMarket(market); listing.setSymbolCode(mms.getSecuritySymbol()); listing.setSymbolName(mms.getFullName()); @@ -26,6 +25,7 @@ public class ListingBuilder { listing.setWorkflowStatus(Status.Active.getKey()); return listing; } + public Listing byUpdateMms(MoneyMarketSecurity mms, Listing listing) { listing.setSecurityId(mms.getId()); listing.setSymbolCode(mms.getSecuritySymbol()); @@ -41,7 +41,7 @@ public class ListingBuilder { Listing listing = new Listing(); listing.setCreated(equitySecurity.getCreated()); listing.setSecurityId(equitySecurity.getId()); - listing.setLotSize(BigDecimal.valueOf(request.getLotSize())); + listing.setLotSize(request.getLotSize()); listing.setMarket(market); listing.setSymbolCode(equitySecurity.getSecuritySymbol()); listing.setSymbolName(equitySecurity.getFullName()); @@ -65,7 +65,7 @@ public class ListingBuilder { Listing listing = new Listing(); listing.setCreated(instant.getCreated()); listing.setSecurityId(instant.getId()); - listing.setLotSize(BigDecimal.valueOf(request.getLotSize())); + listing.setLotSize(request.getLotSize()); listing.setMarket(market); listing.setSymbolCode(instant.getSecuritySymbol()); listing.setSymbolName(instant.getFullName()); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java index e7accd308..5a3585bb8 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java @@ -25,7 +25,6 @@ import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgTransaction; -import java.math.BigDecimal; import java.time.Instant; import java.util.Map; @@ -85,7 +84,7 @@ public class EquitySecurityService extends QueueConsumer implements Initializing equity.setFullName(req.getFullName()); equity.setIsin(req.getIsin()); equity.setShareType(req.getShareType()); - equity.setLotSize(req.getLotSize() != null ? BigDecimal.valueOf(req.getLotSize()) : null); + equity.setLotSize(req.getLotSize()); equity.setIssuerId(req.getIssuerId()); equity.setShortNameEng(req.getShortNameEng()); equity.setFullNameEng(req.getFullNameEng()); @@ -128,7 +127,7 @@ public class EquitySecurityService extends QueueConsumer implements Initializing equity.setFullName(req.getFullName()); equity.setIsin(req.getIsin()); equity.setShareType(req.getShareType()); - equity.setLotSize(req.getLotSize() != null ? BigDecimal.valueOf(req.getLotSize()) : null); + equity.setLotSize(req.getLotSize()); equity.setIssuerId(req.getIssuerId()); equity.setShortNameEng(req.getShortNameEng()); equity.setFullNameEng(req.getFullNameEng()); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java index aa6c36cee..6beb91d3a 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java @@ -25,7 +25,6 @@ import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgTransaction; -import java.math.BigDecimal; import java.time.Instant; import java.util.Map; @@ -85,11 +84,11 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial fixedIncome.setFullName(req.getFullName()); fixedIncome.setIsin(req.getIsin()); fixedIncome.setBondType(req.getBondType()); - fixedIncome.setLotSize(req.getLotSize() != null ? BigDecimal.valueOf(req.getLotSize()) : null); - fixedIncome.setNominalValue(req.getNominalValue() != null ? BigDecimal.valueOf(req.getNominalValue()) : null); + fixedIncome.setLotSize(req.getLotSize()); + fixedIncome.setNominalValue(req.getNominalValue()); fixedIncome.setNominalCurrency(req.getNominalCurrency()); fixedIncome.setMaturityDate(req.getMaturityDate()); - fixedIncome.setCoupon(req.getCoupon() != null ? BigDecimal.valueOf(req.getCoupon()) : null); + fixedIncome.setCoupon(req.getCoupon()); fixedIncome.setCouponFrequency(req.getCouponFrequency()); fixedIncome.setIssuerId(req.getIssuerId()); fixedIncome.setShortNameEng(req.getShortNameEng()); @@ -133,11 +132,11 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial fixedIncome.setFullName(req.getFullName()); fixedIncome.setIsin(req.getIsin()); fixedIncome.setBondType(req.getBondType()); - fixedIncome.setLotSize(req.getLotSize() != null ? BigDecimal.valueOf(req.getLotSize()) : null); - fixedIncome.setNominalValue(req.getNominalValue() != null ? BigDecimal.valueOf(req.getNominalValue()) : null); + fixedIncome.setLotSize(req.getLotSize()); + fixedIncome.setNominalValue(req.getNominalValue()); fixedIncome.setNominalCurrency(req.getNominalCurrency()); fixedIncome.setMaturityDate(req.getMaturityDate()); - fixedIncome.setCoupon(req.getCoupon() != null ? BigDecimal.valueOf(req.getCoupon()) : null); + fixedIncome.setCoupon(req.getCoupon()); fixedIncome.setCouponFrequency(req.getCouponFrequency()); fixedIncome.setIssuerId(req.getIssuerId()); fixedIncome.setShortNameEng(req.getShortNameEng()); 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 383610af8..c96cb0e94 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 @@ -31,7 +31,6 @@ import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.validation.IValidator; -import java.math.BigDecimal; import java.time.Instant; import java.util.Map; import java.util.Optional; @@ -107,8 +106,8 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial mms.setId(idGenerator.nextId()); mms.setStartDate(req.getStartDate()); mms.setEndDate(req.getEndDate()); - mms.setNominalValue(req.getNominalValue() != null ? BigDecimal.valueOf(req.getNominalValue()) : null); - mms.setLotSize(req.getLotSize() != null ? BigDecimal.valueOf(req.getLotSize()) : null); + mms.setNominalValue(req.getNominalValue()); + mms.setLotSize(req.getLotSize()); mms.setNominalCurrency(req.getNominalCurrency()); mms.setInstrumentType(req.getInstrumentType()); mms.setFullName(req.getFullName()); @@ -161,8 +160,8 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial mms.setUpdated(updateTime); mms.setStartDate(req.getStartDate()); mms.setEndDate(req.getEndDate()); - mms.setNominalValue(req.getNominalValue() != null ? BigDecimal.valueOf(req.getNominalValue()) : null); - mms.setLotSize(req.getLotSize() != null ? BigDecimal.valueOf(req.getLotSize()) : null); + mms.setNominalValue(req.getNominalValue()); + mms.setLotSize(req.getLotSize()); mms.setNominalCurrency(req.getNominalCurrency()); mms.setInstrumentType(req.getInstrumentType()); mms.setFullName(req.getFullName()); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/СurrencyService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/СurrencyService.java index 779b46eca..a6632dbe5 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/СurrencyService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/СurrencyService.java @@ -25,7 +25,6 @@ import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgTransaction; -import java.math.BigDecimal; import java.time.Instant; import java.util.Map; @@ -85,7 +84,7 @@ public class СurrencyService extends QueueConsumer implements InitializingBean equity.setFullName(req.getFullName()); equity.setIsin(req.getIsin()); equity.setShareType(req.getShareType()); - equity.setLotSize(req.getLotSize() != null ? BigDecimal.valueOf(req.getLotSize()) : null); + equity.setLotSize(req.getLotSize()); equity.setIssuerId(req.getIssuerId()); equity.setShortNameEng(req.getShortNameEng()); equity.setFullNameEng(req.getFullNameEng()); @@ -128,7 +127,7 @@ public class СurrencyService extends QueueConsumer implements InitializingBean equity.setFullName(req.getFullName()); equity.setIsin(req.getIsin()); equity.setShareType(req.getShareType()); - equity.setLotSize(req.getLotSize() != null ? BigDecimal.valueOf(req.getLotSize()) : null); + equity.setLotSize(req.getLotSize()); equity.setIssuerId(req.getIssuerId()); equity.setShortNameEng(req.getShortNameEng()); equity.setFullNameEng(req.getFullNameEng()); diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/EquitySecurityServiceTest.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/EquitySecurityServiceTest.java index d34e89aff..c3928cb15 100644 --- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/EquitySecurityServiceTest.java +++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/EquitySecurityServiceTest.java @@ -185,7 +185,7 @@ public class EquitySecurityServiceTest extends AbstractServiceTest{ equitySecurityNewRequest.setFullName(equitySecurity.getFullName()); equitySecurityNewRequest.setIsin(equitySecurity.getIsin()); equitySecurityNewRequest.setShareType(equitySecurity.getShareType()); - equitySecurityNewRequest.setLotSize(equitySecurity.getLotSize().doubleValue()); + equitySecurityNewRequest.setLotSize(equitySecurity.getLotSize()); equitySecurityNewRequest.setIssuerId(equitySecurity.getIssuerId()); equitySecurityNewRequest.setShortNameEng(equitySecurity.getShortNameEng()); equitySecurityNewRequest.setFullNameEng(equitySecurity.getFullNameEng()); @@ -202,7 +202,7 @@ public class EquitySecurityServiceTest extends AbstractServiceTest{ equitySecurityUpdateRequest.setFullName(equitySecurity.getFullName()); equitySecurityUpdateRequest.setIsin(equitySecurity.getIsin()); equitySecurityUpdateRequest.setShareType(equitySecurity.getShareType()); - equitySecurityUpdateRequest.setLotSize(equitySecurity.getLotSize().doubleValue()); + equitySecurityUpdateRequest.setLotSize(equitySecurity.getLotSize()); equitySecurityUpdateRequest.setIssuerId(equitySecurity.getIssuerId()); equitySecurityUpdateRequest.setShortNameEng(equitySecurity.getShortNameEng()); equitySecurityUpdateRequest.setFullNameEng(equitySecurity.getFullNameEng()); diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/FixedIncomeSecurityServiceTest.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/FixedIncomeSecurityServiceTest.java index 92ae716b9..1c4fe140b 100644 --- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/FixedIncomeSecurityServiceTest.java +++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/FixedIncomeSecurityServiceTest.java @@ -194,11 +194,11 @@ public class FixedIncomeSecurityServiceTest extends AbstractServiceTest{ fixedIncomeSecurityNewRequest.setFullName(fixedIncomeSecurity.getFullName()); fixedIncomeSecurityNewRequest.setIsin(fixedIncomeSecurity.getIsin()); fixedIncomeSecurityNewRequest.setBondType(fixedIncomeSecurity.getBondType()); - fixedIncomeSecurityNewRequest.setLotSize(fixedIncomeSecurity.getLotSize().doubleValue()); - fixedIncomeSecurityNewRequest.setNominalValue(fixedIncomeSecurity.getNominalValue().doubleValue()); + fixedIncomeSecurityNewRequest.setLotSize(fixedIncomeSecurity.getLotSize()); + fixedIncomeSecurityNewRequest.setNominalValue(fixedIncomeSecurity.getNominalValue()); fixedIncomeSecurityNewRequest.setNominalCurrency(fixedIncomeSecurity.getNominalCurrency()); fixedIncomeSecurityNewRequest.setMaturityDate(fixedIncomeSecurity.getMaturityDate()); - fixedIncomeSecurityNewRequest.setCoupon(fixedIncomeSecurity.getCoupon().doubleValue()); + fixedIncomeSecurityNewRequest.setCoupon(fixedIncomeSecurity.getCoupon()); fixedIncomeSecurityNewRequest.setCouponFrequency(fixedIncomeSecurity.getCouponFrequency()); fixedIncomeSecurityNewRequest.setIssuerId(fixedIncomeSecurity.getIssuerId()); fixedIncomeSecurityNewRequest.setShortNameEng(fixedIncomeSecurity.getShortNameEng()); @@ -216,11 +216,11 @@ public class FixedIncomeSecurityServiceTest extends AbstractServiceTest{ equitySecurityUpdateRequest.setFullName(fixedIncomeSecurity.getFullName()); equitySecurityUpdateRequest.setIsin(fixedIncomeSecurity.getIsin()); equitySecurityUpdateRequest.setBondType(fixedIncomeSecurity.getBondType()); - equitySecurityUpdateRequest.setLotSize(fixedIncomeSecurity.getLotSize().doubleValue()); - equitySecurityUpdateRequest.setNominalValue(fixedIncomeSecurity.getNominalValue().doubleValue()); + equitySecurityUpdateRequest.setLotSize(fixedIncomeSecurity.getLotSize()); + equitySecurityUpdateRequest.setNominalValue(fixedIncomeSecurity.getNominalValue()); equitySecurityUpdateRequest.setNominalCurrency(fixedIncomeSecurity.getNominalCurrency()); equitySecurityUpdateRequest.setMaturityDate(fixedIncomeSecurity.getMaturityDate()); - equitySecurityUpdateRequest.setCoupon(fixedIncomeSecurity.getCoupon().doubleValue()); + equitySecurityUpdateRequest.setCoupon(fixedIncomeSecurity.getCoupon()); equitySecurityUpdateRequest.setCouponFrequency(fixedIncomeSecurity.getCouponFrequency()); equitySecurityUpdateRequest.setIssuerId(fixedIncomeSecurity.getIssuerId()); equitySecurityUpdateRequest.setShortNameEng(fixedIncomeSecurity.getShortNameEng()); diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java index 0ccfd0d7e..d90f48819 100644 --- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java +++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java @@ -16,10 +16,10 @@ class MoneyMarketSecurityFactory { private Long id = 0L; private Long securityId = 0L;// (linked to security) private String description = "tsetse"; - private Double lotSize = 1.0; + private BigDecimal lotSize = BigDecimal.valueOf(341.0); private LocalDate startDate = LocalDate.ofEpochDay(0); private LocalDate endDate = LocalDate.now(); - private BigDecimal nominalValue = BigDecimal.valueOf(1.0); + private BigDecimal nominalValue = BigDecimal.valueOf(11.0); private String instrumentType = RATE; // (linked to instrumentType) private String fullName = "estat"; private String shortName = "esasdftat"; @@ -31,7 +31,7 @@ class MoneyMarketSecurityFactory { return fullName; } - public MoneyMarketSecurityFactory setLotSize(Double lotSize) { + public MoneyMarketSecurityFactory setLotSize(BigDecimal lotSize) { this.lotSize = lotSize; return this; } @@ -104,7 +104,7 @@ class MoneyMarketSecurityFactory { moneyMarketSecurity.setTermType(termType); moneyMarketSecurity.setIssuerId(issuerId); moneyMarketSecurity.setDescription(description); - moneyMarketSecurity.setLotSize(BigDecimal.valueOf(lotSize)); + moneyMarketSecurity.setLotSize(lotSize); moneyMarketSecurity.setSecuritySymbol(securitySymbol); moneyMarketSecurity.setWorkflowStatus(ru.spcex.platform.enumeration.Status.Active.getKey()); @@ -119,7 +119,7 @@ class MoneyMarketSecurityFactory { moneyMarketSecurityUpdateRequest.setLotSize(lotSize); moneyMarketSecurityUpdateRequest.setStartDate(startDate); moneyMarketSecurityUpdateRequest.setEndDate(endDate); - moneyMarketSecurityUpdateRequest.setNominalValue(nominalValue.doubleValue()); + moneyMarketSecurityUpdateRequest.setNominalValue(nominalValue); moneyMarketSecurityUpdateRequest.setNominalCurrency(nominalCurrency); moneyMarketSecurityUpdateRequest.setInstrumentType(instrumentType); moneyMarketSecurityUpdateRequest.setFullName(fullName); @@ -148,7 +148,7 @@ class MoneyMarketSecurityFactory { keyRequest.setLotSize(lotSize); keyRequest.setStartDate(startDate); keyRequest.setEndDate(endDate); - keyRequest.setNominalValue(nominalValue.doubleValue()); + keyRequest.setNominalValue(nominalValue); keyRequest.setNominalCurrency(nominalCurrency); keyRequest.setInstrumentType(instrumentType); keyRequest.setFullName(fullName); 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 5331b7e6f..e5ddda98b 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 @@ -141,14 +141,14 @@ public class MoneyMarketSecurityServiceTest extends AbstractServiceTest{ clearAllInImdg(moneyMarketSecurityMap); final String TOPIC = Consts.DESTINATION_MONEY_MARKET_SECURITY_UPDATE; String updateTermType = "updateTermType"; - Double updateLotSize = 112.0; + BigDecimal updateLotSize = BigDecimal.valueOf(112.0); final MoneyMarketSecurity moneyMarketSecurityPrediction = moneyMarketSecurityFactory .getMoneyMarketSecurity(); moneyMarketSecurityPrediction.setTermType(updateTermType); moneyMarketSecurityMap.insert(moneyMarketSecurityPrediction); moneyMarketSecurityPrediction.setTermType(termType); - moneyMarketSecurityPrediction.setLotSize(BigDecimal.valueOf(updateLotSize)); + moneyMarketSecurityPrediction.setLotSize(updateLotSize); final MoneyMarketSecurityUpdateRequest keyRequest = moneyMarketSecurityFactory .getMoneyMarketSecurityUpdateRequest(); keyRequest.setTermType(termType); @@ -156,7 +156,7 @@ public class MoneyMarketSecurityServiceTest extends AbstractServiceTest{ Listing listingPrediction = new Listing(); listingPrediction = listingBuilder.byUpdateMms(moneyMarketSecurityPrediction, listingPrediction); listingImdg.insert(listingPrediction); - listingPrediction.setLotSize(BigDecimal.valueOf(updateLotSize)); + listingPrediction.setLotSize(updateLotSize); //ACT String jsonString = getJsonStringForUPDATE(keyRequest, ID); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/EquitySecurityNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/EquitySecurityNewRequest.java index 909618598..051273278 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/EquitySecurityNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/EquitySecurityNewRequest.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import ru.spcex.platform.classes.base.interfaces.WithInstrumentType; import ru.spcex.platform.classes.base.interfaces.WithSecuritySymbol; +import java.math.BigDecimal; + public class EquitySecurityNewRequest implements WithSecuritySymbol, WithInstrumentType { @JsonProperty public String securitySymbol; @@ -16,7 +18,7 @@ public class EquitySecurityNewRequest implements WithSecuritySymbol, WithInstrum @JsonProperty public String shareType; @JsonProperty - public Double lotSize; + public BigDecimal lotSize; @JsonProperty public Long issuerId; @JsonProperty @@ -69,11 +71,11 @@ public class EquitySecurityNewRequest implements WithSecuritySymbol, WithInstrum this.shareType = shareType; } - public Double getLotSize() { + public BigDecimal getLotSize() { return lotSize; } - public void setLotSize(Double lotSize) { + public void setLotSize(BigDecimal lotSize) { this.lotSize = lotSize; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/EquitySecurityUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/EquitySecurityUpdateRequest.java index fb4806e79..10a42dabc 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/EquitySecurityUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/EquitySecurityUpdateRequest.java @@ -5,6 +5,8 @@ import ru.spcex.platform.classes.base.interfaces.WithId; import ru.spcex.platform.classes.base.interfaces.WithInstrumentType; import ru.spcex.platform.classes.base.interfaces.WithWorkflowStatus; +import java.math.BigDecimal; + public class EquitySecurityUpdateRequest implements WithId, WithInstrumentType, WithWorkflowStatus { @JsonProperty public Long id; @@ -19,7 +21,7 @@ public class EquitySecurityUpdateRequest implements WithId, WithInstrumentType, @JsonProperty public String shareType; @JsonProperty - public Double lotSize; + public BigDecimal lotSize; @JsonProperty public Long issuerId; @JsonProperty @@ -80,11 +82,11 @@ public class EquitySecurityUpdateRequest implements WithId, WithInstrumentType, this.shareType = shareType; } - public Double getLotSize() { + public BigDecimal getLotSize() { return lotSize; } - public void setLotSize(Double lotSize) { + public void setLotSize(BigDecimal lotSize) { this.lotSize = lotSize; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeSecurityNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeSecurityNewRequest.java index c39fcb494..6d0112883 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeSecurityNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeSecurityNewRequest.java @@ -8,6 +8,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSeria import ru.spcex.platform.classes.base.interfaces.WithInstrumentType; import ru.spcex.platform.classes.base.interfaces.WithSecuritySymbol; +import java.math.BigDecimal; import java.time.LocalDate; public class FixedIncomeSecurityNewRequest implements WithSecuritySymbol, WithInstrumentType { @@ -22,9 +23,9 @@ public class FixedIncomeSecurityNewRequest implements WithSecuritySymbol, WithIn @JsonProperty public String bondType; @JsonProperty - public Double lotSize; + public BigDecimal lotSize; @JsonProperty - public Double nominalValue; + public BigDecimal nominalValue; @JsonProperty public String nominalCurrency; @JsonProperty @@ -32,7 +33,7 @@ public class FixedIncomeSecurityNewRequest implements WithSecuritySymbol, WithIn @JsonDeserialize(using = LocalDateDeserializer.class) public LocalDate maturityDate; @JsonProperty - public Double coupon; + public BigDecimal coupon; @JsonProperty public Long couponFrequency; @JsonProperty @@ -87,19 +88,19 @@ public class FixedIncomeSecurityNewRequest implements WithSecuritySymbol, WithIn this.bondType = bondType; } - public Double getLotSize() { + public BigDecimal getLotSize() { return lotSize; } - public void setLotSize(Double lotSize) { + public void setLotSize(BigDecimal lotSize) { this.lotSize = lotSize; } - public Double getNominalValue() { + public BigDecimal getNominalValue() { return nominalValue; } - public void setNominalValue(Double nominalValue) { + public void setNominalValue(BigDecimal nominalValue) { this.nominalValue = nominalValue; } @@ -119,11 +120,11 @@ public class FixedIncomeSecurityNewRequest implements WithSecuritySymbol, WithIn this.maturityDate = maturityDate; } - public Double getCoupon() { + public BigDecimal getCoupon() { return coupon; } - public void setCoupon(Double coupon) { + public void setCoupon(BigDecimal coupon) { this.coupon = coupon; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeSecurityUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeSecurityUpdateRequest.java index dcfd798ea..592582ab6 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeSecurityUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/FixedIncomeSecurityUpdateRequest.java @@ -9,6 +9,7 @@ import ru.spcex.platform.classes.base.interfaces.WithId; import ru.spcex.platform.classes.base.interfaces.WithInstrumentType; import ru.spcex.platform.classes.base.interfaces.WithWorkflowStatus; +import java.math.BigDecimal; import java.time.LocalDate; public class FixedIncomeSecurityUpdateRequest implements WithId, WithInstrumentType, WithWorkflowStatus { @@ -25,9 +26,9 @@ public class FixedIncomeSecurityUpdateRequest implements WithId, WithInstrumentT @JsonProperty public String bondType; @JsonProperty - public Double lotSize; + public BigDecimal lotSize; @JsonProperty - public Double nominalValue; + public BigDecimal nominalValue; @JsonProperty public String nominalCurrency; @JsonProperty @@ -35,7 +36,7 @@ public class FixedIncomeSecurityUpdateRequest implements WithId, WithInstrumentT @JsonDeserialize(using = LocalDateDeserializer.class) public LocalDate maturityDate; @JsonProperty - public Double coupon; + public BigDecimal coupon; @JsonProperty public Long couponFrequency; @JsonProperty @@ -98,19 +99,19 @@ public class FixedIncomeSecurityUpdateRequest implements WithId, WithInstrumentT this.bondType = bondType; } - public Double getLotSize() { + public BigDecimal getLotSize() { return lotSize; } - public void setLotSize(Double lotSize) { + public void setLotSize(BigDecimal lotSize) { this.lotSize = lotSize; } - public Double getNominalValue() { + public BigDecimal getNominalValue() { return nominalValue; } - public void setNominalValue(Double nominalValue) { + public void setNominalValue(BigDecimal nominalValue) { this.nominalValue = nominalValue; } @@ -130,11 +131,11 @@ public class FixedIncomeSecurityUpdateRequest implements WithId, WithInstrumentT this.maturityDate = maturityDate; } - public Double getCoupon() { + public BigDecimal getCoupon() { return coupon; } - public void setCoupon(Double coupon) { + public void setCoupon(BigDecimal coupon) { this.coupon = coupon; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java index 44466ac0f..108085f5f 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java @@ -10,6 +10,7 @@ import ru.spcex.platform.classes.base.interfaces.WithInstrumentType; import ru.spcex.platform.classes.base.interfaces.WithSecuritySymbol; import ru.spcex.platform.classes.base.interfaces.WithStartDt; +import java.math.BigDecimal; import java.time.LocalDate; public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, WithSecuritySymbol, WithInstrumentType { @@ -22,7 +23,7 @@ public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, Wi @JsonDeserialize(using = LocalDateDeserializer.class) public LocalDate endDate; @JsonProperty - public Double nominalValue; + public BigDecimal nominalValue; @JsonProperty public String nominalCurrency; @JsonProperty @@ -38,7 +39,7 @@ public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, Wi @JsonProperty public String securitySymbol; @JsonProperty - public Double lotSize; + public BigDecimal lotSize; @JsonProperty public String termType; @JsonProperty @@ -66,11 +67,11 @@ public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, Wi this.endDate = endDate; } - public Double getNominalValue() { + public BigDecimal getNominalValue() { return nominalValue; } - public void setNominalValue(Double nominalValue) { + public void setNominalValue(BigDecimal nominalValue) { this.nominalValue = nominalValue; } @@ -114,11 +115,11 @@ public class MoneyMarketSecurityNewRequest implements WithStartDt, WithEndDt, Wi this.securitySymbol = securitySymbol; } - public Double getLotSize() { + public BigDecimal getLotSize() { return lotSize; } - public void setLotSize(Double lotSize) { + public void setLotSize(BigDecimal lotSize) { this.lotSize = lotSize; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java index 9778597b7..1f743aca4 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java @@ -8,6 +8,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDes import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import ru.spcex.platform.classes.base.interfaces.*; +import java.math.BigDecimal; import java.time.LocalDate; public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, WithEndDt, WithInstrumentType, WithWorkflowStatus { @@ -24,7 +25,7 @@ public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, Wi @JsonProperty public LocalDate endDate; @JsonProperty - public Double nominalValue; + public BigDecimal nominalValue; @JsonProperty public String nominalCurrency; @JsonProperty @@ -40,7 +41,7 @@ public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, Wi @JsonProperty public String securitySymbol; @JsonProperty - public Double lotSize; + public BigDecimal lotSize; @JsonProperty public String termType; @JsonProperty @@ -68,11 +69,11 @@ public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, Wi this.endDate = endDate; } - public Double getNominalValue() { + public BigDecimal getNominalValue() { return nominalValue; } - public void setNominalValue(Double nominalValue) { + public void setNominalValue(BigDecimal nominalValue) { this.nominalValue = nominalValue; } @@ -173,11 +174,11 @@ public class MoneyMarketSecurityUpdateRequest implements WithId, WithStartDt, Wi this.workflowStatus = workflowStatus; } - public Double getLotSize() { + public BigDecimal getLotSize() { return lotSize; } - public void setLotSize(Double lotSize) { + public void setLotSize(BigDecimal lotSize) { this.lotSize = lotSize; }