diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java index 6ad5587b5..63821798f 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/FondSecurity.java @@ -1,6 +1,5 @@ package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; @@ -10,8 +9,6 @@ import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; public class FondSecurity extends WithMapId implements WithIssuerId { @@ -174,25 +171,6 @@ public class FondSecurity extends WithMapId implements WithIssuerId { ) private BigDecimal couponFrequency; - - - @ApiModelProperty(hidden = true) - @JsonIgnore - private List listingList = new ArrayList<>(); - - @ApiModelProperty(hidden = true) - @JsonIgnore - private List couponScheduleList = new ArrayList<>(); - - @ApiModelProperty(hidden = true) - @JsonIgnore - private List nominalList = new ArrayList<>(); - - @ApiModelProperty(hidden = true) - @JsonIgnore - private IssuerCompany issuerCompany = null; - - public UUID getId() { return id; } @@ -337,36 +315,4 @@ public class FondSecurity extends WithMapId implements WithIssuerId { public void setCouponFrequency(BigDecimal couponFrequency) { this.couponFrequency = couponFrequency; } - - public List getListingList() { - return listingList; - } - - public void setListingList(List listingList) { - this.listingList = listingList; - } - - public List getCouponScheduleList() { - return couponScheduleList; - } - - public void setCouponScheduleList(List couponScheduleList) { - this.couponScheduleList = couponScheduleList; - } - - public List getNominalList() { - return nominalList; - } - - public void setNominalList(List nominalList) { - this.nominalList = nominalList; - } - - public IssuerCompany getIssuerCompany() { - return issuerCompany; - } - - public void setIssuerCompany(IssuerCompany issuerCompany) { - this.issuerCompany = issuerCompany; - } } diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java index 9c7f9e63b..818de629a 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/fond/IssuerCompany.java @@ -1,13 +1,10 @@ package ru.spcex.clearing.gatewayapi.controller.request.listing.fond; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.gatewayapi.controller.request.WithMapId; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; @ApiModel("Компания эмитент") @@ -43,20 +40,6 @@ public class IssuerCompany extends WithMapId { ) private String workflowStatus; - - @ApiModelProperty(hidden = true) - @JsonIgnore - private IssuerCompanyInfo issuerCompanyInfo; - - @ApiModelProperty(hidden = true) - @JsonIgnore - private List issuerCompanySymbolsList = new ArrayList<>(); - - @ApiModelProperty(hidden = true) - @JsonIgnore - private List issuerContactList = new ArrayList<>(); - - public UUID getId() { return id; } @@ -88,28 +71,4 @@ public class IssuerCompany extends WithMapId { public void setWorkflowStatus(String workflowStatus) { this.workflowStatus = workflowStatus; } - - public List getIssuerCompanySymbolsList() { - return issuerCompanySymbolsList; - } - - public void setIssuerCompanySymbolsList(List issuerCompanySymbolsList) { - this.issuerCompanySymbolsList = issuerCompanySymbolsList; - } - - public List getIssuerContactList() { - return issuerContactList; - } - - public void setIssuerContactList(List issuerContactList) { - this.issuerContactList = issuerContactList; - } - - public IssuerCompanyInfo getIssuerCompanyInfo() { - return issuerCompanyInfo; - } - - public void setIssuerCompanyInfo(IssuerCompanyInfo issuerCompanyInfo) { - this.issuerCompanyInfo = issuerCompanyInfo; - } } diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java index 5d2fdb756..1833a9ccc 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/request/listing/mkr/ExchangeInstrument.java @@ -1,6 +1,5 @@ package ru.spcex.clearing.gatewayapi.controller.request.listing.mkr; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; @@ -203,23 +202,6 @@ public class ExchangeInstrument extends WithMapId { ) private String workflowStatus; - @JsonIgnore - @ApiModelProperty(hidden = true) - private TradingMode tradingMode; - - @JsonIgnore - @ApiModelProperty(hidden = true) - private DirAuctionBiddingType dirAuctionBiddingType; - - @JsonIgnore - @ApiModelProperty(hidden = true) - private Long issuerId; - - @JsonProperty - @ApiModelProperty(hidden = true) - private String securitySymbol; - - public UUID getId() { return id; } @@ -348,22 +330,6 @@ public class ExchangeInstrument extends WithMapId { this.workflowStatus = workflowStatus; } - public TradingMode getTradingMode() { - return tradingMode; - } - - public void setTradingMode(TradingMode tradingMode) { - this.tradingMode = tradingMode; - } - - public DirAuctionBiddingType getDirAuctionBiddingType() { - return dirAuctionBiddingType; - } - - public void setDirAuctionBiddingType(DirAuctionBiddingType dirAuctionBiddingType) { - this.dirAuctionBiddingType = dirAuctionBiddingType; - } - public String getBankDepositAgreementType() { return bankDepositAgreementType; } @@ -403,20 +369,4 @@ public class ExchangeInstrument extends WithMapId { public void setLot(BigDecimal lot) { this.lot = lot; } - - public Long getIssuerId() { - return issuerId; - } - - public void setIssuerId(Long issuerId) { - this.issuerId = issuerId; - } - - public String getSecuritySymbol() { - return securitySymbol; - } - - public void setSecuritySymbol(String securitySymbol) { - this.securitySymbol = securitySymbol; - } } \ No newline at end of file